commit a93c8e36f0e17b4f209cd943e581f0141789450f (HEAD, refs/remotes/origin/master) Author: Glenn Morris Date: Tue Dec 12 23:20:15 2017 -0500 * admin/gitmerge.el (gitmerge-missing): Don't get confused by decorations. diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 13d92ac92b..5e7d8c3e33 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -203,6 +203,7 @@ if and why this commit should be skipped." ;; `gitmerge-skip-regexp' or are marked by --cherry-mark. (with-temp-buffer (call-process "git" nil t nil "log" "--cherry-mark" "--left-only" + "--no-decorate" (concat from "..." (car (vc-git-branches)))) (goto-char (point-max)) (while (re-search-backward "^commit \\(.+\\) \\([0-9a-f]+\\).*" nil t) commit 14b95587520959c5b54356547a0a69932a9bb480 Author: Stefan Monnier Date: Tue Dec 12 23:03:00 2017 -0500 * src/syntax.c (find_defun_start): Use syntax-ppss (syms_of_syntax): New variable comment-use-syntax-ppss. diff --git a/etc/NEWS b/etc/NEWS index 7376fc48b3..bec7753d19 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -164,6 +164,12 @@ generating warnings for a decade. * Lisp Changes in Emacs 27.1 +** Internal parsing commands now use syntax-ppss and disregard +open-paren-in-column-0-is-defun-start. This affects mostly things like +forward-comment, scan-sexps, and forward-sexp when parsing backward. +The new variable 'comment-use-syntax-ppss' can be set to nil to recover the old +behavior if needed. + --- ** The 'file-system-info' function is now available on all platforms. instead of just Microsoft platforms. This fixes a 'get-free-disk-space' diff --git a/src/syntax.c b/src/syntax.c index 80603b4f8b..91c46f7a73 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -605,6 +605,26 @@ find_defun_start (ptrdiff_t pos, ptrdiff_t pos_byte) && MODIFF == find_start_modiff) return find_start_value; + if (!NILP (Vcomment_use_syntax_ppss)) + { + EMACS_INT modiffs = CHARS_MODIFF; + Lisp_Object ppss = call1 (Qsyntax_ppss, make_number (pos)); + if (modiffs != CHARS_MODIFF) + error ("syntax-ppss modified the buffer!"); + TEMP_SET_PT_BOTH (opoint, opoint_byte); + Lisp_Object boc = Fnth (make_number (8), ppss); + if (NUMBERP (boc)) + { + find_start_value = XINT (boc); + find_start_value_byte = CHAR_TO_BYTE (find_start_value); + } + else + { + find_start_value = pos; + find_start_value_byte = pos_byte; + } + goto found; + } if (!open_paren_in_column_0_is_defun_start) { find_start_value = BEGV; @@ -874,6 +894,7 @@ back_comment (ptrdiff_t from, ptrdiff_t from_byte, ptrdiff_t stop, case Sopen: /* Assume a defun-start point is outside of strings. */ if (open_paren_in_column_0_is_defun_start + && NILP (Vcomment_use_syntax_ppss) && (from == stop || (temp_byte = dec_bytepos (from_byte), FETCH_CHAR (temp_byte) == '\n'))) @@ -3689,6 +3710,11 @@ void syms_of_syntax (void) { DEFSYM (Qsyntax_table_p, "syntax-table-p"); + DEFSYM (Qsyntax_ppss, "syntax-ppss"); + DEFVAR_LISP ("comment-use-syntax-ppss", + Vcomment_use_syntax_ppss, + doc: /* Non-nil means `forward-comment' can use `syntax-ppss' internally. */); + Vcomment_use_syntax_ppss = Qt; staticpro (&Vsyntax_code_object); commit 735680fa5e33c8c072081631b14f4a57c00e6340 Merge: 0beba8d164 45099bb90f Author: Glenn Morris Date: Tue Dec 12 19:43:34 2017 -0800 ; Merge from origin/emacs-26 The following commit was skipped: 45099bb90f (origin/emacs-26) Remove ObjC blocks (Bug#23753) commit 0beba8d16419ac592dd3dd7af7c177d80d490c4d Merge: 92ca51cc5e b0369d0536 Author: Glenn Morris Date: Tue Dec 12 19:43:33 2017 -0800 Merge from origin/emacs-26 b0369d0536 Import the latest IVD_Sequences.txt cd53b6399b Fix dired-do-compress when tar doesn't default to stdin (B... 51911dae14 Suppress warnings during elisp completion macroexpansion a36a090a95 * lisp/progmodes/verilog-mode.el (verilog-mode): Fix typo ... 6a6e8e6e8d Make tramp-interrupt-process more robust 5bcd468a9e Make quail-input-method work when inhibit-read-only is non... 87baf1242e Fix 'fontset-name-p' d23158777d Fix fontset documentation inconsistencies for bug#29630 a829cb8c8b Remove sentence from child frames section in Elisp manual ad491c80e4 Avoid crashes in 'font-at' after 'set-fontset-font' c73d2cdfd7 * lisp/files-x.el (connection-local-set-profile-variables)... cefca2b8ac Add /etc/ssl/cert.pem to gnutls-trustfiles for macOS 122e7264b8 Fix tool-tip display when display margins are non-zero by ... e1cc2037a9 Handle hash tables and vectors when reading/writing EIEIO ... cda219c3df Improve interactive debugging commands in xdisp.c 1056b3cbcd Fix calculation of continuation_pixel_width in display engine 90e20804f5 Improve documentation of 'save-abbrevs'. 14f0230a48 Improve documentation of Dired 161b0e5493 * lisp/bookmark.el (bookmark-alist): Doc fix. (Bug#29551) commit 92ca51cc5e9d30818f5abf60a5a13f08f2ea7e96 Author: Stefan Monnier Date: Tue Dec 12 22:40:27 2017 -0500 * lisp/subr.el (backtrace--print-frame): Use cl-prin1 * lisp/emacs-lisp/cl-print.el (cl-prin1): Catch errors, since callers generally don't expect errors. diff --git a/lisp/emacs-lisp/cl-print.el b/lisp/emacs-lisp/cl-print.el index 4fc178c29a..5a26ecf05f 100644 --- a/lisp/emacs-lisp/cl-print.el +++ b/lisp/emacs-lisp/cl-print.el @@ -269,12 +269,13 @@ Output is further controlled by the variables `cl-print-readably', `cl-print-compiled', along with output variables for the standard printing functions. See Info node `(elisp)Output Variables'." - (cond - (cl-print-readably (prin1 object stream)) - ((not print-circle) (cl-print-object object stream)) - (t - (let ((cl-print--number-table (cl-print--preprocess object))) - (cl-print-object object stream))))) + (if cl-print-readably + (prin1 object stream) + (with-demoted-errors "cl-prin1: %S" + (if (not print-circle) + (cl-print-object object stream) + (let ((cl-print--number-table (cl-print--preprocess object))) + (cl-print-object object stream)))))) ;;;###autoload (defun cl-prin1-to-string (object) diff --git a/lisp/subr.el b/lisp/subr.el index d6dceb79fa..eca8dfdb85 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -4536,10 +4536,10 @@ EVALD, FUNC, ARGS, FLAGS are as in `mapbacktrace'." (princ (if (plist-get flags :debug-on-exit) "* " " ")) (cond ((and evald (not debugger-stack-frame-as-list)) - (prin1 func) - (if args (prin1 args) (princ "()"))) + (cl-prin1 func) + (if args (cl-prin1 args) (princ "()"))) (t - (prin1 (cons func args)))) + (cl-prin1 (cons func args)))) (princ "\n")) (defun backtrace () commit 8c91d31beab0234e8a187864df46af543022c656 Author: Glenn Morris Date: Tue Dec 12 21:58:38 2017 -0500 Fix gitmerge handling of automatic conflict reslution * admin/gitmerge.el (gitmerge-resolve): Reenable NEWS handling. (gitmerge-resolve-unmerged): Commit after successful resolution. (gitmerge-commit): New function, extracted from gitmerge-maybe-resume. (gitmerge-maybe-resume): Use gitmerge-commit. diff --git a/admin/gitmerge.el b/admin/gitmerge.el index eddc72e679..13d92ac92b 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -316,11 +316,7 @@ Returns non-nil if conflicts remain." (gitmerge-emacs-version gitmerge--from)))) (file-exists-p temp) (or noninteractive - (and - (y-or-n-p "Try to fix NEWS conflict? ") - ;; FIXME - (y-or-n-p "This is buggy, really try? ") - ))) + (y-or-n-p "Try to fix NEWS conflict? "))) (let ((relfile (file-name-nondirectory file)) (tempfile (make-temp-file "gitmerge"))) (unwind-protect @@ -431,7 +427,9 @@ Throw an user-error if we cannot resolve automatically." (setq conflicted t) ;; Mark as resolved (call-process "git" nil t nil "add" file))) - (when conflicted + (if (not conflicted) + (and files (not (gitmerge-commit)) + (error "Error committing resolution - fix it manually")) (with-current-buffer (get-buffer-create gitmerge-warning-buffer) (erase-buffer) (insert "For the following files, conflicts could\n" @@ -457,6 +455,12 @@ Throw an user-error if we cannot resolve automatically." "diff" "--name-only") (zerop (buffer-size)))) +(defun gitmerge-commit () + "Commit, and return non-nil if it succeeds." + (with-current-buffer (get-buffer-create gitmerge-output-buffer) + (erase-buffer) + (eq 0 (call-process "git" nil t nil "commit" "--no-edit")))) + (defun gitmerge-maybe-resume () "Check if we have to resume a merge. If so, add no longer conflicted files and commit." @@ -478,11 +482,8 @@ If so, add no longer conflicted files and commit." (gitmerge-resolve-unmerged) ;; Commit the merge. (when mergehead - (with-current-buffer (get-buffer-create gitmerge-output-buffer) - (erase-buffer) - (unless (zerop (call-process "git" nil t nil - "commit" "--no-edit")) - (error "Git error during merge - fix it manually")))) + (or (gitmerge-commit) + (error "Git error during merge - fix it manually"))) ;; Successfully resumed. t)))) commit 8e78d49765993bbbb93d42b0530f5ffaa4e759f4 Author: Paul Eggert Date: Tue Dec 12 15:15:56 2017 -0800 Fix recently-introduced cast typo * src/alloc.c (SDATA_OF_STRING): Put cast in right spot. This matters only if GC_CHECK_STRING_BYTES, which is sort of a coals-to-Newcastle situation if pointer bounds checking is also enabled. diff --git a/src/alloc.c b/src/alloc.c index 9197ff12ef..fb0f948474 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -1727,7 +1727,7 @@ static EMACS_INT total_string_bytes; a pointer to the `u.data' member of its sdata structure; the structure starts at a constant offset in front of that. */ -#define SDATA_OF_STRING(S) ptr_bounds_init ((sdata *) ((S)->u.s.data \ +#define SDATA_OF_STRING(S) ((sdata *) ptr_bounds_init ((S)->u.s.data \ - SDATA_DATA_OFFSET)) commit e921f97df9a11fd6f43ee040ba97c686c3fa62ee Author: Paul Eggert Date: Tue Dec 12 12:59:27 2017 -0800 Port --fcheck-pointer-bounds to --with-wide-int * src/lisp (XSYMBOL) [__CHKP__ && !USE_LSB_TAG]: Bypass pointer bounds checking here, instead of failing the entire build. (make_lisp_symbol): Improve comment. diff --git a/src/lisp.h b/src/lisp.h index 56545b7094..eb31ba209a 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -902,12 +902,15 @@ INLINE struct Lisp_Symbol * { #if USE_LSB_TAG return lisp_h_XSYMBOL (a); -#elif defined __CHKP__ -# error "pointer-checking not supported with wide integers" #else eassert (SYMBOLP (a)); intptr_t i = (intptr_t) XUNTAG (a, Lisp_Symbol); void *p = (char *) lispsym + i; +# ifdef __CHKP__ + /* Bypass pointer checking. Although this could be improved it is + probably not worth the trouble. */ + p = __builtin___bnd_set_ptr_bounds (p, sizeof (struct Lisp_Symbol)); +# endif return p; #endif } @@ -916,9 +919,11 @@ INLINE Lisp_Object make_lisp_symbol (struct Lisp_Symbol *sym) { #ifdef __CHKP__ - /* Although this should use '__builtin___bnd_narrow_ptr_bounds (sym, - sym, sizeof *sym)', that would run afoul of GCC bug 83251 - . */ + /* Although '__builtin___bnd_narrow_ptr_bounds (sym, sym, sizeof *sym)' + should be more efficient, it runs afoul of GCC bug 83251 + . + Also, attempting to call __builtin___bnd_chk_ptr_bounds (sym, sizeof *sym) + here seems to trigger a GCC bug, as yet undiagnosed. */ char *addr = __builtin___bnd_set_ptr_bounds (sym, sizeof *sym); char *symoffset = addr - (intptr_t) lispsym; #else commit 4295050e1194af13afa26403dd3ebdff80824ae0 Author: Paul Eggert Date: Sat Dec 9 13:57:38 2017 -0800 Narrow pointer bounds when appropriate This typically occurs in a storage manager, where the caller is expected to access only the newly-allocated object, instead of using the returned value to access unrelated parts of the heap. * src/alloc.c (allocate_string, allocate_string_data) (compact_small_strings, find_string_data_in_pure) (sweep_strings, setup_on_free_list, allocate_vectorlike (pure_alloc): * src/bytecode.c (exec_byte_code): * src/callint.c (Fcall_interactively): * src/dispnew.c (scrolling): * src/editfns.c (styled_format): * src/frame.c (xrdb_get_resource, x_get_resource_string): * src/fringe.c (Fdefine_fringe_bitmap): * src/gmalloc.c (malloc, realloc, aligned_alloc): Narrow pointer bounds when appropriate. * src/alloc.c (SDATA_OF_STRING): * src/lisp.h (make_lisp_symbol) [__CHKP__]: Widen bounds here, though. * src/bytecode.c, src/callint.c, src/dispnew.c, src/editfns.c: * src/emacs.c, src/frame.c, src/fringe.c: Include ptr-bounds.h. * src/ptr-bounds.h (ptr_bounds_clip): New function. diff --git a/src/alloc.c b/src/alloc.c index 96b9aaa0d2..9197ff12ef 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -1727,7 +1727,8 @@ static EMACS_INT total_string_bytes; a pointer to the `u.data' member of its sdata structure; the structure starts at a constant offset in front of that. */ -#define SDATA_OF_STRING(S) ((sdata *) ((S)->u.s.data - SDATA_DATA_OFFSET)) +#define SDATA_OF_STRING(S) ptr_bounds_init ((sdata *) ((S)->u.s.data \ + - SDATA_DATA_OFFSET)) #ifdef GC_CHECK_STRING_OVERRUN @@ -1919,7 +1920,7 @@ allocate_string (void) /* Every string on a free list should have NULL data pointer. */ s->u.s.data = NULL; NEXT_FREE_LISP_STRING (s) = string_free_list; - string_free_list = s; + string_free_list = ptr_bounds_clip (s, sizeof *s); } total_free_strings += STRING_BLOCK_SIZE; @@ -2034,7 +2035,7 @@ allocate_string_data (struct Lisp_String *s, MALLOC_UNBLOCK_INPUT; - s->u.s.data = SDATA_DATA (data); + s->u.s.data = ptr_bounds_clip (SDATA_DATA (data), nbytes + 1); #ifdef GC_CHECK_STRING_BYTES SDATA_NBYTES (data) = nbytes; #endif @@ -2120,7 +2121,7 @@ sweep_strings (void) /* Put the string on the free-list. */ NEXT_FREE_LISP_STRING (s) = string_free_list; - string_free_list = s; + string_free_list = ptr_bounds_clip (s, sizeof *s); ++nfree; } } @@ -2128,7 +2129,7 @@ sweep_strings (void) { /* S was on the free-list before. Put it there again. */ NEXT_FREE_LISP_STRING (s) = string_free_list; - string_free_list = s; + string_free_list = ptr_bounds_clip (s, sizeof *s); ++nfree; } } @@ -2224,9 +2225,9 @@ compact_small_strings (void) nbytes = s ? STRING_BYTES (s) : SDATA_NBYTES (from); eassert (nbytes <= LARGE_STRING_BYTES); - nbytes = SDATA_SIZE (nbytes); + ptrdiff_t size = SDATA_SIZE (nbytes); sdata *from_end = (sdata *) ((char *) from - + nbytes + GC_STRING_EXTRA); + + size + GC_STRING_EXTRA); #ifdef GC_CHECK_STRING_OVERRUN if (memcmp (string_overrun_cookie, @@ -2240,22 +2241,23 @@ compact_small_strings (void) { /* If TB is full, proceed with the next sblock. */ sdata *to_end = (sdata *) ((char *) to - + nbytes + GC_STRING_EXTRA); + + size + GC_STRING_EXTRA); if (to_end > tb_end) { tb->next_free = to; tb = tb->next; tb_end = (sdata *) ((char *) tb + SBLOCK_SIZE); to = tb->data; - to_end = (sdata *) ((char *) to + nbytes + GC_STRING_EXTRA); + to_end = (sdata *) ((char *) to + size + GC_STRING_EXTRA); } /* Copy, and update the string's `data' pointer. */ if (from != to) { eassert (tb != b || to < from); - memmove (to, from, nbytes + GC_STRING_EXTRA); - to->string->u.s.data = SDATA_DATA (to); + memmove (to, from, size + GC_STRING_EXTRA); + to->string->u.s.data + = ptr_bounds_clip (SDATA_DATA (to), nbytes + 1); } /* Advance past the sdata we copied to. */ @@ -3038,6 +3040,7 @@ static EMACS_INT total_vector_slots, total_free_vector_slots; static void setup_on_free_list (struct Lisp_Vector *v, ptrdiff_t nbytes) { + v = ptr_bounds_clip (v, nbytes); eassume (header_size <= nbytes); ptrdiff_t nwords = (nbytes - header_size) / word_size; XSETPVECTYPESIZE (v, PVEC_FREE, 0, nwords); @@ -3347,7 +3350,7 @@ allocate_vectorlike (ptrdiff_t len) MALLOC_UNBLOCK_INPUT; - return p; + return ptr_bounds_clip (p, nbytes); } } @@ -5358,7 +5361,7 @@ pure_alloc (size_t size, int type) pure_bytes_used = pure_bytes_used_lisp + pure_bytes_used_non_lisp; if (pure_bytes_used <= pure_size) - return result; + return ptr_bounds_clip (result, size); /* Don't allocate a large amount here, because it might get mmap'd and then its address @@ -5443,7 +5446,7 @@ find_string_data_in_pure (const char *data, ptrdiff_t nbytes) /* Check the remaining characters. */ if (memcmp (data, non_lisp_beg + start, nbytes) == 0) /* Found. */ - return non_lisp_beg + start; + return ptr_bounds_clip (non_lisp_beg + start, nbytes + 1); start += last_char_skip; } diff --git a/src/bytecode.c b/src/bytecode.c index 8746568f16..78207f776c 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -24,6 +24,7 @@ along with GNU Emacs. If not, see . */ #include "character.h" #include "buffer.h" #include "keyboard.h" +#include "ptr-bounds.h" #include "syntax.h" #include "window.h" @@ -363,13 +364,15 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth, unsigned char quitcounter = 1; EMACS_INT stack_items = XFASTINT (maxdepth) + 1; USE_SAFE_ALLOCA; - Lisp_Object *stack_base; - SAFE_ALLOCA_LISP_EXTRA (stack_base, stack_items, bytestr_length); - Lisp_Object *stack_lim = stack_base + stack_items; + void *alloc; + SAFE_ALLOCA_LISP_EXTRA (alloc, stack_items, bytestr_length); + ptrdiff_t item_bytes = stack_items * word_size; + Lisp_Object *stack_base = ptr_bounds_clip (alloc, item_bytes); Lisp_Object *top = stack_base; - memcpy (stack_lim, SDATA (bytestr), bytestr_length); - void *void_stack_lim = stack_lim; - unsigned char const *bytestr_data = void_stack_lim; + Lisp_Object *stack_lim = stack_base + stack_items; + unsigned char *bytestr_data = alloc; + bytestr_data = ptr_bounds_clip (bytestr_data + item_bytes, bytestr_length); + memcpy (bytestr_data, SDATA (bytestr), bytestr_length); unsigned char const *pc = bytestr_data; ptrdiff_t count = SPECPDL_INDEX (); diff --git a/src/callint.c b/src/callint.c index 5d88082e38..df26e4abb5 100644 --- a/src/callint.c +++ b/src/callint.c @@ -21,6 +21,7 @@ along with GNU Emacs. If not, see . */ #include #include "lisp.h" +#include "ptr-bounds.h" #include "character.h" #include "buffer.h" #include "keyboard.h" @@ -494,6 +495,9 @@ invoke it. If KEYS is omitted or nil, the return value of varies = (signed char *) (visargs + nargs); memclear (args, nargs * (2 * word_size + 1)); + args = ptr_bounds_clip (args, nargs * sizeof *args); + visargs = ptr_bounds_clip (visargs, nargs * sizeof *visargs); + varies = ptr_bounds_clip (varies, nargs * sizeof *varies); if (!NILP (enable)) specbind (Qenable_recursive_minibuffers, Qt); diff --git a/src/dispnew.c b/src/dispnew.c index b0fc5c31fa..7fea867f66 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -25,6 +25,7 @@ along with GNU Emacs. If not, see . */ #include #include "lisp.h" +#include "ptr-bounds.h" #include "termchar.h" /* cm.h must come after dispextern.h on Windows. */ #include "dispextern.h" @@ -4652,6 +4653,11 @@ scrolling (struct frame *frame) unsigned *new_hash = old_hash + height; int *draw_cost = (int *) (new_hash + height); int *old_draw_cost = draw_cost + height; + old_hash = ptr_bounds_clip (old_hash, height * sizeof *old_hash); + new_hash = ptr_bounds_clip (new_hash, height * sizeof *new_hash); + draw_cost = ptr_bounds_clip (draw_cost, height * sizeof *draw_cost); + old_draw_cost = ptr_bounds_clip (old_draw_cost, + height * sizeof *old_draw_cost); eassert (current_matrix); diff --git a/src/editfns.c b/src/editfns.c index 084d92346f..6ab26876a8 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -56,6 +56,7 @@ along with GNU Emacs. If not, see . */ #include "composite.h" #include "intervals.h" +#include "ptr-bounds.h" #include "character.h" #include "buffer.h" #include "coding.h" @@ -4208,9 +4209,9 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message) ptrdiff_t nspec_bound = SCHARS (args[0]) >> 1; /* Allocate the info and discarded tables. */ - ptrdiff_t alloca_size; - if (INT_MULTIPLY_WRAPV (nspec_bound, sizeof *info, &alloca_size) - || INT_ADD_WRAPV (formatlen, alloca_size, &alloca_size) + ptrdiff_t info_size, alloca_size; + if (INT_MULTIPLY_WRAPV (nspec_bound, sizeof *info, &info_size) + || INT_ADD_WRAPV (formatlen, info_size, &alloca_size) || SIZE_MAX < alloca_size) memory_full (SIZE_MAX); info = SAFE_ALLOCA (alloca_size); @@ -4218,6 +4219,8 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message) string was not copied into the output. It is 2 if byte I was not the first byte of its character. */ char *discarded = (char *) &info[nspec_bound]; + info = ptr_bounds_clip (info, info_size); + discarded = ptr_bounds_clip (discarded, formatlen); memset (discarded, 0, formatlen); /* Try to determine whether the result should be multibyte. diff --git a/src/emacs.c b/src/emacs.c index 5a6b896ef4..9dd060fd3d 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -83,6 +83,7 @@ along with GNU Emacs. If not, see . */ #include "charset.h" #include "composite.h" #include "dispextern.h" +#include "ptr-bounds.h" #include "regex.h" #include "sheap.h" #include "syntax.h" diff --git a/src/frame.c b/src/frame.c index 5bafbeddcc..94ec9fbdc7 100644 --- a/src/frame.c +++ b/src/frame.c @@ -35,6 +35,7 @@ along with GNU Emacs. If not, see . */ #include "buffer.h" /* These help us bind and responding to switch-frame events. */ #include "keyboard.h" +#include "ptr-bounds.h" #include "frame.h" #include "blockinput.h" #include "termchar.h" @@ -4812,6 +4813,8 @@ xrdb_get_resource (XrmDatabase rdb, Lisp_Object attribute, Lisp_Object class, Li USE_SAFE_ALLOCA; char *name_key = SAFE_ALLOCA (name_keysize + class_keysize); char *class_key = name_key + name_keysize; + name_key = ptr_bounds_clip (name_key, name_keysize); + class_key = ptr_bounds_clip (class_key, class_keysize); /* Start with emacs.FRAMENAME for the name (the specific one) and with `Emacs' for the class key (the general one). */ @@ -4890,6 +4893,8 @@ x_get_resource_string (const char *attribute, const char *class) ptrdiff_t class_keysize = sizeof (EMACS_CLASS) - 1 + strlen (class) + 2; char *name_key = SAFE_ALLOCA (name_keysize + class_keysize); char *class_key = name_key + name_keysize; + name_key = ptr_bounds_clip (name_key, name_keysize); + class_key = ptr_bounds_clip (class_key, class_keysize); esprintf (name_key, "%s.%s", SSDATA (Vinvocation_name), attribute); sprintf (class_key, "%s.%s", EMACS_CLASS, class); diff --git a/src/fringe.c b/src/fringe.c index 087ef33434..a558117374 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -24,6 +24,7 @@ along with GNU Emacs. If not, see . */ #include "lisp.h" #include "frame.h" +#include "ptr-bounds.h" #include "window.h" #include "dispextern.h" #include "buffer.h" @@ -1591,7 +1592,9 @@ If BITMAP already exists, the existing definition is replaced. */) fb.dynamic = true; xfb = xmalloc (sizeof fb + fb.height * BYTES_PER_BITMAP_ROW); - fb.bits = b = (unsigned short *) (xfb + 1); + fb.bits = b = ((unsigned short *) + ptr_bounds_clip (xfb + 1, fb.height * BYTES_PER_BITMAP_ROW)); + xfb = ptr_bounds_clip (xfb, sizeof *xfb); memset (b, 0, fb.height); j = 0; diff --git a/src/gmalloc.c b/src/gmalloc.c index 97ab76561f..99cb967e53 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -203,7 +203,8 @@ extern size_t _bytes_free; /* Internal versions of `malloc', `realloc', and `free' used when these functions need to call each other. - They are the same but don't call the hooks. */ + They are the same but don't call the hooks + and don't bound the resulting pointers. */ extern void *_malloc_internal (size_t); extern void *_realloc_internal (void *, size_t); extern void _free_internal (void *); @@ -921,7 +922,8 @@ malloc (size_t size) among multiple threads. We just leave it for compatibility with glibc malloc (i.e., assignments to gmalloc_hook) for now. */ hook = gmalloc_hook; - return (hook != NULL ? *hook : _malloc_internal) (size); + void *result = (hook ? hook : _malloc_internal) (size); + return ptr_bounds_clip (result, size); } #if !(defined (_LIBC) || defined (HYBRID_MALLOC)) @@ -1434,7 +1436,8 @@ realloc (void *ptr, size_t size) return NULL; hook = grealloc_hook; - return (hook != NULL ? *hook : _realloc_internal) (ptr, size); + void *result = (hook ? hook : _realloc_internal) (ptr, size); + return ptr_bounds_clip (result, size); } /* Copyright (C) 1991, 1992, 1994 Free Software Foundation, Inc. @@ -1608,6 +1611,7 @@ aligned_alloc (size_t alignment, size_t size) { l->exact = result; result = l->aligned = (char *) result + adj; + result = ptr_bounds_clip (result, size); } UNLOCK_ALIGNED_BLOCKS (); if (l == NULL) diff --git a/src/lisp.h b/src/lisp.h index 8947c59077..56545b7094 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -916,9 +916,14 @@ INLINE Lisp_Object make_lisp_symbol (struct Lisp_Symbol *sym) { #ifdef __CHKP__ - char *symoffset = (char *) sym - (intptr_t) lispsym; + /* Although this should use '__builtin___bnd_narrow_ptr_bounds (sym, + sym, sizeof *sym)', that would run afoul of GCC bug 83251 + . */ + char *addr = __builtin___bnd_set_ptr_bounds (sym, sizeof *sym); + char *symoffset = addr - (intptr_t) lispsym; #else - /* If !__CHKP__ this is equivalent, and is a bit faster as of GCC 7. */ + /* If !__CHKP__, GCC 7 x86-64 generates faster code if lispsym is + cast to char * rather than to intptr_t. */ char *symoffset = (char *) ((char *) sym - (char *) lispsym); #endif Lisp_Object a = TAG_PTR (Lisp_Symbol, symoffset); diff --git a/src/ptr-bounds.h b/src/ptr-bounds.h index 54979824c0..76740da3d3 100644 --- a/src/ptr-bounds.h +++ b/src/ptr-bounds.h @@ -17,6 +17,18 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ +/* Pointer bounds checking is a no-op unless running on hardware + supporting Intel MPX (Intel Skylake or better). Also, it requires + GCC 5 and Linux kernel 3.19, or later. Configure with + CFLAGS='-fcheck-pointer-bounds -mmpx', perhaps with + -fchkp-first-field-has-own-bounds thrown in. + + Although pointer bounds checking can help during debugging, it is + disabled by default because it hurts performance significantly. + The checking does not detect all pointer errors. For example, a + dumped Emacs might not detect a bounds violation of a pointer that + was created before Emacs was dumped. */ + #ifndef PTR_BOUNDS_H #define PTR_BOUNDS_H @@ -26,6 +38,19 @@ along with GNU Emacs. If not, see . */ return their first argument. These macros return either void *, or the same type as their first argument. */ +INLINE_HEADER_BEGIN + +/* Return a copy of P, with bounds narrowed to [P, P + N). */ +#ifdef __CHKP__ +INLINE void * +ptr_bounds_clip (void const *p, size_t n) +{ + return __builtin___bnd_narrow_ptr_bounds (p, p, n); +} +#else +# define ptr_bounds_clip(p, n) ((void) (size_t) {n}, p) +#endif + /* Return a copy of P, but with the bounds of Q. */ #ifdef __CHKP__ # define ptr_bounds_copy(p, q) __builtin___bnd_copy_ptr_bounds (p, q) @@ -49,4 +74,6 @@ along with GNU Emacs. If not, see . */ # define ptr_bounds_set(p, n) ((void) (size_t) {n}, p) #endif +INLINE_HEADER_END + #endif /* PTR_BOUNDS_H */ commit 881abfc7fb55db2d00adf352100cc58a6a86c176 Author: Paul Eggert Date: Sat Dec 9 13:57:38 2017 -0800 Port to gcc -fcheck-pointer-bounds This is a minimal port, just to get Emacs running; it does not attempt to make the pointer bounds at all tight. * src/ptr-bounds.h: New file. * src/alloc.c, src/gmalloc.c: Include it. * src/alloc.c (live_string_holding, live_cons_holding) (live_symbol_holding, live_misc_holding, garbage_collect_1) (sweep_conses, sweep_floats): * src/gmalloc.c (malloc_initialize_1, _free_internal_nolock) (_realloc_internal_nolock): Widen pointer bounds as necessary. We're in a memory allocator so this is OK. * src/lisp.h (lisp_h_XSYMBOL, make_lisp_symbol) [__CHKP__]: Do not convert from pointer to integer and back again, so that GCC does not lose track of pointer bounds. (XSYMBOL) [__CHKP__ && !USE_LSB_TAG]: Now a compile-time error. Although it's possible to support both -fcheck-pointer-bounds and --with-wide-int, it's more work; keep things simple for now. (DEFINE_LISP_SYMBOL) [__CHKP__]: Now a no-op, to avoid trouble with unbounded pointers. diff --git a/etc/NEWS b/etc/NEWS index c0d0d42d3f..7376fc48b3 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -31,6 +31,13 @@ functions 'json-serialize', 'json-insert', 'json-parse-string', and 'json-parse-buffer' are typically much faster than their Lisp counterparts from json.el. +** Emacs has been ported to the -fcheck-pointer-bounds option of GCC. +This causes Emacs to check bounds of some arrays addressed by its +internal pointers, which can be helpful when debugging the Emacs +interpreter or modules that it uses. If your platform supports it you +can enable it when configuring, e.g., './configure CFLAGS="-g3 -O2 +-mmpx -fcheck-pointer-bounds"' on Intel MPX platforms. + * Startup Changes in Emacs 27.1 diff --git a/src/alloc.c b/src/alloc.c index 38daee065a..96b9aaa0d2 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -33,6 +33,7 @@ along with GNU Emacs. If not, see . */ #include "lisp.h" #include "dispextern.h" #include "intervals.h" +#include "ptr-bounds.h" #include "puresize.h" #include "sheap.h" #include "systime.h" @@ -4564,6 +4565,7 @@ live_string_holding (struct mem_node *m, void *p) must not be on the free-list. */ if (0 <= offset && offset < STRING_BLOCK_SIZE * sizeof b->strings[0]) { + cp = ptr_bounds_copy (cp, b); struct Lisp_String *s = p = cp -= offset % sizeof b->strings[0]; if (s->u.s.data) return make_lisp_ptr (s, Lisp_String); @@ -4598,6 +4600,7 @@ live_cons_holding (struct mem_node *m, void *p) && (b != cons_block || offset / sizeof b->conses[0] < cons_block_index)) { + cp = ptr_bounds_copy (cp, b); struct Lisp_Cons *s = p = cp -= offset % sizeof b->conses[0]; if (!EQ (s->u.s.car, Vdead)) return make_lisp_ptr (s, Lisp_Cons); @@ -4633,6 +4636,7 @@ live_symbol_holding (struct mem_node *m, void *p) && (b != symbol_block || offset / sizeof b->symbols[0] < symbol_block_index)) { + cp = ptr_bounds_copy (cp, b); struct Lisp_Symbol *s = p = cp -= offset % sizeof b->symbols[0]; if (!EQ (s->u.s.function, Vdead)) return make_lisp_symbol (s); @@ -4692,6 +4696,7 @@ live_misc_holding (struct mem_node *m, void *p) && (b != marker_block || offset / sizeof b->markers[0] < marker_block_index)) { + cp = ptr_bounds_copy (cp, b); union Lisp_Misc *s = p = cp -= offset % sizeof b->markers[0]; if (s->u_any.type != Lisp_Misc_Free) return make_lisp_ptr (s, Lisp_Misc); @@ -5955,6 +5960,7 @@ garbage_collect_1 (void *end) stack_copy = xrealloc (stack_copy, stack_size); stack_copy_size = stack_size; } + stack = ptr_bounds_set (stack, stack_size); no_sanitize_memcpy (stack_copy, stack, stack_size); } } @@ -6848,7 +6854,9 @@ sweep_conses (void) for (pos = start; pos < stop; pos++) { - if (!CONS_MARKED_P (&cblk->conses[pos])) + struct Lisp_Cons *acons + = ptr_bounds_copy (&cblk->conses[pos], cblk); + if (!CONS_MARKED_P (acons)) { this_free++; cblk->conses[pos].u.s.u.chain = cons_free_list; @@ -6858,7 +6866,7 @@ sweep_conses (void) else { num_used++; - CONS_UNMARK (&cblk->conses[pos]); + CONS_UNMARK (acons); } } } @@ -6901,17 +6909,20 @@ sweep_floats (void) register int i; int this_free = 0; for (i = 0; i < lim; i++) - if (!FLOAT_MARKED_P (&fblk->floats[i])) - { - this_free++; - fblk->floats[i].u.chain = float_free_list; - float_free_list = &fblk->floats[i]; - } - else - { - num_used++; - FLOAT_UNMARK (&fblk->floats[i]); - } + { + struct Lisp_Float *afloat = ptr_bounds_copy (&fblk->floats[i], fblk); + if (!FLOAT_MARKED_P (afloat)) + { + this_free++; + fblk->floats[i].u.chain = float_free_list; + float_free_list = &fblk->floats[i]; + } + else + { + num_used++; + FLOAT_UNMARK (afloat); + } + } lim = FLOAT_BLOCK_SIZE; /* If this block contains only free floats and we have already seen more than two blocks worth of free floats then deallocate diff --git a/src/gmalloc.c b/src/gmalloc.c index a17d39c1ee..97ab76561f 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -40,6 +40,8 @@ License along with this library. If not, see . # include "lisp.h" #endif +#include "ptr-bounds.h" + #ifdef HAVE_MALLOC_H # if GNUC_PREREQ (4, 2, 0) # pragma GCC diagnostic ignored "-Wdeprecated-declarations" @@ -558,7 +560,7 @@ malloc_initialize_1 (void) _heapinfo[0].free.size = 0; _heapinfo[0].free.next = _heapinfo[0].free.prev = 0; _heapindex = 0; - _heapbase = (char *) _heapinfo; + _heapbase = (char *) ptr_bounds_init (_heapinfo); _heaplimit = BLOCK (_heapbase + heapsize * sizeof (malloc_info)); register_heapinfo (); @@ -997,6 +999,7 @@ _free_internal_nolock (void *ptr) if (ptr == NULL) return; + ptr = ptr_bounds_init (ptr); PROTECT_MALLOC_STATE (0); @@ -1308,6 +1311,7 @@ _realloc_internal_nolock (void *ptr, size_t size) else if (ptr == NULL) return _malloc_internal_nolock (size); + ptr = ptr_bounds_init (ptr); block = BLOCK (ptr); PROTECT_MALLOC_STATE (0); diff --git a/src/lisp.h b/src/lisp.h index 54103d4beb..8947c59077 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -379,10 +379,18 @@ typedef EMACS_INT Lisp_Word; XIL ((EMACS_INT) (((EMACS_UINT) (n) << INTTYPEBITS) + Lisp_Int0)) # define lisp_h_XFASTINT(a) XINT (a) # define lisp_h_XINT(a) (XLI (a) >> INTTYPEBITS) -# define lisp_h_XSYMBOL(a) \ +# ifdef __CHKP__ +# define lisp_h_XSYMBOL(a) \ + (eassert (SYMBOLP (a)), \ + (struct Lisp_Symbol *) ((char *) XUNTAG (a, Lisp_Symbol) \ + + (intptr_t) lispsym)) +# else + /* If !__CHKP__ this is equivalent, and is a bit faster as of GCC 7. */ +# define lisp_h_XSYMBOL(a) \ (eassert (SYMBOLP (a)), \ (struct Lisp_Symbol *) ((intptr_t) XLI (a) - Lisp_Symbol \ + (char *) lispsym)) +# endif # define lisp_h_XTYPE(a) ((enum Lisp_Type) (XLI (a) & ~VALMASK)) # define lisp_h_XUNTAG(a, type) \ __builtin_assume_aligned ((char *) XLP (a) - (type), GCALIGNMENT) @@ -826,10 +834,15 @@ typedef EMACS_UINT Lisp_Word_tag; /* Declare extern constants for Lisp symbols. These can be helpful when using a debugger like GDB, on older platforms where the debug - format does not represent C macros. */ -#define DEFINE_LISP_SYMBOL(name) \ - DEFINE_GDB_SYMBOL_BEGIN (Lisp_Object, name) \ - DEFINE_GDB_SYMBOL_END (LISPSYM_INITIALLY (name)) + format does not represent C macros. However, they are unbounded + and would just be asking for trouble if checking pointer bounds. */ +#ifdef __CHKP__ +# define DEFINE_LISP_SYMBOL(name) +#else +# define DEFINE_LISP_SYMBOL(name) \ + DEFINE_GDB_SYMBOL_BEGIN (Lisp_Object, name) \ + DEFINE_GDB_SYMBOL_END (LISPSYM_INITIALLY (name)) +#endif /* The index of the C-defined Lisp symbol SYM. This can be used in a static initializer. */ @@ -889,6 +902,8 @@ INLINE struct Lisp_Symbol * { #if USE_LSB_TAG return lisp_h_XSYMBOL (a); +#elif defined __CHKP__ +# error "pointer-checking not supported with wide integers" #else eassert (SYMBOLP (a)); intptr_t i = (intptr_t) XUNTAG (a, Lisp_Symbol); @@ -900,8 +915,13 @@ INLINE struct Lisp_Symbol * INLINE Lisp_Object make_lisp_symbol (struct Lisp_Symbol *sym) { - intptr_t symoffset = (char *) sym - (char *) lispsym; - Lisp_Object a = TAG_PTR (Lisp_Symbol, (char *) symoffset); +#ifdef __CHKP__ + char *symoffset = (char *) sym - (intptr_t) lispsym; +#else + /* If !__CHKP__ this is equivalent, and is a bit faster as of GCC 7. */ + char *symoffset = (char *) ((char *) sym - (char *) lispsym); +#endif + Lisp_Object a = TAG_PTR (Lisp_Symbol, symoffset); eassert (XSYMBOL (a) == sym); return a; } diff --git a/src/ptr-bounds.h b/src/ptr-bounds.h new file mode 100644 index 0000000000..54979824c0 --- /dev/null +++ b/src/ptr-bounds.h @@ -0,0 +1,52 @@ +/* Pointer bounds checking for GNU Emacs + +Copyright 2017 Free Software Foundation, Inc. + +This file is part of GNU Emacs. + +GNU Emacs is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or (at +your option) any later version. + +GNU Emacs 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 for more details. + +You should have received a copy of the GNU General Public License +along with GNU Emacs. If not, see . */ + +#ifndef PTR_BOUNDS_H +#define PTR_BOUNDS_H + +#include + +/* When not checking pointer bounds, the following macros simply + return their first argument. These macros return either void *, or + the same type as their first argument. */ + +/* Return a copy of P, but with the bounds of Q. */ +#ifdef __CHKP__ +# define ptr_bounds_copy(p, q) __builtin___bnd_copy_ptr_bounds (p, q) +#else +# define ptr_bounds_copy(p, q) ((void) (void const *) {q}, p) +#endif + +/* Return a copy of P, but with infinite bounds. + This is a loophole in pointer bounds checking. */ +#ifdef __CHKP__ +# define ptr_bounds_init(p) __builtin___bnd_init_ptr_bounds (p) +#else +# define ptr_bounds_init(p) (p) +#endif + +/* Return a copy of P, but with bounds [P, P + N). + This is a loophole in pointer bounds checking. */ +#ifdef __CHKP__ +# define ptr_bounds_set(p, n) __builtin___bnd_set_ptr_bounds (p, n) +#else +# define ptr_bounds_set(p, n) ((void) (size_t) {n}, p) +#endif + +#endif /* PTR_BOUNDS_H */ commit 244346c744a6700d320a0a0fe8c796be3b3ff023 Author: Paul Eggert Date: Tue Dec 12 12:59:57 2017 -0800 Reimplement Lisp_Object as pointer-to-incomplete This makes Lisp_Object values opaque pointers instead of integers, which helps avoid the same sort of typos that CHECK_LISP_OBJECT_TYPE helps to avoid, without having to wrap pointers inside structures. This also looks forward to supporting -fcheck-pointer-bounds. * etc/DEBUG: * src/.gdbinit (Lisp_Object_Printer.to_string): Lisp_Object can be a pointer type now. * src/alloc.c (macro_XPNTR, XPNTR): * src/emacs-module.c (value_to_lisp_bits, lisp_to_value_bits): * src/lisp.h (lisp_h_XLI, lisp_h_XIL): (lisp_h_XUNTAG) [USE_LSB_TAG]: (XUNTAG) [!USE_LSB_TAG]: (Lisp_Object, TAG_PTR, make_lisp_symbol): Support new Lisp_Object implementation as a pointer to an incomplete type. Keep pointers pointers, as much as possible. * src/alloc.c (macro_XPNTR_OR_SYMBOL_OFFSET, XPNTR_OR_SYMBOL_OFFSET): Remove. All uses replaced by plain XPNTR. * src/emacs-module.c: Work around GCC bug 83162. * src/lisp.h (LISP_WORDS_ARE_POINTERS, lisp_h_XLP, lisp_h_XPL): (XLP, XPL) [DEFINE_KEY_OPS_AS_MACROS]: New macros. (Lisp_Word, untagged_ptr, Lisp_Word_tag): New types. (XLP, XPL): New inline functions. (TAG_PTR): Now expands to an initializer, not an expression. All uses changed. (TAG_SYMOFFSET, XLI_BUILTIN_LISPSYM): Remove. All uses removed. (LISPSYM_INITIALLY): Redo in terms of the new TAG_PTR. (NIL_IS_ZERO): Redo without XLI_BUILTIN_LISPSYM. * src/xwidget.c (webkit_javascript_finished_cb): Use XPL instead of XIL with a non-EMACS_INT arg. (Fxwidget_webkit_execute_script): Use XLP instead of XLI followed by two conversions. diff --git a/etc/DEBUG b/etc/DEBUG index f5efbe0ff9..9fa6ac1d11 100644 --- a/etc/DEBUG +++ b/etc/DEBUG @@ -140,9 +140,10 @@ If you attached the debugger to a running Emacs, type "continue" into the *gud-emacs* buffer and press RET. Many variables you will encounter while debugging are Lisp objects. -These are displayed as integer values (or structures, if you used the -"--enable-check-lisp-object-type" option at configure time) that are -hard to interpret, especially if they represent long lists. You can +These are normally displayed as opaque pointers or integers that are +hard to interpret, especially if they represent long lists. +(They are instead displayed as structures containing these opaque +values, if --enable-check-lisp-object-type is in effect.) You can use the 'pp' command to display them in their Lisp form. That command displays its output on the standard error stream, which you can redirect to a file using "M-x redirect-debugging-output". diff --git a/src/.gdbinit b/src/.gdbinit index e22d03ea47..0eb2c73591 100644 --- a/src/.gdbinit +++ b/src/.gdbinit @@ -1321,19 +1321,26 @@ if hasattr(gdb, 'printing'): Lisp_Int0 = 2 Lisp_Int1 = 6 if USE_LSB_TAG else 3 - # Unpack the Lisp value from its containing structure, if necessary. val = self.val basic_type = gdb.types.get_basic_type (val.type) + + # Unpack VAL from its containing structure, if necessary. if (basic_type.code == gdb.TYPE_CODE_STRUCT and gdb.types.has_field (basic_type, "i")): val = val["i"] + # Convert VAL to a Python integer. Convert by hand, as this is + # simpler and works regardless of whether VAL is a pointer or + # integer. Also, val.cast (gdb.lookup.type ("EMACS_UINT")) + # would have problems with GDB 7.12.1; see + # . + ival = int (val) + # For nil, yield "XIL(0)", which is easier to read than "XIL(0x0)". - if not val: + if not ival: return "XIL(0)" # Extract the integer representation of the value and its Lisp type. - ival = int(val) itype = ival >> (0 if USE_LSB_TAG else VALBITS) itype = itype & ((1 << GCTYPEBITS) - 1) @@ -1352,8 +1359,7 @@ if hasattr(gdb, 'printing'): # integers even when Lisp_Object is an integer. # Perhaps some day the pretty-printing could be fancier. # Prefer the unsigned representation to negative values, converting - # by hand as val.cast(gdb.lookup_type("EMACS_UINT") does not work in - # GDB 7.12.1; see . + # by hand as val.cast does not work in GDB 7.12.1 as noted above. if ival < 0: ival = ival + (1 << EMACS_INT_WIDTH) return "XIL(0x%x)" % ival diff --git a/src/alloc.c b/src/alloc.c index 4f3928a482..38daee065a 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -502,30 +502,20 @@ pointer_align (void *ptr, int alignment) return (void *) ROUNDUP ((uintptr_t) ptr, alignment); } -/* Extract the pointer hidden within A, if A is not a symbol. - If A is a symbol, extract the hidden pointer's offset from lispsym, - converted to void *. */ +/* Extract the pointer hidden within O. Define this as a function, as + functions are cleaner and can be used in debuggers. Also, define + it as a macro if being compiled with GCC without optimization, for + performance in that case. macro_XPNTR is private to this section + of code. */ + +#define macro_XPNTR(o) \ + ((void *) \ + (SYMBOLP (o) \ + ? ((char *) lispsym \ + - ((EMACS_UINT) Lisp_Symbol << (USE_LSB_TAG ? 0 : VALBITS)) \ + + XLI (o)) \ + : (char *) XLP (o) - (XLI (o) & ~VALMASK))) -#define macro_XPNTR_OR_SYMBOL_OFFSET(a) \ - ((void *) (intptr_t) (USE_LSB_TAG ? XLI (a) - XTYPE (a) : XLI (a) & VALMASK)) - -/* Extract the pointer hidden within A. */ - -#define macro_XPNTR(a) \ - ((void *) ((intptr_t) XPNTR_OR_SYMBOL_OFFSET (a) \ - + (SYMBOLP (a) ? (char *) lispsym : NULL))) - -/* For pointer access, define XPNTR and XPNTR_OR_SYMBOL_OFFSET as - functions, as functions are cleaner and can be used in debuggers. - Also, define them as macros if being compiled with GCC without - optimization, for performance in that case. The macro_* names are - private to this section of code. */ - -static ATTRIBUTE_UNUSED void * -XPNTR_OR_SYMBOL_OFFSET (Lisp_Object a) -{ - return macro_XPNTR_OR_SYMBOL_OFFSET (a); -} static ATTRIBUTE_UNUSED void * XPNTR (Lisp_Object a) { @@ -533,7 +523,6 @@ XPNTR (Lisp_Object a) } #if DEFINE_KEY_OPS_AS_MACROS -# define XPNTR_OR_SYMBOL_OFFSET(a) macro_XPNTR_OR_SYMBOL_OFFSET (a) # define XPNTR(a) macro_XPNTR (a) #endif @@ -5605,7 +5594,7 @@ static Lisp_Object purecopy (Lisp_Object obj) { if (INTEGERP (obj) - || (! SYMBOLP (obj) && PURE_P (XPNTR_OR_SYMBOL_OFFSET (obj))) + || (! SYMBOLP (obj) && PURE_P (XPNTR (obj))) || SUBRP (obj)) return obj; /* Already pure. */ diff --git a/src/emacs-module.c b/src/emacs-module.c index b351515c3b..9a02e7d482 100644 --- a/src/emacs-module.c +++ b/src/emacs-module.c @@ -36,6 +36,11 @@ along with GNU Emacs. If not, see . */ #include #include +/* Work around GCC bug 83162. */ +#if GNUC_PREREQ (4, 3, 0) +# pragma GCC diagnostic ignored "-Wclobbered" +#endif + /* We use different strategies for allocating the user-visible objects (struct emacs_runtime, emacs_env, emacs_value), depending on whether the user supplied the -module-assertions flag. If @@ -915,9 +920,8 @@ static Lisp_Object ltv_mark; static Lisp_Object value_to_lisp_bits (emacs_value v) { - intptr_t i = (intptr_t) v; if (plain_values || USE_LSB_TAG) - return XIL (i); + return XPL (v); /* With wide EMACS_INT and when tag bits are the most significant, reassembling integers differs from reassembling pointers in two @@ -926,6 +930,7 @@ value_to_lisp_bits (emacs_value v) integer when restoring, but zero-extend pointers because that makes TAG_PTR faster. */ + intptr_t i = (intptr_t) v; EMACS_UINT tag = i & (GCALIGNMENT - 1); EMACS_UINT untagged = i - tag; switch (tag) @@ -989,13 +994,22 @@ value_to_lisp (emacs_value v) static emacs_value lisp_to_value_bits (Lisp_Object o) { - EMACS_UINT u = XLI (o); + if (plain_values || USE_LSB_TAG) + return XLP (o); - /* Compress U into the space of a pointer, possibly losing information. */ - uintptr_t p = (plain_values || USE_LSB_TAG - ? u - : (INTEGERP (o) ? u << VALBITS : u & VALMASK) + XTYPE (o)); - return (emacs_value) p; + /* Compress O into the space of a pointer, possibly losing information. */ + EMACS_UINT u = XLI (o); + if (INTEGERP (o)) + { + uintptr_t i = (u << VALBITS) + XTYPE (o); + return (emacs_value) i; + } + else + { + char *p = XLP (o); + void *v = p - (u & ~VALMASK) + XTYPE (o); + return v; + } } /* Convert O to an emacs_value. Allocate storage if needed; this can diff --git a/src/lisp.h b/src/lisp.h index 91ed14fa4c..54103d4beb 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -277,6 +277,18 @@ DEFINE_GDB_SYMBOL_END (VALMASK) error !; #endif +/* Lisp_Word is a scalar word suitable for holding a tagged pointer or + integer. Usually it is a pointer to a deliberately-incomplete type + 'union Lisp_X'. However, it is EMACS_INT when Lisp_Objects and + pointers differ in width. */ + +#define LISP_WORDS_ARE_POINTERS (EMACS_INT_MAX == INTPTR_MAX) +#if LISP_WORDS_ARE_POINTERS +typedef union Lisp_X *Lisp_Word; +#else +typedef EMACS_INT Lisp_Word; +#endif + /* Some operations are so commonly executed that they are implemented as macros, not functions, because otherwise runtime performance would suffer too much when compiling with GCC without optimization. @@ -302,16 +314,37 @@ error !; functions, once "gcc -Og" (new to GCC 4.8) works well enough for Emacs developers. Maybe in the year 2020. See Bug#11935. - Commentary for these macros can be found near their corresponding - functions, below. */ - -#if CHECK_LISP_OBJECT_TYPE -# define lisp_h_XLI(o) ((o).i) -# define lisp_h_XIL(i) ((Lisp_Object) { i }) + For the macros that have corresponding functions (defined later), + see these functions for commentary. */ + +/* Convert among the various Lisp-related types: I for EMACS_INT, L + for Lisp_Object, P for void *. */ +#if !CHECK_LISP_OBJECT_TYPE +# if LISP_WORDS_ARE_POINTERS +# define lisp_h_XLI(o) ((EMACS_INT) (o)) +# define lisp_h_XIL(i) ((Lisp_Object) (i)) +# define lisp_h_XLP(o) ((void *) (o)) +# define lisp_h_XPL(p) ((Lisp_Object) (p)) +# else +# define lisp_h_XLI(o) (o) +# define lisp_h_XIL(i) (i) +# define lisp_h_XLP(o) ((void *) (uintptr_t) (o)) +# define lisp_h_XPL(p) ((Lisp_Object) (uintptr_t) (p)) +# endif #else -# define lisp_h_XLI(o) (o) -# define lisp_h_XIL(i) (i) +# if LISP_WORDS_ARE_POINTERS +# define lisp_h_XLI(o) ((EMACS_INT) (o).i) +# define lisp_h_XIL(i) ((Lisp_Object) {(Lisp_Word) (i)}) +# define lisp_h_XLP(o) ((void *) (o).i) +# define lisp_h_XPL(p) lisp_h_XIL (p) +# else +# define lisp_h_XLI(o) ((o).i) +# define lisp_h_XIL(i) ((Lisp_Object) {i}) +# define lisp_h_XLP(o) ((void *) (uintptr_t) (o).i) +# define lisp_h_XPL(p) ((Lisp_Object) {(uintptr_t) (p)}) +# endif #endif + #define lisp_h_CHECK_NUMBER(x) CHECK_TYPE (INTEGERP (x), Qintegerp, x) #define lisp_h_CHECK_SYMBOL(x) CHECK_TYPE (SYMBOLP (x), Qsymbolp, x) #define lisp_h_CHECK_TYPE(ok, predicate, x) \ @@ -352,8 +385,7 @@ error !; + (char *) lispsym)) # define lisp_h_XTYPE(a) ((enum Lisp_Type) (XLI (a) & ~VALMASK)) # define lisp_h_XUNTAG(a, type) \ - __builtin_assume_aligned ((void *) (intptr_t) (XLI (a) - (type)), \ - GCALIGNMENT) + __builtin_assume_aligned ((char *) XLP (a) - (type), GCALIGNMENT) #endif /* When compiling via gcc -O0, define the key operations as macros, as @@ -370,6 +402,8 @@ error !; #if DEFINE_KEY_OPS_AS_MACROS # define XLI(o) lisp_h_XLI (o) # define XIL(i) lisp_h_XIL (i) +# define XLP(o) lisp_h_XLP (o) +# define XPL(p) lisp_h_XPL (p) # define CHECK_NUMBER(x) lisp_h_CHECK_NUMBER (x) # define CHECK_SYMBOL(x) lisp_h_CHECK_SYMBOL (x) # define CHECK_TYPE(ok, predicate, x) lisp_h_CHECK_TYPE (ok, predicate, x) @@ -543,22 +577,24 @@ enum Lisp_Fwd_Type your object -- this way, the same object could be used to represent several disparate C structures. */ -#ifdef CHECK_LISP_OBJECT_TYPE -typedef struct Lisp_Object { EMACS_INT i; } Lisp_Object; +/* A Lisp_Object is a tagged pointer or integer. Ordinarily it is a + Lisp_Word. However, if CHECK_LISP_OBJECT_TYPE, it is a wrapper + around Lisp_Word, to help catch thinkos like 'Lisp_Object x = 0;'. -#define LISP_INITIALLY(i) {i} + LISP_INITIALLY (W) initializes a Lisp object with a tagged value + that is a Lisp_Word W. It can be used in a static initializer. */ -#undef CHECK_LISP_OBJECT_TYPE +#ifdef CHECK_LISP_OBJECT_TYPE +typedef struct Lisp_Object { Lisp_Word i; } Lisp_Object; +# define LISP_INITIALLY(w) {w} +# undef CHECK_LISP_OBJECT_TYPE enum CHECK_LISP_OBJECT_TYPE { CHECK_LISP_OBJECT_TYPE = true }; -#else /* CHECK_LISP_OBJECT_TYPE */ - -/* If a struct type is not wanted, define Lisp_Object as just a number. */ - -typedef EMACS_INT Lisp_Object; -#define LISP_INITIALLY(i) (i) +#else +typedef Lisp_Word Lisp_Object; +# define LISP_INITIALLY(w) (w) enum CHECK_LISP_OBJECT_TYPE { CHECK_LISP_OBJECT_TYPE = false }; -#endif /* CHECK_LISP_OBJECT_TYPE */ +#endif /* Forward declarations. */ @@ -590,8 +626,10 @@ extern double extract_float (Lisp_Object); /* Low-level conversion and type checking. */ -/* Convert a Lisp_Object to the corresponding EMACS_INT and vice versa. - At the machine level, these operations are no-ops. */ +/* Convert among various types use to implement Lisp_Object. At the + machine level, these operations may widen or narrow their arguments + if pointers differ in width from EMACS_INT; otherwise they are + no-ops. */ INLINE EMACS_INT (XLI) (Lisp_Object o) @@ -605,6 +643,18 @@ INLINE Lisp_Object return lisp_h_XIL (i); } +INLINE void * +(XLP) (Lisp_Object o) +{ + return lisp_h_XLP (o); +} + +INLINE Lisp_Object +(XPL) (void *p) +{ + return lisp_h_XPL (p); +} + /* Extract A's type. */ INLINE enum Lisp_Type @@ -632,8 +682,9 @@ INLINE void * #if USE_LSB_TAG return lisp_h_XUNTAG (a, type); #else - intptr_t i = USE_LSB_TAG ? XLI (a) - type : XLI (a) & VALMASK; - return (void *) i; + EMACS_UINT utype = type; + char *p = XLP (a); + return p - (utype << (USE_LSB_TAG ? 0 : VALBITS)); #endif } @@ -744,28 +795,34 @@ verify (alignof (struct Lisp_Symbol) % GCALIGNMENT == 0); #define DEFUN_ARGS_8 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, \ Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object) -/* Yield a signed integer that contains TAG along with PTR. +/* Typedefs useful for implementing TAG_PTR. untagged_ptr represents + a pointer before tagging, and Lisp_Word_tag contains a + possibly-shifted tag to be added to an untagged_ptr to convert it + to a Lisp_Word. */ +#if LISP_WORDS_ARE_POINTERS +/* untagged_ptr is a pointer so that the compiler knows that TAG_PTR + yields a pointer; this can help with gcc -fcheck-pointer-bounds. + It is char * so that adding a tag uses simple machine addition. */ +typedef char *untagged_ptr; +typedef uintptr_t Lisp_Word_tag; +#else +/* untagged_ptr is an unsigned integer instead of a pointer, so that + it can be added to the possibly-wider Lisp_Word_tag type without + losing information. */ +typedef uintptr_t untagged_ptr; +typedef EMACS_UINT Lisp_Word_tag; +#endif - Sign-extend pointers when USE_LSB_TAG (this simplifies emacs-module.c), - and zero-extend otherwise (that’s a bit faster here). - Sign extension matters only when EMACS_INT is wider than a pointer. */ +/* An initializer for a Lisp_Object that contains TAG along with PTR. */ #define TAG_PTR(tag, ptr) \ - (USE_LSB_TAG \ - ? (intptr_t) (ptr) + (tag) \ - : (EMACS_INT) (((EMACS_UINT) (tag) << VALBITS) + (uintptr_t) (ptr))) - -/* Yield an integer that contains a symbol tag along with OFFSET. - OFFSET should be the offset in bytes from 'lispsym' to the symbol. */ -#define TAG_SYMOFFSET(offset) TAG_PTR (Lisp_Symbol, offset) - -/* XLI_BUILTIN_LISPSYM (iQwhatever) is equivalent to - XLI (builtin_lisp_symbol (Qwhatever)), - except the former expands to an integer constant expression. */ -#define XLI_BUILTIN_LISPSYM(iname) TAG_SYMOFFSET ((iname) * sizeof *lispsym) + LISP_INITIALLY ((Lisp_Word) \ + ((untagged_ptr) (ptr) \ + + ((Lisp_Word_tag) (tag) << (USE_LSB_TAG ? 0 : VALBITS)))) /* LISPSYM_INITIALLY (Qfoo) is equivalent to Qfoo except it is designed for use as an initializer, even for a constant initializer. */ -#define LISPSYM_INITIALLY(name) LISP_INITIALLY (XLI_BUILTIN_LISPSYM (i##name)) +#define LISPSYM_INITIALLY(name) \ + TAG_PTR (Lisp_Symbol, (char *) (intptr_t) ((i##name) * sizeof *lispsym)) /* Declare extern constants for Lisp symbols. These can be helpful when using a debugger like GDB, on older platforms where the debug @@ -843,7 +900,8 @@ INLINE struct Lisp_Symbol * INLINE Lisp_Object make_lisp_symbol (struct Lisp_Symbol *sym) { - Lisp_Object a = XIL (TAG_SYMOFFSET ((char *) sym - (char *) lispsym)); + intptr_t symoffset = (char *) sym - (char *) lispsym; + Lisp_Object a = TAG_PTR (Lisp_Symbol, (char *) symoffset); eassert (XSYMBOL (a) == sym); return a; } @@ -1061,7 +1119,7 @@ clip_to_bounds (ptrdiff_t lower, EMACS_INT num, ptrdiff_t upper) INLINE Lisp_Object make_lisp_ptr (void *ptr, enum Lisp_Type type) { - Lisp_Object a = XIL (TAG_PTR (type, ptr)); + Lisp_Object a = TAG_PTR (type, ptr); eassert (XTYPE (a) == type && XUNTAG (a, type) == ptr); return a; } @@ -1132,7 +1190,7 @@ XINTPTR (Lisp_Object a) INLINE Lisp_Object make_pointer_integer (void *p) { - Lisp_Object a = XIL (TAG_PTR (Lisp_Int0, p)); + Lisp_Object a = TAG_PTR (Lisp_Int0, p); eassert (INTEGERP (a) && XINTPTR (a) == p); return a; } @@ -1644,8 +1702,10 @@ gc_aset (Lisp_Object array, ptrdiff_t idx, Lisp_Object val) /* True, since Qnil's representation is zero. Every place in the code that assumes Qnil is zero should verify (NIL_IS_ZERO), to make it easy - to find such assumptions later if we change Qnil to be nonzero. */ -enum { NIL_IS_ZERO = XLI_BUILTIN_LISPSYM (iQnil) == 0 }; + to find such assumptions later if we change Qnil to be nonzero. + Test iQnil and Lisp_Symbol instead of Qnil directly, since the latter + is not suitable for use in an integer constant expression. */ +enum { NIL_IS_ZERO = iQnil == 0 && Lisp_Symbol == 0 }; /* Clear the object addressed by P, with size NBYTES, so that all its bytes are zero and all its Lisp values are nil. */ diff --git a/src/xwidget.c b/src/xwidget.c index a67dc0ecf4..c7f0594728 100644 --- a/src/xwidget.c +++ b/src/xwidget.c @@ -392,8 +392,7 @@ webkit_javascript_finished_cb (GObject *webview, /* FIXME: This might lead to disaster if LISP_CALLBACK’s object was garbage collected before now. See the FIXME in Fxwidget_webkit_execute_script. */ - store_xwidget_js_callback_event (xw, XIL ((intptr_t) lisp_callback), - lisp_value); + store_xwidget_js_callback_event (xw, XPL (lisp_callback), lisp_value); } @@ -723,7 +722,7 @@ argument procedure FUN.*/) /* FIXME: This hack might lead to disaster if FUN is garbage collected before store_xwidget_js_callback_event makes it visible to Lisp again. See the FIXME in webkit_javascript_finished_cb. */ - gpointer callback_arg = (gpointer) (intptr_t) XLI (fun); + gpointer callback_arg = XLP (fun); /* JavaScript execution happens asynchronously. If an elisp callback function is provided we pass it to the C callback commit 45099bb90ff2107c3a30aef3047c893dbf5ef249 Author: Alan Third Date: Sun Dec 10 10:16:25 2017 +0000 Remove ObjC blocks (Bug#23753) * src/macfont.m (macfont_get_glyph_for_character): (mac_font_get_glyphs_for_variants): Inline Objective-C blocks. (cherry picked from commit 4590f1d768adbb2120a2b02c614f7ed3b21a4a3e) diff --git a/src/macfont.m b/src/macfont.m index 97879506ba..6985364b34 100644 --- a/src/macfont.m +++ b/src/macfont.m @@ -1443,6 +1443,7 @@ static CGGlyph macfont_get_glyph_for_cid (struct font *font, int nrows; dispatch_queue_t queue; dispatch_group_t group = NULL; + int nkeys; if (row != 0) { @@ -1479,23 +1480,16 @@ static CGGlyph macfont_get_glyph_for_cid (struct font *font, return glyph; } - queue = - dispatch_get_global_queue (DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - group = dispatch_group_create (); - dispatch_group_async (group, queue, ^{ - int nkeys; - uintptr_t key; - nkeys = nkeys_or_perm; - for (key = row * (256 / NGLYPHS_IN_VALUE); ; key++) - if (CFDictionaryContainsKey (dictionary, - (const void *) key)) - { - CFDictionaryRemoveValue (dictionary, - (const void *) key); - if (--nkeys == 0) - break; - } - }); + nkeys = nkeys_or_perm; + for (key = row * (256 / NGLYPHS_IN_VALUE); ; key++) + if (CFDictionaryContainsKey (dictionary, + (const void *) key)) + { + CFDictionaryRemoveValue (dictionary, + (const void *) key); + if (--nkeys == 0) + break; + } } len = 0; @@ -1535,12 +1529,6 @@ static CGGlyph macfont_get_glyph_for_cid (struct font *font, sizeof (CGGlyph *) * nrows); cache->glyph.matrix[nrows - 1] = glyphs; cache->glyph.nrows = nrows; - - if (group) - { - dispatch_group_wait (group, DISPATCH_TIME_FOREVER); - dispatch_release (group); - } } return cache->glyph.matrix[nkeys_or_perm - ROW_PERM_OFFSET][c % 256]; @@ -3267,9 +3255,6 @@ So we use CTFontDescriptorCreateMatchingFontDescriptor (no struct variation_selector_record *records = uvs->variation_selector_records; CFIndex i; UInt32 ir, nrecords; - dispatch_queue_t queue = - dispatch_get_global_queue (DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - dispatch_group_t group = dispatch_group_create (); nrecords = BUINT32_VALUE (uvs->num_var_selector_records); i = 0; @@ -3293,66 +3278,63 @@ So we use CTFontDescriptorCreateMatchingFontDescriptor (no default_uvs_offset = BUINT32_VALUE (records[ir].default_uvs_offset); non_default_uvs_offset = BUINT32_VALUE (records[ir].non_default_uvs_offset); - dispatch_group_async (group, queue, ^{ - glyphs[i] = kCGFontIndexInvalid; - if (default_uvs_offset) + glyphs[i] = kCGFontIndexInvalid; + + if (default_uvs_offset) + { + struct default_uvs_table *default_uvs = + (struct default_uvs_table *) ((UInt8 *) uvs + + default_uvs_offset); + struct unicode_value_range *ranges = + default_uvs->unicode_value_ranges; + UInt32 lo, hi; + + lo = 0; + hi = BUINT32_VALUE (default_uvs->num_unicode_value_ranges); + while (lo < hi) { - struct default_uvs_table *default_uvs = - (struct default_uvs_table *) ((UInt8 *) uvs - + default_uvs_offset); - struct unicode_value_range *ranges = - default_uvs->unicode_value_ranges; - UInt32 lo, hi; - - lo = 0; - hi = BUINT32_VALUE (default_uvs->num_unicode_value_ranges); - while (lo < hi) - { - UInt32 mid = (lo + hi) / 2; + UInt32 mid = (lo + hi) / 2; - if (c < BUINT24_VALUE (ranges[mid].start_unicode_value)) - hi = mid; - else - lo = mid + 1; - } - if (hi > 0 - && (c <= (BUINT24_VALUE (ranges[hi - 1].start_unicode_value) - + BUINT8_VALUE (ranges[hi - 1].additional_count)))) - glyphs[i] = 0; + if (c < BUINT24_VALUE (ranges[mid].start_unicode_value)) + hi = mid; + else + lo = mid + 1; } + if (hi > 0 + && (c <= (BUINT24_VALUE (ranges[hi - 1].start_unicode_value) + + BUINT8_VALUE (ranges[hi - 1].additional_count)))) + glyphs[i] = 0; + } - if (glyphs[i] == kCGFontIndexInvalid && non_default_uvs_offset) + if (glyphs[i] == kCGFontIndexInvalid && non_default_uvs_offset) + { + struct non_default_uvs_table *non_default_uvs = + (struct non_default_uvs_table *) ((UInt8 *) uvs + + non_default_uvs_offset); + struct uvs_mapping *mappings = non_default_uvs->uvs_mappings; + UInt32 lo, hi; + + lo = 0; + hi = BUINT32_VALUE (non_default_uvs->num_uvs_mappings); + while (lo < hi) { - struct non_default_uvs_table *non_default_uvs = - (struct non_default_uvs_table *) ((UInt8 *) uvs - + non_default_uvs_offset); - struct uvs_mapping *mappings = non_default_uvs->uvs_mappings; - UInt32 lo, hi; - - lo = 0; - hi = BUINT32_VALUE (non_default_uvs->num_uvs_mappings); - while (lo < hi) - { - UInt32 mid = (lo + hi) / 2; + UInt32 mid = (lo + hi) / 2; - if (c < BUINT24_VALUE (mappings[mid].unicode_value)) - hi = mid; - else - lo = mid + 1; - } - if (hi > 0 && - BUINT24_VALUE (mappings[hi - 1].unicode_value) == c) - glyphs[i] = BUINT16_VALUE (mappings[hi - 1].glyph_id); + if (c < BUINT24_VALUE (mappings[mid].unicode_value)) + hi = mid; + else + lo = mid + 1; } - }); + if (hi > 0 && + BUINT24_VALUE (mappings[hi - 1].unicode_value) == c) + glyphs[i] = BUINT16_VALUE (mappings[hi - 1].glyph_id); + } i++; ir++; } while (i < count) glyphs[i++] = kCGFontIndexInvalid; - dispatch_group_wait (group, DISPATCH_TIME_FOREVER); - dispatch_release (group); } static int commit c705f7250d6f17f1682ee5ad7eec516dbf6c3916 Author: Ted Zlatanov Date: Tue Dec 12 14:46:54 2017 -0500 Rename gnus-cloud method setter * lisp/gnus/gnus-srvr.el (gnus-server-set-cloud-method-server) (gnus-server-make-menu-bar, gnus-server-mode-map): Rename `gnus-server-toggle-cloud-method-server' to `gnus-server-set-cloud-method-server' (Bug#28845). (gnus-server-toggle-cloud-server): Use "toggle" in docstring. * lisp/gnus/gnus-cloud.el: Fix docstring. diff --git a/lisp/gnus/gnus-cloud.el b/lisp/gnus/gnus-cloud.el index c57576cf3c..f3acd9e4c5 100644 --- a/lisp/gnus/gnus-cloud.el +++ b/lisp/gnus/gnus-cloud.el @@ -70,7 +70,7 @@ (defcustom gnus-cloud-method nil "The IMAP select method used to store the cloud data. -See also `gnus-server-toggle-cloud-method-server' for an +See also `gnus-server-set-cloud-method-server' for an easy interactive way to set this from the Server buffer." :group 'gnus-cloud :type '(radio (const :tag "Not set" nil) diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el index a3341470fa..062e9cf154 100644 --- a/lisp/gnus/gnus-srvr.el +++ b/lisp/gnus/gnus-srvr.el @@ -142,7 +142,7 @@ If nil, a faster, but more primitive, buffer is used instead." ["Offline" gnus-server-offline-server t] ["Deny" gnus-server-deny-server t] ["Toggle Cloud Sync for this server" gnus-server-toggle-cloud-server t] - ["Toggle Cloud Sync Host" gnus-server-toggle-cloud-method-server t] + ["Toggle Cloud Sync Host" gnus-server-set-cloud-method-server t] "---" ["Open All" gnus-server-open-all-servers t] ["Close All" gnus-server-close-all-servers t] @@ -189,7 +189,7 @@ If nil, a faster, but more primitive, buffer is used instead." "z" gnus-server-compact-server "i" gnus-server-toggle-cloud-server - "I" gnus-server-toggle-cloud-method-server + "I" gnus-server-set-cloud-method-server "\C-c\C-i" gnus-info-find-node "\C-c\C-b" gnus-bug)) @@ -1129,7 +1129,7 @@ Requesting compaction of %s... (this may take a long time)" (and original (gnus-kill-buffer original)))))) (defun gnus-server-toggle-cloud-server () - "Make the server under point be replicated in the Emacs Cloud." + "Toggle whether the server under point is replicated in the Emacs Cloud." (interactive) (let ((server (gnus-server-server-name))) (unless server @@ -1149,7 +1149,7 @@ Requesting compaction of %s... (this may take a long time)" "Replication of %s in the cloud will stop") server))) -(defun gnus-server-toggle-cloud-method-server () +(defun gnus-server-set-cloud-method-server () "Set the server under point to host the Emacs Cloud." (interactive) (let ((server (gnus-server-server-name))) commit da353e8b10ab60cf86f2f5fa2a87d52b3da8b592 Author: Stefan Monnier Date: Tue Dec 12 14:43:27 2017 -0500 * lisp/subr.el (run-mode-hooks): Fix last change diff --git a/lisp/subr.el b/lisp/subr.el index 8468255ad2..d6dceb79fa 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1877,7 +1877,7 @@ running their FOO-mode-hook." ;; Normal case, just run the hook as before plus any delayed hooks. (setq hooks (nconc (nreverse delayed-mode-hooks) hooks)) (and syntax-propertize-function - (not (buffer-local-p 'parse-sexp-lookup-properties)) + (not (local-variable-p 'parse-sexp-lookup-properties)) ;; `syntax-propertize' sets `parse-sexp-lookup-properties' for us, but ;; in order for the sexp primitives to automatically call ;; `syntax-propertize' we need `parse-sexp-lookup-properties' to be commit b0369d0536cd510e8b7120ccf04ee98c4e323b59 Author: Eli Zaretskii Date: Tue Dec 12 21:41:23 2017 +0200 Import the latest IVD_Sequences.txt * admin/unidata/IVD_Sequences.txt: New version from http://www.unicode.org/ivd/, the 2017-12-12 version of the Unicode Ideographic Variation Database. * src/macuvs.h: Regenerated. diff --git a/admin/unidata/IVD_Sequences.txt b/admin/unidata/IVD_Sequences.txt index 304bf91d9b..a1a38a2e92 100644 --- a/admin/unidata/IVD_Sequences.txt +++ b/admin/unidata/IVD_Sequences.txt @@ -2,6 +2,11 @@ # # History: # +# 2017-12-12 Registration of additional sequences in the Adobe-Japan1 +# collection. Combined registration of the KRName collection +# and of sequences in that collection. Registration of +# additional sequences in the Moji_Joho collection. +# # 2016-08-15 Combined registration of the MSARG collection and of # sequences in that collection. # @@ -24,7 +29,7 @@ # For more details on the IVD, see UTS #37: # http://www.unicode.org/reports/tr37/ # -# Copyright 2006-2016 Unicode, Inc. +# Copyright 2006-2017 Unicode, Inc. # For terms of use, see: http://www.unicode.org/terms_of_use.html # 3402 E0100; Adobe-Japan1; CID+13698 @@ -36,6 +41,7 @@ 3404 E0100; Moji_Joho; MJ000008 3404 E0101; Hanyo-Denshi; KS152700 3404 E0101; Moji_Joho; MJ000007 +3404 E0102; Moji_Joho; MJ068055 3405 E0100; Adobe-Japan1; CID+15387 3406 E0100; Adobe-Japan1; CID+17242 3427 E0100; Adobe-Japan1; CID+13910 @@ -254,6 +260,8 @@ 3687 E0100; Moji_Joho; MJ057255 3687 E0101; Hanyo-Denshi; KS065500 3687 E0101; Moji_Joho; MJ000557 +3688 E0100; Moji_Joho; MJ000558 +3688 E0101; Moji_Joho; MJ057261 3689 E0100; Hanyo-Denshi; IA0203 3689 E0100; Moji_Joho; MJ000560 3689 E0101; Hanyo-Denshi; KS066150 @@ -266,6 +274,8 @@ 3691 E0102; Moji_Joho; MJ000567 3696 E0100; Adobe-Japan1; CID+17477 3699 E0100; Adobe-Japan1; CID+17475 +36A2 E0100; Moji_Joho; MJ000583 +36A2 E0101; Moji_Joho; MJ000584 36AB E0100; Hanyo-Denshi; IA1406 36AB E0101; Hanyo-Denshi; TK01020030 36C3 E0100; Hanyo-Denshi; IA1426 @@ -346,6 +356,8 @@ 3809 E0100; Moji_Joho; MJ000910 3809 E0101; Hanyo-Denshi; KS096130 3809 E0101; Moji_Joho; MJ000911 +3815 E0100; Moji_Joho; MJ000923 +3815 E0101; Moji_Joho; MJ000924 3817 E0100; Hanyo-Denshi; IA0251 3817 E0100; Moji_Joho; MJ000926 3817 E0101; Hanyo-Denshi; JTB085 @@ -472,6 +484,8 @@ 3A28 E0101; Hanyo-Denshi; TK01035930 3A2F E0100; Moji_Joho; MJ001429 3A2F E0101; Moji_Joho; MJ001430 +3A3E E0100; Moji_Joho; MJ001445 +3A3E E0101; Moji_Joho; MJ057568 3A3F E0100; Moji_Joho; MJ001446 3A3F E0101; Moji_Joho; MJ001447 3A5C E0100; Adobe-Japan1; CID+20127 @@ -493,6 +507,8 @@ 3AB4 E0100; Hanyo-Denshi; IA2313 3AB4 E0101; Hanyo-Denshi; TK01037540 3AC4 E0100; Adobe-Japan1; CID+20135 +3AC4 E0101; Moji_Joho; MJ001566 +3AC4 E0102; Moji_Joho; MJ059671 3ACB E0100; Adobe-Japan1; CID+20136 3AD6 E0100; Adobe-Japan1; CID+17731 3AD7 E0100; Adobe-Japan1; CID+17758 @@ -634,6 +650,7 @@ 3C4E E0100; Moji_Joho; MJ001937 3C4E E0101; Hanyo-Denshi; KS184420 3C4E E0101; Moji_Joho; MJ001936 +3C4E E0102; Moji_Joho; MJ068056 3C4F E0100; Hanyo-Denshi; IA0423 3C4F E0100; Moji_Joho; MJ001938 3C4F E0101; Hanyo-Denshi; KS184580 @@ -790,6 +807,8 @@ 3EBF E0100; Hanyo-Denshi; IA3152 3EBF E0101; Hanyo-Denshi; TK01058350 3EDA E0100; Adobe-Japan1; CID+15432 +3EE8 E0100; Moji_Joho; MJ002526 +3EE8 E0101; Moji_Joho; MJ059908 3F0B E0100; Hanyo-Denshi; IA0484 3F0B E0100; Moji_Joho; MJ002551 3F0B E0101; Hanyo-Denshi; KS239730 @@ -1097,8 +1116,12 @@ 43D5 E0101; Hanyo-Denshi; KS326950 43D5 E0101; Moji_Joho; MJ003776 43D5 E0102; Hanyo-Denshi; TK01075190 +43D9 E0100; Moji_Joho; MJ003782 +43D9 E0101; Moji_Joho; MJ003783 43DC E0100; Hanyo-Denshi; IA4345 43DC E0101; Hanyo-Denshi; TK01041310 +43E2 E0100; Moji_Joho; MJ003791 +43E2 E0101; Moji_Joho; MJ003792 43EE E0100; Adobe-Japan1; CID+18423 43F0 E0100; Adobe-Japan1; CID+18426 43F0 E0101; Hanyo-Denshi; JD8534 @@ -1106,6 +1129,8 @@ 43F0 E0102; Hanyo-Denshi; IA4360 43F0 E0102; Moji_Joho; MJ003806 4408 E0100; Adobe-Japan1; CID+18432 +440B E0100; Moji_Joho; MJ003833 +440B E0101; Moji_Joho; MJ003834 440C E0100; Adobe-Japan1; CID+15426 440C E0101; Hanyo-Denshi; IA0605 440C E0101; Moji_Joho; MJ003836 @@ -1404,6 +1429,8 @@ 4670 E0100; Moji_Joho; MJ004480 4670 E0101; Hanyo-Denshi; KS394780 4670 E0101; Moji_Joho; MJ004479 +4672 E0100; Moji_Joho; MJ004482 +4672 E0101; Moji_Joho; MJ004483 4674 E0100; Hanyo-Denshi; IA0674 4674 E0100; Moji_Joho; MJ004485 4674 E0101; Hanyo-Denshi; IB2915 @@ -1488,6 +1515,8 @@ 4889 E0100; Moji_Joho; MJ004995 4889 E0101; Hanyo-Denshi; KS437540 4889 E0101; Moji_Joho; MJ004994 +488B E0100; Moji_Joho; MJ004997 +488B E0101; Moji_Joho; MJ058841 488C E0100; Hanyo-Denshi; IB0385 488C E0100; Moji_Joho; MJ004999 488C E0101; Hanyo-Denshi; IB0918 @@ -1559,6 +1588,8 @@ 49B0 E0100; Adobe-Japan1; CID+17183 49D3 E0100; Hanyo-Denshi; IA5742 49D3 E0101; Hanyo-Denshi; TK01095720 +49DF E0100; Moji_Joho; MJ058975 +49DF E0101; Moji_Joho; MJ068096 49E2 E0100; Hanyo-Denshi; IA0764 49E2 E0100; Moji_Joho; MJ005322 49E2 E0101; Hanyo-Denshi; KS474470 @@ -1585,6 +1616,8 @@ 4A7F E0100; Moji_Joho; MJ005477 4A7F E0101; Hanyo-Denshi; KS487580 4A7F E0101; Moji_Joho; MJ059013 +4A9D E0100; Moji_Joho; MJ005507 +4A9D E0101; Moji_Joho; MJ068057 4AA7 E0100; Hanyo-Denshi; IA5946 4AA7 E0100; Moji_Joho; MJ005515 4AA7 E0101; Hanyo-Denshi; KS490160 @@ -1837,6 +1870,8 @@ 4E12 E0102; Moji_Joho; MJ006319 4E12 E0103; Moji_Joho; MJ006317 4E14 E0100; Adobe-Japan1; CID+1484 +4E14 E0101; Moji_Joho; MJ006321 +4E14 E0102; Moji_Joho; MJ056831 4E15 E0100; Adobe-Japan1; CID+4092 4E16 E0100; Adobe-Japan1; CID+2632 4E17 E0100; Adobe-Japan1; CID+4311 @@ -1915,6 +1950,8 @@ 4E3F E0100; Adobe-Japan1; CID+4097 4E40 E0100; Adobe-Japan1; CID+14302 4E41 E0100; Adobe-Japan1; CID+14303 +4E41 E0101; Moji_Joho; MJ006370 +4E41 E0102; Moji_Joho; MJ006371 4E42 E0100; Adobe-Japan1; CID+4098 4E42 E0101; Moji_Joho; MJ006372 4E42 E0102; Moji_Joho; MJ006373 @@ -1995,6 +2032,8 @@ 4E86 E0101; Hanyo-Denshi; JA4627 4E86 E0102; Hanyo-Denshi; TK01001070 4E88 E0100; Adobe-Japan1; CID+3879 +4E88 E0101; Moji_Joho; MJ006433 +4E88 E0102; Moji_Joho; MJ056873 4E89 E0100; Adobe-Japan1; CID+2794 4E8A E0100; Adobe-Japan1; CID+4104 4E8B E0100; Adobe-Japan1; CID+2244 @@ -2021,6 +2060,8 @@ 4E9C E0100; Adobe-Japan1; CID+1125 4E9D E0100; Adobe-Japan1; CID+17245 4E9E E0100; Adobe-Japan1; CID+4108 +4E9E E0101; Moji_Joho; MJ006456 +4E9E E0102; Moji_Joho; MJ056837 4E9F E0100; Adobe-Japan1; CID+4109 4E9F E0101; Hanyo-Denshi; JA4820 4E9F E0101; Moji_Joho; MJ006458 @@ -2042,6 +2083,8 @@ 4EA2 E0102; Hanyo-Denshi; KS003510 4EA2 E0102; Moji_Joho; MJ056886 4EA2 E0103; Hanyo-Denshi; TK01009210 +4EA2 E0104; Moji_Joho; MJ006465 +4EA2 E0105; Moji_Joho; MJ056979 4EA4 E0100; Adobe-Japan1; CID+1958 4EA4 E0101; Adobe-Japan1; CID+13439 4EA4 E0102; Hanyo-Denshi; JA2482 @@ -2150,6 +2193,9 @@ 4EE4 E0102; Hanyo-Denshi; KS004910 4EE4 E0102; Moji_Joho; MJ056905 4EE5 E0100; Adobe-Japan1; CID+1166 +4EE5 E0101; Moji_Joho; MJ006534 +4EE5 E0102; Moji_Joho; MJ057123 +4EE5 E0103; Moji_Joho; MJ057124 4EE8 E0100; Adobe-Japan1; CID+21085 4EEB E0100; Adobe-Japan1; CID+17250 4EED E0100; Adobe-Japan1; CID+4122 @@ -2297,6 +2343,7 @@ 4F60 E0103; Hanyo-Denshi; IB1339 4F60 E0103; Moji_Joho; MJ006652 4F60 E0104; Hanyo-Denshi; JTAD50 +4F60 E0104; Moji_Joho; MJ059316 4F63 E0100; Adobe-Japan1; CID+21099 4F64 E0100; Adobe-Japan1; CID+17255 4F69 E0100; Adobe-Japan1; CID+4137 @@ -2306,7 +2353,9 @@ 4F69 E0102; Moji_Joho; MJ056914 4F6A E0100; Adobe-Japan1; CID+16781 4F6A E0101; Hanyo-Denshi; JB1682 +4F6A E0101; Moji_Joho; MJ006659 4F6A E0102; Hanyo-Denshi; KS008520 +4F6A E0102; Moji_Joho; MJ006660 4F6C E0100; Adobe-Japan1; CID+16782 4F6D E0100; Hanyo-Denshi; IP4F6D 4F6D E0100; Moji_Joho; MJ006664 @@ -2408,7 +2457,9 @@ 4FAE E0100; Adobe-Japan1; CID+3552 4FAE E0101; Adobe-Japan1; CID+13382 4FAE E0102; Hanyo-Denshi; JA4178 +4FAE E0102; Moji_Joho; MJ006728 4FAE E0103; Hanyo-Denshi; JC1424 +4FAE E0103; Moji_Joho; MJ030244 4FAF E0100; Adobe-Japan1; CID+1960 4FAF E0101; Hanyo-Denshi; JA2484 4FAF E0102; Hanyo-Denshi; TK01004220 @@ -2483,6 +2534,7 @@ 4FDE E0101; Moji_Joho; MJ006783 4FDE E0102; Hanyo-Denshi; JTAD68 4FDE E0102; Moji_Joho; MJ006785 +4FDE E0103; Moji_Joho; MJ056932 4FDF E0100; Adobe-Japan1; CID+4145 4FE0 E0100; Adobe-Japan1; CID+7660 4FE1 E0100; Adobe-Japan1; CID+2548 @@ -2554,6 +2606,8 @@ 501C E0101; Hanyo-Denshi; JB1753 501C E0102; Hanyo-Denshi; TK01004650 501D E0100; Adobe-Japan1; CID+21127 +501D E0101; Moji_Joho; MJ006848 +501D E0102; Moji_Joho; MJ056931 501E E0100; Adobe-Japan1; CID+8386 501F E0100; Adobe-Japan1; CID+2310 5021 E0100; Adobe-Japan1; CID+4162 @@ -2847,6 +2901,7 @@ 50C9 E0101; Moji_Joho; MJ007053 50C9 E0102; Hanyo-Denshi; KS010840 50C9 E0102; Moji_Joho; MJ056936 +50C9 E0103; Moji_Joho; MJ056948 50CA E0100; Adobe-Japan1; CID+4185 50CA E0101; Adobe-Japan1; CID+7982 50CA E0102; Adobe-Japan1; CID+14101 @@ -2920,6 +2975,7 @@ 50E7 E0104; Hanyo-Denshi; JTAD9C 50E7 E0104; Moji_Joho; MJ007096 50E7 E0105; Hanyo-Denshi; JC1441 +50E7 E0105; Moji_Joho; MJ030245 50E8 E0100; Adobe-Japan1; CID+19163 50E8 E0101; Hanyo-Denshi; JB1834 50E8 E0101; Moji_Joho; MJ007097 @@ -3086,8 +3142,12 @@ 513C E0102; Hanyo-Denshi; KS015070 513C E0102; Moji_Joho; MJ056958 513C E0103; Hanyo-Denshi; TK01006460 +513C E0104; Moji_Joho; MJ056960 513F E0100; Adobe-Japan1; CID+4208 5140 E0100; Adobe-Japan1; CID+4209 +5140 E0101; Moji_Joho; MJ007207 +5140 E0102; Moji_Joho; MJ007208 +5140 E0103; Moji_Joho; MJ059294 5141 E0100; Adobe-Japan1; CID+1208 5142 E0100; Adobe-Japan1; CID+21177 5142 E0101; Hanyo-Denshi; JB1869 @@ -3134,6 +3194,7 @@ 514D E0103; Hanyo-Denshi; KS015850S 514D E0103; Moji_Joho; MJ007229 514D E0104; Hanyo-Denshi; JC1448 +514D E0104; Moji_Joho; MJ030246 514E E0100; Adobe-Japan1; CID+3136 514E E0101; Adobe-Japan1; CID+13949 514E E0102; Hanyo-Denshi; JA3738 @@ -3167,6 +3228,8 @@ 5158 E0100; Adobe-Japan1; CID+21180 515A E0100; Adobe-Japan1; CID+3160 515C E0100; Adobe-Japan1; CID+1491 +515C E0101; Moji_Joho; MJ007251 +515C E0102; Moji_Joho; MJ057036 515F E0100; Adobe-Japan1; CID+14349 5160 E0100; Adobe-Japan1; CID+17298 5160 E0101; Hanyo-Denshi; JD0306 @@ -3288,6 +3351,7 @@ 518D E0103; Moji_Joho; MJ007312 518D E0104; Hanyo-Denshi; KS018040 518D E0104; Moji_Joho; MJ057004 +518D E0105; Moji_Joho; MJ057010 518E E0100; Adobe-Japan1; CID+21183 518E E0101; Hanyo-Denshi; JB1883 518E E0101; Moji_Joho; MJ007314 @@ -3344,6 +3408,7 @@ 519D E0101; Moji_Joho; MJ007334 519D E0102; Hanyo-Denshi; IB1434 519D E0102; Moji_Joho; MJ007335 +519D E0103; Moji_Joho; MJ057024 51A0 E0100; Adobe-Japan1; CID+1507 51A1 E0100; Adobe-Japan1; CID+14350 51A1 E0101; Moji_Joho; MJ007339 @@ -3357,6 +3422,7 @@ 51A2 E0103; Moji_Joho; MJ007343 51A2 E0104; Hanyo-Denshi; JTADF2 51A2 E0104; Moji_Joho; MJ007344 +51A2 E0105; Moji_Joho; MJ068058 51A3 E0100; Adobe-Japan1; CID+17305 51A4 E0100; Adobe-Japan1; CID+4228 51A4 E0101; Adobe-Japan1; CID+7817 @@ -3367,6 +3433,7 @@ 51A4 E0104; Hanyo-Denshi; JTADF5S 51A4 E0104; Moji_Joho; MJ007349 51A4 E0105; Moji_Joho; MJ007348 +51A4 E0106; Moji_Joho; MJ068059 51A5 E0100; Adobe-Japan1; CID+3785 51A5 E0101; Hanyo-Denshi; JA4429 51A5 E0101; Moji_Joho; MJ007350 @@ -3540,6 +3607,7 @@ 5207 E0102; Hanyo-Denshi; IB0620 5207 E0102; Moji_Joho; MJ007459 5207 E0103; Moji_Joho; MJ007460 +5207 E0104; Moji_Joho; MJ057061 5208 E0100; Adobe-Japan1; CID+1502 520A E0100; Adobe-Japan1; CID+1509 520B E0100; Adobe-Japan1; CID+4251 @@ -3790,6 +3858,8 @@ 52C2 E0100; Hanyo-Denshi; IP52C2 52C2 E0101; Hanyo-Denshi; TK01010710 52C3 E0100; Adobe-Japan1; CID+3716 +52C3 E0101; Moji_Joho; MJ007662 +52C3 E0102; Moji_Joho; MJ057070 52C4 E0100; Adobe-Japan1; CID+21209 52C4 E0101; Hanyo-Denshi; JB1970 52C4 E0102; Hanyo-Denshi; TK01010590 @@ -3809,7 +3879,9 @@ 52C9 E0100; Adobe-Japan1; CID+13385 52C9 E0101; Adobe-Japan1; CID+3625 52C9 E0102; Hanyo-Denshi; JA4257 +52C9 E0102; Moji_Joho; MJ007670 52C9 E0103; Hanyo-Denshi; JC1467 +52C9 E0103; Moji_Joho; MJ030247 52CA E0100; Adobe-Japan1; CID+17325 52CC E0100; Adobe-Japan1; CID+16797 52CC E0101; Hanyo-Denshi; JB1973 @@ -3886,6 +3958,7 @@ 52E4 E0102; Hanyo-Denshi; JA2248 52E4 E0102; Moji_Joho; MJ007710 52E4 E0103; Hanyo-Denshi; JC1472 +52E4 E0103; Moji_Joho; MJ030248 52E4 E0104; Hanyo-Denshi; JTAE45 52E4 E0104; Moji_Joho; MJ059388 52E4 E0105; Hanyo-Denshi; JTAE46 @@ -4131,7 +4204,9 @@ 5351 E0100; Adobe-Japan1; CID+13378 5351 E0101; Adobe-Japan1; CID+3440 5351 E0102; Hanyo-Denshi; JA4060 +5351 E0102; Moji_Joho; MJ007851 5351 E0103; Hanyo-Denshi; JC1478 +5351 E0103; Moji_Joho; MJ030249 5352 E0100; Adobe-Japan1; CID+2836 5352 E0101; Hanyo-Denshi; JA3420 5352 E0101; Moji_Joho; MJ007852 @@ -4242,6 +4317,8 @@ 537F E0106; Moji_Joho; MJ007914 537F E0107; Hanyo-Denshi; KS033350 537F E0107; Moji_Joho; MJ007912 +537F E0108; KRName; KRName_537F_01 +537F E0109; KRName; KRName_537F_02 5382 E0100; Adobe-Japan1; CID+4321 5383 E0100; Adobe-Japan1; CID+21236 5384 E0100; Adobe-Japan1; CID+3837 @@ -4269,6 +4346,8 @@ 53A1 E0100; Adobe-Japan1; CID+21240 53A4 E0100; Adobe-Japan1; CID+17335 53A5 E0100; Adobe-Japan1; CID+4325 +53A5 E0101; Moji_Joho; MJ007944 +53A5 E0102; Moji_Joho; MJ057119 53A6 E0100; Adobe-Japan1; CID+4324 53A8 E0100; Adobe-Japan1; CID+2597 53A9 E0100; Adobe-Japan1; CID+1243 @@ -4349,6 +4428,8 @@ 53D0 E0100; Moji_Joho; MJ007998 53D0 E0101; Hanyo-Denshi; KS001630S 53D0 E0101; Moji_Joho; MJ056859 +53D0 E0102; Moji_Joho; MJ056861 +53D0 E0103; Moji_Joho; MJ057134 53D2 E0100; Adobe-Japan1; CID+21245 53D3 E0100; Adobe-Japan1; CID+21246 53D3 E0101; Hanyo-Denshi; JB2059 @@ -4957,7 +5038,9 @@ 559D E0100; Adobe-Japan1; CID+1475 559D E0101; Adobe-Japan1; CID+7651 559D E0102; Hanyo-Denshi; JA1969 +559D E0102; Moji_Joho; MJ008468 559D E0103; Hanyo-Denshi; JC1512 +559D E0103; Moji_Joho; MJ030250 559E E0100; Adobe-Japan1; CID+4407 559E E0101; Hanyo-Denshi; JA5136 559E E0101; Moji_Joho; MJ008469 @@ -5002,6 +5085,7 @@ 55AE E0101; Moji_Joho; MJ008491 55AE E0102; Hanyo-Denshi; KS046250 55AE E0102; Moji_Joho; MJ057178 +55AE E0103; Moji_Joho; MJ057167 55B0 E0100; Adobe-Japan1; CID+1772 55B0 E0101; Adobe-Japan1; CID+7664 55B0 E0102; Hanyo-Denshi; JA2284 @@ -5109,7 +5193,9 @@ 5606 E0100; Adobe-Japan1; CID+13366 5606 E0101; Adobe-Japan1; CID+2928 5606 E0102; Hanyo-Denshi; JA3518 +5606 E0102; Moji_Joho; MJ008578 5606 E0103; Hanyo-Denshi; JC1515 +5606 E0103; Moji_Joho; MJ030251 5607 E0100; Adobe-Japan1; CID+17392 5608 E0100; Adobe-Japan1; CID+14396 5609 E0100; Adobe-Japan1; CID+1349 @@ -5176,6 +5262,8 @@ 5639 E0100; Adobe-Japan1; CID+19261 563B E0100; Adobe-Japan1; CID+16810 563C E0100; Adobe-Japan1; CID+21297 +563C E0101; Moji_Joho; MJ008634 +563C E0102; Moji_Joho; MJ059434 563D E0100; Adobe-Japan1; CID+17396 563E E0100; Hanyo-Denshi; IP563E 563E E0100; Moji_Joho; MJ008636 @@ -5240,6 +5328,7 @@ 5668 E0102; Hanyo-Denshi; JA2079 5668 E0102; Moji_Joho; MJ008683 5668 E0103; Hanyo-Denshi; JC1522 +5668 E0103; Moji_Joho; MJ030252 5668 E0104; Hanyo-Denshi; JTAEDB 5668 E0104; Moji_Joho; MJ057164 5668 E0105; Hanyo-Denshi; KS230860 @@ -5268,8 +5357,10 @@ 5674 E0100; Adobe-Japan1; CID+3582 5674 E0101; Adobe-Japan1; CID+13500 5674 E0102; Hanyo-Denshi; JA4214 +5674 E0102; Moji_Joho; MJ008697 5674 E0103; Hanyo-Denshi; KS050480 5674 E0103; Moji_Joho; MJ008698 +5674 E0104; Moji_Joho; MJ008699 5675 E0100; Adobe-Japan1; CID+21305 5676 E0100; Adobe-Japan1; CID+15411 5676 E0101; Hanyo-Denshi; JC1520 @@ -5661,6 +5752,8 @@ 5794 E0102; Hanyo-Denshi; IB1580 5794 E0102; Moji_Joho; MJ009010 5795 E0100; Adobe-Japan1; CID+21338 +5795 E0101; KRName; KRName_5795_01 +5795 E0102; KRName; KRName_5795_02 5797 E0100; Adobe-Japan1; CID+19289 5799 E0100; Adobe-Japan1; CID+21335 579A E0100; Adobe-Japan1; CID+17430 @@ -5708,6 +5801,8 @@ 57CE E0102; Moji_Joho; MJ009062 57CE E0103; Hanyo-Denshi; JTAF58 57CE E0103; Moji_Joho; MJ009063 +57CE E0104; KRName; KRName_57CE_01 +57CE E0105; KRName; KRName_57CE_02 57CF E0100; Adobe-Japan1; CID+16817 57D2 E0100; Adobe-Japan1; CID+4496 57D2 E0101; Hanyo-Denshi; JA5231 @@ -5786,6 +5881,8 @@ 5803 E0100; Adobe-Japan1; CID+21345 5804 E0100; Adobe-Japan1; CID+17445 5805 E0100; Adobe-Japan1; CID+1870 +5805 E0101; Moji_Joho; MJ009126 +5805 E0102; Moji_Joho; MJ057223 5806 E0100; Adobe-Japan1; CID+2863 5807 E0100; Hanyo-Denshi; IP5807 5807 E0101; Hanyo-Denshi; TK01016780 @@ -5870,7 +5967,9 @@ 5840 E0100; Adobe-Japan1; CID+3597 5840 E0101; Adobe-Japan1; CID+13384 5840 E0102; Hanyo-Denshi; JA4229 +5840 E0102; Moji_Joho; MJ009190 5840 E0103; Hanyo-Denshi; JC1558 +5840 E0103; Moji_Joho; MJ030253 5841 E0100; Adobe-Japan1; CID+4005 5849 E0100; Adobe-Japan1; CID+17450 584A E0100; Adobe-Japan1; CID+1396 @@ -6035,7 +6134,9 @@ 58A8 E0100; Adobe-Japan1; CID+13387 58A8 E0101; Adobe-Japan1; CID+3709 58A8 E0102; Hanyo-Denshi; JA4347 +58A8 E0102; Moji_Joho; MJ009301 58A8 E0103; Hanyo-Denshi; JC1562 +58A8 E0103; Moji_Joho; MJ030254 58A9 E0100; Adobe-Japan1; CID+14438 58AA E0100; Adobe-Japan1; CID+17460 58AB E0100; Adobe-Japan1; CID+4516 @@ -6197,6 +6298,7 @@ 5900 E0102; Hanyo-Denshi; KS084800 5900 E0102; Moji_Joho; MJ009404 5900 E0103; Moji_Joho; MJ057358 +5900 E0104; Moji_Joho; MJ057357 5902 E0100; Adobe-Japan1; CID+4538 5903 E0100; Hanyo-Denshi; IP5903 5903 E0101; Hanyo-Denshi; TK01000550 @@ -6215,6 +6317,8 @@ 590A E0102; Moji_Joho; MJ009414 590B E0100; Adobe-Japan1; CID+8425 590C E0100; Adobe-Japan1; CID+14444 +590C E0101; Moji_Joho; MJ009416 +590C E0102; Moji_Joho; MJ057253 590D E0100; Adobe-Japan1; CID+17470 590F E0100; Adobe-Japan1; CID+1350 590F E0101; Hanyo-Denshi; JA1838 @@ -6715,6 +6819,8 @@ 5ABA E0102; Moji_Joho; MJ009882 5ABA E0103; Hanyo-Denshi; JTAFF8 5ABA E0103; Moji_Joho; MJ009883 +5ABA E0104; KRName; KRName_5ABA_01 +5ABA E0105; KRName; KRName_5ABA_02 5ABB E0100; Adobe-Japan1; CID+21421 5ABC E0100; Adobe-Japan1; CID+4587 5ABD E0100; Adobe-Japan1; CID+4591 @@ -7127,6 +7233,7 @@ 5BDB E0102; Moji_Joho; MJ010213 5BDB E0103; Hanyo-Denshi; JTB032S 5BDB E0103; Moji_Joho; MJ010214 +5BDB E0104; Moji_Joho; MJ059508 5BDD E0100; Adobe-Japan1; CID+2552 5BDE E0100; Adobe-Japan1; CID+4634 5BDE E0101; Hanyo-Denshi; JA5375 @@ -7381,7 +7488,9 @@ 5C64 E0100; Adobe-Japan1; CID+2778 5C64 E0101; Adobe-Japan1; CID+13361 5C64 E0102; Hanyo-Denshi; JA3356 +5C64 E0102; Moji_Joho; MJ010378 5C64 E0103; Hanyo-Denshi; JC4765 +5C64 E0103; Moji_Joho; MJ030255 5C65 E0100; Adobe-Japan1; CID+3940 5C65 E0101; Hanyo-Denshi; JA4590 5C65 E0101; Moji_Joho; MJ010380 @@ -7395,7 +7504,9 @@ 5C6E E0100; Adobe-Japan1; CID+16837 5C6E E0101; Adobe-Japan1; CID+4658 5C6E E0102; Hanyo-Denshi; JA5405 +5C6E E0102; Moji_Joho; MJ010388 5C6E E0103; Hanyo-Denshi; JC4766 +5C6E E0103; Moji_Joho; MJ030256 5C6F E0100; Adobe-Japan1; CID+3246 5C6F E0101; Hanyo-Denshi; JA3854 5C6F E0102; Hanyo-Denshi; TK01024230 @@ -7754,6 +7865,7 @@ 5DCD E0101; Moji_Joho; MJ010742 5DCD E0102; Moji_Joho; MJ010743 5DCD E0103; Moji_Joho; MJ010744 +5DCD E0104; Moji_Joho; MJ068060 5DCE E0100; Adobe-Japan1; CID+21490 5DCE E0101; Hanyo-Denshi; JB2790 5DCE E0101; Moji_Joho; MJ010746 @@ -7807,6 +7919,8 @@ 5DE2 E0103; Moji_Joho; MJ010770 5DE3 E0100; Adobe-Japan1; CID+2789 5DE4 E0100; Adobe-Japan1; CID+17586 +5DE4 E0101; Moji_Joho; MJ010772 +5DE4 E0102; Moji_Joho; MJ057405 5DE5 E0100; Adobe-Japan1; CID+1979 5DE5 E0101; Adobe-Japan1; CID+13763 5DE5 E0102; Hanyo-Denshi; JA2509 @@ -7830,6 +7944,9 @@ 5DE9 E0102; Moji_Joho; MJ010779 5DEB E0100; Adobe-Japan1; CID+4717 5DEE E0100; Adobe-Japan1; CID+2089 +5DEE E0101; Moji_Joho; MJ010781 +5DEE E0102; Moji_Joho; MJ057408 +5DEE E0103; Moji_Joho; MJ057409 5DF1 E0100; Adobe-Japan1; CID+1918 5DF1 E0101; Hanyo-Denshi; JA2442 5DF1 E0102; Hanyo-Denshi; TK01026530 @@ -8217,7 +8334,9 @@ 5ECA E0101; Adobe-Japan1; CID+20303 5ECA E0102; Adobe-Japan1; CID+13401 5ECA E0103; Hanyo-Denshi; JA4713 +5ECA E0103; Moji_Joho; MJ011040 5ECA E0104; Hanyo-Denshi; JC8414 +5ECA E0104; Moji_Joho; MJ030184 5ECB E0100; Adobe-Japan1; CID+15390 5ECB E0101; Adobe-Japan1; CID+14510 5ECB E0102; Hanyo-Denshi; JB2850 @@ -8404,6 +8523,7 @@ 5F13 E0101; Moji_Joho; MJ011149 5F13 E0102; Hanyo-Denshi; KS109620 5F13 E0102; Moji_Joho; MJ057459 +5F13 E0103; Moji_Joho; MJ059569 5F14 E0100; Adobe-Japan1; CID+3008 5F14 E0101; Hanyo-Denshi; JA3604 5F14 E0101; Moji_Joho; MJ011150 @@ -8419,7 +8539,9 @@ 5F16 E0102; Moji_Joho; MJ011154 5F17 E0100; Adobe-Japan1; CID+3574 5F17 E0101; Hanyo-Denshi; JA4206 +5F17 E0101; Moji_Joho; MJ011155 5F17 E0102; Hanyo-Denshi; KS152860 +5F17 E0102; Moji_Joho; MJ057633 5F18 E0100; Adobe-Japan1; CID+1986 5F18 E0101; Hanyo-Denshi; JA2516 5F18 E0102; Hanyo-Denshi; TK01013130 @@ -8563,6 +8685,7 @@ 5F5A E0102; Hanyo-Denshi; KS112430 5F5A E0102; Moji_Joho; MJ057480 5F5A E0103; Hanyo-Denshi; TK01030070 +5F5A E0104; Moji_Joho; MJ068054 5F5B E0100; Adobe-Japan1; CID+21519 5F5C E0100; Adobe-Japan1; CID+4767 5F5C E0101; Hanyo-Denshi; JA5520 @@ -8674,6 +8797,8 @@ 5F91 E0102; Hanyo-Denshi; TK01030770 5F92 E0100; Adobe-Japan1; CID+3142 5F93 E0100; Adobe-Japan1; CID+2376 +5F93 E0101; Moji_Joho; MJ011312 +5F93 E0102; Moji_Joho; MJ057488 5F96 E0100; Adobe-Japan1; CID+21527 5F97 E0100; Adobe-Japan1; CID+3224 5F98 E0100; Adobe-Japan1; CID+4796 @@ -8696,6 +8821,8 @@ 5FA1 E0103; Moji_Joho; MJ011325 5FA1 E0104; Hanyo-Denshi; KS115360 5FA1 E0104; Moji_Joho; MJ057489 +5FA1 E0105; Moji_Joho; MJ011324 +5FA1 E0106; Moji_Joho; MJ011326 5FA2 E0100; Adobe-Japan1; CID+17615 5FA4 E0100; Adobe-Japan1; CID+14527 5FA4 E0101; Moji_Joho; MJ011329 @@ -8732,6 +8859,8 @@ 5FB2 E0101; Hanyo-Denshi; KS115430 5FB2 E0101; Moji_Joho; MJ011349 5FB3 E0100; Adobe-Japan1; CID+3225 +5FB3 E0101; Moji_Joho; MJ011351 +5FB3 E0102; Moji_Joho; MJ059596 5FB4 E0100; Adobe-Japan1; CID+3011 5FB5 E0100; Adobe-Japan1; CID+13368 5FB5 E0101; Adobe-Japan1; CID+13929 @@ -8961,7 +9090,9 @@ 6075 E0100; Adobe-Japan1; CID+1817 6075 E0101; Adobe-Japan1; CID+13740 6075 E0102; Hanyo-Denshi; JA2335 +6075 E0102; Moji_Joho; MJ011561 6075 E0103; Hanyo-Denshi; JTB16C +6075 E0103; Moji_Joho; MJ030308 6077 E0100; Adobe-Japan1; CID+4825 607E E0100; Adobe-Japan1; CID+21550 607E E0101; Hanyo-Denshi; JB2975 @@ -9004,7 +9135,9 @@ 6094 E0100; Adobe-Japan1; CID+13326 6094 E0101; Adobe-Japan1; CID+1401 6094 E0102; Hanyo-Denshi; JA1889 +6094 E0102; Moji_Joho; MJ011591 6094 E0103; Hanyo-Denshi; JC8448 +6094 E0103; Moji_Joho; MJ030257 6095 E0100; Adobe-Japan1; CID+17630 6096 E0100; Adobe-Japan1; CID+4844 6097 E0100; Adobe-Japan1; CID+4845 @@ -9383,6 +9516,7 @@ 6168 E0107; Hanyo-Denshi; KS125630 6168 E0107; Moji_Joho; MJ011853 6168 E0108; Hanyo-Denshi; JC8460 +6168 E0108; Moji_Joho; MJ030258 6168 E0109; Hanyo-Denshi; JTB1A0 6168 E0109; Moji_Joho; MJ011852 6168 E010A; Hanyo-Denshi; JTB1A1S @@ -9460,7 +9594,9 @@ 618E E0100; Adobe-Japan1; CID+13363 618E E0101; Adobe-Japan1; CID+2816 618E E0102; Hanyo-Denshi; JA3394 +618E E0102; Moji_Joho; MJ011904 618E E0103; Hanyo-Denshi; JC8462 +618E E0103; Moji_Joho; MJ030259 6190 E0100; Adobe-Japan1; CID+4033 6190 E0101; Adobe-Japan1; CID+14096 6190 E0102; Hanyo-Denshi; JA4689 @@ -9560,6 +9696,8 @@ 61CA E0102; Hanyo-Denshi; FT2192 61CA E0102; Moji_Joho; MJ011981 61CB E0100; Adobe-Japan1; CID+4917 +61CB E0101; Moji_Joho; MJ011982 +61CB E0102; Moji_Joho; MJ059634 61CC E0100; Adobe-Japan1; CID+4909 61CC E0101; Hanyo-Denshi; JA5668 61CC E0101; Moji_Joho; MJ011983 @@ -9688,6 +9826,8 @@ 6210 E0103; Hanyo-Denshi; JTB1CA 6210 E0103; Moji_Joho; MJ012064 6210 E0104; Hanyo-Denshi; TK01034600 +6210 E0105; KRName; KRName_6210_01 +6210 E0106; KRName; KRName_6210_02 6211 E0100; Adobe-Japan1; CID+1382 6212 E0100; Adobe-Japan1; CID+1404 6213 E0100; Adobe-Japan1; CID+8465 @@ -9895,6 +10035,8 @@ 6293 E0100; Adobe-Japan1; CID+4955 6294 E0100; Adobe-Japan1; CID+4959 6295 E0100; Adobe-Japan1; CID+3172 +6295 E0101; Moji_Joho; MJ012217 +6295 E0102; Moji_Joho; MJ057553 6296 E0100; Adobe-Japan1; CID+4956 6297 E0100; Adobe-Japan1; CID+1989 6298 E0100; Adobe-Japan1; CID+2690 @@ -10787,10 +10929,14 @@ 6532 E0100; Adobe-Japan1; CID+17718 6534 E0100; Adobe-Japan1; CID+5058 6534 E0101; Hanyo-Denshi; JA5829 +6534 E0101; Moji_Joho; MJ012946 6534 E0102; Hanyo-Denshi; KS146620 +6534 E0102; Moji_Joho; MJ057581 6535 E0100; Adobe-Japan1; CID+5059 6535 E0101; Hanyo-Denshi; JA5830 +6535 E0101; Moji_Joho; MJ012947 6535 E0102; Hanyo-Denshi; TK01036470 +6535 E0103; Moji_Joho; MJ012948 6536 E0100; Adobe-Japan1; CID+5061 6537 E0100; Adobe-Japan1; CID+5060 6538 E0100; Adobe-Japan1; CID+5062 @@ -10818,7 +10964,9 @@ 654F E0100; Adobe-Japan1; CID+13381 654F E0101; Adobe-Japan1; CID+3524 654F E0102; Hanyo-Denshi; JA4150 +654F E0102; Moji_Joho; MJ012976 654F E0103; Hanyo-Denshi; JC8508 +654F E0103; Moji_Joho; MJ030262 6550 E0100; Adobe-Japan1; CID+21682 6551 E0100; Adobe-Japan1; CID+1657 6551 E0101; Hanyo-Denshi; JA2163 @@ -10827,6 +10975,8 @@ 6554 E0100; Adobe-Japan1; CID+17720 6555 E0100; Adobe-Japan1; CID+5066 6556 E0100; Adobe-Japan1; CID+5065 +6556 E0101; Moji_Joho; MJ012984 +6556 E0102; Moji_Joho; MJ057586 6557 E0100; Adobe-Japan1; CID+3338 6558 E0100; Adobe-Japan1; CID+5068 6559 E0100; Adobe-Japan1; CID+1709 @@ -11071,6 +11221,7 @@ 65E2 E0103; Hanyo-Denshi; JTB27A 65E2 E0103; Moji_Joho; MJ013147 65E2 E0104; Hanyo-Denshi; JC8511 +65E2 E0104; Moji_Joho; MJ030263 65E2 E0105; Moji_Joho; MJ057647 65E3 E0100; Adobe-Japan1; CID+13701 65E3 E0101; Hanyo-Denshi; IP65E3 @@ -11275,6 +11426,8 @@ 665F E0104; Moji_Joho; MJ013288 665F E0105; Hanyo-Denshi; FT1694 665F E0105; Moji_Joho; MJ013289 +665F E0106; KRName; KRName_665F_01 +665F E0107; KRName; KRName_665F_02 6660 E0100; Adobe-Japan1; CID+21713 6661 E0100; Adobe-Japan1; CID+14607 6662 E0100; Adobe-Japan1; CID+5110 @@ -11298,6 +11451,8 @@ 6669 E0101; Adobe-Japan1; CID+13989 666A E0100; Adobe-Japan1; CID+17745 666B E0100; Adobe-Japan1; CID+14608 +666B E0101; Moji_Joho; MJ013303 +666B E0102; Moji_Joho; MJ059691 666C E0100; Adobe-Japan1; CID+17746 666D E0100; Adobe-Japan1; CID+17747 666D E0101; Hanyo-Denshi; JD1408 @@ -11310,9 +11465,15 @@ 6674 E0100; Adobe-Japan1; CID+8481 6674 E0101; Adobe-Japan1; CID+2646 6674 E0102; Hanyo-Denshi; JA3218 +6674 E0102; Moji_Joho; MJ013313 6674 E0103; Hanyo-Denshi; IB2015 +6674 E0103; Moji_Joho; MJ030199 +6674 E0104; KRName; KRName_6674_01 +6674 E0105; KRName; KRName_6674_02 6675 E0100; Adobe-Japan1; CID+21714 6676 E0100; Adobe-Japan1; CID+2469 +6676 E0101; Moji_Joho; MJ013315 +6676 E0102; Moji_Joho; MJ059704 6677 E0100; Adobe-Japan1; CID+16889 6677 E0101; Adobe-Japan1; CID+14609 6677 E0102; Hanyo-Denshi; JB3439 @@ -11362,7 +11523,9 @@ 6691 E0100; Adobe-Japan1; CID+2421 6691 E0101; Adobe-Japan1; CID+13352 6691 E0102; Hanyo-Denshi; JA2975 +6691 E0102; Moji_Joho; MJ013348 6691 E0103; Hanyo-Denshi; JC8535 +6691 E0103; Moji_Joho; MJ030264 6692 E0100; Adobe-Japan1; CID+17751 6695 E0100; Hanyo-Denshi; IP6695 6695 E0101; Hanyo-Denshi; TK01040170 @@ -11468,6 +11631,7 @@ 66C4 E0101; Hanyo-Denshi; JA5901 66C4 E0101; Moji_Joho; MJ013419 66C4 E0102; Hanyo-Denshi; JTB2C5S +66C4 E0102; Moji_Joho; MJ013420 66C5 E0100; Hanyo-Denshi; JT66C5 66C5 E0100; Moji_Joho; MJ013422 66C5 E0101; Hanyo-Denshi; KS159730 @@ -11568,6 +11732,8 @@ 66F7 E0103; Hanyo-Denshi; TK01038540 66F8 E0100; Adobe-Japan1; CID+2427 66F8 E0101; Adobe-Japan1; CID+13827 +66F8 E0102; Moji_Joho; MJ013491 +66F8 E0103; Moji_Joho; MJ013492 66F9 E0100; Adobe-Japan1; CID+2788 66FA E0100; Adobe-Japan1; CID+8487 66FB E0100; Adobe-Japan1; CID+8369 @@ -11593,6 +11759,8 @@ 66FE E0103; Moji_Joho; MJ013503 66FE E0104; Hanyo-Denshi; TK01039940 66FF E0100; Adobe-Japan1; CID+2872 +66FF E0101; Moji_Joho; MJ013504 +66FF E0102; Moji_Joho; MJ057672 6700 E0100; Adobe-Japan1; CID+2103 6700 E0101; Adobe-Japan1; CID+20143 6700 E0102; Hanyo-Denshi; JA2639 @@ -11679,6 +11847,7 @@ 6717 E0105; Hanyo-Denshi; JTB2E9 6717 E0105; Moji_Joho; MJ013543 6717 E0106; Hanyo-Denshi; JC8546 +6717 E0106; Moji_Joho; MJ030185 6717 E0107; Hanyo-Denshi; TK01041570 6719 E0100; Adobe-Japan1; CID+17762 6719 E0101; Hanyo-Denshi; JB3482 @@ -11712,6 +11881,7 @@ 671D E0102; Moji_Joho; MJ013558 671D E0103; Hanyo-Denshi; JTB2EC 671D E0103; Moji_Joho; MJ013557 +671D E0104; Moji_Joho; MJ057690 671E E0100; Adobe-Japan1; CID+5137 671E E0101; Hanyo-Denshi; JA5914 671E E0101; Moji_Joho; MJ013559 @@ -11937,6 +12107,7 @@ 67A9 E0102; Moji_Joho; MJ013714 67A9 E0103; Hanyo-Denshi; FT1701 67A9 E0103; Moji_Joho; MJ013715 +67A9 E0104; Moji_Joho; MJ013582 67AF E0100; Adobe-Japan1; CID+1923 67B0 E0100; Adobe-Japan1; CID+14620 67B0 E0101; Hanyo-Denshi; JB3517 @@ -12053,7 +12224,9 @@ 67FA E0102; Moji_Joho; MJ013806 67FB E0100; Adobe-Japan1; CID+2090 67FB E0101; Hanyo-Denshi; JA2626 +67FB E0101; Moji_Joho; MJ013808 67FB E0102; Hanyo-Denshi; KS166860 +67FB E0102; Moji_Joho; MJ057728 67FC E0100; Adobe-Japan1; CID+16900 67FC E0101; Hanyo-Denshi; JC8560 67FC E0102; Hanyo-Denshi; TK01043220 @@ -12096,6 +12269,8 @@ 6818 E0100; Adobe-Japan1; CID+17785 6819 E0100; Adobe-Japan1; CID+21753 681D E0100; Adobe-Japan1; CID+16901 +681D E0101; Moji_Joho; MJ013840 +681D E0102; Moji_Joho; MJ013841 681E E0100; Adobe-Japan1; CID+5180 681F E0100; Adobe-Japan1; CID+17786 681F E0101; Adobe-Japan1; CID+20065 @@ -12155,6 +12330,7 @@ 6840 E0102; Hanyo-Denshi; JTB31D 6840 E0102; Moji_Joho; MJ013883 6840 E0103; Moji_Joho; MJ013885 +6840 E0104; Moji_Joho; MJ057740 6841 E0100; Adobe-Japan1; CID+1851 6842 E0100; Adobe-Japan1; CID+1825 6843 E0100; Adobe-Japan1; CID+3175 @@ -12251,7 +12427,9 @@ 6885 E0100; Adobe-Japan1; CID+13375 6885 E0101; Adobe-Japan1; CID+3349 6885 E0102; Hanyo-Denshi; JA3963 +6885 E0102; Moji_Joho; MJ013961 6885 E0103; Hanyo-Denshi; JC8569 +6885 E0103; Moji_Joho; MJ030265 6886 E0100; Adobe-Japan1; CID+19453 6886 E0101; Hanyo-Denshi; JB3577 6886 E0101; Moji_Joho; MJ013962 @@ -12569,6 +12747,8 @@ 695E E0102; Moji_Joho; MJ014208 695E E0103; Hanyo-Denshi; JTB356 695E E0103; Moji_Joho; MJ014207 +695E E0104; KRName; KRName_695E_01 +695E E0105; KRName; KRName_695E_02 6960 E0100; Adobe-Japan1; CID+3271 6961 E0100; Adobe-Japan1; CID+5249 6961 E0101; Hanyo-Denshi; JA6032 @@ -12926,7 +13106,9 @@ 6A2B E0100; Adobe-Japan1; CID+1469 6A2E E0100; Adobe-Japan1; CID+5268 6A2E E0101; Hanyo-Denshi; JA6051 +6A2E E0101; Moji_Joho; MJ014461 6A2E E0102; Hanyo-Denshi; JTB383 +6A2E E0102; Moji_Joho; MJ059737 6A30 E0100; Adobe-Japan1; CID+8502 6A32 E0100; Adobe-Japan1; CID+17855 6A33 E0100; Adobe-Japan1; CID+17856 @@ -13248,7 +13430,9 @@ 6B04 E0100; Adobe-Japan1; CID+13392 6B04 E0101; Adobe-Japan1; CID+3933 6B04 E0102; Hanyo-Denshi; JA4583 +6B04 E0102; Moji_Joho; MJ014716 6B04 E0103; Hanyo-Denshi; JC8627 +6B04 E0103; Moji_Joho; MJ030183 6B05 E0100; Adobe-Japan1; CID+5327 6B06 E0100; Adobe-Japan1; CID+21814 6B07 E0100; Adobe-Japan1; CID+21815 @@ -13521,7 +13705,9 @@ 6BBA E0100; Adobe-Japan1; CID+13344 6BBA E0101; Adobe-Japan1; CID+2164 6BBA E0102; Hanyo-Denshi; JA2706 +6BBA E0102; Moji_Joho; MJ014916 6BBA E0103; Hanyo-Denshi; JC8641 +6BBA E0103; Moji_Joho; MJ030187 6BBB E0100; Adobe-Japan1; CID+1450 6BBB E0101; Adobe-Japan1; CID+13424 6BBB E0102; Moji_Joho; MJ014917 @@ -13536,6 +13722,8 @@ 6BC3 E0100; Adobe-Japan1; CID+21836 6BC4 E0100; Adobe-Japan1; CID+21837 6BC5 E0100; Adobe-Japan1; CID+1597 +6BC5 E0101; Moji_Joho; MJ014928 +6BC5 E0102; Moji_Joho; MJ060199 6BC6 E0100; Adobe-Japan1; CID+5367 6BC6 E0101; Hanyo-Denshi; JA6156 6BC6 E0101; Moji_Joho; MJ014929 @@ -14026,7 +14214,11 @@ 6D77 E0100; Adobe-Japan1; CID+13327 6D77 E0101; Adobe-Japan1; CID+1410 6D77 E0102; Hanyo-Denshi; JA1904 +6D77 E0102; Moji_Joho; MJ015371 6D77 E0103; Hanyo-Denshi; JC8673 +6D77 E0103; Moji_Joho; MJ030266 +6D77 E0104; KRName; KRName_6D77_01 +6D77 E0105; KRName; KRName_6D77_02 6D78 E0100; Adobe-Japan1; CID+2561 6D78 E0101; Adobe-Japan1; CID+13853 6D78 E0102; Hanyo-Denshi; JA3127 @@ -14098,6 +14290,7 @@ 6DBF E0101; Moji_Joho; MJ015436 6DBF E0102; Hanyo-Denshi; IB2230 6DBF E0102; Moji_Joho; MJ015438 +6DBF E0103; Moji_Joho; MJ068062 6DC0 E0100; Adobe-Japan1; CID+3918 6DC2 E0100; Adobe-Japan1; CID+17949 6DC3 E0100; Hanyo-Denshi; IP6DC3 @@ -14223,7 +14416,9 @@ 6E1A E0100; Adobe-Japan1; CID+7700 6E1A E0101; Adobe-Japan1; CID+2423 6E1A E0102; Hanyo-Denshi; JA2977 +6E1A E0102; Moji_Joho; MJ015538 6E1A E0103; Hanyo-Denshi; JC8687 +6E1A E0103; Moji_Joho; MJ030267 6E1A E0104; Hanyo-Denshi; TK01050590 6E1B E0100; Adobe-Japan1; CID+1902 6E1D E0100; Adobe-Japan1; CID+5470 @@ -14303,7 +14498,9 @@ 6E4D E0100; Adobe-Japan1; CID+5463 6E4E E0100; Adobe-Japan1; CID+5467 6E4E E0101; Hanyo-Denshi; JA6262 +6E4E E0101; Moji_Joho; MJ015601 6E4E E0102; Hanyo-Denshi; KS200340 +6E4E E0102; Moji_Joho; MJ057956 6E4F E0100; Adobe-Japan1; CID+17963 6E51 E0100; Adobe-Japan1; CID+14718 6E52 E0100; Adobe-Japan1; CID+21880 @@ -14631,6 +14828,7 @@ 6F22 E0102; Hanyo-Denshi; JA2033 6F22 E0102; Moji_Joho; MJ015841 6F22 E0103; Hanyo-Denshi; JC8705 +6F22 E0103; Moji_Joho; MJ030268 6F22 E0104; Hanyo-Denshi; KS552580 6F22 E0105; Hanyo-Denshi; TK01051810 6F22 E0106; Hanyo-Denshi; TK01051860 @@ -14835,6 +15033,7 @@ 6F9A E0101; Hanyo-Denshi; JB4078 6F9A E0101; Moji_Joho; MJ015993 6F9A E0102; Hanyo-Denshi; JTC0BF +6F9A E0102; Moji_Joho; MJ060383 6F9A E0103; Moji_Joho; MJ015994 6F9D E0100; Adobe-Japan1; CID+19508 6F9F E0100; Adobe-Japan1; CID+17991 @@ -15357,6 +15556,8 @@ 7130 E0100; Adobe-Japan1; CID+7644 7131 E0100; Adobe-Japan1; CID+14760 7136 E0100; Adobe-Japan1; CID+2741 +7136 E0101; Moji_Joho; MJ016458 +7136 E0102; Moji_Joho; MJ057997 7138 E0100; Adobe-Japan1; CID+21930 713C E0100; Adobe-Japan1; CID+2478 7141 E0100; Adobe-Japan1; CID+21931 @@ -15426,7 +15627,9 @@ 716E E0100; Adobe-Japan1; CID+13347 716E E0101; Adobe-Japan1; CID+2301 716E E0102; Hanyo-Denshi; JA2849 +716E E0102; Moji_Joho; MJ016520 716E E0103; Hanyo-Denshi; JC8753 +716E E0103; Moji_Joho; MJ030269 7179 E0100; Adobe-Japan1; CID+14764 717A E0100; Hanyo-Denshi; IB0741 717A E0100; Moji_Joho; MJ016528 @@ -15546,6 +15749,8 @@ 71D0 E0104; Moji_Joho; MJ016632 71D2 E0100; Adobe-Japan1; CID+5585 71D3 E0100; Adobe-Japan1; CID+14768 +71D3 E0101; Moji_Joho; MJ016635 +71D3 E0102; Moji_Joho; MJ057831 71D4 E0100; Adobe-Japan1; CID+5587 71D5 E0100; Adobe-Japan1; CID+1295 71D5 E0101; Hanyo-Denshi; JA1777 @@ -15658,7 +15863,9 @@ 722B E0100; Adobe-Japan1; CID+14772 722B E0101; Adobe-Japan1; CID+15398 722B E0102; Hanyo-Denshi; JD8009 +722B E0102; Moji_Joho; MJ030270 722B E0103; Hanyo-Denshi; JB4240 +722B E0103; Moji_Joho; MJ016734 722C E0100; Adobe-Japan1; CID+5601 722D E0100; Adobe-Japan1; CID+5600 722F E0100; Adobe-Japan1; CID+21949 @@ -15951,7 +16158,9 @@ 732A E0100; Adobe-Japan1; CID+8548 732A E0101; Adobe-Japan1; CID+2996 732A E0102; Hanyo-Denshi; JA3586 +732A E0102; Moji_Joho; MJ017008 732A E0103; Hanyo-Denshi; JC8779 +732A E0103; Moji_Joho; MJ030208 732A E0104; Hanyo-Denshi; TK01057410 732B E0100; Adobe-Japan1; CID+3299 732B E0101; Hanyo-Denshi; JA3913 @@ -16121,6 +16330,8 @@ 73A1 E0100; Hanyo-Denshi; IP73A1S 73A1 E0101; Hanyo-Denshi; TK01058040 73A2 E0100; Adobe-Japan1; CID+16974 +73A3 E0100; Moji_Joho; MJ017144 +73A3 E0101; Moji_Joho; MJ068063 73A5 E0100; Adobe-Japan1; CID+18086 73A6 E0100; Adobe-Japan1; CID+14798 73A8 E0100; Adobe-Japan1; CID+15423 @@ -16459,6 +16670,8 @@ 7486 E0100; Adobe-Japan1; CID+14830 7487 E0100; Adobe-Japan1; CID+14831 7488 E0100; Adobe-Japan1; CID+18103 +7488 E0101; Moji_Joho; MJ017415 +7488 E0102; Moji_Joho; MJ068064 7489 E0100; Adobe-Japan1; CID+8562 7489 E0101; Hanyo-Denshi; JB4448 7489 E0101; Moji_Joho; MJ017417 @@ -16607,6 +16820,7 @@ 74DE E0101; Hanyo-Denshi; JB4482 74DE E0101; Moji_Joho; MJ017524 74DE E0102; Hanyo-Denshi; KS239770 +74DE E0102; Moji_Joho; MJ017523 74DF E0100; Adobe-Japan1; CID+19545 74DF E0101; Hanyo-Denshi; JB4483 74DF E0101; Moji_Joho; MJ017527 @@ -16687,6 +16901,7 @@ 7504 E0102; Hanyo-Denshi; JA6511 7504 E0102; Moji_Joho; MJ017577 7504 E0103; Hanyo-Denshi; FT1966 +7504 E0103; Moji_Joho; MJ017579 7504 E0104; Moji_Joho; MJ017576 7504 E0105; Moji_Joho; MJ017578 7505 E0100; Adobe-Japan1; CID+5700 @@ -16744,6 +16959,8 @@ 7518 E0101; Hanyo-Denshi; JA2037 7518 E0102; Hanyo-Denshi; TK01060100 751A E0100; Adobe-Japan1; CID+2585 +751A E0101; Moji_Joho; MJ017612 +751A E0102; Moji_Joho; MJ058077 751C E0100; Adobe-Japan1; CID+3126 751E E0100; Adobe-Japan1; CID+5706 751F E0100; Adobe-Japan1; CID+2652 @@ -16778,8 +16995,12 @@ 7533 E0100; Adobe-Japan1; CID+2563 7536 E0100; Adobe-Japan1; CID+22016 7537 E0100; Adobe-Japan1; CID+2953 +7537 E0101; Moji_Joho; MJ017642 +7537 E0102; Moji_Joho; MJ058085 7538 E0100; Adobe-Japan1; CID+4297 7539 E0100; Adobe-Japan1; CID+22017 +7539 E0101; Moji_Joho; MJ017644 +7539 E0102; Moji_Joho; MJ056877 753A E0100; Adobe-Japan1; CID+3018 753B E0100; Adobe-Japan1; CID+1384 753B E0101; Hanyo-Denshi; JA1872 @@ -17323,12 +17544,15 @@ 76C6 E0103; Moji_Joho; MJ018073 76C6 E0104; Hanyo-Denshi; TK01062070 76C8 E0100; Adobe-Japan1; CID+1264 +76C8 E0101; Moji_Joho; MJ018076 +76C8 E0102; Moji_Joho; MJ058144 76C9 E0100; Adobe-Japan1; CID+18182 76CA E0100; Adobe-Japan1; CID+1273 76CA E0101; Adobe-Japan1; CID+8571 76CA E0102; Hanyo-Denshi; JA1755 76CA E0102; Moji_Joho; MJ018079 76CA E0103; Hanyo-Denshi; JTFA17 +76CA E0103; Moji_Joho; MJ030209 76CA E0104; Hanyo-Denshi; KS386420 76CA E0104; Moji_Joho; MJ058674 76CA E0105; Moji_Joho; MJ059934 @@ -17352,6 +17576,8 @@ 76DB E0102; Moji_Joho; MJ018093 76DB E0103; Hanyo-Denshi; JTB63A 76DB E0103; Moji_Joho; MJ018094 +76DB E0104; KRName; KRName_76DB_01 +76DB E0105; KRName; KRName_76DB_02 76DC E0100; Adobe-Japan1; CID+5336 76DE E0100; Adobe-Japan1; CID+5804 76DF E0100; Adobe-Japan1; CID+3789 @@ -17400,6 +17626,8 @@ 76F4 E0105; Moji_Joho; MJ056840 76F4 E0106; Hanyo-Denshi; KS003740 76F4 E0107; Hanyo-Denshi; TK01062370 +76F4 E0108; Moji_Joho; MJ056841 +76F4 E0109; Moji_Joho; MJ056845 76F6 E0100; Adobe-Japan1; CID+22047 76F8 E0100; Adobe-Japan1; CID+2796 76F9 E0100; Adobe-Japan1; CID+19575 @@ -17444,6 +17672,7 @@ 771E E0103; Hanyo-Denshi; JTB651 771E E0103; Moji_Joho; MJ018171 771E E0104; Hanyo-Denshi; JTB64B +771E E0104; Moji_Joho; MJ058159 771E E0105; Hanyo-Denshi; KS017440 771E E0105; Moji_Joho; MJ056990 771E E0106; Hanyo-Denshi; JTB652 @@ -17537,6 +17766,8 @@ 7767 E0100; Adobe-Japan1; CID+19588 7768 E0100; Adobe-Japan1; CID+5824 776A E0100; Adobe-Japan1; CID+14165 +776A E0101; Moji_Joho; MJ018256 +776A E0102; Moji_Joho; MJ058176 776B E0100; Adobe-Japan1; CID+5825 776C E0100; Adobe-Japan1; CID+19589 776D E0100; Hanyo-Denshi; IP776D @@ -17855,7 +18086,9 @@ 7891 E0100; Adobe-Japan1; CID+13379 7891 E0101; Adobe-Japan1; CID+3454 7891 E0102; Hanyo-Denshi; JA4074 +7891 E0102; Moji_Joho; MJ018561 7891 E0103; Hanyo-Denshi; JC8907 +7891 E0103; Moji_Joho; MJ030272 7893 E0100; Adobe-Japan1; CID+1234 7894 E0100; Adobe-Japan1; CID+18219 7895 E0100; Adobe-Japan1; CID+2140 @@ -18086,7 +18319,9 @@ 793C E0100; Adobe-Japan1; CID+4017 793C E0101; Adobe-Japan1; CID+8579 793C E0102; Hanyo-Denshi; JA4673 +793C E0102; Moji_Joho; MJ018750 793C E0103; Hanyo-Denshi; IB2536 +793C E0103; Moji_Joho; MJ030210 793D E0100; Adobe-Japan1; CID+14906 793D E0101; Hanyo-Denshi; JB4844 793D E0101; Moji_Joho; MJ018752 @@ -18097,6 +18332,7 @@ 793E E0102; Hanyo-Denshi; JA2850 793E E0102; Moji_Joho; MJ018753 793E E0103; Hanyo-Denshi; JC8919 +793E E0103; Moji_Joho; MJ030274 793E E0104; Hanyo-Denshi; KS275210 793E E0104; Moji_Joho; MJ058201 793F E0100; Adobe-Japan1; CID+19615 @@ -18147,11 +18383,15 @@ 7948 E0100; Adobe-Japan1; CID+13335 7948 E0101; Adobe-Japan1; CID+1601 7948 E0102; Hanyo-Denshi; JA2107 +7948 E0102; Moji_Joho; MJ018772 7948 E0103; Hanyo-Denshi; JC8923 +7948 E0103; Moji_Joho; MJ030276 7949 E0100; Adobe-Japan1; CID+2225 7949 E0101; Adobe-Japan1; CID+13345 7949 E0102; Hanyo-Denshi; JA2767 +7949 E0102; Moji_Joho; MJ018773 7949 E0103; Hanyo-Denshi; JC8920 +7949 E0103; Moji_Joho; MJ030275 794A E0100; Adobe-Japan1; CID+18233 794A E0101; Hanyo-Denshi; JB4849 794A E0101; Moji_Joho; MJ018775 @@ -18174,7 +18414,9 @@ 7950 E0100; Adobe-Japan1; CID+13391 7950 E0101; Adobe-Japan1; CID+3870 7950 E0102; Hanyo-Denshi; JA4520 +7950 E0102; Moji_Joho; MJ018782 7950 E0103; Hanyo-Denshi; JC8924 +7950 E0103; Moji_Joho; MJ030277 7950 E0104; Hanyo-Denshi; TK01064920 7951 E0100; Adobe-Japan1; CID+22108 7951 E0101; Hanyo-Denshi; JB4852 @@ -18203,7 +18445,10 @@ 7956 E0100; Adobe-Japan1; CID+2758 7956 E0101; Adobe-Japan1; CID+13359 7956 E0102; Hanyo-Denshi; JA3336 +7956 E0102; Moji_Joho; MJ018794 7956 E0103; Hanyo-Denshi; JC8925 +7956 E0103; Moji_Joho; MJ030278 +7956 E0104; Moji_Joho; MJ059956 7957 E0100; Adobe-Japan1; CID+5888 7957 E0101; Hanyo-Denshi; JA6713 7957 E0101; Moji_Joho; MJ018796 @@ -18243,11 +18488,15 @@ 795D E0100; Adobe-Japan1; CID+13351 795D E0101; Adobe-Japan1; CID+2389 795D E0102; Hanyo-Denshi; JA2943 +795D E0102; Moji_Joho; MJ018810 795D E0103; Hanyo-Denshi; JC8927 +795D E0103; Moji_Joho; MJ030279 795E E0100; Adobe-Japan1; CID+8580 795E E0101; Adobe-Japan1; CID+2566 795E E0102; Hanyo-Denshi; JA3132 +795E E0102; Moji_Joho; MJ018811 795E E0103; Hanyo-Denshi; JC8928 +795E E0103; Moji_Joho; MJ030211 795F E0100; Adobe-Japan1; CID+5889 7960 E0100; Adobe-Japan1; CID+5887 7960 E0101; Hanyo-Denshi; JA6712 @@ -18276,7 +18525,9 @@ 7965 E0100; Adobe-Japan1; CID+8581 7965 E0101; Adobe-Japan1; CID+2485 7965 E0102; Hanyo-Denshi; JA3045 +7965 E0102; Moji_Joho; MJ018825 7965 E0103; Hanyo-Denshi; JC8929 +7965 E0103; Moji_Joho; MJ030212 7965 E0104; Hanyo-Denshi; TK01064810 7966 E0100; Hanyo-Denshi; KS276140 7966 E0101; Hanyo-Denshi; TK01065340 @@ -18405,17 +18656,21 @@ 798D E0102; Hanyo-Denshi; JA1850 798D E0102; Moji_Joho; MJ018894 798D E0103; Hanyo-Denshi; JC8931 +798D E0103; Moji_Joho; MJ030280 798D E0104; Hanyo-Denshi; KS276980 798D E0104; Moji_Joho; MJ058212 798E E0100; Adobe-Japan1; CID+3091 798E E0101; Adobe-Japan1; CID+13371 798E E0102; Hanyo-Denshi; JA3687 +798E E0102; Moji_Joho; MJ018895 798E E0103; Hanyo-Denshi; JC8932 +798E E0103; Moji_Joho; MJ030281 798F E0100; Adobe-Japan1; CID+3569 798F E0101; Adobe-Japan1; CID+8583 798F E0102; Hanyo-Denshi; JA4201 798F E0102; Moji_Joho; MJ018896 798F E0103; Hanyo-Denshi; JC8933 +798F E0103; Moji_Joho; MJ030213 798F E0104; Hanyo-Denshi; KS277650 798F E0104; Moji_Joho; MJ018897 798F E0105; Hanyo-Denshi; TK01065860 @@ -18501,6 +18756,8 @@ 79A5 E0100; Hanyo-Denshi; IP79A5 79A5 E0101; Hanyo-Denshi; TK01066080 79A6 E0100; Adobe-Japan1; CID+1684 +79A6 E0101; Moji_Joho; MJ018943 +79A6 E0102; Moji_Joho; MJ058214 79A7 E0100; Adobe-Japan1; CID+5897 79A7 E0101; Adobe-Japan1; CID+20183 79A7 E0102; Hanyo-Denshi; JA6722 @@ -18595,6 +18852,7 @@ 79BB E0101; Moji_Joho; MJ018985 79BB E0102; Hanyo-Denshi; KS278860 79BB E0102; Moji_Joho; MJ018986 +79BB E0103; Moji_Joho; MJ058219 79BD E0100; Adobe-Japan1; CID+1745 79BD E0101; Hanyo-Denshi; JA2257 79BD E0101; Moji_Joho; MJ018988 @@ -18768,6 +19026,7 @@ 7A3D E0101; Moji_Joho; MJ019135 7A3D E0102; Hanyo-Denshi; KS282540 7A3D E0102; Moji_Joho; MJ058230 +7A3D E0103; Moji_Joho; MJ059990 7A3E E0100; Adobe-Japan1; CID+5919 7A3F E0100; Adobe-Japan1; CID+2008 7A3F E0101; Hanyo-Denshi; JA2538 @@ -18777,7 +19036,9 @@ 7A40 E0100; Adobe-Japan1; CID+13343 7A40 E0101; Adobe-Japan1; CID+2052 7A40 E0102; Hanyo-Denshi; JA2582 +7A40 E0102; Moji_Joho; MJ019140 7A40 E0103; Hanyo-Denshi; JC8945 +7A40 E0103; Moji_Joho; MJ030282 7A42 E0100; Adobe-Japan1; CID+3638 7A42 E0101; Hanyo-Denshi; JA4270 7A42 E0101; Moji_Joho; MJ019142 @@ -18902,7 +19163,9 @@ 7A81 E0100; Adobe-Japan1; CID+3237 7A81 E0101; Adobe-Japan1; CID+13373 7A81 E0102; Hanyo-Denshi; JA3845 +7A81 E0102; Moji_Joho; MJ019221 7A81 E0103; Hanyo-Denshi; JC8949 +7A81 E0103; Moji_Joho; MJ030283 7A81 E0104; Hanyo-Denshi; TK01068460 7A82 E0100; Adobe-Japan1; CID+18264 7A83 E0100; Adobe-Japan1; CID+2692 @@ -19332,6 +19595,7 @@ 7BC0 E0104; Hanyo-Denshi; JTB7B6 7BC0 E0104; Moji_Joho; MJ019577 7BC0 E0105; Hanyo-Denshi; JC8968 +7BC0 E0105; Moji_Joho; MJ030285 7BC0 E0106; Hanyo-Denshi; TK01069740 7BC1 E0100; Adobe-Japan1; CID+5996 7BC2 E0100; Adobe-Japan1; CID+22164 @@ -19393,6 +19657,8 @@ 7BE4 E0100; Adobe-Japan1; CID+3230 7BE5 E0100; Adobe-Japan1; CID+6006 7BE6 E0100; Adobe-Japan1; CID+6005 +7BE6 E0101; Moji_Joho; MJ019622 +7BE6 E0102; Moji_Joho; MJ060027 7BE8 E0100; Adobe-Japan1; CID+19639 7BE9 E0100; Adobe-Japan1; CID+6002 7BEA E0100; Adobe-Japan1; CID+18307 @@ -19744,7 +20010,9 @@ 7CBE E0100; Adobe-Japan1; CID+8590 7CBE E0101; Adobe-Japan1; CID+2654 7CBE E0102; Hanyo-Denshi; JA3226 +7CBE E0102; Moji_Joho; MJ019875 7CBE E0103; Hanyo-Denshi; JTFA1D +7CBE E0103; Moji_Joho; MJ030215 7CBF E0100; Adobe-Japan1; CID+14961 7CC0 E0100; Adobe-Japan1; CID+6050 7CC0 E0101; Hanyo-Denshi; JA6881 @@ -19939,6 +20207,8 @@ 7D26 E0100; Adobe-Japan1; CID+22197 7D2A E0100; Adobe-Japan1; CID+22198 7D2B E0100; Adobe-Japan1; CID+2229 +7D2B E0101; Moji_Joho; MJ020018 +7D2B E0102; Moji_Joho; MJ020019 7D2C E0100; Adobe-Japan1; CID+3065 7D2D E0100; Adobe-Japan1; CID+22199 7D2E E0100; Adobe-Japan1; CID+6070 @@ -20313,7 +20583,9 @@ 7DF4 E0100; Adobe-Japan1; CID+13399 7DF4 E0101; Adobe-Japan1; CID+4037 7DF4 E0102; Hanyo-Denshi; JA4693 +7DF4 E0102; Moji_Joho; MJ020277 7DF4 E0103; Hanyo-Denshi; JC9014 +7DF4 E0103; Moji_Joho; MJ030286 7DF5 E0100; Adobe-Japan1; CID+19672 7DF6 E0100; Adobe-Japan1; CID+19673 7DF9 E0100; Adobe-Japan1; CID+14985 @@ -20335,7 +20607,9 @@ 7E09 E0100; Adobe-Japan1; CID+6117 7E09 E0101; Adobe-Japan1; CID+18366 7E09 E0102; Hanyo-Denshi; JA6954 +7E09 E0102; Moji_Joho; MJ020297 7E09 E0103; Hanyo-Denshi; JD8448 +7E09 E0103; Moji_Joho; MJ030287 7E0A E0100; Adobe-Japan1; CID+6111 7E0A E0101; Hanyo-Denshi; JA6948 7E0A E0101; Moji_Joho; MJ020298 @@ -20457,7 +20731,9 @@ 7E41 E0100; Adobe-Japan1; CID+3423 7E41 E0101; Adobe-Japan1; CID+13376 7E41 E0102; Hanyo-Denshi; JA4043 +7E41 E0102; Moji_Joho; MJ020376 7E41 E0103; Hanyo-Denshi; JC9019 +7E41 E0103; Moji_Joho; MJ030288 7E42 E0100; Hanyo-Denshi; IP7E42 7E42 E0101; Hanyo-Denshi; TK01072640 7E43 E0100; Adobe-Japan1; CID+6125 @@ -20709,7 +20985,9 @@ 7F72 E0100; Adobe-Japan1; CID+13353 7F72 E0101; Adobe-Japan1; CID+2426 7F72 E0102; Hanyo-Denshi; JA2980 +7F72 E0102; Moji_Joho; MJ020564 7F72 E0103; Hanyo-Denshi; JC9026 +7F72 E0103; Moji_Joho; MJ030289 7F75 E0100; Adobe-Japan1; CID+3331 7F76 E0100; Hanyo-Denshi; IP7F76 7F76 E0100; Moji_Joho; MJ020567 @@ -20775,6 +21053,7 @@ 7F9E E0101; Moji_Joho; MJ020616 7F9E E0102; Hanyo-Denshi; KS317830 7F9E E0102; Moji_Joho; MJ020615 +7F9E E0103; Moji_Joho; MJ058348 7FA1 E0100; Adobe-Japan1; CID+8598 7FA1 E0101; Adobe-Japan1; CID+13885 7FA1 E0102; Hanyo-Denshi; JB5314 @@ -20831,6 +21110,7 @@ 7FBD E0102; Hanyo-Denshi; JA1709 7FBD E0102; Moji_Joho; MJ020654 7FBD E0103; Hanyo-Denshi; IB2730 +7FBD E0103; Moji_Joho; MJ030216 7FBD E0104; Hanyo-Denshi; KS319620 7FBD E0104; Moji_Joho; MJ058352 7FBF E0100; Adobe-Japan1; CID+15003 @@ -21011,7 +21291,9 @@ 8005 E0100; Adobe-Japan1; CID+2304 8005 E0101; Adobe-Japan1; CID+13349 8005 E0102; Hanyo-Denshi; JA2852 +8005 E0102; Moji_Joho; MJ020756 8005 E0103; Hanyo-Denshi; JC9036 +8005 E0103; Moji_Joho; MJ030290 8005 E0104; Hanyo-Denshi; TK01074120 8006 E0100; Adobe-Japan1; CID+6202 8007 E0100; Adobe-Japan1; CID+19692 @@ -21130,6 +21412,8 @@ 8056 E0103; Hanyo-Denshi; JTC0CB 8056 E0103; Moji_Joho; MJ020845 8056 E0104; Moji_Joho; MJ020847 +8056 E0105; KRName; KRName_8056_01 +8056 E0106; KRName; KRName_8056_02 8058 E0100; Adobe-Japan1; CID+6216 805A E0100; Adobe-Japan1; CID+6217 805A E0101; Adobe-Japan1; CID+13580 @@ -21547,6 +21831,8 @@ 8187 E0101; Hanyo-Denshi; IP8187 8187 E0101; Moji_Joho; MJ021181 8188 E0100; Adobe-Japan1; CID+6264 +8188 E0101; Moji_Joho; MJ021182 +8188 E0102; Moji_Joho; MJ058398 818A E0100; Adobe-Japan1; CID+6265 818A E0101; Adobe-Japan1; CID+13586 818A E0102; Hanyo-Denshi; JA7114 @@ -21687,13 +21973,17 @@ 81E7 E0102; Moji_Joho; MJ021292 81E7 E0103; Hanyo-Denshi; TK01009020 81E8 E0100; Adobe-Japan1; CID+3999 +81E8 E0101; Moji_Joho; MJ021294 +81E8 E0102; Moji_Joho; MJ058409 81EA E0100; Adobe-Japan1; CID+2263 81EB E0100; Adobe-Japan1; CID+22281 81EC E0100; Adobe-Japan1; CID+18447 81ED E0100; Adobe-Japan1; CID+2359 81ED E0101; Adobe-Japan1; CID+13350 81ED E0102; Hanyo-Denshi; JA2913 +81ED E0102; Moji_Joho; MJ021299 81ED E0103; Hanyo-Denshi; JC9056 +81ED E0103; Moji_Joho; MJ030291 81EE E0100; Moji_Joho; MJ021300 81EE E0101; Moji_Joho; MJ045921 81EF E0100; Adobe-Japan1; CID+19720 @@ -21795,8 +22085,10 @@ 820D E0100; Adobe-Japan1; CID+6301 820E E0100; Adobe-Japan1; CID+2295 820E E0101; Hanyo-Denshi; JA2843 +820E E0101; Moji_Joho; MJ021346 820E E0102; Hanyo-Denshi; TK01014060 820E E0103; Hanyo-Denshi; TK01075660 +820E E0104; Moji_Joho; MJ060095 820F E0100; Adobe-Japan1; CID+22288 8210 E0100; Adobe-Japan1; CID+6302 8211 E0100; Hanyo-Denshi; IP8211 @@ -22003,8 +22295,11 @@ 8279 E0101; Adobe-Japan1; CID+14199 8279 E0102; Adobe-Japan1; CID+14198 8279 E0103; Hanyo-Denshi; JD8584 +8279 E0103; Moji_Joho; MJ030292 8279 E0104; Hanyo-Denshi; JD8585 +8279 E0104; Moji_Joho; MJ030293 8279 E0105; Hanyo-Denshi; JD8586 +8279 E0105; Moji_Joho; MJ021481 827B E0100; Adobe-Japan1; CID+22296 827B E0101; Hanyo-Denshi; JB5512 827B E0101; Moji_Joho; MJ021483 @@ -23116,6 +23411,7 @@ 839A E0103; Moji_Joho; MJ022002 839B E0100; Adobe-Japan1; CID+18497 839B E0101; Hanyo-Denshi; JB5613 +839B E0101; Moji_Joho; MJ022005 839B E0102; Hanyo-Denshi; JTB98F 839B E0102; Moji_Joho; MJ022006 839B E0103; Hanyo-Denshi; KS348780 @@ -23205,6 +23501,7 @@ 83B5 E0102; Moji_Joho; MJ022048 83B5 E0103; Hanyo-Denshi; KS350250 83B5 E0103; Moji_Joho; MJ022047 +83B5 E0104; Moji_Joho; MJ068065 83BD E0100; Adobe-Japan1; CID+6392 83BD E0101; Adobe-Japan1; CID+14204 83BD E0102; Hanyo-Denshi; JA7247 @@ -23219,6 +23516,8 @@ 83BD E0106; Moji_Joho; MJ022053 83BD E0107; Hanyo-Denshi; KS347960 83BD E0107; Moji_Joho; MJ058462 +83BD E0108; KRName; KRName_83BD_01 +83BD E0109; KRName; KRName_83BD_02 83BE E0100; Adobe-Japan1; CID+22331 83BE E0101; Hanyo-Denshi; JB5620 83BE E0101; Moji_Joho; MJ022055 @@ -23736,6 +24035,7 @@ 8457 E0103; Hanyo-Denshi; KS354000 8457 E0103; Moji_Joho; MJ022327 8457 E0104; Hanyo-Denshi; JC9107 +8457 E0104; Moji_Joho; MJ030294 8458 E0100; Adobe-Japan1; CID+19743 8458 E0101; Hanyo-Denshi; JB5656 8458 E0101; Moji_Joho; MJ022328 @@ -24423,6 +24723,7 @@ 8511 E0104; Moji_Joho; MJ022668 8511 E0105; Hanyo-Denshi; HG1660 8511 E0105; Moji_Joho; MJ022670 +8511 E0106; Moji_Joho; MJ058507 8512 E0100; Hanyo-Denshi; IP8512 8512 E0100; Moji_Joho; MJ022671 8512 E0101; Hanyo-Denshi; KS359300 @@ -24489,6 +24790,7 @@ 8521 E0101; Moji_Joho; MJ022701 8521 E0102; Hanyo-Denshi; KS359650 8521 E0102; Moji_Joho; MJ022702 +8521 E0103; Moji_Joho; MJ060130 8522 E0100; Adobe-Japan1; CID+22363 8522 E0101; Hanyo-Denshi; JB5721 8522 E0101; Moji_Joho; MJ022703 @@ -25662,6 +25964,7 @@ 864E E0105; Hanyo-Denshi; TK01082630 864E E0106; Hanyo-Denshi; TK01082640 864E E0107; Hanyo-Denshi; TK01082660 +864E E0108; Moji_Joho; MJ058583 8650 E0100; Adobe-Japan1; CID+1646 8650 E0101; Adobe-Japan1; CID+13708 8650 E0102; Hanyo-Denshi; JA2152 @@ -25688,7 +25991,11 @@ 865C E0100; Adobe-Japan1; CID+13394 865C E0101; Adobe-Japan1; CID+3970 865C E0102; Hanyo-Denshi; JA4626 +865C E0102; Moji_Joho; MJ023294 865C E0103; Hanyo-Denshi; JC9147 +865C E0103; Moji_Joho; MJ030186 +865C E0104; KRName; KRName_865C_01 +865C E0105; KRName; KRName_865C_02 865D E0100; Adobe-Japan1; CID+22402 865E E0100; Adobe-Japan1; CID+1771 865E E0101; Adobe-Japan1; CID+13734 @@ -26605,7 +26912,9 @@ 8910 E0100; Adobe-Japan1; CID+1482 8910 E0101; Adobe-Japan1; CID+13331 8910 E0102; Hanyo-Denshi; JA1976 +8910 E0102; Moji_Joho; MJ024062 8910 E0103; Hanyo-Denshi; JC9179 +8910 E0103; Moji_Joho; MJ030295 8912 E0100; Adobe-Japan1; CID+3673 8912 E0101; Hanyo-Denshi; JA4311 8912 E0101; Moji_Joho; MJ024064 @@ -26692,6 +27001,8 @@ 8941 E0102; Moji_Joho; MJ024123 8941 E0103; Hanyo-Denshi; JTBB24 8941 E0103; Moji_Joho; MJ024124 +8941 E0104; KRName; KRName_8941_01 +8941 E0105; KRName; KRName_8941_02 8942 E0100; Adobe-Japan1; CID+18653 8943 E0100; Adobe-Japan1; CID+6614 8943 E0101; Hanyo-Denshi; JA7481 @@ -26845,17 +27156,22 @@ 898A E0102; Moji_Joho; MJ024216 898B E0100; Adobe-Japan1; CID+1887 898D E0100; Adobe-Japan1; CID+22502 +898D E0101; Moji_Joho; MJ024219 +898D E0102; Moji_Joho; MJ024220 898F E0100; Adobe-Japan1; CID+1606 8990 E0100; Adobe-Japan1; CID+18659 8990 E0101; Moji_Joho; MJ024223 8990 E0102; Moji_Joho; MJ024224 +8990 E0103; Moji_Joho; MJ068066 8993 E0100; Adobe-Japan1; CID+6639 8994 E0100; Adobe-Japan1; CID+17121 8995 E0100; Adobe-Japan1; CID+22503 8996 E0100; Adobe-Japan1; CID+2233 8996 E0101; Adobe-Japan1; CID+13346 8996 E0102; Hanyo-Denshi; JA2775 +8996 E0102; Moji_Joho; MJ024230 8996 E0103; Hanyo-Denshi; JC9189 +8996 E0103; Moji_Joho; MJ030296 8997 E0100; Adobe-Japan1; CID+3319 8998 E0100; Adobe-Japan1; CID+6640 899A E0100; Adobe-Japan1; CID+1454 @@ -26946,7 +27262,9 @@ 89E2 E0101; Hanyo-Denshi; TK01084890 89E3 E0100; Adobe-Japan1; CID+1394 89E3 E0101; Hanyo-Denshi; JA1882 +89E3 E0101; Moji_Joho; MJ024302 89E3 E0102; Hanyo-Denshi; TK01084900 +89E3 E0103; Moji_Joho; MJ058737 89E5 E0100; Adobe-Japan1; CID+15134 89E6 E0100; Adobe-Japan1; CID+2542 89E7 E0100; Adobe-Japan1; CID+6654 @@ -27055,6 +27373,7 @@ 8A3B E0102; Hanyo-Denshi; JA3580 8A3B E0102; Moji_Joho; MJ024399 8A3B E0103; Hanyo-Denshi; FT2927 +8A3B E0103; Moji_Joho; MJ024400 8A3B E0104; Hanyo-Denshi; JTBB57 8A3B E0104; Moji_Joho; MJ024401 8A3C E0100; Adobe-Japan1; CID+2498 @@ -27199,6 +27518,8 @@ 8AA0 E0102; Moji_Joho; MJ024517 8AA0 E0103; Hanyo-Denshi; JTBB64 8AA0 E0103; Moji_Joho; MJ024518 +8AA0 E0104; KRName; KRName_8AA0_01 +8AA0 E0105; KRName; KRName_8AA0_02 8AA1 E0100; Adobe-Japan1; CID+6678 8AA3 E0100; Adobe-Japan1; CID+6683 8AA4 E0100; Adobe-Japan1; CID+1953 @@ -27225,7 +27546,9 @@ 8AA9 E0100; Adobe-Japan1; CID+22541 8AAA E0100; Adobe-Japan1; CID+13880 8AAA E0101; Hanyo-Denshi; JT8AAA +8AAA E0101; Moji_Joho; MJ024533 8AAA E0102; Hanyo-Denshi; KS402930 +8AAA E0102; Moji_Joho; MJ058743 8AAC E0100; Adobe-Japan1; CID+2694 8AAD E0100; Adobe-Japan1; CID+3233 8AAE E0100; Adobe-Japan1; CID+18679 @@ -27263,6 +27586,8 @@ 8AC2 E0100; Adobe-Japan1; CID+6686 8AC3 E0100; Adobe-Japan1; CID+22545 8AC4 E0100; Adobe-Japan1; CID+6684 +8AC4 E0101; Moji_Joho; MJ024564 +8AC4 E0102; Moji_Joho; MJ068089 8AC6 E0100; Adobe-Japan1; CID+22546 8AC7 E0100; Adobe-Japan1; CID+2954 8AC8 E0100; Adobe-Japan1; CID+22547 @@ -27274,6 +27599,8 @@ 8ACB E0102; Moji_Joho; MJ024572 8ACB E0103; Hanyo-Denshi; JTBB6C 8ACB E0103; Moji_Joho; MJ024571 +8ACB E0104; KRName; KRName_8ACB_01 +8ACB E0105; KRName; KRName_8ACB_02 8ACC E0100; Adobe-Japan1; CID+1550 8ACD E0100; Adobe-Japan1; CID+6685 8ACD E0101; Hanyo-Denshi; JA7558 @@ -27376,7 +27703,9 @@ 8AF8 E0100; Adobe-Japan1; CID+8622 8AF8 E0101; Adobe-Japan1; CID+2430 8AF8 E0102; Hanyo-Denshi; JA2984 +8AF8 E0102; Moji_Joho; MJ024638 8AF8 E0103; Hanyo-Denshi; JC9214 +8AF8 E0103; Moji_Joho; MJ030226 8AFA E0100; Adobe-Japan1; CID+1909 8AFA E0101; Adobe-Japan1; CID+7678 8AFA E0102; Hanyo-Denshi; JA2433 @@ -27400,7 +27729,9 @@ 8B01 E0100; Adobe-Japan1; CID+13321 8B01 E0101; Adobe-Japan1; CID+1276 8B01 E0102; Hanyo-Denshi; JA1758 +8B01 E0102; Moji_Joho; MJ024651 8B01 E0103; Hanyo-Denshi; JC9215 +8B01 E0103; Moji_Joho; MJ030297 8B02 E0100; Adobe-Japan1; CID+1190 8B04 E0100; Adobe-Japan1; CID+3197 8B04 E0101; Adobe-Japan1; CID+13958 @@ -27529,6 +27860,7 @@ 8B39 E0103; Hanyo-Denshi; JTBB91 8B39 E0103; Moji_Joho; MJ024731 8B39 E0104; Hanyo-Denshi; JC9216 +8B39 E0104; Moji_Joho; MJ030298 8B39 E0105; Hanyo-Denshi; JTBB77 8B39 E0105; Moji_Joho; MJ060186 8B39 E0106; Hanyo-Denshi; TK01085610 @@ -27562,6 +27894,7 @@ 8B44 E0103; Moji_Joho; MJ024747 8B44 E0104; Hanyo-Denshi; TK01085790 8B44 E0105; Hanyo-Denshi; TK01086040 +8B44 E0106; Moji_Joho; MJ068067 8B45 E0100; Adobe-Japan1; CID+19816 8B45 E0101; Hanyo-Denshi; JB6239 8B45 E0101; Moji_Joho; MJ024750 @@ -28079,7 +28412,9 @@ 8D08 E0100; Adobe-Japan1; CID+2819 8D08 E0101; Adobe-Japan1; CID+13364 8D08 E0102; Hanyo-Denshi; JA3403 +8D08 E0102; Moji_Joho; MJ025122 8D08 E0103; Hanyo-Denshi; JC9229 +8D08 E0103; Moji_Joho; MJ030301 8D09 E0100; Adobe-Japan1; CID+18719 8D09 E0101; Hanyo-Denshi; JB6334 8D09 E0101; Moji_Joho; MJ025123 @@ -28213,6 +28548,7 @@ 8DB9 E0100; Adobe-Japan1; CID+22604 8DB9 E0101; Moji_Joho; MJ025245 8DB9 E0102; Moji_Joho; MJ025246 +8DB9 E0103; Moji_Joho; MJ068068 8DBA E0100; Adobe-Japan1; CID+6792 8DBB E0100; Adobe-Japan1; CID+22605 8DBC E0100; Adobe-Japan1; CID+22613 @@ -28799,6 +29135,7 @@ 8FB6 E0100; Adobe-Japan1; CID+15184 8FB6 E0101; Adobe-Japan1; CID+15403 8FB6 E0102; Hanyo-Denshi; JD8973 +8FB6 E0102; Moji_Joho; MJ030302 8FB6 E0103; Hanyo-Denshi; JB6520 8FB6 E0103; Moji_Joho; MJ025753 8FB6 E0104; Hanyo-Denshi; KS437600 @@ -29384,7 +29721,9 @@ 9038 E0106; Hanyo-Denshi; JTBC9FS 9038 E0106; Moji_Joho; MJ025994 9038 E0107; Hanyo-Denshi; JC9257 +9038 E0107; Moji_Joho; MJ030303 9038 E0108; Hanyo-Denshi; JTFA25S +9038 E0108; Moji_Joho; MJ030234 9038 E0109; Hanyo-Denshi; TK01089600 9039 E0100; Adobe-Japan1; CID+6908 9039 E0101; Adobe-Japan1; CID+13912 @@ -29397,8 +29736,10 @@ 9039 E0105; Hanyo-Denshi; TK01089350 9039 E0106; Moji_Joho; MJ026001 903A E0100; Hanyo-Denshi; KS441960 +903A E0100; Moji_Joho; MJ058857 903A E0101; Hanyo-Denshi; TK01089470 903A E0102; Hanyo-Denshi; TK01089500 +903A E0103; Moji_Joho; MJ060230 903C E0100; Adobe-Japan1; CID+3489 903C E0101; Adobe-Japan1; CID+7783 903C E0102; Hanyo-Denshi; JA4115 @@ -30087,7 +30428,9 @@ 90FD E0100; Adobe-Japan1; CID+8636 90FD E0101; Adobe-Japan1; CID+3150 90FD E0102; Hanyo-Denshi; JA3752 +90FD E0102; Moji_Joho; MJ026341 90FD E0103; Hanyo-Denshi; JC9274 +90FD E0103; Moji_Joho; MJ030235 90FE E0100; Adobe-Japan1; CID+18792 90FF E0100; Adobe-Japan1; CID+18793 9100 E0100; Adobe-Japan1; CID+18790 @@ -30173,7 +30516,9 @@ 9136 E0100; Adobe-Japan1; CID+22692 9137 E0100; Adobe-Japan1; CID+18798 9137 E0101; Hanyo-Denshi; JB6646 +9137 E0101; Moji_Joho; MJ026412 9137 E0102; Hanyo-Denshi; JTBDA0 +9137 E0102; Moji_Joho; MJ026413 9139 E0100; Adobe-Japan1; CID+18799 913A E0100; Adobe-Japan1; CID+15204 913C E0100; Adobe-Japan1; CID+22693 @@ -30199,6 +30544,7 @@ 914B E0103; Hanyo-Denshi; FT1819 914B E0103; Moji_Joho; MJ026434 914B E0104; Hanyo-Denshi; TK01091280 +914B E0105; Moji_Joho; MJ059344 914C E0100; Adobe-Japan1; CID+2316 914C E0101; Adobe-Japan1; CID+13810 914C E0102; Hanyo-Denshi; JA2864 @@ -30663,6 +31009,8 @@ 927C E0101; Moji_Joho; MJ026793 927C E0102; Hanyo-Denshi; JTBE03 927C E0102; Moji_Joho; MJ026794 +927C E0103; KRName; KRName_927C_01 +927C E0104; KRName; KRName_927C_02 927D E0100; Adobe-Japan1; CID+18826 927E E0100; Adobe-Japan1; CID+3702 927F E0100; Adobe-Japan1; CID+18827 @@ -30707,6 +31055,7 @@ 92A0 E0100; Adobe-Japan1; CID+22746 92A2 E0100; Moji_Joho; MJ026837 92A2 E0101; Moji_Joho; MJ026838 +92A2 E0102; Moji_Joho; MJ068069 92A4 E0100; Adobe-Japan1; CID+22747 92A5 E0100; Adobe-Japan1; CID+22748 92A7 E0100; Adobe-Japan1; CID+8657 @@ -31201,6 +31550,7 @@ 9415 E0103; Hanyo-Denshi; TK01094560 9416 E0100; Adobe-Japan1; CID+18869 9416 E0101; Hanyo-Denshi; JB6961 +9416 E0101; Moji_Joho; MJ027258 9416 E0102; Hanyo-Denshi; KS464570 9416 E0102; Moji_Joho; MJ027259 9416 E0103; Hanyo-Denshi; TK01094350 @@ -31635,6 +31985,7 @@ 9686 E0105; Hanyo-Denshi; JTBE75 9686 E0105; Moji_Joho; MJ030190 9686 E0106; Hanyo-Denshi; JC9361 +9686 E0106; Moji_Joho; MJ030189 9688 E0100; Adobe-Japan1; CID+1790 9689 E0100; Adobe-Japan1; CID+19962 968A E0100; Adobe-Japan1; CID+2882 @@ -31746,6 +32097,8 @@ 96B7 E0100; Adobe-Japan1; CID+4020 96B8 E0100; Adobe-Japan1; CID+7114 96B9 E0100; Adobe-Japan1; CID+7115 +96B9 E0101; Moji_Joho; MJ027709 +96B9 E0102; Moji_Joho; MJ056921 96BA E0100; Adobe-Japan1; CID+18900 96BB E0100; Adobe-Japan1; CID+2669 96BB E0101; Adobe-Japan1; CID+13877 @@ -31775,6 +32128,8 @@ 96CA E0100; Adobe-Japan1; CID+22842 96CB E0100; Adobe-Japan1; CID+7117 96CC E0100; Adobe-Japan1; CID+2241 +96CC E0101; Moji_Joho; MJ027731 +96CC E0102; Moji_Joho; MJ027732 96CD E0100; Adobe-Japan1; CID+7119 96CD E0101; Hanyo-Denshi; JA8022 96CD E0102; Hanyo-Denshi; TK01096410 @@ -31824,6 +32179,7 @@ 96E3 E0103; Hanyo-Denshi; IB1030 96E3 E0103; Moji_Joho; MJ058984 96E3 E0104; Hanyo-Denshi; JC9367 +96E3 E0104; Moji_Joho; MJ030304 96E3 E0105; Hanyo-Denshi; TK01096670 96E3 E0106; Hanyo-Denshi; TK01096700 96E3 E0107; Hanyo-Denshi; TK01096710 @@ -31886,6 +32242,8 @@ 9706 E0103; Moji_Joho; MJ027806 9706 E0104; Moji_Joho; MJ027808 9707 E0100; Adobe-Japan1; CID+2578 +9707 E0101; Moji_Joho; MJ027809 +9707 E0102; Moji_Joho; MJ058994 9708 E0100; Adobe-Japan1; CID+7127 9709 E0100; Adobe-Japan1; CID+15274 970A E0100; Adobe-Japan1; CID+4022 @@ -31994,7 +32352,9 @@ 9756 E0100; Adobe-Japan1; CID+3843 9756 E0101; Adobe-Japan1; CID+8587 9756 E0102; Hanyo-Denshi; JA4487 +9756 E0102; Moji_Joho; MJ027901 9756 E0103; Hanyo-Denshi; IB3208 +9756 E0103; Moji_Joho; MJ030214 9757 E0100; Adobe-Japan1; CID+18914 9757 E0101; Hanyo-Denshi; JB7119 9757 E0101; Moji_Joho; MJ027902 @@ -32183,7 +32543,10 @@ 97B6 E0100; Adobe-Japan1; CID+15282 97B8 E0100; Adobe-Japan1; CID+22858 97B8 E0101; Hanyo-Denshi; JB7150 +97B8 E0101; Moji_Joho; MJ028027 97B8 E0102; Hanyo-Denshi; KS487040 +97B8 E0102; Moji_Joho; MJ028026 +97B8 E0103; Moji_Joho; MJ068070 97B9 E0100; Adobe-Japan1; CID+19978 97BA E0100; Adobe-Japan1; CID+17190 97BC E0100; Adobe-Japan1; CID+22859 @@ -32337,6 +32700,7 @@ 97E0 E0101; Moji_Joho; MJ028104 97E0 E0102; Hanyo-Denshi; KS489330 97E0 E0102; Moji_Joho; MJ028103 +97E0 E0103; Moji_Joho; MJ068071 97E1 E0100; Adobe-Japan1; CID+18928 97E1 E0101; Hanyo-Denshi; JB7175 97E1 E0101; Moji_Joho; MJ028105 @@ -32420,6 +32784,7 @@ 97FF E0108; Moji_Joho; MJ030305 97FF E0109; Hanyo-Denshi; JTBEE8 97FF E0109; Moji_Joho; MJ030306 +97FF E010A; Moji_Joho; MJ068072 9800 E0100; Hanyo-Denshi; IP9800 9800 E0101; Hanyo-Denshi; KS490910 9800 E0101; Moji_Joho; MJ028146 @@ -32527,7 +32892,9 @@ 983B E0100; Adobe-Japan1; CID+7788 983B E0101; Adobe-Japan1; CID+3523 983B E0102; Hanyo-Denshi; JA4149 +983B E0102; Moji_Joho; MJ028222 983B E0103; Hanyo-Denshi; JC9391 +983B E0103; Moji_Joho; MJ030307 983C E0100; Adobe-Japan1; CID+3924 983D E0100; Adobe-Japan1; CID+7185 983E E0100; Adobe-Japan1; CID+15291 @@ -32574,7 +32941,10 @@ 985E E0100; Adobe-Japan1; CID+13396 985E E0101; Adobe-Japan1; CID+4008 985E E0102; Hanyo-Denshi; JA4664 +985E E0102; Moji_Joho; MJ028263 985E E0103; Hanyo-Denshi; JC9404 +985E E0103; Moji_Joho; MJ030188 +985E E0104; Moji_Joho; MJ059027 9862 E0100; Adobe-Japan1; CID+19985 9863 E0100; Adobe-Japan1; CID+19986 9865 E0100; Adobe-Japan1; CID+8698 @@ -32701,12 +33071,15 @@ 98ED E0101; Moji_Joho; MJ028362 98ED E0102; Hanyo-Denshi; FT2091 98ED E0102; Moji_Joho; MJ028361 +98ED E0103; Moji_Joho; MJ059041 98EE E0100; Adobe-Japan1; CID+5338 98EF E0100; Adobe-Japan1; CID+8699 98EF E0101; Adobe-Japan1; CID+3431 98EF E0102; Adobe-Japan1; CID+20261 98EF E0103; Hanyo-Denshi; JA4051 +98EF E0103; Moji_Joho; MJ028364 98EF E0104; Hanyo-Denshi; JTFA2A +98EF E0104; Moji_Joho; MJ030240 98F0 E0100; Adobe-Japan1; CID+18954 98F1 E0100; Adobe-Japan1; CID+18955 98F2 E0100; Adobe-Japan1; CID+1215 @@ -32733,7 +33106,9 @@ 98FC E0100; Adobe-Japan1; CID+2242 98FC E0101; Adobe-Japan1; CID+8700 98FC E0102; Hanyo-Denshi; JA2784 +98FC E0102; Moji_Joho; MJ028381 98FC E0103; Hanyo-Denshi; JTFA2B +98FC E0103; Moji_Joho; MJ030241 98FD E0100; Adobe-Japan1; CID+3678 98FD E0101; Adobe-Japan1; CID+14029 98FD E0102; Hanyo-Denshi; JA4316 @@ -32789,6 +33164,7 @@ 990A E0103; Moji_Joho; MJ059042 990A E0104; Hanyo-Denshi; JTBF22 990A E0104; Moji_Joho; MJ028406 +990A E0105; Moji_Joho; MJ068101 990C E0100; Adobe-Japan1; CID+1252 990C E0101; Adobe-Japan1; CID+7643 990C E0102; Adobe-Japan1; CID+13413 @@ -32927,7 +33303,9 @@ 9928 E0100; Adobe-Japan1; CID+1559 9928 E0101; Adobe-Japan1; CID+8702 9928 E0102; Hanyo-Denshi; JA2059 +9928 E0102; Moji_Joho; MJ028464 9928 E0103; Hanyo-Denshi; IB0457 +9928 E0103; Moji_Joho; MJ030242 9929 E0100; Hanyo-Denshi; IB1093 9929 E0100; Moji_Joho; MJ028465 9929 E0101; Hanyo-Denshi; IP9929 @@ -33417,6 +33795,7 @@ 9A4A E0102; Moji_Joho; MJ028800 9A4A E0103; Hanyo-Denshi; JTBFE9S 9A4A E0103; Moji_Joho; MJ028801 +9A4A E0104; Moji_Joho; MJ068073 9A4B E0100; Adobe-Japan1; CID+22921 9A4C E0100; Adobe-Japan1; CID+18993 9A4D E0100; Adobe-Japan1; CID+7257 @@ -33558,6 +33937,8 @@ 9ADE E0101; Hanyo-Denshi; JA8184 9ADE E0102; Hanyo-Denshi; TK01099680 9ADF E0100; Adobe-Japan1; CID+7276 +9ADF E0101; Moji_Joho; MJ028910 +9ADF E0102; Moji_Joho; MJ060349 9AE0 E0100; Adobe-Japan1; CID+19006 9AE2 E0100; Adobe-Japan1; CID+7277 9AE3 E0100; Adobe-Japan1; CID+7278 @@ -33573,6 +33954,8 @@ 9AEC E0100; Adobe-Japan1; CID+22936 9AED E0100; Adobe-Japan1; CID+3480 9AEE E0100; Adobe-Japan1; CID+7282 +9AEE E0101; Moji_Joho; MJ028925 +9AEE E0102; Moji_Joho; MJ059067 9AEF E0100; Adobe-Japan1; CID+7280 9AEF E0101; Adobe-Japan1; CID+14269 9AEF E0102; Hanyo-Denshi; JA8189 @@ -33676,6 +34059,7 @@ 9B32 E0101; Moji_Joho; MJ029004 9B32 E0102; Hanyo-Denshi; KS516930 9B32 E0102; Moji_Joho; MJ059076 +9B32 E0103; Moji_Joho; MJ059077 9B33 E0100; Adobe-Japan1; CID+15326 9B34 E0100; Adobe-Japan1; CID+15327 9B35 E0100; Adobe-Japan1; CID+20010 @@ -33693,6 +34077,8 @@ 9B41 E0100; Adobe-Japan1; CID+1407 9B42 E0100; Adobe-Japan1; CID+2082 9B43 E0100; Adobe-Japan1; CID+7302 +9B43 E0101; Moji_Joho; MJ029020 +9B43 E0102; Moji_Joho; MJ059083 9B44 E0100; Adobe-Japan1; CID+7301 9B45 E0100; Adobe-Japan1; CID+3761 9B48 E0100; Adobe-Japan1; CID+20011 @@ -33708,6 +34094,8 @@ 9B4D E0103; Moji_Joho; MJ029030 9B4E E0100; Adobe-Japan1; CID+7305 9B4F E0100; Adobe-Japan1; CID+7303 +9B4F E0101; Moji_Joho; MJ029032 +9B4F E0102; Moji_Joho; MJ029033 9B51 E0100; Adobe-Japan1; CID+7306 9B51 E0101; Hanyo-Denshi; JA8221 9B51 E0101; Moji_Joho; MJ029035 @@ -33977,6 +34365,8 @@ 9C00 E0103; Hanyo-Denshi; TK01100410 9C02 E0100; Adobe-Japan1; CID+20022 9C04 E0100; Adobe-Japan1; CID+7343 +9C04 E0101; Moji_Joho; MJ029255 +9C04 E0102; Moji_Joho; MJ029256 9C06 E0100; Adobe-Japan1; CID+7339 9C08 E0100; Adobe-Japan1; CID+7340 9C08 E0101; Adobe-Japan1; CID+20253 @@ -34372,7 +34762,9 @@ 9D9A E0100; Adobe-Japan1; CID+7392 9DA1 E0100; Adobe-Japan1; CID+19090 9DA1 E0101; Hanyo-Denshi; JB7615 +9DA1 E0101; Moji_Joho; MJ029619 9DA1 E0102; Hanyo-Denshi; JTC057 +9DA1 E0102; Moji_Joho; MJ060360 9DA4 E0100; Adobe-Japan1; CID+7393 9DA9 E0100; Adobe-Japan1; CID+7394 9DAA E0100; Adobe-Japan1; CID+23004 @@ -34391,7 +34783,9 @@ 9DB4 E0100; Adobe-Japan1; CID+8715 9DB4 E0101; Adobe-Japan1; CID+3069 9DB4 E0102; Hanyo-Denshi; JA3665 +9DB4 E0102; Moji_Joho; MJ029640 9DB4 E0103; Hanyo-Denshi; IB1173 +9DB4 E0103; Moji_Joho; MJ030243 9DB5 E0100; Adobe-Japan1; CID+19092 9DB7 E0100; Hanyo-Denshi; IP9DB7 9DB7 E0100; Moji_Joho; MJ029643 @@ -34558,6 +34952,8 @@ 9E88 E0100; Adobe-Japan1; CID+7418 9E8B E0100; Adobe-Japan1; CID+7419 9E8C E0100; Adobe-Japan1; CID+7420 +9E8C E0101; Moji_Joho; MJ029793 +9E8C E0102; Moji_Joho; MJ029794 9E8E E0100; Adobe-Japan1; CID+23020 9E8E E0101; Hanyo-Denshi; JB7666 9E8E E0102; Hanyo-Denshi; JTC067S @@ -34988,6 +35384,7 @@ 9F4B E0104; Hanyo-Denshi; JTAD37 9F4B E0104; Moji_Joho; MJ030061 9F4B E0105; Hanyo-Denshi; JTAD39S +9F4B E0105; Moji_Joho; MJ059306 9F4B E0106; Moji_Joho; MJ030063 9F4D E0100; Hanyo-Denshi; IP9F4D 9F4D E0100; Moji_Joho; MJ030065 @@ -35075,6 +35472,7 @@ 9F8D E010B; Hanyo-Denshi; TK01101820 9F8D E010C; Hanyo-Denshi; TK01101830 9F8D E010D; Hanyo-Denshi; TK01101840 +9F8D E010E; Moji_Joho; MJ059285 9F8E E0100; Hanyo-Denshi; IP9F8E 9F8E E0101; Hanyo-Denshi; TK01013040 9F8F E0100; Adobe-Japan1; CID+23052 @@ -35135,6 +35533,9 @@ 9F9C E0105; Moji_Joho; MJ030158 9F9C E0106; Hanyo-Denshi; JTC0AE 9F9C E0106; Moji_Joho; MJ030156 +9F9C E0107; KRName; KRName_9F9C_01 +9F9C E0108; KRName; KRName_9F9C_02 +9F9C E0109; Moji_Joho; MJ059288 9F9D E0100; Adobe-Japan1; CID+5927 9F9D E0101; Adobe-Japan1; CID+7847 9F9D E0102; Hanyo-Denshi; JA6752 @@ -35142,6 +35543,7 @@ 9F9D E0103; Hanyo-Denshi; JTB769 9F9D E0103; Moji_Joho; MJ030159 9F9D E0104; Moji_Joho; MJ030161 +9F9D E0105; Moji_Joho; MJ060002 9F9E E0100; Adobe-Japan1; CID+20055 9FA0 E0100; Adobe-Japan1; CID+7473 9FA1 E0100; Adobe-Japan1; CID+23056 @@ -35217,6 +35619,7 @@ FA28 E0100; Adobe-Japan1; CID+8671 FA29 E0100; Adobe-Japan1; CID+8687 20000 E0100; Moji_Joho; MJ030312 20000 E0101; Moji_Joho; MJ030313 +20000 E0102; Moji_Joho; MJ056848 2000B E0100; Adobe-Japan1; CID+13839 2000B E0101; Hanyo-Denshi; JC1402 2000B E0101; Moji_Joho; MJ030320 @@ -35255,7 +35658,9 @@ FA29 E0100; Adobe-Japan1; CID+8687 200E4 E0101; Moji_Joho; MJ057398 200F5 E0100; Adobe-Japan1; CID+20057 2010C E0100; Hanyo-Denshi; KS002670 +2010C E0100; Moji_Joho; MJ030446 2010C E0101; Hanyo-Denshi; KS002680 +2010C E0101; Moji_Joho; MJ030447 20122 E0100; Hanyo-Denshi; KS003180 20122 E0100; Moji_Joho; MJ030466 20122 E0101; Hanyo-Denshi; KS003250 @@ -35313,6 +35718,7 @@ FA29 E0100; Adobe-Japan1; CID+8687 2032B E0101; Moji_Joho; MJ030742 2032B E0102; Hanyo-Denshi; KS011790 2032B E0102; Moji_Joho; MJ030741 +2032B E0103; Moji_Joho; MJ068074 20371 E0100; Adobe-Japan1; CID+17291 20381 E0100; Adobe-Japan1; CID+17289 203A7 E0100; Hanyo-Denshi; JTADA1 @@ -35444,6 +35850,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 208E5 E0101; Hanyo-Denshi; KS029500 208E5 E0101; Moji_Joho; MJ031619 2090E E0100; Adobe-Japan1; CID+13523 +20924 E0100; Moji_Joho; MJ059937 +20924 E0101; Moji_Joho; MJ059938 2097C E0100; Adobe-Japan1; CID+17331 20984 E0100; Adobe-Japan1; CID+14109 20984 E0101; Hanyo-Denshi; HG1610 @@ -35540,6 +35948,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 20DE1 E0100; Adobe-Japan1; CID+17373 20DE1 E0101; Hanyo-Denshi; JD0410 20DE1 E0102; Hanyo-Denshi; TK01014840 +20DF0 E0100; Moji_Joho; MJ057130 +20DF0 E0101; Moji_Joho; MJ057181 20E49 E0100; Hanyo-Denshi; KS046590 20E49 E0101; Hanyo-Denshi; TK01039950 20E64 E0100; Adobe-Japan1; CID+17388 @@ -35644,8 +36054,12 @@ FA29 E0100; Adobe-Japan1; CID+8687 21552 E0100; Moji_Joho; MJ033317 21552 E0101; Hanyo-Denshi; KS065150 21552 E0101; Moji_Joho; MJ033318 +21556 E0100; Moji_Joho; MJ033321 +21556 E0101; Moji_Joho; MJ057252 21569 E0100; Hanyo-Denshi; KS065600 +21569 E0100; Moji_Joho; MJ033336 21569 E0101; Hanyo-Denshi; KS065610 +21569 E0101; Moji_Joho; MJ033337 215B6 E0100; Hanyo-Denshi; KS066560 215B6 E0101; Hanyo-Denshi; TK01018930 215D2 E0100; Hanyo-Denshi; KS066900 @@ -35706,6 +36120,9 @@ FA29 E0100; Adobe-Japan1; CID+8687 219F1 E0101; Moji_Joho; MJ057330 219FD E0100; Hanyo-Denshi; IB1663S 219FD E0101; Hanyo-Denshi; TK01021690 +21A0B E0100; Moji_Joho; MJ033991 +21A0B E0101; Moji_Joho; MJ057336 +21A0B E0102; Moji_Joho; MJ057337 21A1A E0100; Adobe-Japan1; CID+7825 21A41 E0100; Hanyo-Denshi; KS082200 21A41 E0101; Hanyo-Denshi; TK01022390 @@ -35717,6 +36134,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 21AA2 E0101; Moji_Joho; MJ034080 21B33 E0100; Hanyo-Denshi; KS084630 21B33 E0101; Hanyo-Denshi; TK01023570 +21B36 E0100; Moji_Joho; MJ057349 +21B36 E0101; Moji_Joho; MJ059514 21B4E E0100; Hanyo-Denshi; IB0311 21B4E E0100; Moji_Joho; MJ034187 21B4E E0101; Hanyo-Denshi; IB0661 @@ -35816,6 +36235,7 @@ FA29 E0100; Adobe-Japan1; CID+8687 21FEE E0100; Moji_Joho; MJ034910 21FEE E0101; Hanyo-Denshi; KS098230 21FEE E0101; Moji_Joho; MJ034912 +21FEE E0102; Moji_Joho; MJ034911 21FFA E0100; Adobe-Japan1; CID+17585 22029 E0100; Hanyo-Denshi; KS098950 22029 E0100; Moji_Joho; MJ034953 @@ -35834,6 +36254,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 2219F E0100; Moji_Joho; MJ035226 2219F E0101; Hanyo-Denshi; KS245440 2219F E0101; Moji_Joho; MJ035227 +221B0 E0100; Moji_Joho; MJ035232 +221B0 E0101; Moji_Joho; MJ056823 221D4 E0100; Hanyo-Denshi; KS085630 221D4 E0101; Hanyo-Denshi; TK01023850 22214 E0100; Hanyo-Denshi; TK01027820 @@ -35845,6 +36267,10 @@ FA29 E0100; Adobe-Japan1; CID+8687 22218 E0104; Hanyo-Denshi; TK01101190 2221C E0100; Hanyo-Denshi; KS105490 2221C E0101; Hanyo-Denshi; TK01027860 +2223B E0100; Moji_Joho; MJ035336 +2223B E0101; Moji_Joho; MJ057443 +22256 E0100; Moji_Joho; MJ035353 +22256 E0101; Moji_Joho; MJ059250 2228A E0100; Hanyo-Denshi; IB0675 2228A E0101; Hanyo-Denshi; TK01028150 222AC E0100; Hanyo-Denshi; TK01028290 @@ -35895,6 +36321,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 224ED E0101; Moji_Joho; MJ035828 22501 E0100; Hanyo-Denshi; KS114530 22501 E0101; Hanyo-Denshi; TK01030940 +22537 E0100; Moji_Joho; MJ035890 +22537 E0101; Moji_Joho; MJ068075 2254D E0100; Hanyo-Denshi; KS115170 2254D E0101; Hanyo-Denshi; TK01031060 22552 E0100; Hanyo-Denshi; KS115410 @@ -36005,6 +36433,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 22D8A E0100; Moji_Joho; MJ057573 22D8A E0101; Hanyo-Denshi; KS143770 22D8A E0101; Moji_Joho; MJ037047 +22DD0 E0100; Moji_Joho; MJ037078 +22DD0 E0101; Moji_Joho; MJ068076 22DE1 E0100; Adobe-Japan1; CID+17710 22E09 E0100; Hanyo-Denshi; KS145270 22E09 E0100; Moji_Joho; MJ037116 @@ -36045,13 +36475,17 @@ FA29 E0100; Adobe-Japan1; CID+8687 2305D E0100; Moji_Joho; MJ037452 2305D E0101; Moji_Joho; MJ037453 230B0 E0100; Hanyo-Denshi; KS152160 +230B0 E0100; Moji_Joho; MJ037510 230B0 E0101; Hanyo-Denshi; KS152230 +230B0 E0101; Moji_Joho; MJ057626 230D4 E0100; Hanyo-Denshi; KS152600 230D4 E0100; Moji_Joho; MJ037540 230D4 E0101; Hanyo-Denshi; KS152610 230D4 E0101; Moji_Joho; MJ037541 230E0 E0100; Hanyo-Denshi; JTB270S 230E0 E0101; Hanyo-Denshi; TK01037870 +23106 E0100; Moji_Joho; MJ037570 +23106 E0101; Moji_Joho; MJ057642 2311E E0100; Hanyo-Denshi; KS153910 2311E E0100; Moji_Joho; MJ037586 2311E E0101; Hanyo-Denshi; KS153980 @@ -36060,6 +36494,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 23122 E0100; Moji_Joho; MJ037591 23122 E0101; Hanyo-Denshi; KS153990 23122 E0101; Moji_Joho; MJ037592 +2314D E0100; Moji_Joho; MJ037624 +2314D E0101; Moji_Joho; MJ037625 23196 E0100; Hanyo-Denshi; KS156480 23196 E0101; Hanyo-Denshi; TK01039150 231B2 E0100; Hanyo-Denshi; KS156830 @@ -36098,6 +36534,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 23372 E0100; Adobe-Japan1; CID+17761 233B2 E0100; Hanyo-Denshi; KS162280 233B2 E0101; Hanyo-Denshi; TK01042750 +233B5 E0100; Moji_Joho; MJ037921 +233B5 E0101; Moji_Joho; MJ068078 233BE E0100; Hanyo-Denshi; KS162600 233BE E0101; Hanyo-Denshi; TK01008250 233C3 E0100; Hanyo-Denshi; KS162980 @@ -36244,6 +36682,9 @@ FA29 E0100; Adobe-Japan1; CID+8687 238AE E0101; Hanyo-Denshi; TK01047340 238BE E0100; Hanyo-Denshi; TK01047330 238BE E0101; Hanyo-Denshi; TK01065010 +23969 E0100; Moji_Joho; MJ038677 +23969 E0101; Moji_Joho; MJ057892 +23969 E0102; Moji_Joho; MJ057894 23A63 E0100; Hanyo-Denshi; KS187940 23A63 E0100; Moji_Joho; MJ038875 23A63 E0101; Hanyo-Denshi; KS188010 @@ -36265,6 +36706,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 23BAC E0101; Moji_Joho; MJ057931 23BAF E0100; Hanyo-Denshi; KS191280 23BAF E0101; Hanyo-Denshi; KS191400 +23C10 E0100; Moji_Joho; MJ039128 +23C10 E0101; Moji_Joho; MJ068080 23C47 E0100; Hanyo-Denshi; IB2190 23C47 E0101; Hanyo-Denshi; TK01048240 23C75 E0100; Hanyo-Denshi; KS193460 @@ -36299,6 +36742,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 23D34 E0101; Hanyo-Denshi; TK01049220 23D34 E0102; Hanyo-Denshi; TK01049690 23D40 E0100; Adobe-Japan1; CID+17942 +23D60 E0100; Moji_Joho; MJ015437 +23D60 E0101; Moji_Joho; MJ068061 23D7D E0100; Hanyo-Denshi; KS198660 23D7D E0100; Moji_Joho; MJ039336 23D7D E0101; Hanyo-Denshi; KS200300 @@ -36364,6 +36809,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 24103 E0100; Adobe-Japan1; CID+18003 24103 E0101; Hanyo-Denshi; JD7945 24103 E0102; Hanyo-Denshi; TK01053960 +24138 E0100; Moji_Joho; MJ039803 +24138 E0101; Moji_Joho; MJ068081 241C6 E0100; Adobe-Japan1; CID+18015 241FE E0100; Adobe-Japan1; CID+18018 24263 E0100; Hanyo-Denshi; KS215370 @@ -36374,10 +36821,13 @@ FA29 E0100; Adobe-Japan1; CID+8687 24285 E0100; Moji_Joho; MJ059861 24285 E0101; Hanyo-Denshi; JTB51F 24285 E0101; Moji_Joho; MJ039947 +24285 E0102; Moji_Joho; MJ059860 242EE E0100; Adobe-Japan1; CID+14282 242EE E0101; Adobe-Japan1; CID+14281 242EE E0102; Hanyo-Denshi; JTB537 +242EE E0102; Moji_Joho; MJ039982 242EE E0103; Hanyo-Denshi; JTB538 +242EE E0103; Moji_Joho; MJ030309 242F1 E0100; Hanyo-Denshi; FT2317S 242F1 E0101; Hanyo-Denshi; TK01055180 243BC E0100; Adobe-Japan1; CID+18039 @@ -36449,13 +36899,19 @@ FA29 E0100; Adobe-Japan1; CID+8687 24C1E E0102; Moji_Joho; MJ041343 24C1E E0103; Hanyo-Denshi; KS243860 24C1E E0103; Moji_Joho; MJ041344 +24C6B E0100; Moji_Joho; MJ041393 +24C6B E0101; Moji_Joho; MJ068083 24C83 E0100; Hanyo-Denshi; KS245330 24C83 E0100; Moji_Joho; MJ041408 24C83 E0101; Hanyo-Denshi; KS245350 24C83 E0101; Moji_Joho; MJ041409 24C83 E0102; Hanyo-Denshi; KS245400 24C83 E0102; Moji_Joho; MJ058099 +24CFF E0100; Moji_Joho; MJ041491 +24CFF E0101; Moji_Joho; MJ068084 24D14 E0100; Adobe-Japan1; CID+13995 +24D21 E0100; Moji_Joho; MJ041515 +24D21 E0101; Moji_Joho; MJ058117 24D38 E0100; Hanyo-Denshi; KS247350 24D38 E0100; Moji_Joho; MJ041531 24D38 E0101; Hanyo-Denshi; KS247670 @@ -36708,6 +37164,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 25BAB E0101; Hanyo-Denshi; KS292680 25BAB E0101; Moji_Joho; MJ043780 25BB2 E0100; Adobe-Japan1; CID+18293 +25BFF E0100; Moji_Joho; MJ043832 +25BFF E0101; Moji_Joho; MJ068086 25C4B E0100; Adobe-Japan1; CID+18302 25C4B E0101; Hanyo-Denshi; JD8361 25C4B E0101; Moji_Joho; MJ043882 @@ -36732,6 +37190,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 25DA1 E0101; Hanyo-Denshi; JC8978 25DA1 E0102; Hanyo-Denshi; TK01070500 25E2E E0100; Adobe-Japan1; CID+18318 +25E4F E0100; Moji_Joho; MJ044206 +25E4F E0101; Moji_Joho; MJ058287 25E56 E0100; Adobe-Japan1; CID+18319 25E62 E0100; Adobe-Japan1; CID+18322 25E65 E0100; Adobe-Japan1; CID+18320 @@ -36821,6 +37281,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 26273 E0101; Hanyo-Denshi; KS315250 26273 E0101; Moji_Joho; MJ044830 26286 E0100; Adobe-Japan1; CID+18386 +2628B E0100; Moji_Joho; MJ044844 +2628B E0101; Moji_Joho; MJ057703 262D9 E0100; Hanyo-Denshi; KS316300 262D9 E0100; Moji_Joho; MJ044887 262D9 E0101; Hanyo-Denshi; KS316790 @@ -36918,6 +37380,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 2691D E0100; Moji_Joho; MJ045932 2691D E0101; Hanyo-Denshi; KS336240 2691D E0101; Moji_Joho; MJ045933 +2693C E0100; Moji_Joho; MJ045952 +2693C E0101; Moji_Joho; MJ060086 26951 E0100; Adobe-Japan1; CID+13646 2695B E0100; Hanyo-Denshi; KS336850 2695B E0100; Moji_Joho; MJ058415 @@ -36934,6 +37398,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 26977 E0101; Moji_Joho; MJ045996 26999 E0100; Adobe-Japan1; CID+14134 269DD E0100; Adobe-Japan1; CID+18452 +269E0 E0100; Moji_Joho; MJ046074 +269E0 E0101; Moji_Joho; MJ046075 26A01 E0100; Hanyo-Denshi; KS338790 26A01 E0101; Hanyo-Denshi; TK01075790 26A1E E0100; Adobe-Japan1; CID+18455 @@ -36984,6 +37450,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 26BA0 E0100; Moji_Joho; MJ021912 26BA0 E0101; Hanyo-Denshi; KS347990 26BA0 E0101; Moji_Joho; MJ058465 +26BCC E0100; Moji_Joho; MJ046418 +26BCC E0101; Moji_Joho; MJ060109 26BD5 E0100; Hanyo-Denshi; KS349060 26BD5 E0101; Hanyo-Denshi; TK01077930 26BDC E0100; Hanyo-Denshi; KS349140 @@ -37097,6 +37565,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 26FF6 E0102; Hanyo-Denshi; TK01081300 26FF7 E0100; Adobe-Japan1; CID+18555 26FF8 E0100; Adobe-Japan1; CID+18553 +26FF8 E0101; Moji_Joho; MJ047097 +26FF8 E0102; Moji_Joho; MJ068087 2702E E0100; Hanyo-Denshi; KS366970 2702E E0101; Hanyo-Denshi; TK01081500 2702F E0100; Hanyo-Denshi; KS366990 @@ -37158,6 +37628,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 272B7 E0100; Moji_Joho; MJ047564 272B7 E0101; Hanyo-Denshi; KS376020 272B7 E0101; Moji_Joho; MJ047565 +272DD E0100; Moji_Joho; MJ047591 +272DD E0101; Moji_Joho; MJ058636 2730A E0100; Moji_Joho; MJ047613 2730A E0101; Moji_Joho; MJ047614 27354 E0100; Hanyo-Denshi; KS378360 @@ -37177,6 +37649,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 273FE E0101; Moji_Joho; MJ047790 273FE E0102; Hanyo-Denshi; KS380880 273FE E0102; Moji_Joho; MJ047791 +27402 E0100; Moji_Joho; MJ047795 +27402 E0101; Moji_Joho; MJ058653 27410 E0100; Adobe-Japan1; CID+18620 27449 E0100; Adobe-Japan1; CID+18624 27525 E0100; Hanyo-Denshi; IB0374 @@ -37233,6 +37707,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 27771 E0100; Moji_Joho; MJ048434 27771 E0101; Hanyo-Denshi; KS393840 27771 E0101; Moji_Joho; MJ058710 +277AA E0100; Moji_Joho; MJ048475 +277AA E0101; Moji_Joho; MJ068088 277B8 E0100; Hanyo-Denshi; IB0376 277B8 E0100; Moji_Joho; MJ048487 277B8 E0101; Hanyo-Denshi; IB0888 @@ -37362,10 +37838,14 @@ FA29 E0100; Adobe-Japan1; CID+8687 27FA8 E0101; Hanyo-Denshi; KS423250 27FA8 E0101; Moji_Joho; MJ049993 27FB7 E0100; Adobe-Japan1; CID+13898 +27FC0 E0100; Moji_Joho; MJ050013 +27FC0 E0101; Moji_Joho; MJ068090 2802E E0100; Hanyo-Denshi; KS425200 2802E E0101; Hanyo-Denshi; TK01087710 2808A E0100; Adobe-Japan1; CID+18727 280BB E0100; Adobe-Japan1; CID+18733 +28119 E0100; Moji_Joho; MJ050234 +28119 E0101; Moji_Joho; MJ050235 2818B E0100; Hanyo-Denshi; KS429300 2818B E0101; Hanyo-Denshi; TK01087840 28277 E0100; Adobe-Japan1; CID+17140 @@ -37715,6 +38195,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 29031 E0101; Moji_Joho; MJ052666 29093 E0100; Hanyo-Denshi; KS479070 29093 E0101; Hanyo-Denshi; TK01096900 +2912E E0100; Moji_Joho; MJ052839 +2912E E0101; Moji_Joho; MJ058872 2915E E0100; Hanyo-Denshi; KS481210 2915E E0100; Moji_Joho; MJ052866 2915E E0101; Hanyo-Denshi; KS481490 @@ -37788,6 +38270,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 2953A E0100; Moji_Joho; MJ053621 2953A E0101; Hanyo-Denshi; KS494580 2953A E0101; Moji_Joho; MJ059032 +29548 E0100; Moji_Joho; MJ053630 +29548 E0101; Moji_Joho; MJ068091 295B6 E0100; Hanyo-Denshi; KS495840 295B6 E0100; Moji_Joho; MJ053709 295B6 E0101; Hanyo-Denshi; KS495850 @@ -38000,6 +38484,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 29900 E0100; Moji_Joho; MJ054361 29900 E0101; Hanyo-Denshi; KS508750 29900 E0101; Moji_Joho; MJ059053 +29918 E0100; Moji_Joho; MJ054370 +29918 E0101; Moji_Joho; MJ068092 2994A E0100; Hanyo-Denshi; KS509100 2994A E0101; Hanyo-Denshi; TK01099330 2998B E0100; Hanyo-Denshi; KS510010 @@ -38053,6 +38539,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 29E3D E0103; Moji_Joho; MJ055216 29E3D E0104; Moji_Joho; MJ055218 29E49 E0100; Adobe-Japan1; CID+19038 +29E77 E0100; Moji_Joho; MJ055248 +29E77 E0101; Moji_Joho; MJ068093 29E7A E0100; Hanyo-Denshi; KS524790 29E7A E0100; Moji_Joho; MJ055250 29E7A E0101; Hanyo-Denshi; KS525390 @@ -38089,6 +38577,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 2A02F E0100; Adobe-Japan1; CID+19075 2A02F E0101; Moji_Joho; MJ055513 2A02F E0102; Moji_Joho; MJ055514 +2A04B E0100; Moji_Joho; MJ055524 +2A04B E0101; Moji_Joho; MJ068094 2A061 E0100; Hanyo-Denshi; KS531650 2A061 E0100; Moji_Joho; MJ055546 2A061 E0101; Hanyo-Denshi; KS531810 @@ -38185,6 +38675,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 2A564 E0100; Moji_Joho; MJ056510 2A564 E0101; Hanyo-Denshi; KS547670 2A564 E0101; Moji_Joho; MJ056511 +2A56F E0100; Moji_Joho; MJ056521 +2A56F E0101; Moji_Joho; MJ068095 2A585 E0100; Hanyo-Denshi; KS548080 2A585 E0100; Moji_Joho; MJ056539 2A585 E0101; Hanyo-Denshi; KS548130 @@ -38229,6 +38721,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 2A813 E0100; Hanyo-Denshi; TK01012960 2A813 E0101; Hanyo-Denshi; TK01012980 2A9E6 E0100; Adobe-Japan1; CID+14145 +2A9E8 E0100; Moji_Joho; MJ059509 +2A9E8 E0101; Moji_Joho; MJ068099 2AB03 E0100; Hanyo-Denshi; IB1867 2AB03 E0101; Hanyo-Denshi; TK01032200 2AB87 E0100; Hanyo-Denshi; KS138200 @@ -38324,6 +38818,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 2B74C E0101; Hanyo-Denshi; JTADD6 2B74C E0101; Moji_Joho; MJ059345 2B751 E0100; Adobe-Japan1; CID+13866 +2B751 E0101; Moji_Joho; MJ057073 +2B751 E0102; Moji_Joho; MJ060385 2B753 E0100; Adobe-Japan1; CID+20088 2B754 E0100; Hanyo-Denshi; IB0646 2B754 E0101; Hanyo-Denshi; TK01006880 @@ -38375,6 +38871,8 @@ FA29 E0100; Adobe-Japan1; CID+8687 2B778 E0101; Moji_Joho; MJ057482 2B778 E0102; Hanyo-Denshi; TK01001520 2B77C E0100; Adobe-Japan1; CID+20125 +2B780 E0100; Moji_Joho; MJ057640 +2B780 E0101; Moji_Joho; MJ057641 2B782 E0100; Adobe-Japan1; CID+20141 2B789 E0100; Adobe-Japan1; CID+14064 2B789 E0101; Hanyo-Denshi; JTB314 @@ -38482,4 +38980,225 @@ FA29 E0100; Adobe-Japan1; CID+8687 2B81A E0100; Adobe-Japan1; CID+14278 2B81D E0100; Hanyo-Denshi; JTC0B0 2B81D E0101; Hanyo-Denshi; TK01102050 +2B930 E0100; Moji_Joho; MJ059346 +2B930 E0101; Moji_Joho; MJ059348 +2B930 E0102; Moji_Joho; MJ059349 +2B97B E0100; Moji_Joho; MJ057044 +2B97B E0101; Moji_Joho; MJ059375 +2B9E4 E0100; Moji_Joho; MJ059399 +2B9E4 E0101; Moji_Joho; MJ059400 +2B9E4 E0102; Moji_Joho; MJ059401 +2B9E4 E0103; Moji_Joho; MJ059402 +2BBF1 E0100; Moji_Joho; MJ059482 +2BBF1 E0101; Moji_Joho; MJ059483 +2BEDB E0100; Moji_Joho; MJ057527 +2BEDB E0101; Moji_Joho; MJ057530 +2C0FE E0100; Moji_Joho; MJ057767 +2C0FE E0101; Moji_Joho; MJ057782 +2C155 E0100; Moji_Joho; MJ057871 +2C155 E0101; Moji_Joho; MJ057872 +2C737 E0100; Moji_Joho; MJ058461 +2C737 E0101; Moji_Joho; MJ058478 +2C73B E0100; Moji_Joho; MJ058476 +2C73B E0101; Moji_Joho; MJ058479 +2C73B E0102; Moji_Joho; MJ060112 +2C73B E0103; Moji_Joho; MJ060113 +2C7D3 E0100; Moji_Joho; MJ023163 +2C7D3 E0101; Moji_Joho; MJ023164 +2CD6B E0100; Moji_Joho; MJ059156 +2CD6B E0101; Moji_Joho; MJ059171 +2CECE E0100; Moji_Joho; MJ059298 +2CECE E0101; Moji_Joho; MJ059381 +2CED0 E0100; Moji_Joho; MJ056838 +2CED0 E0101; Moji_Joho; MJ057545 +2CEDC E0100; Moji_Joho; MJ056843 +2CEDC E0101; Moji_Joho; MJ056844 +2CF18 E0100; Moji_Joho; MJ057888 +2CF18 E0101; Moji_Joho; MJ057889 +2CF4C E0100; Moji_Joho; MJ056862 +2CF4C E0101; Moji_Joho; MJ056893 +2CF4C E0102; Moji_Joho; MJ056894 +2CF4C E0103; Moji_Joho; MJ056898 +2D020 E0100; Moji_Joho; MJ056969 +2D020 E0101; Moji_Joho; MJ056970 +2D028 E0100; Moji_Joho; MJ059338 +2D028 E0101; Moji_Joho; MJ059339 +2D048 E0100; Moji_Joho; MJ058413 +2D048 E0101; Moji_Joho; MJ059341 +2D048 E0102; Moji_Joho; MJ059342 +2D06B E0100; Moji_Joho; MJ057014 +2D06B E0101; Moji_Joho; MJ057015 +2D06F E0100; Moji_Joho; MJ057017 +2D06F E0101; Moji_Joho; MJ057018 +2D06F E0102; Moji_Joho; MJ057019 +2D077 E0100; Moji_Joho; MJ057026 +2D077 E0101; Moji_Joho; MJ057028 +2D077 E0102; Moji_Joho; MJ057029 +2D0B2 E0100; Moji_Joho; MJ059372 +2D0B2 E0101; Moji_Joho; MJ068097 +2D0DA E0100; Moji_Joho; MJ057048 +2D0DA E0101; Moji_Joho; MJ057049 +2D169 E0100; Moji_Joho; MJ057102 +2D169 E0101; Moji_Joho; MJ057103 +2D186 E0100; Moji_Joho; MJ057115 +2D186 E0101; Moji_Joho; MJ057116 +2D18F E0100; Moji_Joho; MJ057120 +2D18F E0101; Moji_Joho; MJ057121 +2D199 E0100; Moji_Joho; MJ057126 +2D199 E0101; Moji_Joho; MJ057127 +2D1A2 E0100; Moji_Joho; MJ056986 +2D1A2 E0101; Moji_Joho; MJ056988 +2D1AB E0100; Moji_Joho; MJ057137 +2D1AB E0101; Moji_Joho; MJ058030 +2D239 E0100; Moji_Joho; MJ057174 +2D239 E0101; Moji_Joho; MJ057183 +2D260 E0100; Moji_Joho; MJ059425 +2D260 E0101; Moji_Joho; MJ059426 +2D260 E0102; Moji_Joho; MJ059430 +2D260 E0103; Moji_Joho; MJ059464 +2D2DB E0100; Moji_Joho; MJ057197 +2D2DB E0101; Moji_Joho; MJ057198 +2D380 E0100; Moji_Joho; MJ059445 +2D380 E0101; Moji_Joho; MJ060381 +2D3DB E0100; Moji_Joho; MJ057238 +2D3DB E0101; Moji_Joho; MJ057239 +2D423 E0100; Moji_Joho; MJ057254 +2D423 E0101; Moji_Joho; MJ057257 +2D433 E0100; Moji_Joho; MJ057265 +2D433 E0101; Moji_Joho; MJ057267 +2D445 E0100; Moji_Joho; MJ057274 +2D445 E0101; Moji_Joho; MJ057276 +2D455 E0100; Moji_Joho; MJ057283 +2D455 E0101; Moji_Joho; MJ057284 +2D4E9 E0100; Moji_Joho; MJ057329 +2D4E9 E0101; Moji_Joho; MJ057331 +2D4F1 E0100; Moji_Joho; MJ059505 +2D4F1 E0101; Moji_Joho; MJ068098 +2D544 E0100; Adobe-Japan1; CID+13834 +2D5D5 E0100; Moji_Joho; MJ059531 +2D5D5 E0101; Moji_Joho; MJ059532 +2D63E E0100; Moji_Joho; MJ057430 +2D63E E0101; Moji_Joho; MJ057431 +2D64C E0100; Moji_Joho; MJ057433 +2D64C E0101; Moji_Joho; MJ057434 +2D64C E0102; Moji_Joho; MJ057435 +2D698 E0100; Moji_Joho; MJ057456 +2D698 E0101; Moji_Joho; MJ057457 +2D6B6 E0100; Moji_Joho; MJ057466 +2D6B6 E0101; Moji_Joho; MJ059574 +2D6B6 E0102; Moji_Joho; MJ059575 +2D6B6 E0103; Moji_Joho; MJ059576 +2D6B6 E0104; Moji_Joho; MJ059577 +2D6B6 E0105; Moji_Joho; MJ059578 +2D6DD E0100; Moji_Joho; MJ059588 +2D6DD E0101; Moji_Joho; MJ059589 +2D710 E0100; Moji_Joho; MJ059600 +2D710 E0101; Moji_Joho; MJ059601 +2D72E E0100; Moji_Joho; MJ059608 +2D72E E0101; Moji_Joho; MJ059609 +2D733 E0100; Moji_Joho; MJ057506 +2D733 E0101; Moji_Joho; MJ057512 +2D7BE E0100; Moji_Joho; MJ059635 +2D7BE E0101; Moji_Joho; MJ059636 +2D7F1 E0100; Moji_Joho; MJ059640 +2D7F1 E0101; Moji_Joho; MJ059641 +2D805 E0100; Moji_Joho; MJ057548 +2D805 E0101; Moji_Joho; MJ057550 +2D886 E0100; Moji_Joho; MJ057564 +2D886 E0101; Moji_Joho; MJ057567 +2D916 E0100; Moji_Joho; MJ059663 +2D916 E0101; Moji_Joho; MJ059664 +2D918 E0100; Moji_Joho; MJ059661 +2D918 E0101; Moji_Joho; MJ059662 +2D967 E0100; Moji_Joho; MJ059677 +2D967 E0101; Moji_Joho; MJ059681 +2D997 E0100; Moji_Joho; MJ057668 +2D997 E0101; Moji_Joho; MJ057669 +2DA99 E0100; Moji_Joho; MJ057756 +2DA99 E0101; Moji_Joho; MJ057769 +2DB4B E0100; Moji_Joho; MJ057878 +2DB4B E0101; Moji_Joho; MJ057879 +2DB4E E0100; Moji_Joho; MJ057882 +2DB4E E0101; Moji_Joho; MJ057883 +2DC7D E0100; Moji_Joho; MJ059820 +2DC7D E0101; Moji_Joho; MJ059821 +2DC9E E0100; Moji_Joho; MJ059830 +2DC9E E0101; Moji_Joho; MJ059831 +2DCD3 E0100; Moji_Joho; MJ059843 +2DCD3 E0101; Moji_Joho; MJ059844 +2DCD3 E0102; Moji_Joho; MJ059845 +2DCD3 E0103; Moji_Joho; MJ059846 +2DCD3 E0104; Moji_Joho; MJ059850 +2DCEF E0100; Moji_Joho; MJ059854 +2DCEF E0101; Moji_Joho; MJ059855 +2DD44 E0100; Moji_Joho; MJ056993 +2DD44 E0101; Moji_Joho; MJ056994 +2DD48 E0100; Moji_Joho; MJ056944 +2DD48 E0101; Moji_Joho; MJ057999 +2DEBE E0100; Moji_Joho; MJ058090 +2DEBE E0101; Moji_Joho; MJ058093 +2DEBE E0102; Moji_Joho; MJ058094 +2DF3D E0100; Moji_Joho; MJ058128 +2DF3D E0101; Moji_Joho; MJ058130 +2DF41 E0100; Moji_Joho; MJ058132 +2DF41 E0101; Moji_Joho; MJ058133 +2DFF5 E0100; Moji_Joho; MJ058190 +2DFF5 E0101; Moji_Joho; MJ058191 +2E068 E0100; Moji_Joho; MJ058205 +2E068 E0101; Moji_Joho; MJ058209 +2E0BA E0100; Moji_Joho; MJ059983 +2E0BA E0101; Moji_Joho; MJ059984 +2E0EC E0100; Moji_Joho; MJ059995 +2E0EC E0101; Moji_Joho; MJ059996 +2E152 E0100; Moji_Joho; MJ019541 +2E152 E0101; Moji_Joho; MJ058266 +2E170 E0100; Moji_Joho; MJ060024 +2E170 E0101; Moji_Joho; MJ060025 +2E278 E0100; Adobe-Japan1; CID+14187 +2E284 E0100; Moji_Joho; MJ058338 +2E284 E0101; Moji_Joho; MJ058339 +2E2AB E0100; Moji_Joho; MJ058349 +2E2AB E0101; Moji_Joho; MJ060064 +2E306 E0100; Moji_Joho; MJ058375 +2E306 E0101; Moji_Joho; MJ058376 +2E307 E0100; Moji_Joho; MJ058377 +2E307 E0101; Moji_Joho; MJ058378 +2E3B0 E0100; Moji_Joho; MJ058447 +2E3B0 E0101; Moji_Joho; MJ060101 +2E3B0 E0102; Moji_Joho; MJ060102 +2E3C0 E0100; Moji_Joho; MJ058472 +2E3C0 E0101; Moji_Joho; MJ060108 +2E43C E0100; Moji_Joho; MJ058533 +2E43C E0101; Moji_Joho; MJ058541 +2E4D9 E0100; Moji_Joho; MJ058580 +2E4D9 E0101; Moji_Joho; MJ058581 +2E4DC E0100; Moji_Joho; MJ058586 +2E4DC E0101; Moji_Joho; MJ058587 +2E509 E0100; Moji_Joho; MJ058623 +2E509 E0101; Moji_Joho; MJ058635 +2E569 E0100; Adobe-Japan1; CID+13863 +2E5E8 E0100; Moji_Joho; MJ058732 +2E5E8 E0101; Moji_Joho; MJ058733 +2E6EA E0100; Adobe-Japan1; CID+14226 +2E789 E0100; Moji_Joho; MJ060224 +2E789 E0101; Moji_Joho; MJ060225 +2E7D0 E0100; Moji_Joho; MJ060244 +2E7D0 E0101; Moji_Joho; MJ060245 +2E9C0 E0100; Moji_Joho; MJ060330 +2E9C0 E0101; Moji_Joho; MJ060331 +2E9CA E0100; Moji_Joho; MJ059001 +2E9CA E0101; Moji_Joho; MJ059002 +2E9D3 E0100; Moji_Joho; MJ059005 +2E9D3 E0101; Moji_Joho; MJ059007 +2E9F0 E0100; Moji_Joho; MJ059015 +2E9F0 E0101; Moji_Joho; MJ059016 +2E9F2 E0100; Moji_Joho; MJ060334 +2E9F2 E0101; Moji_Joho; MJ060335 +2EA41 E0100; Moji_Joho; MJ060341 +2EA41 E0101; Moji_Joho; MJ060342 +2EA41 E0102; Moji_Joho; MJ068100 +2EB71 E0100; Moji_Joho; MJ059251 +2EB71 E0101; Moji_Joho; MJ059252 +2EB79 E0100; Moji_Joho; MJ059255 +2EB79 E0101; Moji_Joho; MJ059256 # EOF diff --git a/src/macuvs.h b/src/macuvs.h index 2f52ce3da8..679e8fa457 100644 --- a/src/macuvs.h +++ b/src/macuvs.h @@ -1,29 +1,29 @@ /* Automatically generated by uvs.el. */ static const unsigned char mac_uvs_table_adobe_japan1_bytes[] = { - 0x00, 0x0e, 0x00, 0x01, 0x1f, 0x9e, 0x00, 0x00, + 0x00, 0x0e, 0x00, 0x01, 0x1f, 0xb2, 0x00, 0x00, 0x00, 0x0f, 0x0e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaf, 0x0e, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x9a, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0xae, 0x0e, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x1c, 0x31, 0x0e, 0x01, 0x03, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01, 0x1e, 0xb0, 0x0e, 0x01, + 0x01, 0x1c, 0x45, 0x0e, 0x01, 0x03, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x01, 0x1e, 0xc4, 0x0e, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1f, - 0x09, 0x0e, 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x1f, 0x2b, 0x0e, 0x01, 0x06, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x01, 0x1f, 0x43, 0x0e, + 0x1d, 0x0e, 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x1f, 0x3f, 0x0e, 0x01, 0x06, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x01, 0x1f, 0x57, 0x0e, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, - 0x1f, 0x51, 0x0e, 0x01, 0x08, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x1f, 0x5f, 0x0e, 0x01, 0x09, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1f, 0x68, + 0x1f, 0x65, 0x0e, 0x01, 0x08, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x1f, 0x73, 0x0e, 0x01, 0x09, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1f, 0x7c, 0x0e, 0x01, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x1f, 0x71, 0x0e, 0x01, 0x0b, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01, 0x1f, 0x7a, 0x0e, 0x01, + 0x01, 0x1f, 0x85, 0x0e, 0x01, 0x0b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x01, 0x1f, 0x8e, 0x0e, 0x01, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1f, - 0x83, 0x0e, 0x01, 0x0d, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x1f, 0x8c, 0x0e, 0x01, 0x0e, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x01, 0x1f, 0x95, 0x00, - 0x00, 0x33, 0xfb, 0x00, 0x34, 0x02, 0x35, 0x82, + 0x97, 0x0e, 0x01, 0x0d, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x1f, 0xa0, 0x0e, 0x01, 0x0e, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x01, 0x1f, 0xa9, 0x00, + 0x00, 0x33, 0xff, 0x00, 0x34, 0x02, 0x35, 0x82, 0x00, 0x34, 0x05, 0x3c, 0x1b, 0x00, 0x34, 0x06, 0x43, 0x5a, 0x00, 0x34, 0x27, 0x36, 0x56, 0x00, 0x34, 0x2c, 0x43, 0x5e, 0x00, 0x34, 0x2e, 0x37, @@ -8340,869 +8340,872 @@ static const unsigned char mac_uvs_table_adobe_japan1_bytes[] = 0xec, 0x02, 0xb7, 0xd8, 0x35, 0x53, 0x02, 0xb7, 0xf0, 0x4f, 0x10, 0x02, 0xb8, 0x0d, 0x4f, 0x20, 0x02, 0xb8, 0x17, 0x4f, 0x24, 0x02, 0xb8, 0x1a, - 0x37, 0xc6, 0x00, 0x00, 0x04, 0xb7, 0x00, 0x34, - 0x02, 0x35, 0x81, 0x00, 0x4e, 0x08, 0x34, 0x97, - 0x00, 0x4e, 0x0e, 0x4e, 0x69, 0x00, 0x4e, 0x19, - 0x36, 0xb9, 0x00, 0x4e, 0x26, 0x4e, 0x6a, 0x00, - 0x4e, 0x30, 0x3c, 0x1a, 0x00, 0x4e, 0x39, 0x36, - 0x5a, 0x00, 0x4e, 0x3b, 0x35, 0xf4, 0x00, 0x4e, - 0x73, 0x36, 0x90, 0x00, 0x4e, 0xa1, 0x36, 0xcf, - 0x00, 0x4e, 0xa4, 0x34, 0x7f, 0x00, 0x4e, 0xca, - 0x35, 0xd4, 0x00, 0x4f, 0x34, 0x36, 0xa0, 0x00, - 0x4f, 0x4f, 0x35, 0xfc, 0x00, 0x4f, 0x60, 0x3c, - 0x1c, 0x00, 0x4f, 0x73, 0x4e, 0x6c, 0x00, 0x4f, - 0x75, 0x34, 0x47, 0x00, 0x4f, 0x7f, 0x34, 0x8a, - 0x00, 0x4f, 0xae, 0x34, 0x46, 0x00, 0x4f, 0xb5, - 0x36, 0x1b, 0x00, 0x4f, 0xbf, 0x34, 0xc2, 0x00, - 0x50, 0x24, 0x36, 0x5f, 0x00, 0x50, 0x26, 0x1d, - 0xfa, 0x00, 0x50, 0x49, 0x34, 0x61, 0x00, 0x50, - 0x4f, 0x36, 0xbe, 0x00, 0x50, 0x56, 0x4e, 0x6d, - 0x00, 0x50, 0x65, 0x34, 0x7b, 0x00, 0x50, 0x85, - 0x34, 0xd0, 0x00, 0x50, 0x91, 0x34, 0x79, 0x00, - 0x50, 0xc5, 0x1d, 0xee, 0x00, 0x50, 0xca, 0x1f, - 0x2e, 0x00, 0x50, 0xcf, 0x34, 0xa2, 0x00, 0x50, - 0xe7, 0x34, 0x30, 0x00, 0x50, 0xed, 0x4e, 0x6e, - 0x00, 0x50, 0xf2, 0x52, 0xac, 0x00, 0x51, 0x1a, - 0x37, 0x16, 0x00, 0x51, 0x32, 0x1e, 0x76, 0x00, - 0x51, 0x46, 0x34, 0xa5, 0x00, 0x51, 0x4d, 0x34, - 0x4d, 0x00, 0x51, 0x4e, 0x36, 0x7d, 0x00, 0x51, - 0x54, 0x10, 0x74, 0x00, 0x51, 0x68, 0x36, 0x42, - 0x00, 0x51, 0x6b, 0x4e, 0x6f, 0x00, 0x51, 0x6c, - 0x34, 0x80, 0x00, 0x51, 0x77, 0x35, 0xa5, 0x00, - 0x51, 0x7c, 0x35, 0xb4, 0x00, 0x51, 0x89, 0x1e, - 0x87, 0x00, 0x51, 0x8d, 0x08, 0x36, 0x00, 0x51, - 0x92, 0x36, 0xd6, 0x00, 0x51, 0x93, 0x34, 0xd1, - 0x00, 0x51, 0x95, 0x10, 0x82, 0x00, 0x51, 0xa4, - 0x1e, 0x89, 0x00, 0x51, 0xac, 0x0c, 0x59, 0x00, - 0x51, 0xb4, 0x34, 0x5c, 0x00, 0x51, 0xcb, 0x1e, - 0x3e, 0x00, 0x51, 0xdb, 0x34, 0xd2, 0x00, 0x51, - 0xde, 0x4f, 0x53, 0x00, 0x51, 0xe1, 0x36, 0xd9, - 0x00, 0x51, 0xfd, 0x4e, 0x72, 0x00, 0x52, 0x03, - 0x36, 0x22, 0x00, 0x52, 0x06, 0x34, 0xbb, 0x00, - 0x52, 0x24, 0x36, 0xa1, 0x00, 0x52, 0x38, 0x35, - 0xb5, 0x00, 0x52, 0x4a, 0x35, 0xdd, 0x00, 0x52, - 0x4d, 0x36, 0x41, 0x00, 0x52, 0x64, 0x4e, 0x74, - 0x00, 0x52, 0x71, 0x4e, 0x75, 0x00, 0x52, 0x72, - 0x05, 0xc2, 0x00, 0x52, 0x75, 0x1e, 0x2b, 0x00, - 0x52, 0x8d, 0x37, 0x1a, 0x00, 0x52, 0xc7, 0x36, - 0xf6, 0x00, 0x52, 0xc9, 0x0e, 0x29, 0x00, 0x52, - 0xd7, 0x37, 0x1b, 0x00, 0x52, 0xdd, 0x36, 0x05, - 0x00, 0x52, 0xe2, 0x36, 0x2a, 0x00, 0x52, 0xe4, - 0x34, 0x1a, 0x00, 0x52, 0xfa, 0x09, 0x07, 0x00, - 0x53, 0x00, 0x37, 0xcf, 0x00, 0x53, 0x05, 0x36, - 0xc3, 0x00, 0x53, 0x07, 0x20, 0xd4, 0x00, 0x53, - 0x15, 0x1f, 0x2f, 0x00, 0x53, 0x16, 0x35, 0x61, - 0x00, 0x53, 0x39, 0x36, 0xaa, 0x00, 0x53, 0x3f, - 0x4e, 0x77, 0x00, 0x53, 0x40, 0x34, 0xd4, 0x00, - 0x53, 0x4a, 0x36, 0xa2, 0x00, 0x53, 0x51, 0x0d, - 0x70, 0x00, 0x53, 0x5a, 0x36, 0x98, 0x00, 0x53, - 0x65, 0x52, 0xf3, 0x00, 0x53, 0x71, 0x35, 0x80, - 0x00, 0x53, 0x78, 0x35, 0x5f, 0x00, 0x53, 0x7f, - 0x06, 0xa2, 0x00, 0x53, 0xa9, 0x1d, 0xd8, 0x00, - 0x53, 0xc9, 0x4f, 0x39, 0x00, 0x53, 0xca, 0x35, - 0x8e, 0x00, 0x53, 0xce, 0x34, 0x8f, 0x00, 0x53, - 0xd7, 0x35, 0xf5, 0x00, 0x53, 0xdb, 0x1f, 0x2a, - 0x00, 0x53, 0xdf, 0x37, 0x1f, 0x00, 0x53, 0xe0, - 0x53, 0x00, 0x00, 0x53, 0xf1, 0x1e, 0x0c, 0x00, - 0x53, 0xf2, 0x34, 0x8b, 0x00, 0x54, 0x0f, 0x34, - 0xc9, 0x00, 0x54, 0x38, 0x35, 0x8f, 0x00, 0x54, - 0x40, 0x4e, 0x79, 0x00, 0x54, 0x48, 0x36, 0x76, - 0x00, 0x54, 0x68, 0x09, 0x2a, 0x00, 0x54, 0xac, - 0x4f, 0x35, 0x00, 0x54, 0xb2, 0x35, 0xdc, 0x00, - 0x54, 0xe8, 0x1e, 0x17, 0x00, 0x55, 0x10, 0x36, - 0x83, 0x00, 0x55, 0x33, 0x1e, 0x8b, 0x00, 0x55, - 0x39, 0x1e, 0x8a, 0x00, 0x55, 0x44, 0x1e, 0x32, - 0x00, 0x55, 0x46, 0x36, 0x06, 0x00, 0x55, 0x53, - 0x35, 0xaa, 0x00, 0x55, 0x61, 0x38, 0x39, 0x00, - 0x55, 0x84, 0x4e, 0x5e, 0x00, 0x55, 0x9c, 0x4e, - 0x7b, 0x00, 0x55, 0x9d, 0x1d, 0xe3, 0x00, 0x55, - 0xa9, 0x1f, 0x30, 0x00, 0x55, 0xab, 0x35, 0x8b, - 0x00, 0x55, 0xb0, 0x1d, 0xf0, 0x00, 0x55, 0xe4, - 0x1e, 0x8c, 0x00, 0x56, 0x05, 0x53, 0x2d, 0x00, - 0x56, 0x06, 0x0b, 0x70, 0x00, 0x56, 0x09, 0x4e, - 0x7d, 0x00, 0x56, 0x32, 0x1e, 0x8d, 0x00, 0x56, - 0x42, 0x1d, 0xda, 0x00, 0x56, 0x4c, 0x1e, 0x29, - 0x00, 0x56, 0x68, 0x34, 0x15, 0x00, 0x56, 0x74, - 0x34, 0xbc, 0x00, 0x56, 0x78, 0x1e, 0x52, 0x00, - 0x56, 0xa5, 0x1e, 0x8e, 0x00, 0x56, 0xae, 0x1f, - 0x31, 0x00, 0x56, 0xc0, 0x37, 0x24, 0x00, 0x56, - 0xc1, 0x34, 0xd7, 0x00, 0x56, 0xce, 0x4e, 0x82, - 0x00, 0x56, 0xee, 0x4e, 0x83, 0x00, 0x57, 0x0d, - 0x34, 0xd8, 0x00, 0x57, 0x47, 0x34, 0x78, 0x00, - 0x57, 0x6a, 0x36, 0x74, 0x00, 0x57, 0xce, 0x09, - 0xd3, 0x00, 0x57, 0xd6, 0x4e, 0x84, 0x00, 0x57, - 0xf4, 0x34, 0x98, 0x00, 0x58, 0x0b, 0x1e, 0x8f, - 0x00, 0x58, 0x19, 0x1f, 0x32, 0x00, 0x58, 0x35, - 0x1e, 0x49, 0x00, 0x58, 0x3d, 0x4e, 0x85, 0x00, - 0x58, 0x40, 0x34, 0x48, 0x00, 0x58, 0x58, 0x1e, - 0x4d, 0x00, 0x58, 0x59, 0x4e, 0x86, 0x00, 0x58, - 0x5a, 0x1e, 0x42, 0x00, 0x58, 0x9c, 0x36, 0x71, - 0x00, 0x58, 0xa8, 0x0e, 0x7d, 0x00, 0x58, 0xab, - 0x34, 0xd9, 0x00, 0x59, 0x06, 0x53, 0x7b, 0x00, - 0x59, 0x1b, 0x1f, 0x33, 0x00, 0x59, 0x27, 0x36, - 0x55, 0x00, 0x59, 0x4f, 0x4e, 0x87, 0x00, 0x59, - 0x51, 0x35, 0xab, 0x00, 0x59, 0x53, 0x37, 0xd1, - 0x00, 0x59, 0x60, 0x4e, 0x89, 0x00, 0x59, 0x62, - 0x4e, 0x8a, 0x00, 0x59, 0x73, 0x36, 0x04, 0x00, - 0x59, 0x84, 0x36, 0xe7, 0x00, 0x59, 0xa5, 0x36, - 0x4f, 0x00, 0x59, 0xc9, 0x34, 0x8c, 0x00, 0x59, - 0xda, 0x34, 0xda, 0x00, 0x59, 0xec, 0x36, 0xae, - 0x00, 0x59, 0xff, 0x35, 0xe0, 0x00, 0x5a, 0x1c, - 0x37, 0x26, 0x00, 0x5a, 0x29, 0x1e, 0x6f, 0x00, - 0x5a, 0x36, 0x34, 0xdb, 0x00, 0x5a, 0x66, 0x36, - 0xb2, 0x00, 0x5a, 0x9b, 0x1e, 0x68, 0x00, 0x5a, - 0xbe, 0x1e, 0x90, 0x00, 0x5a, 0xc2, 0x37, 0x27, - 0x00, 0x5a, 0xcc, 0x1d, 0xfb, 0x00, 0x5a, 0xda, - 0x4e, 0x8b, 0x00, 0x5b, 0x5a, 0x4e, 0x8c, 0x00, - 0x5b, 0x73, 0x4e, 0x8d, 0x00, 0x5b, 0x7c, 0x4e, - 0x8e, 0x00, 0x5b, 0xb3, 0x34, 0x6d, 0x00, 0x5b, - 0xb5, 0x36, 0x07, 0x00, 0x5b, 0xc3, 0x37, 0x29, - 0x00, 0x5b, 0xd2, 0x35, 0x78, 0x00, 0x5b, 0xdb, - 0x20, 0xf4, 0x00, 0x5b, 0xe7, 0x0c, 0xe1, 0x00, - 0x5b, 0xe8, 0x37, 0x42, 0x00, 0x5c, 0x06, 0x09, - 0x95, 0x00, 0x5c, 0x0a, 0x36, 0x4d, 0x00, 0x5c, - 0x0b, 0x36, 0x23, 0x00, 0x5c, 0x0e, 0x36, 0x8a, - 0x00, 0x5c, 0x0f, 0x36, 0x09, 0x00, 0x5c, 0x28, - 0x1f, 0x34, 0x00, 0x5c, 0x51, 0x1d, 0xf2, 0x00, - 0x5c, 0x60, 0x1e, 0x4a, 0x00, 0x5c, 0x64, 0x34, - 0x31, 0x00, 0x5c, 0x6e, 0x12, 0x32, 0x00, 0x5d, - 0x29, 0x36, 0xc4, 0x00, 0x5d, 0x4e, 0x34, 0xdd, - 0x00, 0x5d, 0x87, 0x34, 0xde, 0x00, 0x5d, 0xb2, - 0x3c, 0x2d, 0x00, 0x5d, 0xc9, 0x34, 0xdf, 0x00, - 0x5d, 0xcc, 0x34, 0x73, 0x00, 0x5d, 0xd3, 0x34, - 0xe0, 0x00, 0x5d, 0xe1, 0x35, 0xff, 0x00, 0x5d, - 0xe5, 0x35, 0xc3, 0x00, 0x5d, 0xe8, 0x35, 0x92, - 0x00, 0x5d, 0xf7, 0x1d, 0xff, 0x00, 0x5d, 0xfd, - 0x0b, 0x65, 0x00, 0x5e, 0x06, 0x36, 0xa3, 0x00, - 0x5e, 0x1d, 0x36, 0x77, 0x00, 0x5e, 0x30, 0x34, - 0x75, 0x00, 0x5e, 0x3d, 0x36, 0xd0, 0x00, 0x5e, - 0x43, 0x4e, 0x91, 0x00, 0x5e, 0x54, 0x37, 0x2d, - 0x00, 0x5e, 0x63, 0x36, 0xba, 0x00, 0x5e, 0x64, - 0x1e, 0x93, 0x00, 0x5e, 0x73, 0x36, 0xbb, 0x00, - 0x5e, 0x7e, 0x35, 0x84, 0x00, 0x5e, 0x96, 0x1e, - 0x70, 0x00, 0x5e, 0xa7, 0x4e, 0x92, 0x00, 0x5e, - 0xad, 0x34, 0xa9, 0x00, 0x5e, 0xc9, 0x0f, 0xbf, - 0x00, 0x5e, 0xca, 0x4f, 0x4f, 0x00, 0x5e, 0xcb, - 0x38, 0xae, 0x00, 0x5e, 0xcf, 0x1f, 0x36, 0x00, - 0x5e, 0xd0, 0x1f, 0x35, 0x00, 0x5e, 0xdf, 0x1e, - 0x6a, 0x00, 0x5e, 0xe0, 0x1e, 0x18, 0x00, 0x5e, - 0xe3, 0x37, 0x2f, 0x00, 0x5e, 0xf6, 0x34, 0x67, - 0x00, 0x5e, 0xf7, 0x34, 0xaa, 0x00, 0x5e, 0xfa, - 0x34, 0x7c, 0x00, 0x5e, 0xfb, 0x35, 0x69, 0x00, - 0x5f, 0x0a, 0x36, 0xbc, 0x00, 0x5f, 0x2d, 0x34, - 0xe1, 0x00, 0x5f, 0x31, 0x35, 0xf3, 0x00, 0x5f, - 0x38, 0x4e, 0x94, 0x00, 0x5f, 0x45, 0x37, 0xce, - 0x00, 0x5f, 0x50, 0x3c, 0x1f, 0x00, 0x5f, 0x62, - 0x4e, 0x5f, 0x00, 0x5f, 0x69, 0x35, 0xd7, 0x00, - 0x5f, 0x6b, 0x36, 0x68, 0x00, 0x5f, 0x80, 0x35, - 0x5d, 0x00, 0x5f, 0x98, 0x34, 0xe2, 0x00, 0x5f, - 0xa1, 0x4e, 0x95, 0x00, 0x5f, 0xae, 0x36, 0xa8, - 0x00, 0x5f, 0xb5, 0x36, 0x69, 0x00, 0x5f, 0xbd, - 0x1d, 0xea, 0x00, 0x5f, 0xcd, 0x36, 0x91, 0x00, - 0x5f, 0xd8, 0x36, 0xd1, 0x00, 0x5f, 0xd9, 0x36, - 0xd2, 0x00, 0x5f, 0xdd, 0x4e, 0x96, 0x00, 0x60, - 0x25, 0x35, 0x90, 0x00, 0x60, 0x50, 0x35, 0x99, - 0x00, 0x60, 0x62, 0x1d, 0xe0, 0x00, 0x60, 0x65, - 0x34, 0xa4, 0x00, 0x60, 0x75, 0x35, 0xac, 0x00, - 0x60, 0x94, 0x05, 0x79, 0x00, 0x60, 0x97, 0x1e, - 0x94, 0x00, 0x60, 0x9e, 0x54, 0x36, 0x00, 0x60, - 0xa4, 0x3c, 0x20, 0x00, 0x60, 0xb2, 0x34, 0xb3, - 0x00, 0x60, 0xc5, 0x36, 0x12, 0x00, 0x60, 0xd8, - 0x34, 0xe3, 0x00, 0x61, 0x08, 0x1e, 0x7a, 0x00, - 0x61, 0x09, 0x36, 0xf3, 0x00, 0x61, 0x0f, 0x35, - 0x47, 0x00, 0x61, 0x3d, 0x34, 0xe4, 0x00, 0x61, - 0x48, 0x4e, 0x60, 0x00, 0x61, 0x4c, 0x35, 0xc4, - 0x00, 0x61, 0x4e, 0x34, 0x2c, 0x00, 0x61, 0x62, - 0x4e, 0x97, 0x00, 0x61, 0x67, 0x1d, 0xf5, 0x00, - 0x61, 0x68, 0x34, 0x10, 0x00, 0x61, 0x8e, 0x0b, - 0x00, 0x00, 0x61, 0x90, 0x37, 0x10, 0x00, 0x61, - 0xa4, 0x34, 0xbd, 0x00, 0x61, 0xb2, 0x35, 0xb6, - 0x00, 0x61, 0xf2, 0x34, 0x39, 0x00, 0x61, 0xf8, - 0x4e, 0x99, 0x00, 0x61, 0xfe, 0x34, 0xe5, 0x00, - 0x62, 0x10, 0x36, 0x2b, 0x00, 0x62, 0x3b, 0x36, - 0xeb, 0x00, 0x62, 0x3f, 0x36, 0xd3, 0x00, 0x62, - 0x40, 0x36, 0x02, 0x00, 0x62, 0x41, 0x1f, 0x37, - 0x00, 0x62, 0x47, 0x36, 0x3b, 0x00, 0x62, 0x48, - 0x1e, 0xc2, 0x00, 0x62, 0x49, 0x1e, 0x63, 0x00, - 0x62, 0x68, 0x34, 0xe6, 0x00, 0x62, 0x71, 0x35, - 0x45, 0x00, 0x62, 0xb1, 0x36, 0xc5, 0x00, 0x62, - 0xcc, 0x37, 0x32, 0x00, 0x62, 0xcf, 0x34, 0xe7, - 0x00, 0x62, 0xd0, 0x1d, 0xe1, 0x00, 0x62, 0xd2, - 0x35, 0x93, 0x00, 0x62, 0xd4, 0x13, 0x5d, 0x00, - 0x62, 0xf3, 0x1f, 0x21, 0x00, 0x62, 0xf7, 0x34, - 0x88, 0x00, 0x63, 0x3a, 0x4f, 0x3e, 0x00, 0x63, - 0x3d, 0x1e, 0x62, 0x00, 0x63, 0x4c, 0x34, 0x5d, - 0x00, 0x63, 0x57, 0x1e, 0x3f, 0x00, 0x63, 0x67, - 0x34, 0xc3, 0x00, 0x63, 0x68, 0x35, 0xec, 0x00, - 0x63, 0x69, 0x1e, 0x95, 0x00, 0x63, 0x6e, 0x34, - 0x9d, 0x00, 0x63, 0x72, 0x1d, 0xfc, 0x00, 0x63, - 0x83, 0x36, 0x43, 0x00, 0x63, 0x88, 0x35, 0xf6, - 0x00, 0x63, 0x92, 0x34, 0xaf, 0x00, 0x63, 0xa1, - 0x35, 0xd8, 0x00, 0x63, 0xa7, 0x35, 0xc6, 0x00, - 0x63, 0xc3, 0x1f, 0x27, 0x00, 0x63, 0xc6, 0x37, - 0x34, 0x00, 0x63, 0xf4, 0x35, 0x57, 0x00, 0x64, - 0x06, 0x1e, 0x96, 0x00, 0x64, 0x0f, 0x34, 0xe9, - 0x00, 0x64, 0x1c, 0x37, 0x33, 0x00, 0x64, 0x28, - 0x37, 0x35, 0x00, 0x64, 0x42, 0x34, 0x9e, 0x00, - 0x64, 0x69, 0x36, 0xd7, 0x00, 0x64, 0x6f, 0x4f, - 0x28, 0x00, 0x64, 0x7a, 0x1e, 0x21, 0x00, 0x64, - 0xb0, 0x1e, 0x24, 0x00, 0x64, 0xe2, 0x1e, 0x45, - 0x00, 0x64, 0xf2, 0x34, 0xea, 0x00, 0x64, 0xf6, - 0x4e, 0x9e, 0x00, 0x65, 0x1d, 0x34, 0xe8, 0x00, - 0x65, 0x4f, 0x0d, 0xc4, 0x00, 0x65, 0x5d, 0x34, - 0xeb, 0x00, 0x65, 0x5e, 0x4e, 0xa1, 0x00, 0x65, - 0x62, 0x34, 0x71, 0x00, 0x65, 0x77, 0x36, 0xb3, - 0x00, 0x65, 0x83, 0x1e, 0x98, 0x00, 0x65, 0x87, - 0x4e, 0xa3, 0x00, 0x65, 0x89, 0x4e, 0xa4, 0x00, - 0x65, 0x8e, 0x4e, 0xa6, 0x00, 0x65, 0x90, 0x34, - 0xb5, 0x00, 0x65, 0x9c, 0x35, 0xed, 0x00, 0x65, - 0xa7, 0x4f, 0x41, 0x00, 0x65, 0xbc, 0x35, 0x5c, - 0x00, 0x65, 0xc5, 0x37, 0x08, 0x00, 0x65, 0xdf, - 0x54, 0xbe, 0x00, 0x65, 0xe1, 0x4e, 0xa9, 0x00, - 0x65, 0xe2, 0x06, 0x37, 0x00, 0x66, 0x0e, 0x36, - 0xe4, 0x00, 0x66, 0x1e, 0x21, 0x1c, 0x00, 0x66, - 0x5f, 0x34, 0xec, 0x00, 0x66, 0x66, 0x1d, 0xe2, - 0x00, 0x66, 0x67, 0x4e, 0xaa, 0x00, 0x66, 0x69, - 0x36, 0xa5, 0x00, 0x66, 0x6e, 0x4e, 0xab, 0x00, - 0x66, 0x74, 0x0a, 0x56, 0x00, 0x66, 0x77, 0x39, - 0x11, 0x00, 0x66, 0x81, 0x35, 0xa0, 0x00, 0x66, - 0x91, 0x34, 0x28, 0x00, 0x66, 0x96, 0x36, 0x5e, - 0x00, 0x66, 0x97, 0x35, 0x46, 0x00, 0x66, 0xb5, - 0x54, 0xda, 0x00, 0x66, 0xc1, 0x1f, 0x38, 0x00, - 0x66, 0xd9, 0x1e, 0x13, 0x00, 0x66, 0xdc, 0x36, - 0xfd, 0x00, 0x66, 0xf4, 0x34, 0x81, 0x00, 0x66, - 0xf5, 0x37, 0x3b, 0x00, 0x66, 0xf8, 0x36, 0x03, - 0x00, 0x66, 0xfb, 0x37, 0xcd, 0x00, 0x66, 0xfc, - 0x37, 0x20, 0x00, 0x67, 0x00, 0x4e, 0xaf, 0x00, - 0x67, 0x08, 0x35, 0xb2, 0x00, 0x67, 0x09, 0x36, - 0xf7, 0x00, 0x67, 0x0b, 0x36, 0xc6, 0x00, 0x67, - 0x0d, 0x36, 0xb7, 0x00, 0x67, 0x15, 0x36, 0x6f, - 0x00, 0x67, 0x17, 0x0f, 0xd5, 0x00, 0x67, 0x1b, - 0x36, 0xd4, 0x00, 0x67, 0x1d, 0x36, 0x6b, 0x00, - 0x67, 0x1f, 0x35, 0x86, 0x00, 0x67, 0x53, 0x1e, - 0x0f, 0x00, 0x67, 0x56, 0x4f, 0x3a, 0x00, 0x67, - 0x5e, 0x37, 0x3c, 0x00, 0x67, 0x61, 0x4e, 0xb0, - 0x00, 0x67, 0x7e, 0x34, 0x95, 0x00, 0x67, 0xa6, - 0x1e, 0x99, 0x00, 0x67, 0xa9, 0x34, 0xed, 0x00, - 0x67, 0xc4, 0x4e, 0xb1, 0x00, 0x67, 0xca, 0x1e, - 0x65, 0x00, 0x67, 0xd4, 0x34, 0x91, 0x00, 0x67, - 0xe7, 0x34, 0xee, 0x00, 0x67, 0xf1, 0x36, 0x65, - 0x00, 0x68, 0x01, 0x21, 0x2e, 0x00, 0x68, 0x02, - 0x4e, 0xb2, 0x00, 0x68, 0x13, 0x1e, 0x25, 0x00, - 0x68, 0x1f, 0x4e, 0x61, 0x00, 0x68, 0x21, 0x34, - 0x82, 0x00, 0x68, 0x43, 0x34, 0xac, 0x00, 0x68, - 0x52, 0x21, 0x2c, 0x00, 0x68, 0x5d, 0x34, 0xc5, - 0x00, 0x68, 0x7a, 0x36, 0xf0, 0x00, 0x68, 0x81, - 0x37, 0x09, 0x00, 0x68, 0x85, 0x0d, 0x15, 0x00, - 0x68, 0x8d, 0x37, 0x3e, 0x00, 0x68, 0x97, 0x4f, - 0x37, 0x00, 0x68, 0x9b, 0x1e, 0x9b, 0x00, 0x68, - 0x9d, 0x37, 0x3d, 0x00, 0x68, 0xa2, 0x1e, 0x19, - 0x00, 0x68, 0xc8, 0x37, 0xcc, 0x00, 0x68, 0xda, - 0x1e, 0x38, 0x00, 0x69, 0x0d, 0x34, 0x99, 0x00, - 0x69, 0x30, 0x34, 0xf0, 0x00, 0x69, 0x3d, 0x4e, - 0xb3, 0x00, 0x69, 0x5e, 0x4e, 0xb4, 0x00, 0x69, - 0x62, 0x1e, 0x58, 0x00, 0x69, 0x6b, 0x34, 0xef, - 0x00, 0x69, 0x6f, 0x34, 0x94, 0x00, 0x69, 0x82, - 0x34, 0x5b, 0x00, 0x69, 0x8a, 0x1e, 0x06, 0x00, - 0x69, 0x94, 0x1e, 0x84, 0x00, 0x69, 0xa7, 0x34, - 0xf1, 0x00, 0x69, 0xbb, 0x37, 0x43, 0x00, 0x69, - 0xc1, 0x35, 0x9a, 0x00, 0x69, 0xcb, 0x35, 0xc7, - 0x00, 0x69, 0xcc, 0x1e, 0x40, 0x00, 0x69, 0xd9, - 0x36, 0xdd, 0x00, 0x69, 0xea, 0x35, 0x6f, 0x00, - 0x69, 0xfe, 0x55, 0x1f, 0x00, 0x6a, 0x0b, 0x1e, - 0x64, 0x00, 0x6a, 0x3d, 0x1e, 0x3a, 0x00, 0x6a, - 0x44, 0x34, 0xf2, 0x00, 0x6a, 0x55, 0x55, 0x25, - 0x00, 0x6a, 0x5f, 0x35, 0x87, 0x00, 0x6a, 0x73, - 0x37, 0xd4, 0x00, 0x6a, 0x8e, 0x34, 0x7e, 0x00, - 0x6a, 0x90, 0x34, 0xf3, 0x00, 0x6a, 0x9c, 0x4e, - 0xb6, 0x00, 0x6a, 0xdb, 0x06, 0xf3, 0x00, 0x6b, - 0x04, 0x0f, 0x5d, 0x00, 0x6b, 0x1d, 0x1d, 0xd7, - 0x00, 0x6b, 0x21, 0x35, 0xe7, 0x00, 0x6b, 0x24, - 0x3c, 0x22, 0x00, 0x6b, 0x4e, 0x36, 0x5b, 0x00, - 0x6b, 0x96, 0x36, 0x16, 0x00, 0x6b, 0xba, 0x08, - 0x74, 0x00, 0x6b, 0xbb, 0x34, 0x70, 0x00, 0x6c, - 0x08, 0x1f, 0x39, 0x00, 0x6c, 0x13, 0x34, 0xf5, - 0x00, 0x6c, 0x38, 0x4e, 0xba, 0x00, 0x6c, 0x3a, - 0x39, 0x62, 0x00, 0x6c, 0x72, 0x1f, 0x1e, 0x00, - 0x6c, 0xaa, 0x37, 0x48, 0x00, 0x6c, 0xbf, 0x05, - 0x0a, 0x00, 0x6c, 0xe1, 0x1e, 0x71, 0x00, 0x6c, - 0xe8, 0x36, 0x66, 0x00, 0x6d, 0x3e, 0x34, 0xae, - 0x00, 0x6d, 0x69, 0x35, 0xc8, 0x00, 0x6d, 0x6e, - 0x36, 0xb4, 0x00, 0x6d, 0x77, 0x05, 0x82, 0x00, - 0x6d, 0x78, 0x36, 0x1d, 0x00, 0x6d, 0x88, 0x36, - 0x0c, 0x00, 0x6d, 0xe4, 0x4e, 0xbd, 0x00, 0x6d, - 0xeb, 0x1d, 0xd5, 0x00, 0x6d, 0xfb, 0x36, 0x7c, - 0x00, 0x6e, 0x08, 0x4e, 0xbf, 0x00, 0x6e, 0x1a, - 0x09, 0x77, 0x00, 0x6e, 0x23, 0x1f, 0x3a, 0x00, - 0x6e, 0x2f, 0x35, 0xc9, 0x00, 0x6e, 0x6e, 0x1e, - 0x9d, 0x00, 0x6e, 0x72, 0x4e, 0xc0, 0x00, 0x6e, - 0x7e, 0x34, 0xcf, 0x00, 0x6e, 0x9d, 0x1e, 0x01, - 0x00, 0x6e, 0xa2, 0x1d, 0xd3, 0x00, 0x6e, 0xba, - 0x1e, 0x46, 0x00, 0x6e, 0xcb, 0x35, 0xe9, 0x00, - 0x6e, 0xd5, 0x4e, 0xc2, 0x00, 0x6e, 0xdb, 0x4e, - 0xc3, 0x00, 0x6e, 0xec, 0x1f, 0x3b, 0x00, 0x6e, - 0xfe, 0x34, 0xf8, 0x00, 0x6f, 0x11, 0x34, 0xf7, - 0x00, 0x6f, 0x22, 0x34, 0x14, 0x00, 0x6f, 0x23, - 0x0f, 0xc2, 0x00, 0x6f, 0x3e, 0x34, 0xf9, 0x00, - 0x6f, 0x51, 0x36, 0x9e, 0x00, 0x6f, 0x54, 0x35, - 0xb0, 0x00, 0x6f, 0x5b, 0x4e, 0xc4, 0x00, 0x6f, - 0x64, 0x4e, 0xc6, 0x00, 0x6f, 0x6e, 0x0b, 0xc8, - 0x00, 0x6f, 0x74, 0x4e, 0xc7, 0x00, 0x6f, 0x98, - 0x37, 0x47, 0x00, 0x6f, 0xef, 0x1e, 0x33, 0x00, - 0x6f, 0xf9, 0x39, 0x95, 0x00, 0x70, 0x15, 0x1e, - 0x6b, 0x00, 0x70, 0x1b, 0x37, 0x4a, 0x00, 0x70, - 0x1e, 0x1e, 0x51, 0x00, 0x70, 0x26, 0x1e, 0x3d, - 0x00, 0x70, 0x27, 0x36, 0x57, 0x00, 0x70, 0x4a, - 0x39, 0x98, 0x00, 0x70, 0x58, 0x1e, 0x57, 0x00, - 0x70, 0x70, 0x35, 0x6a, 0x00, 0x70, 0x78, 0x4f, - 0x2e, 0x00, 0x70, 0x7c, 0x1e, 0x10, 0x00, 0x70, - 0xad, 0x36, 0x5c, 0x00, 0x71, 0x49, 0x0f, 0xc3, - 0x00, 0x71, 0x4e, 0x1e, 0x26, 0x00, 0x71, 0x52, - 0x55, 0xad, 0x00, 0x71, 0x59, 0x35, 0x59, 0x00, - 0x71, 0x62, 0x37, 0x4b, 0x00, 0x71, 0x6e, 0x08, - 0xfd, 0x00, 0x71, 0x7d, 0x1e, 0x27, 0x00, 0x71, - 0x94, 0x1e, 0x7d, 0x00, 0x71, 0xb3, 0x39, 0xae, - 0x00, 0x71, 0xd0, 0x37, 0x0a, 0x00, 0x71, 0xff, - 0x34, 0xfa, 0x00, 0x72, 0x28, 0x15, 0xdf, 0x00, - 0x72, 0x2b, 0x3c, 0x26, 0x00, 0x72, 0x35, 0x09, - 0x0b, 0x00, 0x72, 0x36, 0x34, 0xb9, 0x00, 0x72, - 0x3a, 0x4f, 0x46, 0x00, 0x72, 0x3b, 0x37, 0x4c, - 0x00, 0x72, 0x3e, 0x4e, 0xc9, 0x00, 0x72, 0x4c, - 0x1e, 0x5b, 0x00, 0x72, 0x59, 0x1f, 0x1d, 0x00, - 0x72, 0xe1, 0x4f, 0x36, 0x00, 0x73, 0x1c, 0x37, - 0x4e, 0x00, 0x73, 0x2a, 0x0b, 0xb4, 0x00, 0x73, - 0x36, 0x36, 0xf8, 0x00, 0x73, 0x37, 0x1e, 0x7c, - 0x00, 0x73, 0x87, 0x37, 0x05, 0x00, 0x73, 0x8b, - 0x35, 0xa1, 0x00, 0x73, 0xca, 0x1e, 0x0b, 0x00, - 0x73, 0xce, 0x1e, 0xa0, 0x00, 0x73, 0xe5, 0x34, - 0xfb, 0x00, 0x73, 0xed, 0x34, 0xb1, 0x00, 0x74, - 0x22, 0x0b, 0x56, 0x00, 0x74, 0x32, 0x34, 0xfc, - 0x00, 0x74, 0x5f, 0x34, 0xfd, 0x00, 0x74, 0x62, - 0x21, 0x71, 0x00, 0x74, 0xb0, 0x35, 0x79, 0x00, - 0x74, 0xbd, 0x4e, 0xcd, 0x00, 0x74, 0xca, 0x37, - 0x4f, 0x00, 0x74, 0xd8, 0x55, 0xf6, 0x00, 0x74, - 0xdc, 0x35, 0x50, 0x00, 0x74, 0xe0, 0x34, 0xfe, - 0x00, 0x74, 0xef, 0x55, 0xfa, 0x00, 0x75, 0x04, - 0x1e, 0xa1, 0x00, 0x75, 0x0c, 0x34, 0xff, 0x00, - 0x75, 0x0d, 0x1e, 0xa2, 0x00, 0x75, 0x11, 0x1e, - 0x04, 0x00, 0x75, 0x15, 0x1e, 0xa3, 0x00, 0x75, - 0x26, 0x4f, 0x3b, 0x00, 0x75, 0x54, 0x36, 0xa4, - 0x00, 0x75, 0x5d, 0x4e, 0xce, 0x00, 0x75, 0xbc, - 0x4e, 0xcf, 0x00, 0x75, 0xc5, 0x36, 0xb1, 0x00, - 0x76, 0x08, 0x4e, 0xd1, 0x00, 0x76, 0x26, 0x1e, - 0x2d, 0x00, 0x76, 0x52, 0x1e, 0x7b, 0x00, 0x76, - 0x64, 0x4e, 0xd2, 0x00, 0x76, 0x69, 0x4e, 0xd3, - 0x00, 0x76, 0x72, 0x35, 0x00, 0x00, 0x76, 0x84, - 0x36, 0x79, 0x00, 0x76, 0x93, 0x1e, 0xa4, 0x00, - 0x76, 0xc6, 0x34, 0xc4, 0x00, 0x76, 0xca, 0x21, - 0x7b, 0x00, 0x76, 0xd4, 0x56, 0x1d, 0x00, 0x76, - 0xdb, 0x36, 0x2c, 0x00, 0x76, 0xdf, 0x36, 0xe5, - 0x00, 0x76, 0xf2, 0x36, 0xe9, 0x00, 0x76, 0xf4, - 0x36, 0x6e, 0x00, 0x77, 0x1e, 0x16, 0xb8, 0x00, - 0x77, 0x1f, 0x36, 0x1e, 0x00, 0x77, 0x37, 0x4e, - 0xd5, 0x00, 0x77, 0x3a, 0x34, 0xa6, 0x00, 0x77, - 0x7e, 0x4e, 0xd6, 0x00, 0x77, 0x8d, 0x56, 0x2e, - 0x00, 0x77, 0xa2, 0x56, 0x2f, 0x00, 0x77, 0xa5, - 0x1e, 0x6e, 0x00, 0x77, 0xac, 0x34, 0x92, 0x00, - 0x77, 0xe9, 0x35, 0xa4, 0x00, 0x78, 0x32, 0x36, - 0xc7, 0x00, 0x78, 0x3a, 0x36, 0x7f, 0x00, 0x78, - 0x5d, 0x36, 0x0d, 0x00, 0x78, 0x6c, 0x34, 0x83, - 0x00, 0x78, 0x7c, 0x1e, 0xa5, 0x00, 0x78, 0x91, - 0x0d, 0x7e, 0x00, 0x78, 0xd4, 0x35, 0x02, 0x00, - 0x78, 0xe8, 0x36, 0xda, 0x00, 0x78, 0xef, 0x35, - 0x4b, 0x00, 0x79, 0x2a, 0x35, 0x01, 0x00, 0x79, - 0x34, 0x3a, 0x38, 0x00, 0x79, 0x3a, 0x08, 0xd4, - 0x00, 0x79, 0x3c, 0x21, 0x83, 0x00, 0x79, 0x3e, - 0x34, 0x24, 0x00, 0x79, 0x40, 0x37, 0x57, 0x00, - 0x79, 0x41, 0x1d, 0xf4, 0x00, 0x79, 0x47, 0x1d, - 0xeb, 0x00, 0x79, 0x48, 0x06, 0x41, 0x00, 0x79, - 0x49, 0x34, 0x21, 0x00, 0x79, 0x50, 0x0f, 0x1e, - 0x00, 0x79, 0x53, 0x37, 0x58, 0x00, 0x79, 0x56, - 0x34, 0x2f, 0x00, 0x79, 0x5d, 0x09, 0x55, 0x00, - 0x79, 0x5e, 0x0a, 0x06, 0x00, 0x79, 0x62, 0x1f, - 0x29, 0x00, 0x79, 0x65, 0x09, 0xb5, 0x00, 0x79, - 0x8d, 0x05, 0x52, 0x00, 0x79, 0x8e, 0x34, 0x3b, - 0x00, 0x79, 0x8f, 0x21, 0x87, 0x00, 0x79, 0xa7, - 0x4e, 0xd7, 0x00, 0x79, 0xae, 0x37, 0x5b, 0x00, - 0x79, 0xb0, 0x1e, 0x59, 0x00, 0x79, 0xb1, 0x4e, - 0xd8, 0x00, 0x79, 0xba, 0x35, 0x03, 0x00, 0x79, - 0xe4, 0x1e, 0x5d, 0x00, 0x7a, 0x0b, 0x36, 0x78, - 0x00, 0x7a, 0x17, 0x1e, 0x66, 0x00, 0x7a, 0x19, - 0x35, 0x04, 0x00, 0x7a, 0x31, 0x1e, 0xa6, 0x00, - 0x7a, 0x40, 0x08, 0x04, 0x00, 0x7a, 0x60, 0x3a, - 0x4e, 0x00, 0x7a, 0x74, 0x34, 0x7a, 0x00, 0x7a, - 0x7a, 0x35, 0xa7, 0x00, 0x7a, 0x7f, 0x1f, 0x25, - 0x00, 0x7a, 0x81, 0x34, 0x3d, 0x00, 0x7a, 0x95, - 0x35, 0x05, 0x00, 0x7a, 0x97, 0x1f, 0x3c, 0x00, - 0x7a, 0xae, 0x34, 0x77, 0x00, 0x7a, 0xbe, 0x4e, - 0xd9, 0x00, 0x7a, 0xc6, 0x3c, 0x27, 0x00, 0x7a, - 0xc8, 0x4f, 0x3d, 0x00, 0x7b, 0x08, 0x1f, 0x1f, - 0x00, 0x7b, 0x51, 0x36, 0x63, 0x00, 0x7b, 0x75, - 0x4f, 0x2a, 0x00, 0x7b, 0x99, 0x1e, 0xa8, 0x00, - 0x7b, 0xad, 0x1f, 0x26, 0x00, 0x7b, 0xb8, 0x1e, - 0x5f, 0x00, 0x7b, 0xc0, 0x34, 0x2e, 0x00, 0x7b, - 0xc7, 0x1f, 0x2b, 0x00, 0x7b, 0xc9, 0x36, 0x61, - 0x00, 0x7b, 0xdd, 0x1f, 0x3d, 0x00, 0x7b, 0xe0, - 0x4e, 0xda, 0x00, 0x7c, 0x14, 0x37, 0x5f, 0x00, - 0x7c, 0x3e, 0x1f, 0x2d, 0x00, 0x7c, 0x3f, 0x36, - 0xc2, 0x00, 0x7c, 0x4d, 0x36, 0x36, 0x00, 0x7c, - 0x50, 0x37, 0x61, 0x00, 0x7c, 0x58, 0x37, 0x62, - 0x00, 0x7c, 0x69, 0x56, 0xaa, 0x00, 0x7c, 0x7e, - 0x1e, 0x78, 0x00, 0x7c, 0x82, 0x4f, 0x30, 0x00, - 0x7c, 0x89, 0x34, 0xbe, 0x00, 0x7c, 0x90, 0x1e, - 0xa9, 0x00, 0x7c, 0xae, 0x1e, 0xaa, 0x00, 0x7c, - 0xbe, 0x0a, 0x5e, 0x00, 0x7c, 0xd6, 0x0c, 0x76, - 0x00, 0x7c, 0xf2, 0x35, 0x06, 0x00, 0x7d, 0x04, - 0x36, 0xee, 0x00, 0x7d, 0x09, 0x4e, 0xdc, 0x00, - 0x7d, 0x0b, 0x36, 0xec, 0x00, 0x7d, 0x0d, 0x36, - 0x94, 0x00, 0x7d, 0x1a, 0x35, 0x91, 0x00, 0x7d, - 0x1b, 0x34, 0xbf, 0x00, 0x7d, 0x42, 0x35, 0xf8, - 0x00, 0x7d, 0x46, 0x37, 0x63, 0x00, 0x7d, 0x5c, - 0x21, 0x90, 0x00, 0x7d, 0x5e, 0x34, 0x84, 0x00, - 0x7d, 0x63, 0x37, 0x64, 0x00, 0x7d, 0x73, 0x35, - 0x07, 0x00, 0x7d, 0x9b, 0x1e, 0xab, 0x00, 0x7d, - 0x9f, 0x1e, 0xad, 0x00, 0x7d, 0xae, 0x1e, 0xac, - 0x00, 0x7d, 0xb2, 0x4e, 0xdd, 0x00, 0x7d, 0xcb, - 0x34, 0xb6, 0x00, 0x7d, 0xcf, 0x34, 0xa0, 0x00, - 0x7d, 0xdd, 0x35, 0x08, 0x00, 0x7d, 0xe8, 0x36, - 0xbf, 0x00, 0x7d, 0xe9, 0x35, 0x7a, 0x00, 0x7d, - 0xef, 0x34, 0x62, 0x00, 0x7d, 0xf4, 0x0f, 0xc5, - 0x00, 0x7e, 0x09, 0x47, 0xbe, 0x00, 0x7e, 0x1b, - 0x36, 0x9b, 0x00, 0x7e, 0x22, 0x37, 0x65, 0x00, - 0x7e, 0x2b, 0x36, 0xc8, 0x00, 0x7e, 0x35, 0x35, - 0x09, 0x00, 0x7e, 0x41, 0x34, 0x40, 0x00, 0x7e, - 0x43, 0x37, 0x69, 0x00, 0x7e, 0x6d, 0x36, 0xe1, - 0x00, 0x7e, 0x8c, 0x37, 0x6a, 0x00, 0x7f, 0x3e, - 0x4e, 0xdf, 0x00, 0x7f, 0x50, 0x37, 0x6b, 0x00, - 0x7f, 0x61, 0x3c, 0x28, 0x00, 0x7f, 0x6a, 0x34, - 0x89, 0x00, 0x7f, 0x6e, 0x36, 0x60, 0x00, 0x7f, - 0x72, 0x09, 0x7a, 0x00, 0x7f, 0x80, 0x56, 0xda, - 0x00, 0x7f, 0x8a, 0x0f, 0x3d, 0x00, 0x7f, 0xa1, - 0x36, 0x3d, 0x00, 0x7f, 0xae, 0x35, 0x0a, 0x00, - 0x7f, 0xbd, 0x04, 0xcb, 0x00, 0x7f, 0xc1, 0x34, - 0x6a, 0x00, 0x7f, 0xc5, 0x37, 0x6f, 0x00, 0x7f, - 0xc6, 0x37, 0x70, 0x00, 0x7f, 0xcc, 0x37, 0x01, - 0x00, 0x7f, 0xd2, 0x35, 0xf9, 0x00, 0x7f, 0xd4, - 0x1e, 0xae, 0x00, 0x7f, 0xe0, 0x1e, 0x20, 0x00, - 0x7f, 0xe1, 0x35, 0x0b, 0x00, 0x7f, 0xe9, 0x1f, - 0x3e, 0x00, 0x7f, 0xeb, 0x1d, 0xe9, 0x00, 0x7f, - 0xf0, 0x1d, 0xe8, 0x00, 0x7f, 0xfb, 0x36, 0xd8, - 0x00, 0x7f, 0xfc, 0x34, 0xc8, 0x00, 0x80, 0x00, - 0x1e, 0x7e, 0x00, 0x80, 0x03, 0x34, 0x85, 0x00, - 0x80, 0x05, 0x34, 0x25, 0x00, 0x80, 0x12, 0x4e, - 0xe1, 0x00, 0x80, 0x15, 0x35, 0xca, 0x00, 0x80, - 0x17, 0x36, 0xea, 0x00, 0x80, 0x36, 0x34, 0xc7, - 0x00, 0x80, 0x56, 0x36, 0x2d, 0x00, 0x80, 0x5a, - 0x35, 0x0c, 0x00, 0x80, 0x5f, 0x35, 0x0d, 0x00, - 0x80, 0x61, 0x34, 0xa1, 0x00, 0x80, 0x6f, 0x34, - 0xcd, 0x00, 0x80, 0x70, 0x35, 0x0f, 0x00, 0x80, - 0x71, 0x3c, 0x29, 0x00, 0x80, 0x73, 0x35, 0x0e, - 0x00, 0x80, 0x74, 0x34, 0xa7, 0x00, 0x80, 0x76, - 0x35, 0x10, 0x00, 0x80, 0x77, 0x34, 0x9a, 0x00, - 0x80, 0x7e, 0x34, 0xce, 0x00, 0x80, 0x87, 0x36, - 0x9c, 0x00, 0x80, 0x89, 0x36, 0x8f, 0x00, 0x80, - 0x96, 0x36, 0x0e, 0x00, 0x80, 0x9e, 0x3c, 0x2a, - 0x00, 0x80, 0xa9, 0x35, 0xb8, 0x00, 0x80, 0xba, - 0x36, 0x97, 0x00, 0x80, 0xd6, 0x4e, 0xe3, 0x00, - 0x80, 0xde, 0x36, 0xc9, 0x00, 0x81, 0x06, 0x36, - 0x34, 0x00, 0x81, 0x08, 0x34, 0xc6, 0x00, 0x81, - 0x09, 0x4e, 0xe4, 0x00, 0x81, 0x29, 0x4e, 0xe5, - 0x00, 0x81, 0x53, 0x35, 0x11, 0x00, 0x81, 0x54, - 0x35, 0xcb, 0x00, 0x81, 0x70, 0x35, 0xd1, 0x00, - 0x81, 0x71, 0x4f, 0x33, 0x00, 0x81, 0x7f, 0x1e, - 0x30, 0x00, 0x81, 0x8a, 0x35, 0x12, 0x00, 0x81, - 0xb5, 0x35, 0x13, 0x00, 0x81, 0xcd, 0x35, 0x14, - 0x00, 0x81, 0xed, 0x34, 0x26, 0x00, 0x82, 0x00, - 0x57, 0x0f, 0x00, 0x82, 0x0c, 0x4e, 0xe6, 0x00, - 0x82, 0x18, 0x35, 0x7f, 0x00, 0x82, 0x1b, 0x4e, - 0xe7, 0x00, 0x82, 0x1c, 0x34, 0x93, 0x00, 0x82, - 0x1f, 0x35, 0xb3, 0x00, 0x82, 0x2e, 0x1e, 0xaf, - 0x00, 0x82, 0x39, 0x34, 0x9f, 0x00, 0x82, 0x40, - 0x4e, 0xe8, 0x00, 0x82, 0x47, 0x34, 0xab, 0x00, - 0x82, 0x58, 0x37, 0x74, 0x00, 0x82, 0x79, 0x37, - 0x77, 0x00, 0x82, 0x8d, 0x1e, 0xb0, 0x00, 0x82, - 0x92, 0x4f, 0x44, 0x00, 0x82, 0xa6, 0x1f, 0x19, - 0x00, 0x82, 0xb1, 0x35, 0x62, 0x00, 0x82, 0xbd, - 0x05, 0x6a, 0x00, 0x82, 0xc5, 0x35, 0x77, 0x00, - 0x82, 0xd2, 0x1e, 0xb1, 0x00, 0x82, 0xe3, 0x37, - 0x78, 0x00, 0x83, 0x23, 0x1e, 0xb2, 0x00, 0x83, - 0x28, 0x1f, 0x1a, 0x00, 0x83, 0x52, 0x35, 0xcc, - 0x00, 0x83, 0x75, 0x1e, 0xb3, 0x00, 0x83, 0xbd, - 0x37, 0x7c, 0x00, 0x83, 0xd3, 0x35, 0x63, 0x00, - 0x83, 0xd4, 0x4e, 0xea, 0x00, 0x83, 0xdc, 0x35, - 0xda, 0x00, 0x83, 0xdf, 0x1e, 0x4b, 0x00, 0x83, - 0xf2, 0x35, 0x15, 0x00, 0x84, 0x0c, 0x36, 0xca, - 0x00, 0x84, 0x0f, 0x4e, 0xeb, 0x00, 0x84, 0x20, - 0x37, 0x7b, 0x00, 0x84, 0x22, 0x1f, 0x3f, 0x00, - 0x84, 0x57, 0x34, 0x37, 0x00, 0x84, 0x5b, 0x1d, - 0xe4, 0x00, 0x84, 0x5c, 0x57, 0x45, 0x00, 0x84, - 0x7a, 0x34, 0xba, 0x00, 0x84, 0xea, 0x4e, 0xed, - 0x00, 0x84, 0xec, 0x1e, 0x72, 0x00, 0x84, 0xee, - 0x0f, 0xc7, 0x00, 0x84, 0xf4, 0x37, 0x7d, 0x00, - 0x85, 0x11, 0x36, 0xbd, 0x00, 0x85, 0x17, 0x1e, - 0xb4, 0x00, 0x85, 0x3d, 0x1e, 0x6d, 0x00, 0x85, - 0x43, 0x36, 0xa6, 0x00, 0x85, 0x51, 0x4e, 0xef, - 0x00, 0x85, 0x55, 0x35, 0x16, 0x00, 0x85, 0x5d, - 0x57, 0x64, 0x00, 0x85, 0x63, 0x4e, 0xf0, 0x00, - 0x85, 0x84, 0x36, 0x99, 0x00, 0x85, 0x87, 0x37, - 0x7f, 0x00, 0x85, 0xa9, 0x1e, 0x08, 0x00, 0x85, - 0xaf, 0x1e, 0x15, 0x00, 0x85, 0xcf, 0x4e, 0xf1, - 0x00, 0x85, 0xd5, 0x35, 0x17, 0x00, 0x85, 0xe4, - 0x36, 0x85, 0x00, 0x85, 0xf7, 0x1e, 0x16, 0x00, - 0x86, 0x12, 0x21, 0xa4, 0x00, 0x86, 0x2d, 0x37, - 0x04, 0x00, 0x86, 0x4e, 0x4e, 0xf2, 0x00, 0x86, - 0x50, 0x35, 0x8c, 0x00, 0x86, 0x54, 0x4f, 0x32, - 0x00, 0x86, 0x5c, 0x0f, 0x82, 0x00, 0x86, 0x5e, - 0x35, 0xa6, 0x00, 0x86, 0x62, 0x4e, 0xf3, 0x00, - 0x86, 0x8a, 0x4e, 0xf4, 0x00, 0x86, 0xdb, 0x34, - 0x5e, 0x00, 0x86, 0xf8, 0x1e, 0x35, 0x00, 0x87, - 0x03, 0x4f, 0x48, 0x00, 0x87, 0x1a, 0x35, 0x18, - 0x00, 0x87, 0x37, 0x37, 0x82, 0x00, 0x87, 0x3b, - 0x37, 0x83, 0x00, 0x87, 0x55, 0x1e, 0x1d, 0x00, - 0x87, 0x59, 0x1f, 0x40, 0x00, 0x87, 0x82, 0x1e, - 0xb6, 0x00, 0x87, 0xa3, 0x57, 0xaa, 0x00, 0x87, - 0xbd, 0x37, 0x85, 0x00, 0x87, 0xd2, 0x1e, 0xb7, - 0x00, 0x88, 0x03, 0x3b, 0x03, 0x00, 0x88, 0x05, - 0x37, 0x84, 0x00, 0x88, 0x0e, 0x1f, 0x41, 0x00, - 0x88, 0x36, 0x35, 0x19, 0x00, 0x88, 0x42, 0x4e, - 0xf5, 0x00, 0x88, 0x46, 0x35, 0xfa, 0x00, 0x88, - 0x4b, 0x57, 0xc3, 0x00, 0x88, 0x53, 0x35, 0xfd, - 0x00, 0x88, 0x5b, 0x34, 0x66, 0x00, 0x88, 0x5e, - 0x35, 0x53, 0x00, 0x88, 0x63, 0x35, 0x48, 0x00, - 0x88, 0x70, 0x36, 0x27, 0x00, 0x88, 0x77, 0x4e, - 0xf6, 0x00, 0x88, 0x9e, 0x35, 0x1a, 0x00, 0x88, - 0xd8, 0x35, 0x1b, 0x00, 0x88, 0xf4, 0x35, 0x1c, - 0x00, 0x89, 0x0a, 0x1e, 0xb8, 0x00, 0x89, 0x10, - 0x34, 0x13, 0x00, 0x89, 0x1c, 0x37, 0xcb, 0x00, - 0x89, 0x2b, 0x35, 0x1d, 0x00, 0x89, 0x3b, 0x35, - 0x1e, 0x00, 0x89, 0x41, 0x4e, 0xf7, 0x00, 0x89, - 0x56, 0x1d, 0xdd, 0x00, 0x89, 0x6a, 0x35, 0x1f, - 0x00, 0x89, 0x6f, 0x35, 0x20, 0x00, 0x89, 0x81, - 0x36, 0xff, 0x00, 0x89, 0x86, 0x36, 0xb8, 0x00, - 0x89, 0x87, 0x36, 0x95, 0x00, 0x89, 0x96, 0x34, - 0x22, 0x00, 0x89, 0xaa, 0x34, 0x9b, 0x00, 0x89, - 0xaf, 0x1e, 0xb9, 0x00, 0x89, 0xbd, 0x37, 0x8a, - 0x00, 0x89, 0xd2, 0x05, 0xaf, 0x00, 0x8a, 0x0a, - 0x36, 0x24, 0x00, 0x8a, 0x12, 0x37, 0xd7, 0x00, - 0x8a, 0x1d, 0x35, 0x21, 0x00, 0x8a, 0x1f, 0x34, - 0x96, 0x00, 0x8a, 0x3b, 0x1e, 0x3c, 0x00, 0x8a, - 0x55, 0x36, 0xaf, 0x00, 0x8a, 0x6e, 0x1e, 0x28, - 0x00, 0x8a, 0x8d, 0x36, 0x92, 0x00, 0x8a, 0x95, - 0x34, 0xa3, 0x00, 0x8a, 0xa0, 0x36, 0x2f, 0x00, - 0x8a, 0xa4, 0x35, 0xc2, 0x00, 0x8a, 0xb9, 0x34, - 0xb7, 0x00, 0x8a, 0xbf, 0x36, 0x6d, 0x00, 0x8a, - 0xcb, 0x36, 0x30, 0x00, 0x8a, 0xdb, 0x37, 0x8b, - 0x00, 0x8a, 0xde, 0x1e, 0xba, 0x00, 0x8a, 0xed, - 0x0f, 0x0b, 0x00, 0x8a, 0xee, 0x35, 0xe3, 0x00, - 0x8a, 0xf8, 0x09, 0x7e, 0x00, 0x8a, 0xfa, 0x1d, - 0xfe, 0x00, 0x8b, 0x01, 0x04, 0xfc, 0x00, 0x8b, - 0x04, 0x36, 0x86, 0x00, 0x8b, 0x0e, 0x1e, 0x56, - 0x00, 0x8b, 0x19, 0x35, 0xb9, 0x00, 0x8b, 0x1b, - 0x35, 0xcd, 0x00, 0x8b, 0x1d, 0x34, 0x8d, 0x00, - 0x8b, 0x2c, 0x1e, 0x69, 0x00, 0x8b, 0x39, 0x06, - 0xd8, 0x00, 0x8b, 0x3e, 0x37, 0x8c, 0x00, 0x8b, - 0x41, 0x1e, 0xbb, 0x00, 0x8b, 0x56, 0x4e, 0xf8, - 0x00, 0x8b, 0x5a, 0x37, 0x8d, 0x00, 0x8b, 0x5c, - 0x4e, 0xfa, 0x00, 0x8b, 0x7f, 0x52, 0x52, 0x00, - 0x8c, 0x6a, 0x4e, 0xfd, 0x00, 0x8c, 0x79, 0x4e, - 0xfe, 0x00, 0x8c, 0x9b, 0x58, 0x37, 0x00, 0x8c, - 0xa0, 0x36, 0xb5, 0x00, 0x8c, 0xa7, 0x34, 0xb8, - 0x00, 0x8c, 0xa8, 0x35, 0x64, 0x00, 0x8c, 0xab, - 0x34, 0x72, 0x00, 0x8c, 0xc7, 0x35, 0xe5, 0x00, - 0x8c, 0xca, 0x36, 0x4c, 0x00, 0x8c, 0xd3, 0x0d, - 0xc2, 0x00, 0x8c, 0xed, 0x1e, 0x4c, 0x00, 0x8c, - 0xfc, 0x34, 0x86, 0x00, 0x8d, 0x05, 0x35, 0x22, - 0x00, 0x8d, 0x08, 0x34, 0x34, 0x00, 0x8d, 0x0f, - 0x35, 0x23, 0x00, 0x8d, 0x67, 0x4f, 0x00, 0x00, - 0x8d, 0x70, 0x36, 0x46, 0x00, 0x8d, 0x73, 0x37, - 0x8e, 0x00, 0x8d, 0x77, 0x35, 0x88, 0x00, 0x8d, - 0x99, 0x37, 0x8f, 0x00, 0x8d, 0xda, 0x1e, 0xbc, - 0x00, 0x8d, 0xdd, 0x35, 0x94, 0x00, 0x8d, 0xf3, - 0x34, 0xa8, 0x00, 0x8e, 0x09, 0x1e, 0xbd, 0x00, - 0x8e, 0x34, 0x37, 0x91, 0x00, 0x8e, 0x4a, 0x37, - 0x92, 0x00, 0x8e, 0x8d, 0x36, 0xef, 0x00, 0x8e, - 0x91, 0x35, 0x25, 0x00, 0x8e, 0xa1, 0x35, 0x26, - 0x00, 0x8e, 0xcc, 0x34, 0x76, 0x00, 0x8e, 0xd4, - 0x3b, 0x4a, 0x00, 0x8f, 0x03, 0x4f, 0x02, 0x00, - 0x8f, 0x13, 0x1e, 0xbe, 0x00, 0x8f, 0x29, 0x34, - 0xb0, 0x00, 0x8f, 0x2f, 0x34, 0x90, 0x00, 0x8f, - 0x38, 0x36, 0xf5, 0x00, 0x8f, 0x44, 0x35, 0x75, - 0x00, 0x8f, 0xb6, 0x3c, 0x2b, 0x00, 0x8f, 0xbb, - 0x20, 0x4b, 0x00, 0x8f, 0xbc, 0x35, 0xd3, 0x00, - 0x8f, 0xbf, 0x1e, 0x37, 0x00, 0x8f, 0xc2, 0x1d, - 0xd6, 0x00, 0x8f, 0xc4, 0x1f, 0x2c, 0x00, 0x8f, - 0xc5, 0x36, 0x26, 0x00, 0x8f, 0xc6, 0x3b, 0x51, - 0x00, 0x8f, 0xce, 0x35, 0xae, 0x00, 0x8f, 0xd1, - 0x35, 0xa2, 0x00, 0x8f, 0xd4, 0x36, 0xc0, 0x00, - 0x8f, 0xe6, 0x1d, 0xdf, 0x00, 0x8f, 0xe9, 0x1e, - 0xc0, 0x00, 0x8f, 0xea, 0x1e, 0xbf, 0x00, 0x8f, - 0xeb, 0x36, 0x9a, 0x00, 0x8f, 0xed, 0x36, 0x7b, - 0x00, 0x8f, 0xef, 0x37, 0x93, 0x00, 0x8f, 0xf0, - 0x35, 0xfe, 0x00, 0x8f, 0xf6, 0x4f, 0x06, 0x00, - 0x8f, 0xf7, 0x36, 0xe6, 0x00, 0x8f, 0xfa, 0x37, - 0x95, 0x00, 0x8f, 0xfd, 0x36, 0x72, 0x00, 0x90, - 0x00, 0x36, 0x51, 0x00, 0x90, 0x01, 0x36, 0x47, - 0x00, 0x90, 0x03, 0x34, 0xad, 0x00, 0x90, 0x06, - 0x35, 0x8d, 0x00, 0x90, 0x0e, 0x35, 0x28, 0x00, - 0x90, 0x0f, 0x36, 0x88, 0x00, 0x90, 0x10, 0x36, - 0x64, 0x00, 0x90, 0x14, 0x36, 0x7e, 0x00, 0x90, - 0x17, 0x1e, 0x1f, 0x00, 0x90, 0x19, 0x1e, 0x5c, - 0x00, 0x90, 0x1a, 0x36, 0x73, 0x00, 0x90, 0x1d, - 0x1e, 0x22, 0x00, 0x90, 0x1e, 0x37, 0x96, 0x00, - 0x90, 0x1f, 0x36, 0x4b, 0x00, 0x90, 0x20, 0x36, - 0x49, 0x00, 0x90, 0x22, 0x20, 0x4a, 0x00, 0x90, - 0x23, 0x0f, 0xc8, 0x00, 0x90, 0x2e, 0x36, 0x52, - 0x00, 0x90, 0x31, 0x35, 0xfb, 0x00, 0x90, 0x32, - 0x36, 0x1f, 0x00, 0x90, 0x35, 0x37, 0x97, 0x00, - 0x90, 0x38, 0x34, 0x08, 0x00, 0x90, 0x39, 0x36, - 0x58, 0x00, 0x90, 0x3c, 0x1e, 0x67, 0x00, 0x90, - 0x41, 0x1e, 0x53, 0x00, 0x90, 0x42, 0x34, 0x9c, - 0x00, 0x90, 0x47, 0x35, 0xa8, 0x00, 0x90, 0x4a, - 0x36, 0xfc, 0x00, 0x90, 0x4b, 0x35, 0x51, 0x00, - 0x90, 0x4d, 0x36, 0xc1, 0x00, 0x90, 0x4e, 0x35, - 0x65, 0x00, 0x90, 0x50, 0x37, 0x98, 0x00, 0x90, - 0x52, 0x35, 0x27, 0x00, 0x90, 0x53, 0x36, 0x8b, - 0x00, 0x90, 0x54, 0x36, 0x58, 0x00, 0x90, 0x55, - 0x34, 0x63, 0x00, 0x90, 0x58, 0x1e, 0xc1, 0x00, - 0x90, 0x5c, 0x1e, 0x2e, 0x00, 0x90, 0x60, 0x35, - 0x5a, 0x00, 0x90, 0x61, 0x1e, 0x2a, 0x00, 0x90, - 0x63, 0x35, 0xba, 0x00, 0x90, 0x69, 0x36, 0x7a, - 0x00, 0x90, 0x6d, 0x36, 0x48, 0x00, 0x90, 0x6e, - 0x1e, 0x0e, 0x00, 0x90, 0x75, 0x36, 0x00, 0x00, - 0x90, 0x77, 0x36, 0x40, 0x00, 0x90, 0x78, 0x36, - 0x3f, 0x00, 0x90, 0x7a, 0x35, 0x4a, 0x00, 0x90, - 0x7c, 0x1e, 0x80, 0x00, 0x90, 0x7f, 0x36, 0xa7, - 0x00, 0x90, 0x81, 0x37, 0x9a, 0x00, 0x90, 0x83, - 0x37, 0x5c, 0x00, 0x90, 0x84, 0x35, 0x7c, 0x00, - 0x90, 0x87, 0x37, 0x94, 0x00, 0x90, 0x89, 0x34, - 0x5f, 0x00, 0x90, 0x8a, 0x37, 0x9b, 0x00, 0x90, - 0xa3, 0x1e, 0x55, 0x00, 0x90, 0xa6, 0x36, 0xcb, - 0x00, 0x90, 0xa8, 0x4f, 0x0b, 0x00, 0x90, 0xaa, - 0x34, 0x8e, 0x00, 0x90, 0xf7, 0x35, 0x9d, 0x00, - 0x90, 0xfd, 0x0c, 0x4e, 0x00, 0x91, 0x2d, 0x1e, - 0x44, 0x00, 0x91, 0x30, 0x35, 0x29, 0x00, 0x91, - 0x4b, 0x1e, 0x12, 0x00, 0x91, 0x4c, 0x35, 0xf2, - 0x00, 0x91, 0x4d, 0x4f, 0x0c, 0x00, 0x91, 0x56, - 0x35, 0x2a, 0x00, 0x91, 0x58, 0x35, 0x2b, 0x00, - 0x91, 0x65, 0x35, 0x2c, 0x00, 0x91, 0x72, 0x35, - 0x2e, 0x00, 0x91, 0x73, 0x35, 0x2d, 0x00, 0x91, - 0x77, 0x35, 0xd0, 0x00, 0x91, 0xa2, 0x35, 0x2f, - 0x00, 0x91, 0xaa, 0x35, 0x31, 0x00, 0x91, 0xaf, - 0x35, 0x30, 0x00, 0x91, 0xb1, 0x36, 0x9f, 0x00, - 0x91, 0xb4, 0x35, 0x32, 0x00, 0x91, 0xba, 0x35, - 0x33, 0x00, 0x91, 0xc1, 0x1e, 0xc3, 0x00, 0x91, - 0xc7, 0x1e, 0x05, 0x00, 0x91, 0xdc, 0x4f, 0x42, - 0x00, 0x91, 0xe3, 0x36, 0x75, 0x00, 0x91, 0xfc, - 0x3c, 0x2c, 0x00, 0x92, 0x37, 0x34, 0x7d, 0x00, - 0x92, 0x5b, 0x34, 0x69, 0x00, 0x92, 0xe9, 0x4f, - 0x0d, 0x00, 0x93, 0x06, 0x1e, 0x0a, 0x00, 0x93, - 0x35, 0x4f, 0x0e, 0x00, 0x93, 0x65, 0x3b, 0x86, - 0x00, 0x93, 0x75, 0x4f, 0x34, 0x00, 0x93, 0x8b, - 0x4f, 0x0f, 0x00, 0x93, 0x8c, 0x35, 0x76, 0x00, - 0x93, 0x96, 0x35, 0xd5, 0x00, 0x93, 0x9a, 0x1e, - 0x41, 0x00, 0x93, 0xa1, 0x59, 0x04, 0x00, 0x93, - 0xae, 0x34, 0x3a, 0x00, 0x93, 0xdd, 0x37, 0xae, - 0x00, 0x94, 0x3a, 0x4f, 0x10, 0x00, 0x94, 0x53, - 0x1e, 0x79, 0x00, 0x94, 0x77, 0x35, 0x34, 0x00, - 0x95, 0x92, 0x35, 0x7d, 0x00, 0x95, 0xab, 0x3b, - 0x9a, 0x00, 0x95, 0xbb, 0x1e, 0xc4, 0x00, 0x95, - 0xbc, 0x37, 0xaf, 0x00, 0x95, 0xcd, 0x4f, 0x11, - 0x00, 0x96, 0x2a, 0x4f, 0x12, 0x00, 0x96, 0x4d, - 0x34, 0x87, 0x00, 0x96, 0x86, 0x34, 0x51, 0x00, - 0x96, 0x8a, 0x36, 0x53, 0x00, 0x96, 0x94, 0x35, - 0x73, 0x00, 0x96, 0x98, 0x35, 0x35, 0x00, 0x96, - 0x99, 0x4f, 0x31, 0x00, 0x96, 0xa3, 0x34, 0xca, - 0x00, 0x96, 0xa7, 0x4f, 0x14, 0x00, 0x96, 0xb2, - 0x37, 0xb1, 0x00, 0x96, 0xbb, 0x36, 0x35, 0x00, - 0x96, 0xc5, 0x34, 0x6c, 0x00, 0x96, 0xc7, 0x35, - 0xbe, 0x00, 0x96, 0xd9, 0x34, 0xd5, 0x00, 0x96, - 0xda, 0x59, 0x3b, 0x00, 0x96, 0xe3, 0x0c, 0xc9, - 0x00, 0x96, 0xe8, 0x35, 0x4d, 0x00, 0x96, 0xea, - 0x36, 0x39, 0x00, 0x96, 0xf0, 0x34, 0xc0, 0x00, - 0x97, 0x21, 0x59, 0x41, 0x00, 0x97, 0x24, 0x1e, - 0xc6, 0x00, 0x97, 0x3d, 0x35, 0x36, 0x00, 0x97, - 0x55, 0x21, 0xf8, 0x00, 0x97, 0x56, 0x21, 0x8b, - 0x00, 0x97, 0x59, 0x37, 0xb2, 0x00, 0x97, 0x5c, - 0x36, 0x31, 0x00, 0x97, 0x60, 0x1e, 0xc7, 0x00, - 0x97, 0x6d, 0x1e, 0xc8, 0x00, 0x97, 0x71, 0x1e, - 0x1e, 0x00, 0x97, 0x74, 0x1d, 0xf3, 0x00, 0x97, - 0x84, 0x1d, 0xe5, 0x00, 0x97, 0x98, 0x1e, 0x1c, - 0x00, 0x97, 0xad, 0x4f, 0x43, 0x00, 0x97, 0xd3, - 0x35, 0x7e, 0x00, 0x97, 0xde, 0x3c, 0x2e, 0x00, - 0x97, 0xf3, 0x35, 0x60, 0x00, 0x97, 0xff, 0x34, - 0x19, 0x00, 0x98, 0x0c, 0x35, 0x39, 0x00, 0x98, - 0x11, 0x34, 0x74, 0x00, 0x98, 0x12, 0x34, 0xb2, - 0x00, 0x98, 0x13, 0x1e, 0x54, 0x00, 0x98, 0x24, - 0x1e, 0xc9, 0x00, 0x98, 0x3b, 0x0d, 0xc3, 0x00, - 0x98, 0x5e, 0x0f, 0xa8, 0x00, 0x98, 0x67, 0x35, - 0xbf, 0x00, 0x98, 0x73, 0x35, 0x3a, 0x00, 0x98, - 0xc3, 0x35, 0x3b, 0x00, 0x98, 0xdf, 0x36, 0x17, - 0x00, 0x98, 0xe2, 0x35, 0x89, 0x00, 0x98, 0xeb, - 0x37, 0xb4, 0x00, 0x98, 0xef, 0x0d, 0x67, 0x00, - 0x98, 0xf4, 0x1d, 0xd2, 0x00, 0x98, 0xfc, 0x21, - 0xfc, 0x00, 0x98, 0xfd, 0x36, 0xcd, 0x00, 0x98, - 0xfe, 0x36, 0x14, 0x00, 0x99, 0x03, 0x37, 0xb5, - 0x00, 0x99, 0x05, 0x1e, 0x77, 0x00, 0x99, 0x09, - 0x37, 0xb6, 0x00, 0x99, 0x0a, 0x37, 0x00, 0x00, - 0x99, 0x0c, 0x1d, 0xdb, 0x00, 0x99, 0x10, 0x1f, - 0x22, 0x00, 0x99, 0x13, 0x35, 0x68, 0x00, 0x99, - 0x21, 0x4f, 0x18, 0x00, 0x99, 0x28, 0x21, 0xfe, - 0x00, 0x99, 0x45, 0x37, 0xb7, 0x00, 0x99, 0x4b, - 0x37, 0xb9, 0x00, 0x99, 0x57, 0x1f, 0x20, 0x00, - 0x99, 0xc1, 0x4f, 0x40, 0x00, 0x99, 0xd0, 0x36, - 0x67, 0x00, 0x9a, 0x19, 0x1f, 0x43, 0x00, 0x9a, - 0x30, 0x36, 0x89, 0x00, 0x9a, 0x45, 0x35, 0x3c, - 0x00, 0x9a, 0x4a, 0x59, 0x88, 0x00, 0x9a, 0x5f, - 0x37, 0xbb, 0x00, 0x9a, 0x65, 0x37, 0xbc, 0x00, - 0x9a, 0xef, 0x37, 0xbd, 0x00, 0x9b, 0x18, 0x37, - 0xbe, 0x00, 0x9b, 0x2d, 0x34, 0x3c, 0x00, 0x9b, - 0x2e, 0x1e, 0xca, 0x00, 0x9b, 0x35, 0x59, 0xa4, - 0x00, 0x9b, 0x4d, 0x35, 0x3d, 0x00, 0x9b, 0x54, - 0x36, 0xdb, 0x00, 0x9b, 0x58, 0x35, 0x3e, 0x00, - 0x9b, 0x97, 0x1e, 0xcb, 0x00, 0x9b, 0xa8, 0x4f, - 0x1a, 0x00, 0x9b, 0xab, 0x4f, 0x38, 0x00, 0x9b, - 0xae, 0x4f, 0x1b, 0x00, 0x9b, 0xb9, 0x4f, 0x1c, - 0x00, 0x9b, 0xc6, 0x35, 0x3f, 0x00, 0x9b, 0xd6, - 0x1e, 0x09, 0x00, 0x9b, 0xdb, 0x36, 0x54, 0x00, - 0x9b, 0xe1, 0x35, 0x40, 0x00, 0x9b, 0xf1, 0x35, - 0x41, 0x00, 0x9b, 0xf2, 0x1e, 0xcc, 0x00, 0x9c, - 0x08, 0x4f, 0x1d, 0x00, 0x9c, 0x24, 0x4f, 0x1e, - 0x00, 0x9c, 0x2f, 0x1d, 0xd4, 0x00, 0x9c, 0x3b, - 0x4f, 0x1f, 0x00, 0x9c, 0x48, 0x1e, 0x39, 0x00, - 0x9c, 0x52, 0x1e, 0x74, 0x00, 0x9c, 0x57, 0x37, - 0x0c, 0x00, 0x9c, 0xe6, 0x4f, 0x21, 0x00, 0x9d, - 0x07, 0x1e, 0x4f, 0x00, 0x9d, 0x08, 0x37, 0xc1, - 0x00, 0x9d, 0x09, 0x37, 0xc0, 0x00, 0x9d, 0x48, - 0x35, 0x42, 0x00, 0x9d, 0x60, 0x1e, 0x03, 0x00, - 0x9d, 0x6c, 0x36, 0xce, 0x00, 0x9d, 0xb4, 0x0b, - 0xfd, 0x00, 0x9d, 0xbf, 0x59, 0xde, 0x00, 0x9d, - 0xc0, 0x4f, 0x22, 0x00, 0x9d, 0xc2, 0x4f, 0x23, - 0x00, 0x9d, 0xcf, 0x35, 0x43, 0x00, 0x9e, 0x97, - 0x34, 0xcc, 0x00, 0x9e, 0x9f, 0x34, 0xcb, 0x00, - 0x9e, 0xa5, 0x37, 0xc2, 0x00, 0x9e, 0xaa, 0x1e, - 0xcd, 0x00, 0x9e, 0xad, 0x1f, 0x44, 0x00, 0x9e, - 0xbb, 0x36, 0xdc, 0x00, 0x9e, 0xbf, 0x36, 0xe2, - 0x00, 0x9e, 0xcc, 0x37, 0xc3, 0x00, 0x9e, 0xdb, - 0x1e, 0x31, 0x00, 0x9f, 0x08, 0x35, 0x44, 0x00, - 0x9f, 0x3b, 0x36, 0xa9, 0x00, 0x9f, 0x4a, 0x37, - 0xc5, 0x00, 0x9f, 0x4b, 0x37, 0x5a, 0x00, 0x9f, - 0x4e, 0x35, 0x24, 0x00, 0x9f, 0x67, 0x37, 0xc7, - 0x00, 0x9f, 0x8d, 0x37, 0x06, 0x00, 0x9f, 0x9c, - 0x1e, 0xce, 0x00, 0x9f, 0x9d, 0x1e, 0xa7, 0x00, - 0xfa, 0x11, 0x20, 0xfb, 0x00, 0xfa, 0x24, 0x21, - 0xb8, 0x02, 0x35, 0xc4, 0x3c, 0x44, 0x02, 0x36, - 0x3a, 0x35, 0x9b, 0x02, 0x38, 0x3d, 0x4f, 0x26, - 0x02, 0x42, 0xee, 0x37, 0xc9, 0x02, 0x62, 0x70, - 0x37, 0x6e, 0x02, 0x9d, 0x4b, 0x35, 0x96, 0x02, - 0x9e, 0x3d, 0x3c, 0x4d, 0x02, 0xa6, 0x1a, 0x37, - 0xc8, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x34, 0x02, - 0x35, 0x83, 0x00, 0x50, 0x91, 0x35, 0xaf, 0x00, - 0x50, 0xca, 0x37, 0x15, 0x00, 0x51, 0x54, 0x37, - 0x17, 0x00, 0x51, 0x95, 0x37, 0x18, 0x00, 0x51, - 0xb4, 0x35, 0xdb, 0x00, 0x51, 0xde, 0x38, 0x10, - 0x00, 0x52, 0x72, 0x4e, 0x76, 0x00, 0x53, 0x7f, - 0x1d, 0xed, 0x00, 0x53, 0xa9, 0x1f, 0x1c, 0x00, - 0x55, 0x33, 0x37, 0x21, 0x00, 0x55, 0xa9, 0x34, - 0xd6, 0x00, 0x55, 0xab, 0x4e, 0x7c, 0x00, 0x55, - 0xe4, 0x37, 0x22, 0x00, 0x56, 0xae, 0x4e, 0x7e, - 0x00, 0x57, 0xf4, 0x36, 0x13, 0x00, 0x58, 0x5a, - 0x20, 0xe6, 0x00, 0x59, 0x51, 0x4e, 0x88, 0x00, - 0x59, 0xff, 0x35, 0xe1, 0x00, 0x5a, 0xbe, 0x34, - 0xdc, 0x00, 0x5b, 0xb3, 0x35, 0x6b, 0x00, 0x5c, - 0x0a, 0x36, 0x4e, 0x00, 0x5c, 0x0f, 0x36, 0x0a, - 0x00, 0x5e, 0xca, 0x34, 0x59, 0x00, 0x5e, 0xe3, - 0x4e, 0x93, 0x00, 0x5e, 0xf6, 0x35, 0x56, 0x00, - 0x60, 0x62, 0x4f, 0x2d, 0x00, 0x60, 0x97, 0x37, - 0x30, 0x00, 0x61, 0x67, 0x35, 0xad, 0x00, 0x61, - 0x68, 0x34, 0x6e, 0x00, 0x61, 0xb2, 0x4e, 0x98, - 0x00, 0x61, 0xf2, 0x36, 0x6a, 0x00, 0x62, 0x49, - 0x34, 0xb4, 0x00, 0x66, 0x5f, 0x37, 0x38, 0x00, - 0x66, 0xc1, 0x4e, 0xac, 0x00, 0x67, 0x15, 0x36, - 0x70, 0x00, 0x67, 0x17, 0x21, 0x29, 0x00, 0x67, - 0x1b, 0x36, 0xd5, 0x00, 0x68, 0x5d, 0x36, 0xde, - 0x00, 0x68, 0x7a, 0x36, 0xf1, 0x00, 0x69, 0x0d, - 0x36, 0x15, 0x00, 0x69, 0x82, 0x34, 0x6f, 0x00, - 0x6a, 0xdb, 0x35, 0xa9, 0x00, 0x6b, 0x21, 0x35, - 0xe8, 0x00, 0x6c, 0x08, 0x34, 0xf4, 0x00, 0x6c, - 0xaa, 0x4e, 0xbb, 0x00, 0x6c, 0xbf, 0x34, 0x68, - 0x00, 0x6c, 0xe8, 0x32, 0x45, 0x00, 0x6d, 0x3e, - 0x36, 0x96, 0x00, 0x6e, 0x23, 0x34, 0xf6, 0x00, - 0x6e, 0xa2, 0x52, 0x4f, 0x00, 0x6e, 0xcb, 0x4e, - 0xc1, 0x00, 0x6f, 0x11, 0x37, 0x45, 0x00, 0x6f, - 0x5b, 0x4e, 0xc5, 0x00, 0x71, 0x7d, 0x1f, 0x24, - 0x00, 0x72, 0x35, 0x35, 0xf0, 0x00, 0x73, 0x36, - 0x36, 0xf9, 0x00, 0x73, 0x37, 0x36, 0xfa, 0x00, - 0x73, 0xca, 0x4e, 0xcc, 0x00, 0x75, 0x11, 0x35, - 0xd2, 0x00, 0x75, 0x15, 0x4f, 0x2b, 0x00, 0x79, - 0x53, 0x37, 0x59, 0x00, 0x7a, 0x74, 0x35, 0xb1, - 0x00, 0x7b, 0x08, 0x4f, 0x27, 0x00, 0x7b, 0xc0, - 0x36, 0x37, 0x00, 0x7c, 0x3e, 0x4f, 0x29, 0x00, - 0x7c, 0x50, 0x4e, 0xdb, 0x00, 0x7c, 0x7e, 0x4f, - 0x45, 0x00, 0x7d, 0xb2, 0x4e, 0xde, 0x00, 0x7e, - 0x22, 0x37, 0x66, 0x00, 0x7e, 0x35, 0x37, 0x68, - 0x00, 0x7f, 0xc1, 0x35, 0x5e, 0x00, 0x7f, 0xe1, - 0x4e, 0xe0, 0x00, 0x7f, 0xe9, 0x37, 0x71, 0x00, - 0x7f, 0xfc, 0x37, 0x02, 0x00, 0x81, 0x08, 0x36, - 0xe3, 0x00, 0x82, 0x39, 0x36, 0x3e, 0x00, 0x82, - 0x79, 0x37, 0x76, 0x00, 0x82, 0xbd, 0x34, 0x6b, - 0x00, 0x83, 0xdf, 0x1f, 0x28, 0x00, 0x85, 0x3d, - 0x34, 0xc1, 0x00, 0x86, 0x12, 0x52, 0x51, 0x00, - 0x87, 0xd2, 0x1f, 0x42, 0x00, 0x88, 0x05, 0x4f, - 0x47, 0x00, 0x88, 0x36, 0x37, 0x87, 0x00, 0x8a, - 0x0a, 0x36, 0x25, 0x00, 0x8a, 0x1d, 0x4f, 0x2c, - 0x00, 0x8a, 0x95, 0x36, 0x5d, 0x00, 0x8a, 0xee, - 0x35, 0xe4, 0x00, 0x8b, 0x56, 0x4e, 0xf9, 0x00, - 0x8c, 0xa0, 0x36, 0xb6, 0x00, 0x8c, 0xc7, 0x35, - 0xe6, 0x00, 0x8c, 0xca, 0x4e, 0xff, 0x00, 0x8c, - 0xfc, 0x35, 0xce, 0x00, 0x8f, 0x44, 0x4f, 0x03, - 0x00, 0x8f, 0xc5, 0x4f, 0x04, 0x00, 0x8f, 0xd4, - 0x4f, 0x05, 0x00, 0x90, 0x03, 0x36, 0x87, 0x00, - 0x90, 0x22, 0x34, 0x60, 0x00, 0x90, 0x38, 0x21, - 0xb9, 0x00, 0x90, 0x41, 0x4f, 0x3f, 0x00, 0x90, - 0x42, 0x36, 0x28, 0x00, 0x90, 0x55, 0x35, 0x49, - 0x00, 0x90, 0x75, 0x36, 0x01, 0x00, 0x90, 0x77, - 0x4f, 0x07, 0x00, 0x90, 0x89, 0x37, 0xa1, 0x00, - 0x90, 0x8a, 0x37, 0x9c, 0x00, 0x90, 0xa6, 0x36, - 0xcc, 0x00, 0x90, 0xaa, 0x35, 0xee, 0x00, 0x92, - 0x5b, 0x35, 0x5b, 0x00, 0x96, 0x86, 0x21, 0xee, - 0x00, 0x96, 0x98, 0x4f, 0x13, 0x00, 0x96, 0xa3, - 0x37, 0x0b, 0x00, 0x96, 0xc5, 0x35, 0x67, 0x00, - 0x97, 0x5c, 0x36, 0x32, 0x00, 0x97, 0x60, 0x35, - 0x37, 0x00, 0x97, 0x6d, 0x1f, 0x23, 0x00, 0x97, - 0x71, 0x35, 0x38, 0x00, 0x97, 0xff, 0x35, 0x9e, - 0x00, 0x98, 0xef, 0x4f, 0x25, 0x00, 0x99, 0x0c, - 0x34, 0x65, 0x00, 0x99, 0x45, 0x37, 0xb8, 0x00, - 0x99, 0x57, 0x35, 0x9f, 0x00, 0x9e, 0x9f, 0x37, - 0x0d, 0x00, 0x9f, 0x08, 0x37, 0xc4, 0x00, 0x9f, - 0x8d, 0x37, 0x07, 0x02, 0x36, 0x3a, 0x35, 0x9c, - 0x00, 0x00, 0x00, 0x11, 0x00, 0x51, 0xde, 0x4e, - 0x71, 0x00, 0x53, 0xa9, 0x34, 0x64, 0x00, 0x56, - 0xae, 0x4e, 0x7f, 0x00, 0x5b, 0xb3, 0x4e, 0x8f, - 0x00, 0x61, 0x68, 0x35, 0x6c, 0x00, 0x61, 0xf2, - 0x52, 0x50, 0x00, 0x66, 0x5f, 0x37, 0x39, 0x00, - 0x67, 0x17, 0x37, 0x12, 0x00, 0x69, 0x82, 0x35, - 0x70, 0x00, 0x75, 0x11, 0x4f, 0x3c, 0x00, 0x83, - 0xdf, 0x4e, 0xe9, 0x00, 0x90, 0x77, 0x4f, 0x08, - 0x00, 0x90, 0x89, 0x37, 0xa2, 0x00, 0x90, 0x8a, - 0x37, 0x9d, 0x00, 0x97, 0xff, 0x4f, 0x15, 0x00, - 0x99, 0x0c, 0x35, 0x52, 0x00, 0x99, 0x57, 0x4f, - 0x19, 0x00, 0x00, 0x00, 0x06, 0x00, 0x51, 0xde, - 0x21, 0x5e, 0x00, 0x53, 0xa9, 0x35, 0x4f, 0x00, - 0x61, 0x68, 0x35, 0x6d, 0x00, 0x90, 0x89, 0x37, - 0xa3, 0x00, 0x90, 0x8a, 0x37, 0x9e, 0x00, 0x97, - 0xff, 0x4f, 0x16, 0x00, 0x00, 0x00, 0x04, 0x00, - 0x53, 0xa9, 0x4f, 0x2f, 0x00, 0x61, 0x68, 0x35, - 0x6e, 0x00, 0x90, 0x89, 0x37, 0xa4, 0x00, 0x90, - 0x8a, 0x37, 0x9f, 0x00, 0x00, 0x00, 0x02, 0x00, - 0x90, 0x89, 0x37, 0xa5, 0x00, 0x90, 0x8a, 0x37, - 0xa0, 0x00, 0x00, 0x00, 0x02, 0x00, 0x90, 0x89, - 0x37, 0xa6, 0x00, 0x90, 0x8a, 0x4f, 0x0a, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x90, 0x89, 0x37, 0xa7, + 0x37, 0xc6, 0x02, 0xd5, 0x44, 0x36, 0x0a, 0x02, + 0xe2, 0x78, 0x37, 0x6b, 0x02, 0xe5, 0x69, 0x36, + 0x27, 0x02, 0xe6, 0xea, 0x37, 0x92, 0x00, 0x00, + 0x04, 0xb7, 0x00, 0x34, 0x02, 0x35, 0x81, 0x00, + 0x4e, 0x08, 0x34, 0x97, 0x00, 0x4e, 0x0e, 0x4e, + 0x69, 0x00, 0x4e, 0x19, 0x36, 0xb9, 0x00, 0x4e, + 0x26, 0x4e, 0x6a, 0x00, 0x4e, 0x30, 0x3c, 0x1a, + 0x00, 0x4e, 0x39, 0x36, 0x5a, 0x00, 0x4e, 0x3b, + 0x35, 0xf4, 0x00, 0x4e, 0x73, 0x36, 0x90, 0x00, + 0x4e, 0xa1, 0x36, 0xcf, 0x00, 0x4e, 0xa4, 0x34, + 0x7f, 0x00, 0x4e, 0xca, 0x35, 0xd4, 0x00, 0x4f, + 0x34, 0x36, 0xa0, 0x00, 0x4f, 0x4f, 0x35, 0xfc, + 0x00, 0x4f, 0x60, 0x3c, 0x1c, 0x00, 0x4f, 0x73, + 0x4e, 0x6c, 0x00, 0x4f, 0x75, 0x34, 0x47, 0x00, + 0x4f, 0x7f, 0x34, 0x8a, 0x00, 0x4f, 0xae, 0x34, + 0x46, 0x00, 0x4f, 0xb5, 0x36, 0x1b, 0x00, 0x4f, + 0xbf, 0x34, 0xc2, 0x00, 0x50, 0x24, 0x36, 0x5f, + 0x00, 0x50, 0x26, 0x1d, 0xfa, 0x00, 0x50, 0x49, + 0x34, 0x61, 0x00, 0x50, 0x4f, 0x36, 0xbe, 0x00, + 0x50, 0x56, 0x4e, 0x6d, 0x00, 0x50, 0x65, 0x34, + 0x7b, 0x00, 0x50, 0x85, 0x34, 0xd0, 0x00, 0x50, + 0x91, 0x34, 0x79, 0x00, 0x50, 0xc5, 0x1d, 0xee, + 0x00, 0x50, 0xca, 0x1f, 0x2e, 0x00, 0x50, 0xcf, + 0x34, 0xa2, 0x00, 0x50, 0xe7, 0x34, 0x30, 0x00, + 0x50, 0xed, 0x4e, 0x6e, 0x00, 0x50, 0xf2, 0x52, + 0xac, 0x00, 0x51, 0x1a, 0x37, 0x16, 0x00, 0x51, + 0x32, 0x1e, 0x76, 0x00, 0x51, 0x46, 0x34, 0xa5, + 0x00, 0x51, 0x4d, 0x34, 0x4d, 0x00, 0x51, 0x4e, + 0x36, 0x7d, 0x00, 0x51, 0x54, 0x10, 0x74, 0x00, + 0x51, 0x68, 0x36, 0x42, 0x00, 0x51, 0x6b, 0x4e, + 0x6f, 0x00, 0x51, 0x6c, 0x34, 0x80, 0x00, 0x51, + 0x77, 0x35, 0xa5, 0x00, 0x51, 0x7c, 0x35, 0xb4, + 0x00, 0x51, 0x89, 0x1e, 0x87, 0x00, 0x51, 0x8d, + 0x08, 0x36, 0x00, 0x51, 0x92, 0x36, 0xd6, 0x00, + 0x51, 0x93, 0x34, 0xd1, 0x00, 0x51, 0x95, 0x10, + 0x82, 0x00, 0x51, 0xa4, 0x1e, 0x89, 0x00, 0x51, + 0xac, 0x0c, 0x59, 0x00, 0x51, 0xb4, 0x34, 0x5c, + 0x00, 0x51, 0xcb, 0x1e, 0x3e, 0x00, 0x51, 0xdb, + 0x34, 0xd2, 0x00, 0x51, 0xde, 0x4f, 0x53, 0x00, + 0x51, 0xe1, 0x36, 0xd9, 0x00, 0x51, 0xfd, 0x4e, + 0x72, 0x00, 0x52, 0x03, 0x36, 0x22, 0x00, 0x52, + 0x06, 0x34, 0xbb, 0x00, 0x52, 0x24, 0x36, 0xa1, + 0x00, 0x52, 0x38, 0x35, 0xb5, 0x00, 0x52, 0x4a, + 0x35, 0xdd, 0x00, 0x52, 0x4d, 0x36, 0x41, 0x00, + 0x52, 0x64, 0x4e, 0x74, 0x00, 0x52, 0x71, 0x4e, + 0x75, 0x00, 0x52, 0x72, 0x05, 0xc2, 0x00, 0x52, + 0x75, 0x1e, 0x2b, 0x00, 0x52, 0x8d, 0x37, 0x1a, + 0x00, 0x52, 0xc7, 0x36, 0xf6, 0x00, 0x52, 0xc9, + 0x0e, 0x29, 0x00, 0x52, 0xd7, 0x37, 0x1b, 0x00, + 0x52, 0xdd, 0x36, 0x05, 0x00, 0x52, 0xe2, 0x36, + 0x2a, 0x00, 0x52, 0xe4, 0x34, 0x1a, 0x00, 0x52, + 0xfa, 0x09, 0x07, 0x00, 0x53, 0x00, 0x37, 0xcf, + 0x00, 0x53, 0x05, 0x36, 0xc3, 0x00, 0x53, 0x07, + 0x20, 0xd4, 0x00, 0x53, 0x15, 0x1f, 0x2f, 0x00, + 0x53, 0x16, 0x35, 0x61, 0x00, 0x53, 0x39, 0x36, + 0xaa, 0x00, 0x53, 0x3f, 0x4e, 0x77, 0x00, 0x53, + 0x40, 0x34, 0xd4, 0x00, 0x53, 0x4a, 0x36, 0xa2, + 0x00, 0x53, 0x51, 0x0d, 0x70, 0x00, 0x53, 0x5a, + 0x36, 0x98, 0x00, 0x53, 0x65, 0x52, 0xf3, 0x00, + 0x53, 0x71, 0x35, 0x80, 0x00, 0x53, 0x78, 0x35, + 0x5f, 0x00, 0x53, 0x7f, 0x06, 0xa2, 0x00, 0x53, + 0xa9, 0x1d, 0xd8, 0x00, 0x53, 0xc9, 0x4f, 0x39, + 0x00, 0x53, 0xca, 0x35, 0x8e, 0x00, 0x53, 0xce, + 0x34, 0x8f, 0x00, 0x53, 0xd7, 0x35, 0xf5, 0x00, + 0x53, 0xdb, 0x1f, 0x2a, 0x00, 0x53, 0xdf, 0x37, + 0x1f, 0x00, 0x53, 0xe0, 0x53, 0x00, 0x00, 0x53, + 0xf1, 0x1e, 0x0c, 0x00, 0x53, 0xf2, 0x34, 0x8b, + 0x00, 0x54, 0x0f, 0x34, 0xc9, 0x00, 0x54, 0x38, + 0x35, 0x8f, 0x00, 0x54, 0x40, 0x4e, 0x79, 0x00, + 0x54, 0x48, 0x36, 0x76, 0x00, 0x54, 0x68, 0x09, + 0x2a, 0x00, 0x54, 0xac, 0x4f, 0x35, 0x00, 0x54, + 0xb2, 0x35, 0xdc, 0x00, 0x54, 0xe8, 0x1e, 0x17, + 0x00, 0x55, 0x10, 0x36, 0x83, 0x00, 0x55, 0x33, + 0x1e, 0x8b, 0x00, 0x55, 0x39, 0x1e, 0x8a, 0x00, + 0x55, 0x44, 0x1e, 0x32, 0x00, 0x55, 0x46, 0x36, + 0x06, 0x00, 0x55, 0x53, 0x35, 0xaa, 0x00, 0x55, + 0x61, 0x38, 0x39, 0x00, 0x55, 0x84, 0x4e, 0x5e, + 0x00, 0x55, 0x9c, 0x4e, 0x7b, 0x00, 0x55, 0x9d, + 0x1d, 0xe3, 0x00, 0x55, 0xa9, 0x1f, 0x30, 0x00, + 0x55, 0xab, 0x35, 0x8b, 0x00, 0x55, 0xb0, 0x1d, + 0xf0, 0x00, 0x55, 0xe4, 0x1e, 0x8c, 0x00, 0x56, + 0x05, 0x53, 0x2d, 0x00, 0x56, 0x06, 0x0b, 0x70, + 0x00, 0x56, 0x09, 0x4e, 0x7d, 0x00, 0x56, 0x32, + 0x1e, 0x8d, 0x00, 0x56, 0x42, 0x1d, 0xda, 0x00, + 0x56, 0x4c, 0x1e, 0x29, 0x00, 0x56, 0x68, 0x34, + 0x15, 0x00, 0x56, 0x74, 0x34, 0xbc, 0x00, 0x56, + 0x78, 0x1e, 0x52, 0x00, 0x56, 0xa5, 0x1e, 0x8e, + 0x00, 0x56, 0xae, 0x1f, 0x31, 0x00, 0x56, 0xc0, + 0x37, 0x24, 0x00, 0x56, 0xc1, 0x34, 0xd7, 0x00, + 0x56, 0xce, 0x4e, 0x82, 0x00, 0x56, 0xee, 0x4e, + 0x83, 0x00, 0x57, 0x0d, 0x34, 0xd8, 0x00, 0x57, + 0x47, 0x34, 0x78, 0x00, 0x57, 0x6a, 0x36, 0x74, + 0x00, 0x57, 0xce, 0x09, 0xd3, 0x00, 0x57, 0xd6, + 0x4e, 0x84, 0x00, 0x57, 0xf4, 0x34, 0x98, 0x00, + 0x58, 0x0b, 0x1e, 0x8f, 0x00, 0x58, 0x19, 0x1f, + 0x32, 0x00, 0x58, 0x35, 0x1e, 0x49, 0x00, 0x58, + 0x3d, 0x4e, 0x85, 0x00, 0x58, 0x40, 0x34, 0x48, + 0x00, 0x58, 0x58, 0x1e, 0x4d, 0x00, 0x58, 0x59, + 0x4e, 0x86, 0x00, 0x58, 0x5a, 0x1e, 0x42, 0x00, + 0x58, 0x9c, 0x36, 0x71, 0x00, 0x58, 0xa8, 0x0e, + 0x7d, 0x00, 0x58, 0xab, 0x34, 0xd9, 0x00, 0x59, + 0x06, 0x53, 0x7b, 0x00, 0x59, 0x1b, 0x1f, 0x33, + 0x00, 0x59, 0x27, 0x36, 0x55, 0x00, 0x59, 0x4f, + 0x4e, 0x87, 0x00, 0x59, 0x51, 0x35, 0xab, 0x00, + 0x59, 0x53, 0x37, 0xd1, 0x00, 0x59, 0x60, 0x4e, + 0x89, 0x00, 0x59, 0x62, 0x4e, 0x8a, 0x00, 0x59, + 0x73, 0x36, 0x04, 0x00, 0x59, 0x84, 0x36, 0xe7, + 0x00, 0x59, 0xa5, 0x36, 0x4f, 0x00, 0x59, 0xc9, + 0x34, 0x8c, 0x00, 0x59, 0xda, 0x34, 0xda, 0x00, + 0x59, 0xec, 0x36, 0xae, 0x00, 0x59, 0xff, 0x35, + 0xe0, 0x00, 0x5a, 0x1c, 0x37, 0x26, 0x00, 0x5a, + 0x29, 0x1e, 0x6f, 0x00, 0x5a, 0x36, 0x34, 0xdb, + 0x00, 0x5a, 0x66, 0x36, 0xb2, 0x00, 0x5a, 0x9b, + 0x1e, 0x68, 0x00, 0x5a, 0xbe, 0x1e, 0x90, 0x00, + 0x5a, 0xc2, 0x37, 0x27, 0x00, 0x5a, 0xcc, 0x1d, + 0xfb, 0x00, 0x5a, 0xda, 0x4e, 0x8b, 0x00, 0x5b, + 0x5a, 0x4e, 0x8c, 0x00, 0x5b, 0x73, 0x4e, 0x8d, + 0x00, 0x5b, 0x7c, 0x4e, 0x8e, 0x00, 0x5b, 0xb3, + 0x34, 0x6d, 0x00, 0x5b, 0xb5, 0x36, 0x07, 0x00, + 0x5b, 0xc3, 0x37, 0x29, 0x00, 0x5b, 0xd2, 0x35, + 0x78, 0x00, 0x5b, 0xdb, 0x20, 0xf4, 0x00, 0x5b, + 0xe7, 0x0c, 0xe1, 0x00, 0x5b, 0xe8, 0x37, 0x42, + 0x00, 0x5c, 0x06, 0x09, 0x95, 0x00, 0x5c, 0x0a, + 0x36, 0x4d, 0x00, 0x5c, 0x0b, 0x36, 0x23, 0x00, + 0x5c, 0x0e, 0x36, 0x8a, 0x00, 0x5c, 0x0f, 0x36, + 0x09, 0x00, 0x5c, 0x28, 0x1f, 0x34, 0x00, 0x5c, + 0x51, 0x1d, 0xf2, 0x00, 0x5c, 0x60, 0x1e, 0x4a, + 0x00, 0x5c, 0x64, 0x34, 0x31, 0x00, 0x5c, 0x6e, + 0x12, 0x32, 0x00, 0x5d, 0x29, 0x36, 0xc4, 0x00, + 0x5d, 0x4e, 0x34, 0xdd, 0x00, 0x5d, 0x87, 0x34, + 0xde, 0x00, 0x5d, 0xb2, 0x3c, 0x2d, 0x00, 0x5d, + 0xc9, 0x34, 0xdf, 0x00, 0x5d, 0xcc, 0x34, 0x73, + 0x00, 0x5d, 0xd3, 0x34, 0xe0, 0x00, 0x5d, 0xe1, + 0x35, 0xff, 0x00, 0x5d, 0xe5, 0x35, 0xc3, 0x00, + 0x5d, 0xe8, 0x35, 0x92, 0x00, 0x5d, 0xf7, 0x1d, + 0xff, 0x00, 0x5d, 0xfd, 0x0b, 0x65, 0x00, 0x5e, + 0x06, 0x36, 0xa3, 0x00, 0x5e, 0x1d, 0x36, 0x77, + 0x00, 0x5e, 0x30, 0x34, 0x75, 0x00, 0x5e, 0x3d, + 0x36, 0xd0, 0x00, 0x5e, 0x43, 0x4e, 0x91, 0x00, + 0x5e, 0x54, 0x37, 0x2d, 0x00, 0x5e, 0x63, 0x36, + 0xba, 0x00, 0x5e, 0x64, 0x1e, 0x93, 0x00, 0x5e, + 0x73, 0x36, 0xbb, 0x00, 0x5e, 0x7e, 0x35, 0x84, + 0x00, 0x5e, 0x96, 0x1e, 0x70, 0x00, 0x5e, 0xa7, + 0x4e, 0x92, 0x00, 0x5e, 0xad, 0x34, 0xa9, 0x00, + 0x5e, 0xc9, 0x0f, 0xbf, 0x00, 0x5e, 0xca, 0x4f, + 0x4f, 0x00, 0x5e, 0xcb, 0x38, 0xae, 0x00, 0x5e, + 0xcf, 0x1f, 0x36, 0x00, 0x5e, 0xd0, 0x1f, 0x35, + 0x00, 0x5e, 0xdf, 0x1e, 0x6a, 0x00, 0x5e, 0xe0, + 0x1e, 0x18, 0x00, 0x5e, 0xe3, 0x37, 0x2f, 0x00, + 0x5e, 0xf6, 0x34, 0x67, 0x00, 0x5e, 0xf7, 0x34, + 0xaa, 0x00, 0x5e, 0xfa, 0x34, 0x7c, 0x00, 0x5e, + 0xfb, 0x35, 0x69, 0x00, 0x5f, 0x0a, 0x36, 0xbc, + 0x00, 0x5f, 0x2d, 0x34, 0xe1, 0x00, 0x5f, 0x31, + 0x35, 0xf3, 0x00, 0x5f, 0x38, 0x4e, 0x94, 0x00, + 0x5f, 0x45, 0x37, 0xce, 0x00, 0x5f, 0x50, 0x3c, + 0x1f, 0x00, 0x5f, 0x62, 0x4e, 0x5f, 0x00, 0x5f, + 0x69, 0x35, 0xd7, 0x00, 0x5f, 0x6b, 0x36, 0x68, + 0x00, 0x5f, 0x80, 0x35, 0x5d, 0x00, 0x5f, 0x98, + 0x34, 0xe2, 0x00, 0x5f, 0xa1, 0x4e, 0x95, 0x00, + 0x5f, 0xae, 0x36, 0xa8, 0x00, 0x5f, 0xb5, 0x36, + 0x69, 0x00, 0x5f, 0xbd, 0x1d, 0xea, 0x00, 0x5f, + 0xcd, 0x36, 0x91, 0x00, 0x5f, 0xd8, 0x36, 0xd1, + 0x00, 0x5f, 0xd9, 0x36, 0xd2, 0x00, 0x5f, 0xdd, + 0x4e, 0x96, 0x00, 0x60, 0x25, 0x35, 0x90, 0x00, + 0x60, 0x50, 0x35, 0x99, 0x00, 0x60, 0x62, 0x1d, + 0xe0, 0x00, 0x60, 0x65, 0x34, 0xa4, 0x00, 0x60, + 0x75, 0x35, 0xac, 0x00, 0x60, 0x94, 0x05, 0x79, + 0x00, 0x60, 0x97, 0x1e, 0x94, 0x00, 0x60, 0x9e, + 0x54, 0x36, 0x00, 0x60, 0xa4, 0x3c, 0x20, 0x00, + 0x60, 0xb2, 0x34, 0xb3, 0x00, 0x60, 0xc5, 0x36, + 0x12, 0x00, 0x60, 0xd8, 0x34, 0xe3, 0x00, 0x61, + 0x08, 0x1e, 0x7a, 0x00, 0x61, 0x09, 0x36, 0xf3, + 0x00, 0x61, 0x0f, 0x35, 0x47, 0x00, 0x61, 0x3d, + 0x34, 0xe4, 0x00, 0x61, 0x48, 0x4e, 0x60, 0x00, + 0x61, 0x4c, 0x35, 0xc4, 0x00, 0x61, 0x4e, 0x34, + 0x2c, 0x00, 0x61, 0x62, 0x4e, 0x97, 0x00, 0x61, + 0x67, 0x1d, 0xf5, 0x00, 0x61, 0x68, 0x34, 0x10, + 0x00, 0x61, 0x8e, 0x0b, 0x00, 0x00, 0x61, 0x90, + 0x37, 0x10, 0x00, 0x61, 0xa4, 0x34, 0xbd, 0x00, + 0x61, 0xb2, 0x35, 0xb6, 0x00, 0x61, 0xf2, 0x34, + 0x39, 0x00, 0x61, 0xf8, 0x4e, 0x99, 0x00, 0x61, + 0xfe, 0x34, 0xe5, 0x00, 0x62, 0x10, 0x36, 0x2b, + 0x00, 0x62, 0x3b, 0x36, 0xeb, 0x00, 0x62, 0x3f, + 0x36, 0xd3, 0x00, 0x62, 0x40, 0x36, 0x02, 0x00, + 0x62, 0x41, 0x1f, 0x37, 0x00, 0x62, 0x47, 0x36, + 0x3b, 0x00, 0x62, 0x48, 0x1e, 0xc2, 0x00, 0x62, + 0x49, 0x1e, 0x63, 0x00, 0x62, 0x68, 0x34, 0xe6, + 0x00, 0x62, 0x71, 0x35, 0x45, 0x00, 0x62, 0xb1, + 0x36, 0xc5, 0x00, 0x62, 0xcc, 0x37, 0x32, 0x00, + 0x62, 0xcf, 0x34, 0xe7, 0x00, 0x62, 0xd0, 0x1d, + 0xe1, 0x00, 0x62, 0xd2, 0x35, 0x93, 0x00, 0x62, + 0xd4, 0x13, 0x5d, 0x00, 0x62, 0xf3, 0x1f, 0x21, + 0x00, 0x62, 0xf7, 0x34, 0x88, 0x00, 0x63, 0x3a, + 0x4f, 0x3e, 0x00, 0x63, 0x3d, 0x1e, 0x62, 0x00, + 0x63, 0x4c, 0x34, 0x5d, 0x00, 0x63, 0x57, 0x1e, + 0x3f, 0x00, 0x63, 0x67, 0x34, 0xc3, 0x00, 0x63, + 0x68, 0x35, 0xec, 0x00, 0x63, 0x69, 0x1e, 0x95, + 0x00, 0x63, 0x6e, 0x34, 0x9d, 0x00, 0x63, 0x72, + 0x1d, 0xfc, 0x00, 0x63, 0x83, 0x36, 0x43, 0x00, + 0x63, 0x88, 0x35, 0xf6, 0x00, 0x63, 0x92, 0x34, + 0xaf, 0x00, 0x63, 0xa1, 0x35, 0xd8, 0x00, 0x63, + 0xa7, 0x35, 0xc6, 0x00, 0x63, 0xc3, 0x1f, 0x27, + 0x00, 0x63, 0xc6, 0x37, 0x34, 0x00, 0x63, 0xf4, + 0x35, 0x57, 0x00, 0x64, 0x06, 0x1e, 0x96, 0x00, + 0x64, 0x0f, 0x34, 0xe9, 0x00, 0x64, 0x1c, 0x37, + 0x33, 0x00, 0x64, 0x28, 0x37, 0x35, 0x00, 0x64, + 0x42, 0x34, 0x9e, 0x00, 0x64, 0x69, 0x36, 0xd7, + 0x00, 0x64, 0x6f, 0x4f, 0x28, 0x00, 0x64, 0x7a, + 0x1e, 0x21, 0x00, 0x64, 0xb0, 0x1e, 0x24, 0x00, + 0x64, 0xe2, 0x1e, 0x45, 0x00, 0x64, 0xf2, 0x34, + 0xea, 0x00, 0x64, 0xf6, 0x4e, 0x9e, 0x00, 0x65, + 0x1d, 0x34, 0xe8, 0x00, 0x65, 0x4f, 0x0d, 0xc4, + 0x00, 0x65, 0x5d, 0x34, 0xeb, 0x00, 0x65, 0x5e, + 0x4e, 0xa1, 0x00, 0x65, 0x62, 0x34, 0x71, 0x00, + 0x65, 0x77, 0x36, 0xb3, 0x00, 0x65, 0x83, 0x1e, + 0x98, 0x00, 0x65, 0x87, 0x4e, 0xa3, 0x00, 0x65, + 0x89, 0x4e, 0xa4, 0x00, 0x65, 0x8e, 0x4e, 0xa6, + 0x00, 0x65, 0x90, 0x34, 0xb5, 0x00, 0x65, 0x9c, + 0x35, 0xed, 0x00, 0x65, 0xa7, 0x4f, 0x41, 0x00, + 0x65, 0xbc, 0x35, 0x5c, 0x00, 0x65, 0xc5, 0x37, + 0x08, 0x00, 0x65, 0xdf, 0x54, 0xbe, 0x00, 0x65, + 0xe1, 0x4e, 0xa9, 0x00, 0x65, 0xe2, 0x06, 0x37, + 0x00, 0x66, 0x0e, 0x36, 0xe4, 0x00, 0x66, 0x1e, + 0x21, 0x1c, 0x00, 0x66, 0x5f, 0x34, 0xec, 0x00, + 0x66, 0x66, 0x1d, 0xe2, 0x00, 0x66, 0x67, 0x4e, + 0xaa, 0x00, 0x66, 0x69, 0x36, 0xa5, 0x00, 0x66, + 0x6e, 0x4e, 0xab, 0x00, 0x66, 0x74, 0x0a, 0x56, + 0x00, 0x66, 0x77, 0x39, 0x11, 0x00, 0x66, 0x81, + 0x35, 0xa0, 0x00, 0x66, 0x91, 0x34, 0x28, 0x00, + 0x66, 0x96, 0x36, 0x5e, 0x00, 0x66, 0x97, 0x35, + 0x46, 0x00, 0x66, 0xb5, 0x54, 0xda, 0x00, 0x66, + 0xc1, 0x1f, 0x38, 0x00, 0x66, 0xd9, 0x1e, 0x13, + 0x00, 0x66, 0xdc, 0x36, 0xfd, 0x00, 0x66, 0xf4, + 0x34, 0x81, 0x00, 0x66, 0xf5, 0x37, 0x3b, 0x00, + 0x66, 0xf8, 0x36, 0x03, 0x00, 0x66, 0xfb, 0x37, + 0xcd, 0x00, 0x66, 0xfc, 0x37, 0x20, 0x00, 0x67, + 0x00, 0x4e, 0xaf, 0x00, 0x67, 0x08, 0x35, 0xb2, + 0x00, 0x67, 0x09, 0x36, 0xf7, 0x00, 0x67, 0x0b, + 0x36, 0xc6, 0x00, 0x67, 0x0d, 0x36, 0xb7, 0x00, + 0x67, 0x15, 0x36, 0x6f, 0x00, 0x67, 0x17, 0x0f, + 0xd5, 0x00, 0x67, 0x1b, 0x36, 0xd4, 0x00, 0x67, + 0x1d, 0x36, 0x6b, 0x00, 0x67, 0x1f, 0x35, 0x86, + 0x00, 0x67, 0x53, 0x1e, 0x0f, 0x00, 0x67, 0x56, + 0x4f, 0x3a, 0x00, 0x67, 0x5e, 0x37, 0x3c, 0x00, + 0x67, 0x61, 0x4e, 0xb0, 0x00, 0x67, 0x7e, 0x34, + 0x95, 0x00, 0x67, 0xa6, 0x1e, 0x99, 0x00, 0x67, + 0xa9, 0x34, 0xed, 0x00, 0x67, 0xc4, 0x4e, 0xb1, + 0x00, 0x67, 0xca, 0x1e, 0x65, 0x00, 0x67, 0xd4, + 0x34, 0x91, 0x00, 0x67, 0xe7, 0x34, 0xee, 0x00, + 0x67, 0xf1, 0x36, 0x65, 0x00, 0x68, 0x01, 0x21, + 0x2e, 0x00, 0x68, 0x02, 0x4e, 0xb2, 0x00, 0x68, + 0x13, 0x1e, 0x25, 0x00, 0x68, 0x1f, 0x4e, 0x61, + 0x00, 0x68, 0x21, 0x34, 0x82, 0x00, 0x68, 0x43, + 0x34, 0xac, 0x00, 0x68, 0x52, 0x21, 0x2c, 0x00, + 0x68, 0x5d, 0x34, 0xc5, 0x00, 0x68, 0x7a, 0x36, + 0xf0, 0x00, 0x68, 0x81, 0x37, 0x09, 0x00, 0x68, + 0x85, 0x0d, 0x15, 0x00, 0x68, 0x8d, 0x37, 0x3e, + 0x00, 0x68, 0x97, 0x4f, 0x37, 0x00, 0x68, 0x9b, + 0x1e, 0x9b, 0x00, 0x68, 0x9d, 0x37, 0x3d, 0x00, + 0x68, 0xa2, 0x1e, 0x19, 0x00, 0x68, 0xc8, 0x37, + 0xcc, 0x00, 0x68, 0xda, 0x1e, 0x38, 0x00, 0x69, + 0x0d, 0x34, 0x99, 0x00, 0x69, 0x30, 0x34, 0xf0, + 0x00, 0x69, 0x3d, 0x4e, 0xb3, 0x00, 0x69, 0x5e, + 0x4e, 0xb4, 0x00, 0x69, 0x62, 0x1e, 0x58, 0x00, + 0x69, 0x6b, 0x34, 0xef, 0x00, 0x69, 0x6f, 0x34, + 0x94, 0x00, 0x69, 0x82, 0x34, 0x5b, 0x00, 0x69, + 0x8a, 0x1e, 0x06, 0x00, 0x69, 0x94, 0x1e, 0x84, + 0x00, 0x69, 0xa7, 0x34, 0xf1, 0x00, 0x69, 0xbb, + 0x37, 0x43, 0x00, 0x69, 0xc1, 0x35, 0x9a, 0x00, + 0x69, 0xcb, 0x35, 0xc7, 0x00, 0x69, 0xcc, 0x1e, + 0x40, 0x00, 0x69, 0xd9, 0x36, 0xdd, 0x00, 0x69, + 0xea, 0x35, 0x6f, 0x00, 0x69, 0xfe, 0x55, 0x1f, + 0x00, 0x6a, 0x0b, 0x1e, 0x64, 0x00, 0x6a, 0x3d, + 0x1e, 0x3a, 0x00, 0x6a, 0x44, 0x34, 0xf2, 0x00, + 0x6a, 0x55, 0x55, 0x25, 0x00, 0x6a, 0x5f, 0x35, + 0x87, 0x00, 0x6a, 0x73, 0x37, 0xd4, 0x00, 0x6a, + 0x8e, 0x34, 0x7e, 0x00, 0x6a, 0x90, 0x34, 0xf3, + 0x00, 0x6a, 0x9c, 0x4e, 0xb6, 0x00, 0x6a, 0xdb, + 0x06, 0xf3, 0x00, 0x6b, 0x04, 0x0f, 0x5d, 0x00, + 0x6b, 0x1d, 0x1d, 0xd7, 0x00, 0x6b, 0x21, 0x35, + 0xe7, 0x00, 0x6b, 0x24, 0x3c, 0x22, 0x00, 0x6b, + 0x4e, 0x36, 0x5b, 0x00, 0x6b, 0x96, 0x36, 0x16, + 0x00, 0x6b, 0xba, 0x08, 0x74, 0x00, 0x6b, 0xbb, + 0x34, 0x70, 0x00, 0x6c, 0x08, 0x1f, 0x39, 0x00, + 0x6c, 0x13, 0x34, 0xf5, 0x00, 0x6c, 0x38, 0x4e, + 0xba, 0x00, 0x6c, 0x3a, 0x39, 0x62, 0x00, 0x6c, + 0x72, 0x1f, 0x1e, 0x00, 0x6c, 0xaa, 0x37, 0x48, + 0x00, 0x6c, 0xbf, 0x05, 0x0a, 0x00, 0x6c, 0xe1, + 0x1e, 0x71, 0x00, 0x6c, 0xe8, 0x36, 0x66, 0x00, + 0x6d, 0x3e, 0x34, 0xae, 0x00, 0x6d, 0x69, 0x35, + 0xc8, 0x00, 0x6d, 0x6e, 0x36, 0xb4, 0x00, 0x6d, + 0x77, 0x05, 0x82, 0x00, 0x6d, 0x78, 0x36, 0x1d, + 0x00, 0x6d, 0x88, 0x36, 0x0c, 0x00, 0x6d, 0xe4, + 0x4e, 0xbd, 0x00, 0x6d, 0xeb, 0x1d, 0xd5, 0x00, + 0x6d, 0xfb, 0x36, 0x7c, 0x00, 0x6e, 0x08, 0x4e, + 0xbf, 0x00, 0x6e, 0x1a, 0x09, 0x77, 0x00, 0x6e, + 0x23, 0x1f, 0x3a, 0x00, 0x6e, 0x2f, 0x35, 0xc9, + 0x00, 0x6e, 0x6e, 0x1e, 0x9d, 0x00, 0x6e, 0x72, + 0x4e, 0xc0, 0x00, 0x6e, 0x7e, 0x34, 0xcf, 0x00, + 0x6e, 0x9d, 0x1e, 0x01, 0x00, 0x6e, 0xa2, 0x1d, + 0xd3, 0x00, 0x6e, 0xba, 0x1e, 0x46, 0x00, 0x6e, + 0xcb, 0x35, 0xe9, 0x00, 0x6e, 0xd5, 0x4e, 0xc2, + 0x00, 0x6e, 0xdb, 0x4e, 0xc3, 0x00, 0x6e, 0xec, + 0x1f, 0x3b, 0x00, 0x6e, 0xfe, 0x34, 0xf8, 0x00, + 0x6f, 0x11, 0x34, 0xf7, 0x00, 0x6f, 0x22, 0x34, + 0x14, 0x00, 0x6f, 0x23, 0x0f, 0xc2, 0x00, 0x6f, + 0x3e, 0x34, 0xf9, 0x00, 0x6f, 0x51, 0x36, 0x9e, + 0x00, 0x6f, 0x54, 0x35, 0xb0, 0x00, 0x6f, 0x5b, + 0x4e, 0xc4, 0x00, 0x6f, 0x64, 0x4e, 0xc6, 0x00, + 0x6f, 0x6e, 0x0b, 0xc8, 0x00, 0x6f, 0x74, 0x4e, + 0xc7, 0x00, 0x6f, 0x98, 0x37, 0x47, 0x00, 0x6f, + 0xef, 0x1e, 0x33, 0x00, 0x6f, 0xf9, 0x39, 0x95, + 0x00, 0x70, 0x15, 0x1e, 0x6b, 0x00, 0x70, 0x1b, + 0x37, 0x4a, 0x00, 0x70, 0x1e, 0x1e, 0x51, 0x00, + 0x70, 0x26, 0x1e, 0x3d, 0x00, 0x70, 0x27, 0x36, + 0x57, 0x00, 0x70, 0x4a, 0x39, 0x98, 0x00, 0x70, + 0x58, 0x1e, 0x57, 0x00, 0x70, 0x70, 0x35, 0x6a, + 0x00, 0x70, 0x78, 0x4f, 0x2e, 0x00, 0x70, 0x7c, + 0x1e, 0x10, 0x00, 0x70, 0xad, 0x36, 0x5c, 0x00, + 0x71, 0x49, 0x0f, 0xc3, 0x00, 0x71, 0x4e, 0x1e, + 0x26, 0x00, 0x71, 0x52, 0x55, 0xad, 0x00, 0x71, + 0x59, 0x35, 0x59, 0x00, 0x71, 0x62, 0x37, 0x4b, + 0x00, 0x71, 0x6e, 0x08, 0xfd, 0x00, 0x71, 0x7d, + 0x1e, 0x27, 0x00, 0x71, 0x94, 0x1e, 0x7d, 0x00, + 0x71, 0xb3, 0x39, 0xae, 0x00, 0x71, 0xd0, 0x37, + 0x0a, 0x00, 0x71, 0xff, 0x34, 0xfa, 0x00, 0x72, + 0x28, 0x15, 0xdf, 0x00, 0x72, 0x2b, 0x3c, 0x26, + 0x00, 0x72, 0x35, 0x09, 0x0b, 0x00, 0x72, 0x36, + 0x34, 0xb9, 0x00, 0x72, 0x3a, 0x4f, 0x46, 0x00, + 0x72, 0x3b, 0x37, 0x4c, 0x00, 0x72, 0x3e, 0x4e, + 0xc9, 0x00, 0x72, 0x4c, 0x1e, 0x5b, 0x00, 0x72, + 0x59, 0x1f, 0x1d, 0x00, 0x72, 0xe1, 0x4f, 0x36, + 0x00, 0x73, 0x1c, 0x37, 0x4e, 0x00, 0x73, 0x2a, + 0x0b, 0xb4, 0x00, 0x73, 0x36, 0x36, 0xf8, 0x00, + 0x73, 0x37, 0x1e, 0x7c, 0x00, 0x73, 0x87, 0x37, + 0x05, 0x00, 0x73, 0x8b, 0x35, 0xa1, 0x00, 0x73, + 0xca, 0x1e, 0x0b, 0x00, 0x73, 0xce, 0x1e, 0xa0, + 0x00, 0x73, 0xe5, 0x34, 0xfb, 0x00, 0x73, 0xed, + 0x34, 0xb1, 0x00, 0x74, 0x22, 0x0b, 0x56, 0x00, + 0x74, 0x32, 0x34, 0xfc, 0x00, 0x74, 0x5f, 0x34, + 0xfd, 0x00, 0x74, 0x62, 0x21, 0x71, 0x00, 0x74, + 0xb0, 0x35, 0x79, 0x00, 0x74, 0xbd, 0x4e, 0xcd, + 0x00, 0x74, 0xca, 0x37, 0x4f, 0x00, 0x74, 0xd8, + 0x55, 0xf6, 0x00, 0x74, 0xdc, 0x35, 0x50, 0x00, + 0x74, 0xe0, 0x34, 0xfe, 0x00, 0x74, 0xef, 0x55, + 0xfa, 0x00, 0x75, 0x04, 0x1e, 0xa1, 0x00, 0x75, + 0x0c, 0x34, 0xff, 0x00, 0x75, 0x0d, 0x1e, 0xa2, + 0x00, 0x75, 0x11, 0x1e, 0x04, 0x00, 0x75, 0x15, + 0x1e, 0xa3, 0x00, 0x75, 0x26, 0x4f, 0x3b, 0x00, + 0x75, 0x54, 0x36, 0xa4, 0x00, 0x75, 0x5d, 0x4e, + 0xce, 0x00, 0x75, 0xbc, 0x4e, 0xcf, 0x00, 0x75, + 0xc5, 0x36, 0xb1, 0x00, 0x76, 0x08, 0x4e, 0xd1, + 0x00, 0x76, 0x26, 0x1e, 0x2d, 0x00, 0x76, 0x52, + 0x1e, 0x7b, 0x00, 0x76, 0x64, 0x4e, 0xd2, 0x00, + 0x76, 0x69, 0x4e, 0xd3, 0x00, 0x76, 0x72, 0x35, + 0x00, 0x00, 0x76, 0x84, 0x36, 0x79, 0x00, 0x76, + 0x93, 0x1e, 0xa4, 0x00, 0x76, 0xc6, 0x34, 0xc4, + 0x00, 0x76, 0xca, 0x21, 0x7b, 0x00, 0x76, 0xd4, + 0x56, 0x1d, 0x00, 0x76, 0xdb, 0x36, 0x2c, 0x00, + 0x76, 0xdf, 0x36, 0xe5, 0x00, 0x76, 0xf2, 0x36, + 0xe9, 0x00, 0x76, 0xf4, 0x36, 0x6e, 0x00, 0x77, + 0x1e, 0x16, 0xb8, 0x00, 0x77, 0x1f, 0x36, 0x1e, + 0x00, 0x77, 0x37, 0x4e, 0xd5, 0x00, 0x77, 0x3a, + 0x34, 0xa6, 0x00, 0x77, 0x7e, 0x4e, 0xd6, 0x00, + 0x77, 0x8d, 0x56, 0x2e, 0x00, 0x77, 0xa2, 0x56, + 0x2f, 0x00, 0x77, 0xa5, 0x1e, 0x6e, 0x00, 0x77, + 0xac, 0x34, 0x92, 0x00, 0x77, 0xe9, 0x35, 0xa4, + 0x00, 0x78, 0x32, 0x36, 0xc7, 0x00, 0x78, 0x3a, + 0x36, 0x7f, 0x00, 0x78, 0x5d, 0x36, 0x0d, 0x00, + 0x78, 0x6c, 0x34, 0x83, 0x00, 0x78, 0x7c, 0x1e, + 0xa5, 0x00, 0x78, 0x91, 0x0d, 0x7e, 0x00, 0x78, + 0xd4, 0x35, 0x02, 0x00, 0x78, 0xe8, 0x36, 0xda, + 0x00, 0x78, 0xef, 0x35, 0x4b, 0x00, 0x79, 0x2a, + 0x35, 0x01, 0x00, 0x79, 0x34, 0x3a, 0x38, 0x00, + 0x79, 0x3a, 0x08, 0xd4, 0x00, 0x79, 0x3c, 0x21, + 0x83, 0x00, 0x79, 0x3e, 0x34, 0x24, 0x00, 0x79, + 0x40, 0x37, 0x57, 0x00, 0x79, 0x41, 0x1d, 0xf4, + 0x00, 0x79, 0x47, 0x1d, 0xeb, 0x00, 0x79, 0x48, + 0x06, 0x41, 0x00, 0x79, 0x49, 0x34, 0x21, 0x00, + 0x79, 0x50, 0x0f, 0x1e, 0x00, 0x79, 0x53, 0x37, + 0x58, 0x00, 0x79, 0x56, 0x34, 0x2f, 0x00, 0x79, + 0x5d, 0x09, 0x55, 0x00, 0x79, 0x5e, 0x0a, 0x06, + 0x00, 0x79, 0x62, 0x1f, 0x29, 0x00, 0x79, 0x65, + 0x09, 0xb5, 0x00, 0x79, 0x8d, 0x05, 0x52, 0x00, + 0x79, 0x8e, 0x34, 0x3b, 0x00, 0x79, 0x8f, 0x21, + 0x87, 0x00, 0x79, 0xa7, 0x4e, 0xd7, 0x00, 0x79, + 0xae, 0x37, 0x5b, 0x00, 0x79, 0xb0, 0x1e, 0x59, + 0x00, 0x79, 0xb1, 0x4e, 0xd8, 0x00, 0x79, 0xba, + 0x35, 0x03, 0x00, 0x79, 0xe4, 0x1e, 0x5d, 0x00, + 0x7a, 0x0b, 0x36, 0x78, 0x00, 0x7a, 0x17, 0x1e, + 0x66, 0x00, 0x7a, 0x19, 0x35, 0x04, 0x00, 0x7a, + 0x31, 0x1e, 0xa6, 0x00, 0x7a, 0x40, 0x08, 0x04, + 0x00, 0x7a, 0x60, 0x3a, 0x4e, 0x00, 0x7a, 0x74, + 0x34, 0x7a, 0x00, 0x7a, 0x7a, 0x35, 0xa7, 0x00, + 0x7a, 0x7f, 0x1f, 0x25, 0x00, 0x7a, 0x81, 0x34, + 0x3d, 0x00, 0x7a, 0x95, 0x35, 0x05, 0x00, 0x7a, + 0x97, 0x1f, 0x3c, 0x00, 0x7a, 0xae, 0x34, 0x77, + 0x00, 0x7a, 0xbe, 0x4e, 0xd9, 0x00, 0x7a, 0xc6, + 0x3c, 0x27, 0x00, 0x7a, 0xc8, 0x4f, 0x3d, 0x00, + 0x7b, 0x08, 0x1f, 0x1f, 0x00, 0x7b, 0x51, 0x36, + 0x63, 0x00, 0x7b, 0x75, 0x4f, 0x2a, 0x00, 0x7b, + 0x99, 0x1e, 0xa8, 0x00, 0x7b, 0xad, 0x1f, 0x26, + 0x00, 0x7b, 0xb8, 0x1e, 0x5f, 0x00, 0x7b, 0xc0, + 0x34, 0x2e, 0x00, 0x7b, 0xc7, 0x1f, 0x2b, 0x00, + 0x7b, 0xc9, 0x36, 0x61, 0x00, 0x7b, 0xdd, 0x1f, + 0x3d, 0x00, 0x7b, 0xe0, 0x4e, 0xda, 0x00, 0x7c, + 0x14, 0x37, 0x5f, 0x00, 0x7c, 0x3e, 0x1f, 0x2d, + 0x00, 0x7c, 0x3f, 0x36, 0xc2, 0x00, 0x7c, 0x4d, + 0x36, 0x36, 0x00, 0x7c, 0x50, 0x37, 0x61, 0x00, + 0x7c, 0x58, 0x37, 0x62, 0x00, 0x7c, 0x69, 0x56, + 0xaa, 0x00, 0x7c, 0x7e, 0x1e, 0x78, 0x00, 0x7c, + 0x82, 0x4f, 0x30, 0x00, 0x7c, 0x89, 0x34, 0xbe, + 0x00, 0x7c, 0x90, 0x1e, 0xa9, 0x00, 0x7c, 0xae, + 0x1e, 0xaa, 0x00, 0x7c, 0xbe, 0x0a, 0x5e, 0x00, + 0x7c, 0xd6, 0x0c, 0x76, 0x00, 0x7c, 0xf2, 0x35, + 0x06, 0x00, 0x7d, 0x04, 0x36, 0xee, 0x00, 0x7d, + 0x09, 0x4e, 0xdc, 0x00, 0x7d, 0x0b, 0x36, 0xec, + 0x00, 0x7d, 0x0d, 0x36, 0x94, 0x00, 0x7d, 0x1a, + 0x35, 0x91, 0x00, 0x7d, 0x1b, 0x34, 0xbf, 0x00, + 0x7d, 0x42, 0x35, 0xf8, 0x00, 0x7d, 0x46, 0x37, + 0x63, 0x00, 0x7d, 0x5c, 0x21, 0x90, 0x00, 0x7d, + 0x5e, 0x34, 0x84, 0x00, 0x7d, 0x63, 0x37, 0x64, + 0x00, 0x7d, 0x73, 0x35, 0x07, 0x00, 0x7d, 0x9b, + 0x1e, 0xab, 0x00, 0x7d, 0x9f, 0x1e, 0xad, 0x00, + 0x7d, 0xae, 0x1e, 0xac, 0x00, 0x7d, 0xb2, 0x4e, + 0xdd, 0x00, 0x7d, 0xcb, 0x34, 0xb6, 0x00, 0x7d, + 0xcf, 0x34, 0xa0, 0x00, 0x7d, 0xdd, 0x35, 0x08, + 0x00, 0x7d, 0xe8, 0x36, 0xbf, 0x00, 0x7d, 0xe9, + 0x35, 0x7a, 0x00, 0x7d, 0xef, 0x34, 0x62, 0x00, + 0x7d, 0xf4, 0x0f, 0xc5, 0x00, 0x7e, 0x09, 0x47, + 0xbe, 0x00, 0x7e, 0x1b, 0x36, 0x9b, 0x00, 0x7e, + 0x22, 0x37, 0x65, 0x00, 0x7e, 0x2b, 0x36, 0xc8, + 0x00, 0x7e, 0x35, 0x35, 0x09, 0x00, 0x7e, 0x41, + 0x34, 0x40, 0x00, 0x7e, 0x43, 0x37, 0x69, 0x00, + 0x7e, 0x6d, 0x36, 0xe1, 0x00, 0x7e, 0x8c, 0x37, + 0x6a, 0x00, 0x7f, 0x3e, 0x4e, 0xdf, 0x00, 0x7f, + 0x50, 0x37, 0x6b, 0x00, 0x7f, 0x61, 0x3c, 0x28, + 0x00, 0x7f, 0x6a, 0x34, 0x89, 0x00, 0x7f, 0x6e, + 0x36, 0x60, 0x00, 0x7f, 0x72, 0x09, 0x7a, 0x00, + 0x7f, 0x80, 0x56, 0xda, 0x00, 0x7f, 0x8a, 0x0f, + 0x3d, 0x00, 0x7f, 0xa1, 0x36, 0x3d, 0x00, 0x7f, + 0xae, 0x35, 0x0a, 0x00, 0x7f, 0xbd, 0x04, 0xcb, + 0x00, 0x7f, 0xc1, 0x34, 0x6a, 0x00, 0x7f, 0xc5, + 0x37, 0x6f, 0x00, 0x7f, 0xc6, 0x37, 0x70, 0x00, + 0x7f, 0xcc, 0x37, 0x01, 0x00, 0x7f, 0xd2, 0x35, + 0xf9, 0x00, 0x7f, 0xd4, 0x1e, 0xae, 0x00, 0x7f, + 0xe0, 0x1e, 0x20, 0x00, 0x7f, 0xe1, 0x35, 0x0b, + 0x00, 0x7f, 0xe9, 0x1f, 0x3e, 0x00, 0x7f, 0xeb, + 0x1d, 0xe9, 0x00, 0x7f, 0xf0, 0x1d, 0xe8, 0x00, + 0x7f, 0xfb, 0x36, 0xd8, 0x00, 0x7f, 0xfc, 0x34, + 0xc8, 0x00, 0x80, 0x00, 0x1e, 0x7e, 0x00, 0x80, + 0x03, 0x34, 0x85, 0x00, 0x80, 0x05, 0x34, 0x25, + 0x00, 0x80, 0x12, 0x4e, 0xe1, 0x00, 0x80, 0x15, + 0x35, 0xca, 0x00, 0x80, 0x17, 0x36, 0xea, 0x00, + 0x80, 0x36, 0x34, 0xc7, 0x00, 0x80, 0x56, 0x36, + 0x2d, 0x00, 0x80, 0x5a, 0x35, 0x0c, 0x00, 0x80, + 0x5f, 0x35, 0x0d, 0x00, 0x80, 0x61, 0x34, 0xa1, + 0x00, 0x80, 0x6f, 0x34, 0xcd, 0x00, 0x80, 0x70, + 0x35, 0x0f, 0x00, 0x80, 0x71, 0x3c, 0x29, 0x00, + 0x80, 0x73, 0x35, 0x0e, 0x00, 0x80, 0x74, 0x34, + 0xa7, 0x00, 0x80, 0x76, 0x35, 0x10, 0x00, 0x80, + 0x77, 0x34, 0x9a, 0x00, 0x80, 0x7e, 0x34, 0xce, + 0x00, 0x80, 0x87, 0x36, 0x9c, 0x00, 0x80, 0x89, + 0x36, 0x8f, 0x00, 0x80, 0x96, 0x36, 0x0e, 0x00, + 0x80, 0x9e, 0x3c, 0x2a, 0x00, 0x80, 0xa9, 0x35, + 0xb8, 0x00, 0x80, 0xba, 0x36, 0x97, 0x00, 0x80, + 0xd6, 0x4e, 0xe3, 0x00, 0x80, 0xde, 0x36, 0xc9, + 0x00, 0x81, 0x06, 0x36, 0x34, 0x00, 0x81, 0x08, + 0x34, 0xc6, 0x00, 0x81, 0x09, 0x4e, 0xe4, 0x00, + 0x81, 0x29, 0x4e, 0xe5, 0x00, 0x81, 0x53, 0x35, + 0x11, 0x00, 0x81, 0x54, 0x35, 0xcb, 0x00, 0x81, + 0x70, 0x35, 0xd1, 0x00, 0x81, 0x71, 0x4f, 0x33, + 0x00, 0x81, 0x7f, 0x1e, 0x30, 0x00, 0x81, 0x8a, + 0x35, 0x12, 0x00, 0x81, 0xb5, 0x35, 0x13, 0x00, + 0x81, 0xcd, 0x35, 0x14, 0x00, 0x81, 0xed, 0x34, + 0x26, 0x00, 0x82, 0x00, 0x57, 0x0f, 0x00, 0x82, + 0x0c, 0x4e, 0xe6, 0x00, 0x82, 0x18, 0x35, 0x7f, + 0x00, 0x82, 0x1b, 0x4e, 0xe7, 0x00, 0x82, 0x1c, + 0x34, 0x93, 0x00, 0x82, 0x1f, 0x35, 0xb3, 0x00, + 0x82, 0x2e, 0x1e, 0xaf, 0x00, 0x82, 0x39, 0x34, + 0x9f, 0x00, 0x82, 0x40, 0x4e, 0xe8, 0x00, 0x82, + 0x47, 0x34, 0xab, 0x00, 0x82, 0x58, 0x37, 0x74, + 0x00, 0x82, 0x79, 0x37, 0x77, 0x00, 0x82, 0x8d, + 0x1e, 0xb0, 0x00, 0x82, 0x92, 0x4f, 0x44, 0x00, + 0x82, 0xa6, 0x1f, 0x19, 0x00, 0x82, 0xb1, 0x35, + 0x62, 0x00, 0x82, 0xbd, 0x05, 0x6a, 0x00, 0x82, + 0xc5, 0x35, 0x77, 0x00, 0x82, 0xd2, 0x1e, 0xb1, + 0x00, 0x82, 0xe3, 0x37, 0x78, 0x00, 0x83, 0x23, + 0x1e, 0xb2, 0x00, 0x83, 0x28, 0x1f, 0x1a, 0x00, + 0x83, 0x52, 0x35, 0xcc, 0x00, 0x83, 0x75, 0x1e, + 0xb3, 0x00, 0x83, 0xbd, 0x37, 0x7c, 0x00, 0x83, + 0xd3, 0x35, 0x63, 0x00, 0x83, 0xd4, 0x4e, 0xea, + 0x00, 0x83, 0xdc, 0x35, 0xda, 0x00, 0x83, 0xdf, + 0x1e, 0x4b, 0x00, 0x83, 0xf2, 0x35, 0x15, 0x00, + 0x84, 0x0c, 0x36, 0xca, 0x00, 0x84, 0x0f, 0x4e, + 0xeb, 0x00, 0x84, 0x20, 0x37, 0x7b, 0x00, 0x84, + 0x22, 0x1f, 0x3f, 0x00, 0x84, 0x57, 0x34, 0x37, + 0x00, 0x84, 0x5b, 0x1d, 0xe4, 0x00, 0x84, 0x5c, + 0x57, 0x45, 0x00, 0x84, 0x7a, 0x34, 0xba, 0x00, + 0x84, 0xea, 0x4e, 0xed, 0x00, 0x84, 0xec, 0x1e, + 0x72, 0x00, 0x84, 0xee, 0x0f, 0xc7, 0x00, 0x84, + 0xf4, 0x37, 0x7d, 0x00, 0x85, 0x11, 0x36, 0xbd, + 0x00, 0x85, 0x17, 0x1e, 0xb4, 0x00, 0x85, 0x3d, + 0x1e, 0x6d, 0x00, 0x85, 0x43, 0x36, 0xa6, 0x00, + 0x85, 0x51, 0x4e, 0xef, 0x00, 0x85, 0x55, 0x35, + 0x16, 0x00, 0x85, 0x5d, 0x57, 0x64, 0x00, 0x85, + 0x63, 0x4e, 0xf0, 0x00, 0x85, 0x84, 0x36, 0x99, + 0x00, 0x85, 0x87, 0x37, 0x7f, 0x00, 0x85, 0xa9, + 0x1e, 0x08, 0x00, 0x85, 0xaf, 0x1e, 0x15, 0x00, + 0x85, 0xcf, 0x4e, 0xf1, 0x00, 0x85, 0xd5, 0x35, + 0x17, 0x00, 0x85, 0xe4, 0x36, 0x85, 0x00, 0x85, + 0xf7, 0x1e, 0x16, 0x00, 0x86, 0x12, 0x21, 0xa4, + 0x00, 0x86, 0x2d, 0x37, 0x04, 0x00, 0x86, 0x4e, + 0x4e, 0xf2, 0x00, 0x86, 0x50, 0x35, 0x8c, 0x00, + 0x86, 0x54, 0x4f, 0x32, 0x00, 0x86, 0x5c, 0x0f, + 0x82, 0x00, 0x86, 0x5e, 0x35, 0xa6, 0x00, 0x86, + 0x62, 0x4e, 0xf3, 0x00, 0x86, 0x8a, 0x4e, 0xf4, + 0x00, 0x86, 0xdb, 0x34, 0x5e, 0x00, 0x86, 0xf8, + 0x1e, 0x35, 0x00, 0x87, 0x03, 0x4f, 0x48, 0x00, + 0x87, 0x1a, 0x35, 0x18, 0x00, 0x87, 0x37, 0x37, + 0x82, 0x00, 0x87, 0x3b, 0x37, 0x83, 0x00, 0x87, + 0x55, 0x1e, 0x1d, 0x00, 0x87, 0x59, 0x1f, 0x40, + 0x00, 0x87, 0x82, 0x1e, 0xb6, 0x00, 0x87, 0xa3, + 0x57, 0xaa, 0x00, 0x87, 0xbd, 0x37, 0x85, 0x00, + 0x87, 0xd2, 0x1e, 0xb7, 0x00, 0x88, 0x03, 0x3b, + 0x03, 0x00, 0x88, 0x05, 0x37, 0x84, 0x00, 0x88, + 0x0e, 0x1f, 0x41, 0x00, 0x88, 0x36, 0x35, 0x19, + 0x00, 0x88, 0x42, 0x4e, 0xf5, 0x00, 0x88, 0x46, + 0x35, 0xfa, 0x00, 0x88, 0x4b, 0x57, 0xc3, 0x00, + 0x88, 0x53, 0x35, 0xfd, 0x00, 0x88, 0x5b, 0x34, + 0x66, 0x00, 0x88, 0x5e, 0x35, 0x53, 0x00, 0x88, + 0x63, 0x35, 0x48, 0x00, 0x88, 0x70, 0x36, 0x27, + 0x00, 0x88, 0x77, 0x4e, 0xf6, 0x00, 0x88, 0x9e, + 0x35, 0x1a, 0x00, 0x88, 0xd8, 0x35, 0x1b, 0x00, + 0x88, 0xf4, 0x35, 0x1c, 0x00, 0x89, 0x0a, 0x1e, + 0xb8, 0x00, 0x89, 0x10, 0x34, 0x13, 0x00, 0x89, + 0x1c, 0x37, 0xcb, 0x00, 0x89, 0x2b, 0x35, 0x1d, + 0x00, 0x89, 0x3b, 0x35, 0x1e, 0x00, 0x89, 0x41, + 0x4e, 0xf7, 0x00, 0x89, 0x56, 0x1d, 0xdd, 0x00, + 0x89, 0x6a, 0x35, 0x1f, 0x00, 0x89, 0x6f, 0x35, + 0x20, 0x00, 0x89, 0x81, 0x36, 0xff, 0x00, 0x89, + 0x86, 0x36, 0xb8, 0x00, 0x89, 0x87, 0x36, 0x95, + 0x00, 0x89, 0x96, 0x34, 0x22, 0x00, 0x89, 0xaa, + 0x34, 0x9b, 0x00, 0x89, 0xaf, 0x1e, 0xb9, 0x00, + 0x89, 0xbd, 0x37, 0x8a, 0x00, 0x89, 0xd2, 0x05, + 0xaf, 0x00, 0x8a, 0x0a, 0x36, 0x24, 0x00, 0x8a, + 0x12, 0x37, 0xd7, 0x00, 0x8a, 0x1d, 0x35, 0x21, + 0x00, 0x8a, 0x1f, 0x34, 0x96, 0x00, 0x8a, 0x3b, + 0x1e, 0x3c, 0x00, 0x8a, 0x55, 0x36, 0xaf, 0x00, + 0x8a, 0x6e, 0x1e, 0x28, 0x00, 0x8a, 0x8d, 0x36, + 0x92, 0x00, 0x8a, 0x95, 0x34, 0xa3, 0x00, 0x8a, + 0xa0, 0x36, 0x2f, 0x00, 0x8a, 0xa4, 0x35, 0xc2, + 0x00, 0x8a, 0xb9, 0x34, 0xb7, 0x00, 0x8a, 0xbf, + 0x36, 0x6d, 0x00, 0x8a, 0xcb, 0x36, 0x30, 0x00, + 0x8a, 0xdb, 0x37, 0x8b, 0x00, 0x8a, 0xde, 0x1e, + 0xba, 0x00, 0x8a, 0xed, 0x0f, 0x0b, 0x00, 0x8a, + 0xee, 0x35, 0xe3, 0x00, 0x8a, 0xf8, 0x09, 0x7e, + 0x00, 0x8a, 0xfa, 0x1d, 0xfe, 0x00, 0x8b, 0x01, + 0x04, 0xfc, 0x00, 0x8b, 0x04, 0x36, 0x86, 0x00, + 0x8b, 0x0e, 0x1e, 0x56, 0x00, 0x8b, 0x19, 0x35, + 0xb9, 0x00, 0x8b, 0x1b, 0x35, 0xcd, 0x00, 0x8b, + 0x1d, 0x34, 0x8d, 0x00, 0x8b, 0x2c, 0x1e, 0x69, + 0x00, 0x8b, 0x39, 0x06, 0xd8, 0x00, 0x8b, 0x3e, + 0x37, 0x8c, 0x00, 0x8b, 0x41, 0x1e, 0xbb, 0x00, + 0x8b, 0x56, 0x4e, 0xf8, 0x00, 0x8b, 0x5a, 0x37, + 0x8d, 0x00, 0x8b, 0x5c, 0x4e, 0xfa, 0x00, 0x8b, + 0x7f, 0x52, 0x52, 0x00, 0x8c, 0x6a, 0x4e, 0xfd, + 0x00, 0x8c, 0x79, 0x4e, 0xfe, 0x00, 0x8c, 0x9b, + 0x58, 0x37, 0x00, 0x8c, 0xa0, 0x36, 0xb5, 0x00, + 0x8c, 0xa7, 0x34, 0xb8, 0x00, 0x8c, 0xa8, 0x35, + 0x64, 0x00, 0x8c, 0xab, 0x34, 0x72, 0x00, 0x8c, + 0xc7, 0x35, 0xe5, 0x00, 0x8c, 0xca, 0x36, 0x4c, + 0x00, 0x8c, 0xd3, 0x0d, 0xc2, 0x00, 0x8c, 0xed, + 0x1e, 0x4c, 0x00, 0x8c, 0xfc, 0x34, 0x86, 0x00, + 0x8d, 0x05, 0x35, 0x22, 0x00, 0x8d, 0x08, 0x34, + 0x34, 0x00, 0x8d, 0x0f, 0x35, 0x23, 0x00, 0x8d, + 0x67, 0x4f, 0x00, 0x00, 0x8d, 0x70, 0x36, 0x46, + 0x00, 0x8d, 0x73, 0x37, 0x8e, 0x00, 0x8d, 0x77, + 0x35, 0x88, 0x00, 0x8d, 0x99, 0x37, 0x8f, 0x00, + 0x8d, 0xda, 0x1e, 0xbc, 0x00, 0x8d, 0xdd, 0x35, + 0x94, 0x00, 0x8d, 0xf3, 0x34, 0xa8, 0x00, 0x8e, + 0x09, 0x1e, 0xbd, 0x00, 0x8e, 0x34, 0x37, 0x91, + 0x00, 0x8e, 0x4a, 0x37, 0x92, 0x00, 0x8e, 0x8d, + 0x36, 0xef, 0x00, 0x8e, 0x91, 0x35, 0x25, 0x00, + 0x8e, 0xa1, 0x35, 0x26, 0x00, 0x8e, 0xcc, 0x34, + 0x76, 0x00, 0x8e, 0xd4, 0x3b, 0x4a, 0x00, 0x8f, + 0x03, 0x4f, 0x02, 0x00, 0x8f, 0x13, 0x1e, 0xbe, + 0x00, 0x8f, 0x29, 0x34, 0xb0, 0x00, 0x8f, 0x2f, + 0x34, 0x90, 0x00, 0x8f, 0x38, 0x36, 0xf5, 0x00, + 0x8f, 0x44, 0x35, 0x75, 0x00, 0x8f, 0xb6, 0x3c, + 0x2b, 0x00, 0x8f, 0xbb, 0x20, 0x4b, 0x00, 0x8f, + 0xbc, 0x35, 0xd3, 0x00, 0x8f, 0xbf, 0x1e, 0x37, + 0x00, 0x8f, 0xc2, 0x1d, 0xd6, 0x00, 0x8f, 0xc4, + 0x1f, 0x2c, 0x00, 0x8f, 0xc5, 0x36, 0x26, 0x00, + 0x8f, 0xc6, 0x3b, 0x51, 0x00, 0x8f, 0xce, 0x35, + 0xae, 0x00, 0x8f, 0xd1, 0x35, 0xa2, 0x00, 0x8f, + 0xd4, 0x36, 0xc0, 0x00, 0x8f, 0xe6, 0x1d, 0xdf, + 0x00, 0x8f, 0xe9, 0x1e, 0xc0, 0x00, 0x8f, 0xea, + 0x1e, 0xbf, 0x00, 0x8f, 0xeb, 0x36, 0x9a, 0x00, + 0x8f, 0xed, 0x36, 0x7b, 0x00, 0x8f, 0xef, 0x37, + 0x93, 0x00, 0x8f, 0xf0, 0x35, 0xfe, 0x00, 0x8f, + 0xf6, 0x4f, 0x06, 0x00, 0x8f, 0xf7, 0x36, 0xe6, + 0x00, 0x8f, 0xfa, 0x37, 0x95, 0x00, 0x8f, 0xfd, + 0x36, 0x72, 0x00, 0x90, 0x00, 0x36, 0x51, 0x00, + 0x90, 0x01, 0x36, 0x47, 0x00, 0x90, 0x03, 0x34, + 0xad, 0x00, 0x90, 0x06, 0x35, 0x8d, 0x00, 0x90, + 0x0e, 0x35, 0x28, 0x00, 0x90, 0x0f, 0x36, 0x88, + 0x00, 0x90, 0x10, 0x36, 0x64, 0x00, 0x90, 0x14, + 0x36, 0x7e, 0x00, 0x90, 0x17, 0x1e, 0x1f, 0x00, + 0x90, 0x19, 0x1e, 0x5c, 0x00, 0x90, 0x1a, 0x36, + 0x73, 0x00, 0x90, 0x1d, 0x1e, 0x22, 0x00, 0x90, + 0x1e, 0x37, 0x96, 0x00, 0x90, 0x1f, 0x36, 0x4b, + 0x00, 0x90, 0x20, 0x36, 0x49, 0x00, 0x90, 0x22, + 0x20, 0x4a, 0x00, 0x90, 0x23, 0x0f, 0xc8, 0x00, + 0x90, 0x2e, 0x36, 0x52, 0x00, 0x90, 0x31, 0x35, + 0xfb, 0x00, 0x90, 0x32, 0x36, 0x1f, 0x00, 0x90, + 0x35, 0x37, 0x97, 0x00, 0x90, 0x38, 0x34, 0x08, + 0x00, 0x90, 0x39, 0x36, 0x58, 0x00, 0x90, 0x3c, + 0x1e, 0x67, 0x00, 0x90, 0x41, 0x1e, 0x53, 0x00, + 0x90, 0x42, 0x34, 0x9c, 0x00, 0x90, 0x47, 0x35, + 0xa8, 0x00, 0x90, 0x4a, 0x36, 0xfc, 0x00, 0x90, + 0x4b, 0x35, 0x51, 0x00, 0x90, 0x4d, 0x36, 0xc1, + 0x00, 0x90, 0x4e, 0x35, 0x65, 0x00, 0x90, 0x50, + 0x37, 0x98, 0x00, 0x90, 0x52, 0x35, 0x27, 0x00, + 0x90, 0x53, 0x36, 0x8b, 0x00, 0x90, 0x54, 0x36, + 0x58, 0x00, 0x90, 0x55, 0x34, 0x63, 0x00, 0x90, + 0x58, 0x1e, 0xc1, 0x00, 0x90, 0x5c, 0x1e, 0x2e, + 0x00, 0x90, 0x60, 0x35, 0x5a, 0x00, 0x90, 0x61, + 0x1e, 0x2a, 0x00, 0x90, 0x63, 0x35, 0xba, 0x00, + 0x90, 0x69, 0x36, 0x7a, 0x00, 0x90, 0x6d, 0x36, + 0x48, 0x00, 0x90, 0x6e, 0x1e, 0x0e, 0x00, 0x90, + 0x75, 0x36, 0x00, 0x00, 0x90, 0x77, 0x36, 0x40, + 0x00, 0x90, 0x78, 0x36, 0x3f, 0x00, 0x90, 0x7a, + 0x35, 0x4a, 0x00, 0x90, 0x7c, 0x1e, 0x80, 0x00, + 0x90, 0x7f, 0x36, 0xa7, 0x00, 0x90, 0x81, 0x37, + 0x9a, 0x00, 0x90, 0x83, 0x37, 0x5c, 0x00, 0x90, + 0x84, 0x35, 0x7c, 0x00, 0x90, 0x87, 0x37, 0x94, + 0x00, 0x90, 0x89, 0x34, 0x5f, 0x00, 0x90, 0x8a, + 0x37, 0x9b, 0x00, 0x90, 0xa3, 0x1e, 0x55, 0x00, + 0x90, 0xa6, 0x36, 0xcb, 0x00, 0x90, 0xa8, 0x4f, + 0x0b, 0x00, 0x90, 0xaa, 0x34, 0x8e, 0x00, 0x90, + 0xf7, 0x35, 0x9d, 0x00, 0x90, 0xfd, 0x0c, 0x4e, + 0x00, 0x91, 0x2d, 0x1e, 0x44, 0x00, 0x91, 0x30, + 0x35, 0x29, 0x00, 0x91, 0x4b, 0x1e, 0x12, 0x00, + 0x91, 0x4c, 0x35, 0xf2, 0x00, 0x91, 0x4d, 0x4f, + 0x0c, 0x00, 0x91, 0x56, 0x35, 0x2a, 0x00, 0x91, + 0x58, 0x35, 0x2b, 0x00, 0x91, 0x65, 0x35, 0x2c, + 0x00, 0x91, 0x72, 0x35, 0x2e, 0x00, 0x91, 0x73, + 0x35, 0x2d, 0x00, 0x91, 0x77, 0x35, 0xd0, 0x00, + 0x91, 0xa2, 0x35, 0x2f, 0x00, 0x91, 0xaa, 0x35, + 0x31, 0x00, 0x91, 0xaf, 0x35, 0x30, 0x00, 0x91, + 0xb1, 0x36, 0x9f, 0x00, 0x91, 0xb4, 0x35, 0x32, + 0x00, 0x91, 0xba, 0x35, 0x33, 0x00, 0x91, 0xc1, + 0x1e, 0xc3, 0x00, 0x91, 0xc7, 0x1e, 0x05, 0x00, + 0x91, 0xdc, 0x4f, 0x42, 0x00, 0x91, 0xe3, 0x36, + 0x75, 0x00, 0x91, 0xfc, 0x3c, 0x2c, 0x00, 0x92, + 0x37, 0x34, 0x7d, 0x00, 0x92, 0x5b, 0x34, 0x69, + 0x00, 0x92, 0xe9, 0x4f, 0x0d, 0x00, 0x93, 0x06, + 0x1e, 0x0a, 0x00, 0x93, 0x35, 0x4f, 0x0e, 0x00, + 0x93, 0x65, 0x3b, 0x86, 0x00, 0x93, 0x75, 0x4f, + 0x34, 0x00, 0x93, 0x8b, 0x4f, 0x0f, 0x00, 0x93, + 0x8c, 0x35, 0x76, 0x00, 0x93, 0x96, 0x35, 0xd5, + 0x00, 0x93, 0x9a, 0x1e, 0x41, 0x00, 0x93, 0xa1, + 0x59, 0x04, 0x00, 0x93, 0xae, 0x34, 0x3a, 0x00, + 0x93, 0xdd, 0x37, 0xae, 0x00, 0x94, 0x3a, 0x4f, + 0x10, 0x00, 0x94, 0x53, 0x1e, 0x79, 0x00, 0x94, + 0x77, 0x35, 0x34, 0x00, 0x95, 0x92, 0x35, 0x7d, + 0x00, 0x95, 0xab, 0x3b, 0x9a, 0x00, 0x95, 0xbb, + 0x1e, 0xc4, 0x00, 0x95, 0xbc, 0x37, 0xaf, 0x00, + 0x95, 0xcd, 0x4f, 0x11, 0x00, 0x96, 0x2a, 0x4f, + 0x12, 0x00, 0x96, 0x4d, 0x34, 0x87, 0x00, 0x96, + 0x86, 0x34, 0x51, 0x00, 0x96, 0x8a, 0x36, 0x53, + 0x00, 0x96, 0x94, 0x35, 0x73, 0x00, 0x96, 0x98, + 0x35, 0x35, 0x00, 0x96, 0x99, 0x4f, 0x31, 0x00, + 0x96, 0xa3, 0x34, 0xca, 0x00, 0x96, 0xa7, 0x4f, + 0x14, 0x00, 0x96, 0xb2, 0x37, 0xb1, 0x00, 0x96, + 0xbb, 0x36, 0x35, 0x00, 0x96, 0xc5, 0x34, 0x6c, + 0x00, 0x96, 0xc7, 0x35, 0xbe, 0x00, 0x96, 0xd9, + 0x34, 0xd5, 0x00, 0x96, 0xda, 0x59, 0x3b, 0x00, + 0x96, 0xe3, 0x0c, 0xc9, 0x00, 0x96, 0xe8, 0x35, + 0x4d, 0x00, 0x96, 0xea, 0x36, 0x39, 0x00, 0x96, + 0xf0, 0x34, 0xc0, 0x00, 0x97, 0x21, 0x59, 0x41, + 0x00, 0x97, 0x24, 0x1e, 0xc6, 0x00, 0x97, 0x3d, + 0x35, 0x36, 0x00, 0x97, 0x55, 0x21, 0xf8, 0x00, + 0x97, 0x56, 0x21, 0x8b, 0x00, 0x97, 0x59, 0x37, + 0xb2, 0x00, 0x97, 0x5c, 0x36, 0x31, 0x00, 0x97, + 0x60, 0x1e, 0xc7, 0x00, 0x97, 0x6d, 0x1e, 0xc8, + 0x00, 0x97, 0x71, 0x1e, 0x1e, 0x00, 0x97, 0x74, + 0x1d, 0xf3, 0x00, 0x97, 0x84, 0x1d, 0xe5, 0x00, + 0x97, 0x98, 0x1e, 0x1c, 0x00, 0x97, 0xad, 0x4f, + 0x43, 0x00, 0x97, 0xd3, 0x35, 0x7e, 0x00, 0x97, + 0xde, 0x3c, 0x2e, 0x00, 0x97, 0xf3, 0x35, 0x60, + 0x00, 0x97, 0xff, 0x34, 0x19, 0x00, 0x98, 0x0c, + 0x35, 0x39, 0x00, 0x98, 0x11, 0x34, 0x74, 0x00, + 0x98, 0x12, 0x34, 0xb2, 0x00, 0x98, 0x13, 0x1e, + 0x54, 0x00, 0x98, 0x24, 0x1e, 0xc9, 0x00, 0x98, + 0x3b, 0x0d, 0xc3, 0x00, 0x98, 0x5e, 0x0f, 0xa8, + 0x00, 0x98, 0x67, 0x35, 0xbf, 0x00, 0x98, 0x73, + 0x35, 0x3a, 0x00, 0x98, 0xc3, 0x35, 0x3b, 0x00, + 0x98, 0xdf, 0x36, 0x17, 0x00, 0x98, 0xe2, 0x35, + 0x89, 0x00, 0x98, 0xeb, 0x37, 0xb4, 0x00, 0x98, + 0xef, 0x0d, 0x67, 0x00, 0x98, 0xf4, 0x1d, 0xd2, + 0x00, 0x98, 0xfc, 0x21, 0xfc, 0x00, 0x98, 0xfd, + 0x36, 0xcd, 0x00, 0x98, 0xfe, 0x36, 0x14, 0x00, + 0x99, 0x03, 0x37, 0xb5, 0x00, 0x99, 0x05, 0x1e, + 0x77, 0x00, 0x99, 0x09, 0x37, 0xb6, 0x00, 0x99, + 0x0a, 0x37, 0x00, 0x00, 0x99, 0x0c, 0x1d, 0xdb, + 0x00, 0x99, 0x10, 0x1f, 0x22, 0x00, 0x99, 0x13, + 0x35, 0x68, 0x00, 0x99, 0x21, 0x4f, 0x18, 0x00, + 0x99, 0x28, 0x21, 0xfe, 0x00, 0x99, 0x45, 0x37, + 0xb7, 0x00, 0x99, 0x4b, 0x37, 0xb9, 0x00, 0x99, + 0x57, 0x1f, 0x20, 0x00, 0x99, 0xc1, 0x4f, 0x40, + 0x00, 0x99, 0xd0, 0x36, 0x67, 0x00, 0x9a, 0x19, + 0x1f, 0x43, 0x00, 0x9a, 0x30, 0x36, 0x89, 0x00, + 0x9a, 0x45, 0x35, 0x3c, 0x00, 0x9a, 0x4a, 0x59, + 0x88, 0x00, 0x9a, 0x5f, 0x37, 0xbb, 0x00, 0x9a, + 0x65, 0x37, 0xbc, 0x00, 0x9a, 0xef, 0x37, 0xbd, + 0x00, 0x9b, 0x18, 0x37, 0xbe, 0x00, 0x9b, 0x2d, + 0x34, 0x3c, 0x00, 0x9b, 0x2e, 0x1e, 0xca, 0x00, + 0x9b, 0x35, 0x59, 0xa4, 0x00, 0x9b, 0x4d, 0x35, + 0x3d, 0x00, 0x9b, 0x54, 0x36, 0xdb, 0x00, 0x9b, + 0x58, 0x35, 0x3e, 0x00, 0x9b, 0x97, 0x1e, 0xcb, + 0x00, 0x9b, 0xa8, 0x4f, 0x1a, 0x00, 0x9b, 0xab, + 0x4f, 0x38, 0x00, 0x9b, 0xae, 0x4f, 0x1b, 0x00, + 0x9b, 0xb9, 0x4f, 0x1c, 0x00, 0x9b, 0xc6, 0x35, + 0x3f, 0x00, 0x9b, 0xd6, 0x1e, 0x09, 0x00, 0x9b, + 0xdb, 0x36, 0x54, 0x00, 0x9b, 0xe1, 0x35, 0x40, + 0x00, 0x9b, 0xf1, 0x35, 0x41, 0x00, 0x9b, 0xf2, + 0x1e, 0xcc, 0x00, 0x9c, 0x08, 0x4f, 0x1d, 0x00, + 0x9c, 0x24, 0x4f, 0x1e, 0x00, 0x9c, 0x2f, 0x1d, + 0xd4, 0x00, 0x9c, 0x3b, 0x4f, 0x1f, 0x00, 0x9c, + 0x48, 0x1e, 0x39, 0x00, 0x9c, 0x52, 0x1e, 0x74, + 0x00, 0x9c, 0x57, 0x37, 0x0c, 0x00, 0x9c, 0xe6, + 0x4f, 0x21, 0x00, 0x9d, 0x07, 0x1e, 0x4f, 0x00, + 0x9d, 0x08, 0x37, 0xc1, 0x00, 0x9d, 0x09, 0x37, + 0xc0, 0x00, 0x9d, 0x48, 0x35, 0x42, 0x00, 0x9d, + 0x60, 0x1e, 0x03, 0x00, 0x9d, 0x6c, 0x36, 0xce, + 0x00, 0x9d, 0xb4, 0x0b, 0xfd, 0x00, 0x9d, 0xbf, + 0x59, 0xde, 0x00, 0x9d, 0xc0, 0x4f, 0x22, 0x00, + 0x9d, 0xc2, 0x4f, 0x23, 0x00, 0x9d, 0xcf, 0x35, + 0x43, 0x00, 0x9e, 0x97, 0x34, 0xcc, 0x00, 0x9e, + 0x9f, 0x34, 0xcb, 0x00, 0x9e, 0xa5, 0x37, 0xc2, + 0x00, 0x9e, 0xaa, 0x1e, 0xcd, 0x00, 0x9e, 0xad, + 0x1f, 0x44, 0x00, 0x9e, 0xbb, 0x36, 0xdc, 0x00, + 0x9e, 0xbf, 0x36, 0xe2, 0x00, 0x9e, 0xcc, 0x37, + 0xc3, 0x00, 0x9e, 0xdb, 0x1e, 0x31, 0x00, 0x9f, + 0x08, 0x35, 0x44, 0x00, 0x9f, 0x3b, 0x36, 0xa9, + 0x00, 0x9f, 0x4a, 0x37, 0xc5, 0x00, 0x9f, 0x4b, + 0x37, 0x5a, 0x00, 0x9f, 0x4e, 0x35, 0x24, 0x00, + 0x9f, 0x67, 0x37, 0xc7, 0x00, 0x9f, 0x8d, 0x37, + 0x06, 0x00, 0x9f, 0x9c, 0x1e, 0xce, 0x00, 0x9f, + 0x9d, 0x1e, 0xa7, 0x00, 0xfa, 0x11, 0x20, 0xfb, + 0x00, 0xfa, 0x24, 0x21, 0xb8, 0x02, 0x35, 0xc4, + 0x3c, 0x44, 0x02, 0x36, 0x3a, 0x35, 0x9b, 0x02, + 0x38, 0x3d, 0x4f, 0x26, 0x02, 0x42, 0xee, 0x37, + 0xc9, 0x02, 0x62, 0x70, 0x37, 0x6e, 0x02, 0x9d, + 0x4b, 0x35, 0x96, 0x02, 0x9e, 0x3d, 0x3c, 0x4d, + 0x02, 0xa6, 0x1a, 0x37, 0xc8, 0x00, 0x00, 0x00, + 0x7f, 0x00, 0x34, 0x02, 0x35, 0x83, 0x00, 0x50, + 0x91, 0x35, 0xaf, 0x00, 0x50, 0xca, 0x37, 0x15, + 0x00, 0x51, 0x54, 0x37, 0x17, 0x00, 0x51, 0x95, + 0x37, 0x18, 0x00, 0x51, 0xb4, 0x35, 0xdb, 0x00, + 0x51, 0xde, 0x38, 0x10, 0x00, 0x52, 0x72, 0x4e, + 0x76, 0x00, 0x53, 0x7f, 0x1d, 0xed, 0x00, 0x53, + 0xa9, 0x1f, 0x1c, 0x00, 0x55, 0x33, 0x37, 0x21, + 0x00, 0x55, 0xa9, 0x34, 0xd6, 0x00, 0x55, 0xab, + 0x4e, 0x7c, 0x00, 0x55, 0xe4, 0x37, 0x22, 0x00, + 0x56, 0xae, 0x4e, 0x7e, 0x00, 0x57, 0xf4, 0x36, + 0x13, 0x00, 0x58, 0x5a, 0x20, 0xe6, 0x00, 0x59, + 0x51, 0x4e, 0x88, 0x00, 0x59, 0xff, 0x35, 0xe1, + 0x00, 0x5a, 0xbe, 0x34, 0xdc, 0x00, 0x5b, 0xb3, + 0x35, 0x6b, 0x00, 0x5c, 0x0a, 0x36, 0x4e, 0x00, + 0x5c, 0x0f, 0x36, 0x0a, 0x00, 0x5e, 0xca, 0x34, + 0x59, 0x00, 0x5e, 0xe3, 0x4e, 0x93, 0x00, 0x5e, + 0xf6, 0x35, 0x56, 0x00, 0x60, 0x62, 0x4f, 0x2d, + 0x00, 0x60, 0x97, 0x37, 0x30, 0x00, 0x61, 0x67, + 0x35, 0xad, 0x00, 0x61, 0x68, 0x34, 0x6e, 0x00, + 0x61, 0xb2, 0x4e, 0x98, 0x00, 0x61, 0xf2, 0x36, + 0x6a, 0x00, 0x62, 0x49, 0x34, 0xb4, 0x00, 0x66, + 0x5f, 0x37, 0x38, 0x00, 0x66, 0xc1, 0x4e, 0xac, + 0x00, 0x67, 0x15, 0x36, 0x70, 0x00, 0x67, 0x17, + 0x21, 0x29, 0x00, 0x67, 0x1b, 0x36, 0xd5, 0x00, + 0x68, 0x5d, 0x36, 0xde, 0x00, 0x68, 0x7a, 0x36, + 0xf1, 0x00, 0x69, 0x0d, 0x36, 0x15, 0x00, 0x69, + 0x82, 0x34, 0x6f, 0x00, 0x6a, 0xdb, 0x35, 0xa9, + 0x00, 0x6b, 0x21, 0x35, 0xe8, 0x00, 0x6c, 0x08, + 0x34, 0xf4, 0x00, 0x6c, 0xaa, 0x4e, 0xbb, 0x00, + 0x6c, 0xbf, 0x34, 0x68, 0x00, 0x6c, 0xe8, 0x32, + 0x45, 0x00, 0x6d, 0x3e, 0x36, 0x96, 0x00, 0x6e, + 0x23, 0x34, 0xf6, 0x00, 0x6e, 0xa2, 0x52, 0x4f, + 0x00, 0x6e, 0xcb, 0x4e, 0xc1, 0x00, 0x6f, 0x11, + 0x37, 0x45, 0x00, 0x6f, 0x5b, 0x4e, 0xc5, 0x00, + 0x71, 0x7d, 0x1f, 0x24, 0x00, 0x72, 0x35, 0x35, + 0xf0, 0x00, 0x73, 0x36, 0x36, 0xf9, 0x00, 0x73, + 0x37, 0x36, 0xfa, 0x00, 0x73, 0xca, 0x4e, 0xcc, + 0x00, 0x75, 0x11, 0x35, 0xd2, 0x00, 0x75, 0x15, + 0x4f, 0x2b, 0x00, 0x79, 0x53, 0x37, 0x59, 0x00, + 0x7a, 0x74, 0x35, 0xb1, 0x00, 0x7b, 0x08, 0x4f, + 0x27, 0x00, 0x7b, 0xc0, 0x36, 0x37, 0x00, 0x7c, + 0x3e, 0x4f, 0x29, 0x00, 0x7c, 0x50, 0x4e, 0xdb, + 0x00, 0x7c, 0x7e, 0x4f, 0x45, 0x00, 0x7d, 0xb2, + 0x4e, 0xde, 0x00, 0x7e, 0x22, 0x37, 0x66, 0x00, + 0x7e, 0x35, 0x37, 0x68, 0x00, 0x7f, 0xc1, 0x35, + 0x5e, 0x00, 0x7f, 0xe1, 0x4e, 0xe0, 0x00, 0x7f, + 0xe9, 0x37, 0x71, 0x00, 0x7f, 0xfc, 0x37, 0x02, + 0x00, 0x81, 0x08, 0x36, 0xe3, 0x00, 0x82, 0x39, + 0x36, 0x3e, 0x00, 0x82, 0x79, 0x37, 0x76, 0x00, + 0x82, 0xbd, 0x34, 0x6b, 0x00, 0x83, 0xdf, 0x1f, + 0x28, 0x00, 0x85, 0x3d, 0x34, 0xc1, 0x00, 0x86, + 0x12, 0x52, 0x51, 0x00, 0x87, 0xd2, 0x1f, 0x42, + 0x00, 0x88, 0x05, 0x4f, 0x47, 0x00, 0x88, 0x36, + 0x37, 0x87, 0x00, 0x8a, 0x0a, 0x36, 0x25, 0x00, + 0x8a, 0x1d, 0x4f, 0x2c, 0x00, 0x8a, 0x95, 0x36, + 0x5d, 0x00, 0x8a, 0xee, 0x35, 0xe4, 0x00, 0x8b, + 0x56, 0x4e, 0xf9, 0x00, 0x8c, 0xa0, 0x36, 0xb6, + 0x00, 0x8c, 0xc7, 0x35, 0xe6, 0x00, 0x8c, 0xca, + 0x4e, 0xff, 0x00, 0x8c, 0xfc, 0x35, 0xce, 0x00, + 0x8f, 0x44, 0x4f, 0x03, 0x00, 0x8f, 0xc5, 0x4f, + 0x04, 0x00, 0x8f, 0xd4, 0x4f, 0x05, 0x00, 0x90, + 0x03, 0x36, 0x87, 0x00, 0x90, 0x22, 0x34, 0x60, + 0x00, 0x90, 0x38, 0x21, 0xb9, 0x00, 0x90, 0x41, + 0x4f, 0x3f, 0x00, 0x90, 0x42, 0x36, 0x28, 0x00, + 0x90, 0x55, 0x35, 0x49, 0x00, 0x90, 0x75, 0x36, + 0x01, 0x00, 0x90, 0x77, 0x4f, 0x07, 0x00, 0x90, + 0x89, 0x37, 0xa1, 0x00, 0x90, 0x8a, 0x37, 0x9c, + 0x00, 0x90, 0xa6, 0x36, 0xcc, 0x00, 0x90, 0xaa, + 0x35, 0xee, 0x00, 0x92, 0x5b, 0x35, 0x5b, 0x00, + 0x96, 0x86, 0x21, 0xee, 0x00, 0x96, 0x98, 0x4f, + 0x13, 0x00, 0x96, 0xa3, 0x37, 0x0b, 0x00, 0x96, + 0xc5, 0x35, 0x67, 0x00, 0x97, 0x5c, 0x36, 0x32, + 0x00, 0x97, 0x60, 0x35, 0x37, 0x00, 0x97, 0x6d, + 0x1f, 0x23, 0x00, 0x97, 0x71, 0x35, 0x38, 0x00, + 0x97, 0xff, 0x35, 0x9e, 0x00, 0x98, 0xef, 0x4f, + 0x25, 0x00, 0x99, 0x0c, 0x34, 0x65, 0x00, 0x99, + 0x45, 0x37, 0xb8, 0x00, 0x99, 0x57, 0x35, 0x9f, + 0x00, 0x9e, 0x9f, 0x37, 0x0d, 0x00, 0x9f, 0x08, + 0x37, 0xc4, 0x00, 0x9f, 0x8d, 0x37, 0x07, 0x02, + 0x36, 0x3a, 0x35, 0x9c, 0x00, 0x00, 0x00, 0x11, + 0x00, 0x51, 0xde, 0x4e, 0x71, 0x00, 0x53, 0xa9, + 0x34, 0x64, 0x00, 0x56, 0xae, 0x4e, 0x7f, 0x00, + 0x5b, 0xb3, 0x4e, 0x8f, 0x00, 0x61, 0x68, 0x35, + 0x6c, 0x00, 0x61, 0xf2, 0x52, 0x50, 0x00, 0x66, + 0x5f, 0x37, 0x39, 0x00, 0x67, 0x17, 0x37, 0x12, + 0x00, 0x69, 0x82, 0x35, 0x70, 0x00, 0x75, 0x11, + 0x4f, 0x3c, 0x00, 0x83, 0xdf, 0x4e, 0xe9, 0x00, + 0x90, 0x77, 0x4f, 0x08, 0x00, 0x90, 0x89, 0x37, + 0xa2, 0x00, 0x90, 0x8a, 0x37, 0x9d, 0x00, 0x97, + 0xff, 0x4f, 0x15, 0x00, 0x99, 0x0c, 0x35, 0x52, + 0x00, 0x99, 0x57, 0x4f, 0x19, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x51, 0xde, 0x21, 0x5e, 0x00, 0x53, + 0xa9, 0x35, 0x4f, 0x00, 0x61, 0x68, 0x35, 0x6d, + 0x00, 0x90, 0x89, 0x37, 0xa3, 0x00, 0x90, 0x8a, + 0x37, 0x9e, 0x00, 0x97, 0xff, 0x4f, 0x16, 0x00, + 0x00, 0x00, 0x04, 0x00, 0x53, 0xa9, 0x4f, 0x2f, + 0x00, 0x61, 0x68, 0x35, 0x6e, 0x00, 0x90, 0x89, + 0x37, 0xa4, 0x00, 0x90, 0x8a, 0x37, 0x9f, 0x00, + 0x00, 0x00, 0x02, 0x00, 0x90, 0x89, 0x37, 0xa5, + 0x00, 0x90, 0x8a, 0x37, 0xa0, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x90, 0x89, 0x37, 0xa6, 0x00, 0x90, + 0x8a, 0x4f, 0x0a, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x90, 0x89, 0x37, 0xa7, 0x00, 0x00, 0x00, 0x01, + 0x00, 0x90, 0x89, 0x37, 0xa8, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x90, 0x89, 0x37, 0xa9, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x90, 0x89, 0x37, 0xaa, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x90, 0x89, 0x37, 0xab, 0x00, 0x00, 0x00, 0x01, 0x00, 0x90, 0x89, 0x37, - 0xa8, 0x00, 0x00, 0x00, 0x01, 0x00, 0x90, 0x89, - 0x37, 0xa9, 0x00, 0x00, 0x00, 0x01, 0x00, 0x90, - 0x89, 0x37, 0xaa, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x90, 0x89, 0x37, 0xab, 0x00, 0x00, 0x00, 0x01, - 0x00, 0x90, 0x89, 0x37, 0xac, 0x00, 0x00, 0x00, - 0x01, 0x00, 0x90, 0x89, 0x4f, 0x09 + 0xac, 0x00, 0x00, 0x00, 0x01, 0x00, 0x90, 0x89, + 0x4f, 0x09 }; commit 4590f1d768adbb2120a2b02c614f7ed3b21a4a3e Author: Alan Third Date: Sun Dec 10 10:16:25 2017 +0000 Remove ObjC blocks (Bug#23753) * src/macfont.m (macfont_get_glyph_for_character): (mac_font_get_glyphs_for_variants): Inline Objective-C blocks. diff --git a/src/macfont.m b/src/macfont.m index 97879506ba..6985364b34 100644 --- a/src/macfont.m +++ b/src/macfont.m @@ -1443,6 +1443,7 @@ static CGGlyph macfont_get_glyph_for_cid (struct font *font, int nrows; dispatch_queue_t queue; dispatch_group_t group = NULL; + int nkeys; if (row != 0) { @@ -1479,23 +1480,16 @@ static CGGlyph macfont_get_glyph_for_cid (struct font *font, return glyph; } - queue = - dispatch_get_global_queue (DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - group = dispatch_group_create (); - dispatch_group_async (group, queue, ^{ - int nkeys; - uintptr_t key; - nkeys = nkeys_or_perm; - for (key = row * (256 / NGLYPHS_IN_VALUE); ; key++) - if (CFDictionaryContainsKey (dictionary, - (const void *) key)) - { - CFDictionaryRemoveValue (dictionary, - (const void *) key); - if (--nkeys == 0) - break; - } - }); + nkeys = nkeys_or_perm; + for (key = row * (256 / NGLYPHS_IN_VALUE); ; key++) + if (CFDictionaryContainsKey (dictionary, + (const void *) key)) + { + CFDictionaryRemoveValue (dictionary, + (const void *) key); + if (--nkeys == 0) + break; + } } len = 0; @@ -1535,12 +1529,6 @@ static CGGlyph macfont_get_glyph_for_cid (struct font *font, sizeof (CGGlyph *) * nrows); cache->glyph.matrix[nrows - 1] = glyphs; cache->glyph.nrows = nrows; - - if (group) - { - dispatch_group_wait (group, DISPATCH_TIME_FOREVER); - dispatch_release (group); - } } return cache->glyph.matrix[nkeys_or_perm - ROW_PERM_OFFSET][c % 256]; @@ -3267,9 +3255,6 @@ So we use CTFontDescriptorCreateMatchingFontDescriptor (no struct variation_selector_record *records = uvs->variation_selector_records; CFIndex i; UInt32 ir, nrecords; - dispatch_queue_t queue = - dispatch_get_global_queue (DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - dispatch_group_t group = dispatch_group_create (); nrecords = BUINT32_VALUE (uvs->num_var_selector_records); i = 0; @@ -3293,66 +3278,63 @@ So we use CTFontDescriptorCreateMatchingFontDescriptor (no default_uvs_offset = BUINT32_VALUE (records[ir].default_uvs_offset); non_default_uvs_offset = BUINT32_VALUE (records[ir].non_default_uvs_offset); - dispatch_group_async (group, queue, ^{ - glyphs[i] = kCGFontIndexInvalid; - if (default_uvs_offset) + glyphs[i] = kCGFontIndexInvalid; + + if (default_uvs_offset) + { + struct default_uvs_table *default_uvs = + (struct default_uvs_table *) ((UInt8 *) uvs + + default_uvs_offset); + struct unicode_value_range *ranges = + default_uvs->unicode_value_ranges; + UInt32 lo, hi; + + lo = 0; + hi = BUINT32_VALUE (default_uvs->num_unicode_value_ranges); + while (lo < hi) { - struct default_uvs_table *default_uvs = - (struct default_uvs_table *) ((UInt8 *) uvs - + default_uvs_offset); - struct unicode_value_range *ranges = - default_uvs->unicode_value_ranges; - UInt32 lo, hi; - - lo = 0; - hi = BUINT32_VALUE (default_uvs->num_unicode_value_ranges); - while (lo < hi) - { - UInt32 mid = (lo + hi) / 2; + UInt32 mid = (lo + hi) / 2; - if (c < BUINT24_VALUE (ranges[mid].start_unicode_value)) - hi = mid; - else - lo = mid + 1; - } - if (hi > 0 - && (c <= (BUINT24_VALUE (ranges[hi - 1].start_unicode_value) - + BUINT8_VALUE (ranges[hi - 1].additional_count)))) - glyphs[i] = 0; + if (c < BUINT24_VALUE (ranges[mid].start_unicode_value)) + hi = mid; + else + lo = mid + 1; } + if (hi > 0 + && (c <= (BUINT24_VALUE (ranges[hi - 1].start_unicode_value) + + BUINT8_VALUE (ranges[hi - 1].additional_count)))) + glyphs[i] = 0; + } - if (glyphs[i] == kCGFontIndexInvalid && non_default_uvs_offset) + if (glyphs[i] == kCGFontIndexInvalid && non_default_uvs_offset) + { + struct non_default_uvs_table *non_default_uvs = + (struct non_default_uvs_table *) ((UInt8 *) uvs + + non_default_uvs_offset); + struct uvs_mapping *mappings = non_default_uvs->uvs_mappings; + UInt32 lo, hi; + + lo = 0; + hi = BUINT32_VALUE (non_default_uvs->num_uvs_mappings); + while (lo < hi) { - struct non_default_uvs_table *non_default_uvs = - (struct non_default_uvs_table *) ((UInt8 *) uvs - + non_default_uvs_offset); - struct uvs_mapping *mappings = non_default_uvs->uvs_mappings; - UInt32 lo, hi; - - lo = 0; - hi = BUINT32_VALUE (non_default_uvs->num_uvs_mappings); - while (lo < hi) - { - UInt32 mid = (lo + hi) / 2; + UInt32 mid = (lo + hi) / 2; - if (c < BUINT24_VALUE (mappings[mid].unicode_value)) - hi = mid; - else - lo = mid + 1; - } - if (hi > 0 && - BUINT24_VALUE (mappings[hi - 1].unicode_value) == c) - glyphs[i] = BUINT16_VALUE (mappings[hi - 1].glyph_id); + if (c < BUINT24_VALUE (mappings[mid].unicode_value)) + hi = mid; + else + lo = mid + 1; } - }); + if (hi > 0 && + BUINT24_VALUE (mappings[hi - 1].unicode_value) == c) + glyphs[i] = BUINT16_VALUE (mappings[hi - 1].glyph_id); + } i++; ir++; } while (i < count) glyphs[i++] = kCGFontIndexInvalid; - dispatch_group_wait (group, DISPATCH_TIME_FOREVER); - dispatch_release (group); } static int commit 95a2a74d0e8d54b32c57800661d77e3de57c53bb Author: Michael Albinus Date: Tue Dec 12 15:46:17 2017 +0100 Extend tramp-cache.el interface * lisp/net/tramp.el (tramp-handle-add-name-to-file) (tramp-handle-dired-uncache): * lisp/net/tramp-adb.el (tramp-adb-handle-make-directory) (tramp-adb-handle-delete-directory, tramp-adb-handle-delete-file) (tramp-adb-handle-write-region, tramp-adb-handle-set-file-modes) (tramp-adb-handle-set-file-times, tramp-adb-handle-copy-file) (tramp-adb-handle-rename-file, tramp-adb-handle-process-file) (tramp-adb-handle-start-file-process, tramp-adb-get-device) (tramp-adb-maybe-open-connection): * lisp/net/tramp-cache.el (tramp-flush-file-properties) (tramp-flush-directory-properties, tramp-flush-file-function): * lisp/net/tramp-cmds.el (tramp-cleanup-connection): * lisp/net/tramp-gvfs.el (tramp-gvfs-do-copy-or-rename-file) (tramp-gvfs-handle-delete-directory, tramp-gvfs-handle-delete-file) (tramp-gvfs-handle-file-system-info, tramp-gvfs-handle-make-directory) (tramp-gvfs-handle-write-region, tramp-gvfs-handler-mounted-unmounted) (tramp-gvfs-send-command): * lisp/net/tramp-sh.el (tramp-sh-handle-make-symbolic-link) (tramp-sh-handle-set-file-modes, tramp-sh-handle-set-file-times) (tramp-sh-handle-set-file-selinux-context, tramp-sh-handle-set-file-acl) (tramp-sh-handle-add-name-to-file, tramp-sh-handle-copy-directory) (tramp-do-copy-or-rename-file, tramp-do-copy-or-rename-file-out-of-band) (tramp-sh-handle-make-directory, tramp-sh-handle-delete-directory) (tramp-sh-handle-delete-file, tramp-sh-handle-dired-compress-file) (tramp-process-sentinel, tramp-sh-handle-start-file-process) (tramp-sh-handle-process-file, tramp-sh-handle-write-region): * lisp/net/tramp-smb.el (tramp-smb-handle-add-name-to-file) (tramp-smb-handle-copy-directory, tramp-smb-handle-copy-file) (tramp-smb-handle-delete-directory, tramp-smb-handle-delete-file) (tramp-smb-handle-file-acl, tramp-smb-handle-make-directory-internal) (tramp-smb-handle-make-symbolic-link, tramp-smb-handle-process-file) (tramp-smb-handle-rename-file, tramp-smb-handle-set-file-acl) (tramp-smb-handle-set-file-modes, tramp-smb-handle-start-file-process) (tramp-smb-handle-write-region, tramp-smb-maybe-open-connection): Use them. * lisp/net/tramp-cache.el (tramp-flush-file-properties) (tramp-flush-directory-properties, tramp-flush-connection-properties): Rename from `tramp-flush-file-property',`tramp-flush-directory-property' and `tramp-flush-connection-property', respectively. (tramp-flush-file-property, tramp-flush-connection-property): New defuns. diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index f1753cec53..d06031f1a6 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el @@ -541,8 +541,8 @@ Emacs dired can't find files." (let ((par (expand-file-name ".." dir))) (unless (file-directory-p par) (make-directory par parents)))) - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-directory-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-directory-properties v localname) (unless (or (tramp-adb-send-command-and-check v (format "mkdir %s" (tramp-shell-quote-argument localname))) (and parents (file-directory-p dir))) @@ -552,11 +552,11 @@ Emacs dired can't find files." "Like `delete-directory' for Tramp files." (setq directory (expand-file-name directory)) (with-parsed-tramp-file-name (file-truename directory) nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-directory-property v localname)) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-directory-properties v localname)) (with-parsed-tramp-file-name directory nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-directory-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-directory-properties v localname) (tramp-adb-barf-unless-okay v (format "%s %s" (if recursive "rm -r" "rmdir") @@ -567,8 +567,8 @@ Emacs dired can't find files." "Like `delete-file' for Tramp files." (setq filename (expand-file-name filename)) (with-parsed-tramp-file-name filename nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname) (tramp-adb-barf-unless-okay v (format "rm %s" (tramp-shell-quote-argument localname)) "Couldn't delete %s" filename))) @@ -661,8 +661,8 @@ But handle the case, if the \"test\" command is not available." ;; We must also flush the cache of the directory, because ;; `file-attributes' reads the values from there. - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname) (let* ((curbuf (current-buffer)) (tmpfile (tramp-compat-make-temp-file filename))) (when (and append (file-exists-p filename)) @@ -692,15 +692,15 @@ But handle the case, if the \"test\" command is not available." (defun tramp-adb-handle-set-file-modes (filename mode) "Like `set-file-modes' for Tramp files." (with-parsed-tramp-file-name filename nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname) (tramp-adb-send-command-and-check v (format "chmod %o %s" mode localname)))) (defun tramp-adb-handle-set-file-times (filename &optional time) "Like `set-file-times' for Tramp files." (with-parsed-tramp-file-name filename nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname) (let ((time (if (or (null time) (equal time '(0 0))) (current-time) time))) @@ -736,8 +736,8 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." ;; We must also flush the cache of the directory, ;; because `file-attributes' reads the values from ;; there. - (tramp-flush-file-property v (file-name-directory l2)) - (tramp-flush-file-property v l2) + (tramp-flush-file-properties v (file-name-directory l2)) + (tramp-flush-file-properties v l2) ;; Short track. (tramp-adb-barf-unless-okay v (format @@ -771,8 +771,9 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." ;; We must also flush the cache of the directory, ;; because `file-attributes' reads the values from ;; there. - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties + v (file-name-directory localname)) + (tramp-flush-file-properties v localname) (when (tramp-adb-execute-adb-command v "push" (tramp-compat-file-name-unquote filename) @@ -815,10 +816,10 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (tramp-error v 'file-already-exists newname)) ;; We must also flush the cache of the directory, because ;; `file-attributes' reads the values from there. - (tramp-flush-file-property v (file-name-directory l1)) - (tramp-flush-file-property v l1) - (tramp-flush-file-property v (file-name-directory l2)) - (tramp-flush-file-property v l2) + (tramp-flush-file-properties v (file-name-directory l1)) + (tramp-flush-file-properties v l1) + (tramp-flush-file-properties v (file-name-directory l2)) + (tramp-flush-file-properties v l2) ;; Short track. (tramp-adb-barf-unless-okay v (format @@ -930,7 +931,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (when tmpinput (delete-file tmpinput)) (unless process-file-side-effects - (tramp-flush-directory-property v "")) + (tramp-flush-directory-properties v "")) ;; Return exit status. (if (equal ret -1) @@ -1087,8 +1088,8 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (set-process-buffer (tramp-get-connection-process v) nil) (kill-buffer (current-buffer))) (set-buffer-modified-p bmp)) - (tramp-set-connection-property v "process-name" nil) - (tramp-set-connection-property v "process-buffer" nil)))))) + (tramp-flush-connection-property v "process-name") + (tramp-flush-connection-property v "process-buffer")))))) (defun tramp-adb-get-device (vec) "Return full host name from VEC to be used in shell execution. @@ -1097,7 +1098,7 @@ E.g. a host name \"192.168.1.1#5555\" returns \"192.168.1.1:5555\" ;; Sometimes this is called before there is a connection process ;; yet. In order to work with the connection cache, we flush all ;; unwanted entries first. - (tramp-flush-connection-property nil) + (tramp-flush-connection-properties nil) (with-tramp-connection-property (tramp-get-connection-process vec) "device" (let* ((host (tramp-file-name-host vec)) (port (tramp-file-name-port-or-default vec)) @@ -1310,7 +1311,7 @@ connection if a previous connection has died for some reason." (tramp-adb-send-command vec (format "su %s" user)) (unless (tramp-adb-send-command-and-check vec nil) (delete-process p) - (tramp-set-file-property vec "" "su-command-p" nil) + (tramp-flush-file-property vec "" "su-command-p") (tramp-error vec 'file-error "Cannot switch to user `%s'" user))) diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index bd746c1a99..56f3f28c5c 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -166,7 +166,22 @@ Returns VALUE." value)) ;;;###tramp-autoload -(defun tramp-flush-file-property (key file) +(defun tramp-flush-file-property (key file property) + "Remove PROPERTY of FILE in the cache context of KEY." + ;; Unify localname. Remove hop from `tramp-file-name' structure. + (setq file (tramp-compat-file-name-unquote file) + key (copy-tramp-file-name key)) + (setf (tramp-file-name-localname key) + (tramp-run-real-handler 'directory-file-name (list file)) + (tramp-file-name-hop key) nil) + (remhash property (tramp-get-hash-table key)) + (tramp-message key 8 "%s %s" file property) + (when (>= tramp-verbose 10) + (let ((var (intern (concat "tramp-cache-set-count-" property)))) + (makunbound var)))) + +;;;###tramp-autoload +(defun tramp-flush-file-properties (key file) "Remove all properties of FILE in the cache context of KEY." (let* ((file (tramp-run-real-handler 'directory-file-name (list file))) @@ -181,10 +196,10 @@ Returns VALUE." ;; Remove file properties of symlinks. (when (and (stringp truename) (not (string-equal file (directory-file-name truename)))) - (tramp-flush-file-property key truename)))) + (tramp-flush-file-properties key truename)))) ;;;###tramp-autoload -(defun tramp-flush-directory-property (key directory) +(defun tramp-flush-directory-properties (key directory) "Remove all properties of DIRECTORY in the cache context of KEY. Remove also properties of all files in subdirectories." (setq directory (tramp-compat-file-name-unquote directory)) @@ -203,7 +218,7 @@ Remove also properties of all files in subdirectories." ;; Remove file properties of symlinks. (when (and (stringp truename) (not (string-equal directory (directory-file-name truename)))) - (tramp-flush-directory-property key truename)))) + (tramp-flush-directory-properties key truename)))) ;; Reverting or killing a buffer should also flush file properties. ;; They could have been changed outside Tramp. In eshell, "ls" would @@ -222,7 +237,7 @@ This is suppressed for temporary buffers." (tramp-verbose 0)) (when (tramp-tramp-file-p bfn) (with-parsed-tramp-file-name bfn nil - (tramp-flush-file-property v localname))))))) + (tramp-flush-file-properties v localname))))))) (add-hook 'before-revert-hook 'tramp-flush-file-function) (add-hook 'eshell-pre-command-hook 'tramp-flush-file-function) @@ -291,7 +306,24 @@ used to cache connection properties of the local machine." (not (eq (tramp-get-connection-property key property 'undef) 'undef))) ;;;###tramp-autoload -(defun tramp-flush-connection-property (key) +(defun tramp-flush-connection-property (key property) + "Remove the named PROPERTY of a connection identified by KEY. +KEY identifies the connection, it is either a process or a +`tramp-file-name' structure. A special case is nil, which is +used to cache connection properties of the local machine. +PROPERTY is set persistent when KEY is a `tramp-file-name' structure." + ;; Unify key by removing localname and hop from `tramp-file-name' + ;; structure. Work with a copy in order to avoid side effects. + (when (tramp-file-name-p key) + (setq key (copy-tramp-file-name key)) + (setf (tramp-file-name-localname key) nil + (tramp-file-name-hop key) nil)) + (remhash property (tramp-get-hash-table key)) + (setq tramp-cache-data-changed t) + (tramp-message key 7 "%s" property)) + +;;;###tramp-autoload +(defun tramp-flush-connection-properties (key) "Remove all properties identified by KEY. KEY identifies the connection, it is either a process or a `tramp-file-name' structure. A special case is nil, which is diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el index 1f72e255c4..ed36761ed9 100644 --- a/lisp/net/tramp-cmds.el +++ b/lisp/net/tramp-cmds.el @@ -104,13 +104,13 @@ When called interactively, a Tramp connection has to be selected." (when keep-password (setq tramp-current-connection nil)) ;; Flush file cache. - (tramp-flush-directory-property vec "") + (tramp-flush-directory-properties vec "") ;; Flush connection cache. (when (processp (tramp-get-connection-process vec)) - (tramp-flush-connection-property (tramp-get-connection-process vec)) + (tramp-flush-connection-properties (tramp-get-connection-process vec)) (delete-process (tramp-get-connection-process vec))) - (tramp-flush-connection-property vec) + (tramp-flush-connection-properties vec) ;; Remove buffers. (dolist diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index a1d50b6f2e..a65b8e96d5 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -745,13 +745,13 @@ file names." (when (and t1 (eq op 'rename)) (with-parsed-tramp-file-name filename nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname))) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname))) (when t2 (with-parsed-tramp-file-name newname nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname)))))))) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname)))))))) (defun tramp-gvfs-handle-copy-file (filename newname &optional ok-if-already-exists keep-date @@ -785,8 +785,8 @@ file names." (tramp-error v 'file-error "Couldn't delete non-empty %s" directory))) - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-directory-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-directory-properties v localname) (unless (tramp-gvfs-send-command v (if (and trash delete-by-moving-to-trash) "gvfs-trash" "gvfs-rm") @@ -800,8 +800,8 @@ file names." (defun tramp-gvfs-handle-delete-file (filename &optional trash) "Like `delete-file' for Tramp files." (with-parsed-tramp-file-name filename nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname) (unless (tramp-gvfs-send-command v (if (and trash delete-by-moving-to-trash) "gvfs-trash" "gvfs-rm") @@ -1180,7 +1180,7 @@ file-notify events." (setq filename (directory-file-name (expand-file-name filename))) (with-parsed-tramp-file-name filename nil ;; We don't use cached values. - (tramp-set-file-property v localname "file-system-attributes" 'undef) + (tramp-flush-file-property v localname "file-system-attributes") (let* ((attr (tramp-gvfs-get-root-attributes filename 'file-system)) (size (cdr (assoc "filesystem::size" attr))) (used (cdr (assoc "filesystem::used" attr))) @@ -1205,8 +1205,8 @@ file-notify events." "Like `make-directory' for Tramp files." (setq dir (directory-file-name (expand-file-name dir))) (with-parsed-tramp-file-name dir nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-directory-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-directory-properties v localname) (save-match-data (let ((ldir (file-name-directory dir))) ;; Make missing directory parts. "gvfs-mkdir -p ..." does not @@ -1262,8 +1262,8 @@ file-notify events." (tramp-error v 'file-error "Couldn't write region to `%s'" filename)))) - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname) ;; Set file modification time. (when (or (eq visit t) (stringp visit)) @@ -1487,9 +1487,9 @@ ADDRESS can have the form \"xx:xx:xx:xx:xx:xx\" or \"[xx:xx:xx:xx:xx:xx]\"." (tramp-message v 6 "%s %s" signal-name (tramp-gvfs-stringify-dbus-message mount-info)) - (tramp-set-file-property v "/" "list-mounts" 'undef) + (tramp-flush-file-property v "/" "list-mounts") (if (string-equal (downcase signal-name) "unmounted") - (tramp-flush-file-property v "/") + (tramp-flush-file-properties v "/") ;; Set prefix, mountpoint and location. (unless (string-equal prefix "/") (tramp-set-file-property v "/" "prefix" prefix)) @@ -1865,7 +1865,7 @@ is applied, and it returns t if the return code is zero." (erase-buffer) (or (zerop (apply 'tramp-call-process vec command nil t nil args)) ;; Remove information about mounted connection. - (and (tramp-flush-file-property vec "/") nil))))) + (and (tramp-flush-file-properties vec "/") nil))))) ;; D-Bus BLUEZ functions. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 1ca19e05f2..361e4c3e30 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1104,8 +1104,8 @@ component is used as the target of the symlink." (tramp-error v 'file-already-exists localname) (delete-file linkname))) - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname) ;; Right, they are on the same host, regardless of user, ;; method, etc. We now make the link on the remote @@ -1500,8 +1500,8 @@ of." (defun tramp-sh-handle-set-file-modes (filename mode) "Like `set-file-modes' for Tramp files." (with-parsed-tramp-file-name filename nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname) ;; FIXME: extract the proper text from chmod's stderr. (tramp-barf-unless-okay v @@ -1512,8 +1512,8 @@ of." "Like `set-file-times' for Tramp files." (with-parsed-tramp-file-name filename nil (when (tramp-get-remote-touch v) - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname) (let ((time (if (or (null time) (equal time '(0 0))) (current-time) time))) @@ -1605,8 +1605,7 @@ be non-negative integers." (if (and user role type range) (tramp-set-file-property v localname "file-selinux-context" context) - (tramp-set-file-property - v localname "file-selinux-context" 'undef)) + (tramp-flush-file-property v localname "file-selinux-context")) t))))) (defun tramp-remote-acl-p (vec) @@ -1646,7 +1645,7 @@ be non-negative integers." (tramp-set-file-property v localname "file-acl" acl-string) t) ;; In case of errors, we return nil. - (tramp-set-file-property v localname "file-acl-string" 'undef) + (tramp-flush-file-property v localname "file-acl-string") nil))) ;; Simple functions using the `test' command. @@ -1940,8 +1939,8 @@ tramp-sh-handle-file-name-all-completions: internal error accessing `%s': `%s'" v2-localname))))) (tramp-error v2 'file-already-exists newname) (delete-file newname))) - (tramp-flush-file-property v2 (file-name-directory v2-localname)) - (tramp-flush-file-property v2 v2-localname) + (tramp-flush-file-properties v2 (file-name-directory v2-localname)) + (tramp-flush-file-properties v2 v2-localname) (tramp-barf-unless-okay v1 (format "%s %s %s" ln @@ -2007,8 +2006,8 @@ tramp-sh-handle-file-name-all-completions: internal error accessing `%s': `%s'" ;; When newname did exist, we have wrong cached values. (when t2 (with-parsed-tramp-file-name newname nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname)))))) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname)))))) (defun tramp-sh-handle-rename-file (filename newname &optional ok-if-already-exists) @@ -2133,14 +2132,16 @@ file names." ;; In case of `rename', we must flush the cache of the source file. (when (and t1 (eq op 'rename)) (with-parsed-tramp-file-name filename v1 - (tramp-flush-file-property v1 (file-name-directory v1-localname)) - (tramp-flush-file-property v1 v1-localname))) + (tramp-flush-file-properties + v1 (file-name-directory v1-localname)) + (tramp-flush-file-properties v1 v1-localname))) ;; When newname did exist, we have wrong cached values. (when t2 (with-parsed-tramp-file-name newname v2 - (tramp-flush-file-property v2 (file-name-directory v2-localname)) - (tramp-flush-file-property v2 v2-localname)))))))) + (tramp-flush-file-properties + v2 (file-name-directory v2-localname)) + (tramp-flush-file-properties v2 v2-localname)))))))) (defun tramp-do-copy-or-rename-file-via-buffer (op filename newname keep-date) "Use an Emacs buffer to copy or rename a file. @@ -2515,8 +2516,8 @@ The method used must be an out-of-band method." p v nil tramp-actions-copy-out-of-band)))) ;; Reset the transfer process properties. - (tramp-set-connection-property v "process-name" nil) - (tramp-set-connection-property v "process-buffer" nil) + (tramp-flush-connection-property v "process-name") + (tramp-flush-connection-property v "process-buffer") ;; Clear the remote prompt. (when (and remote-copy-program (not (tramp-send-command-and-check v nil))) @@ -2547,7 +2548,7 @@ The method used must be an out-of-band method." "Like `make-directory' for Tramp files." (setq dir (expand-file-name dir)) (with-parsed-tramp-file-name dir nil - (tramp-flush-directory-property v (file-name-directory localname)) + (tramp-flush-directory-properties v (file-name-directory localname)) (save-excursion (tramp-barf-unless-okay v (format "%s %s" @@ -2559,8 +2560,8 @@ The method used must be an out-of-band method." "Like `delete-directory' for Tramp files." (setq directory (expand-file-name directory)) (with-parsed-tramp-file-name directory nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-directory-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-directory-properties v localname) (tramp-barf-unless-okay v (format "cd / && %s %s" (or (and trash (tramp-get-remote-trash v)) @@ -2572,8 +2573,8 @@ The method used must be an out-of-band method." "Like `delete-file' for Tramp files." (setq filename (expand-file-name filename)) (with-parsed-tramp-file-name filename nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname) (tramp-barf-unless-okay v (format "%s %s" (or (and trash (tramp-get-remote-trash v)) "rm -f") @@ -2586,7 +2587,7 @@ The method used must be an out-of-band method." "Like `dired-compress-file' for Tramp files." ;; Code stolen mainly from dired-aux.el. (with-parsed-tramp-file-name file nil - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v localname) (save-excursion (let ((suffixes dired-compress-file-suffixes) suffix) @@ -2822,8 +2823,8 @@ the result will be a local, non-Tramp, file name." (let ((vec (tramp-get-connection-property proc "vector" nil))) (when vec (tramp-message vec 5 "Sentinel called: `%S' `%s'" proc event) - (tramp-flush-connection-property proc) - (tramp-flush-directory-property vec ""))))) + (tramp-flush-connection-properties proc) + (tramp-flush-directory-properties vec ""))))) ;; We use BUFFER also as connection buffer during setup. Because of ;; this, its original contents must be saved, and restored once @@ -2957,8 +2958,8 @@ the result will be a local, non-Tramp, file name." (set-process-buffer p nil) (kill-buffer (current-buffer))) (set-buffer-modified-p bmp)) - (tramp-set-connection-property v "process-name" nil) - (tramp-set-connection-property v "process-buffer" nil)))))) + (tramp-flush-connection-property v "process-name") + (tramp-flush-connection-property v "process-buffer")))))) (defun tramp-sh-handle-process-file (program &optional infile destination display &rest args) @@ -3080,7 +3081,7 @@ the result will be a local, non-Tramp, file name." (when tmpinput (delete-file tmpinput)) (unless process-file-side-effects - (tramp-flush-directory-property v "")) + (tramp-flush-directory-properties v "")) ;; Return exit status. (if (equal ret -1) @@ -3384,8 +3385,8 @@ the result will be a local, non-Tramp, file name." (when coding-system-used (set 'last-coding-system-used coding-system-used)))) - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname) ;; We must protect `last-coding-system-used', now we have set it ;; to its correct value. diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 5a8299b1da..ec689aea15 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -370,8 +370,8 @@ pass to the OPERATION." (delete-file newname))) ;; We must also flush the cache of the directory, because ;; `file-attributes' reads the values from there. - (tramp-flush-file-property v2 (file-name-directory v2-localname)) - (tramp-flush-file-property v2 v2-localname) + (tramp-flush-file-properties v2 (file-name-directory v2-localname)) + (tramp-flush-file-properties v2 v2-localname) (unless (tramp-smb-send-command v1 @@ -527,8 +527,8 @@ pass to the OPERATION." (tramp-message v 6 "\n%s" (buffer-string)))) ;; Reset the transfer process properties. - (tramp-set-connection-property v "process-name" nil) - (tramp-set-connection-property v "process-buffer" nil) + (tramp-flush-connection-property v "process-name") + (tramp-flush-connection-property v "process-buffer") (when t1 (delete-directory tmpdir 'recursive)))) ;; Handle KEEP-DATE argument. @@ -545,8 +545,8 @@ pass to the OPERATION." ;; When newname did exist, we have wrong cached values. (when t2 (with-parsed-tramp-file-name newname nil - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname)))) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname)))) ;; We must do it file-wise. (t @@ -591,8 +591,8 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." ;; We must also flush the cache of the directory, because ;; `file-attributes' reads the values from there. - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname) (unless (tramp-smb-get-share v) (tramp-error v 'file-error "Target `%s' must contain a share name" newname)) @@ -626,8 +626,8 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (with-parsed-tramp-file-name directory nil ;; We must also flush the cache of the directory, because ;; `file-attributes' reads the values from there. - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-directory-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-directory-properties v localname) (unless (tramp-smb-send-command v (format "%s \"%s\"" @@ -647,8 +647,8 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (with-parsed-tramp-file-name filename nil ;; We must also flush the cache of the directory, because ;; `file-attributes' reads the values from there. - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname) (unless (tramp-smb-send-command v (format "%s \"%s\"" @@ -780,8 +780,8 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (substring-no-properties (buffer-string))))) ;; Reset the transfer process properties. - (tramp-set-connection-property v "process-name" nil) - (tramp-set-connection-property v "process-buffer" nil)))))))) + (tramp-flush-connection-property v "process-name") + (tramp-flush-connection-property v "process-buffer")))))))) (defun tramp-smb-handle-file-attributes (filename &optional id-format) "Like `file-attributes' for Tramp files." @@ -1144,8 +1144,8 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (format "mkdir \"%s\"" file))) ;; We must also flush the cache of the directory, because ;; `file-attributes' reads the values from there. - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname)) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname)) (unless (file-directory-p directory) (tramp-error v 'file-error "Couldn't make directory %s" directory)))))) @@ -1191,8 +1191,8 @@ component is used as the target of the symlink." ;; We must also flush the cache of the directory, because ;; `file-attributes' reads the values from there. - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname) (unless (tramp-smb-send-command @@ -1307,14 +1307,14 @@ component is used as the target of the symlink." ;; Cleanup. We remove all file cache values for the connection, ;; because the remote process could have changed them. - (tramp-set-connection-property v "process-name" nil) - (tramp-set-connection-property v "process-buffer" nil) + (tramp-flush-connection-property v "process-name") + (tramp-flush-connection-property v "process-buffer") (when tmpinput (delete-file tmpinput)) (unless outbuf (kill-buffer (tramp-get-connection-property v "process-buffer" nil))) (unless process-file-side-effects - (tramp-flush-directory-property v "")) + (tramp-flush-directory-properties v "")) ;; Return exit status. (if (equal ret -1) @@ -1350,10 +1350,10 @@ component is used as the target of the symlink." ;; We must also flush the cache of the directory, because ;; `file-attributes' reads the values from there. - (tramp-flush-file-property v1 (file-name-directory v1-localname)) - (tramp-flush-file-property v1 v1-localname) - (tramp-flush-file-property v2 (file-name-directory v2-localname)) - (tramp-flush-file-property v2 v2-localname) + (tramp-flush-file-properties v1 (file-name-directory v1-localname)) + (tramp-flush-file-properties v1 v1-localname) + (tramp-flush-file-properties v2 (file-name-directory v2-localname)) + (tramp-flush-file-properties v2 v2-localname) (unless (tramp-smb-get-share v2) (tramp-error v2 'file-error "Target `%s' must contain a share name" newname)) @@ -1383,7 +1383,7 @@ component is used as the target of the symlink." "Like `set-file-acl' for Tramp files." (ignore-errors (with-parsed-tramp-file-name filename nil - (tramp-set-file-property v localname "file-acl" 'undef) + (tramp-flush-file-property v localname "file-acl") (when (and (stringp acl-string) (executable-find tramp-smb-acl-program)) (let* ((share (tramp-smb-get-share v)) @@ -1444,14 +1444,14 @@ component is used as the target of the symlink." t))) ;; Reset the transfer process properties. - (tramp-set-connection-property v "process-name" nil) - (tramp-set-connection-property v "process-buffer" nil))))))) + (tramp-flush-connection-property v "process-name") + (tramp-flush-connection-property v "process-buffer"))))))) (defun tramp-smb-handle-set-file-modes (filename mode) "Like `set-file-modes' for Tramp files." (with-parsed-tramp-file-name filename nil (when (tramp-smb-get-cifs-capabilities v) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v localname) (unless (tramp-smb-send-command v (format "chmod \"%s\" %o" (tramp-smb-get-localname v) mode)) (tramp-error @@ -1504,8 +1504,8 @@ component is used as the target of the symlink." (set-process-buffer (tramp-get-connection-process v) nil) (kill-buffer (current-buffer))) (set-buffer-modified-p bmp))) - (tramp-set-connection-property v "process-name" nil) - (tramp-set-connection-property v "process-buffer" nil))))) + (tramp-flush-connection-property v "process-name") + (tramp-flush-connection-property v "process-buffer"))))) (defun tramp-smb-handle-substitute-in-file-name (filename) "Like `handle-substitute-in-file-name' for Tramp files. @@ -1538,8 +1538,8 @@ errors for shares like \"C$/\", which are common in Microsoft Windows." ;; We must also flush the cache of the directory, because ;; `file-attributes' reads the values from there. - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname) (let ((curbuf (current-buffer)) (tmpfile (tramp-compat-make-temp-file filename))) (when (and append (file-exists-p filename)) @@ -1863,8 +1863,8 @@ If ARGUMENT is non-nil, use it as argument for tramp-smb-version (tramp-get-connection-property vec "smbclient-version" tramp-smb-version)) - (tramp-flush-directory-property vec "") - (tramp-flush-connection-property vec)) + (tramp-flush-directory-properties vec "") + (tramp-flush-connection-properties vec)) (tramp-set-connection-property vec "smbclient-version" tramp-smb-version))) @@ -1965,8 +1965,8 @@ If ARGUMENT is non-nil, use it as argument for smbserver-version (tramp-get-connection-property vec "smbserver-version" smbserver-version)) - (tramp-flush-directory-property vec "") - (tramp-flush-connection-property vec)) + (tramp-flush-directory-properties vec "") + (tramp-flush-connection-properties vec)) (tramp-set-connection-property vec "smbserver-version" smbserver-version)))) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index c73ec1de30..398d91ef77 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -2948,8 +2948,8 @@ User is always nil." localname))))) (tramp-error v 'file-already-exists newname) (delete-file newname))) - (tramp-flush-file-property v (file-name-directory localname)) - (tramp-flush-file-property v localname) + (tramp-flush-file-properties v (file-name-directory localname)) + (tramp-flush-file-properties v localname) (copy-file filename newname 'ok-if-already-exists 'keep-time 'preserve-uid-gid 'preserve-permissions))) @@ -2993,7 +2993,7 @@ User is always nil." "Like `dired-uncache' for Tramp files." (with-parsed-tramp-file-name (if (file-directory-p dir) dir (file-name-directory dir)) nil - (tramp-flush-directory-property v localname))) + (tramp-flush-directory-properties v localname))) (defun tramp-handle-file-accessible-directory-p (filename) "Like `file-accessible-directory-p' for Tramp files." commit 489d6466372f488adc53897435fff290394b62f7 Author: Stefan Monnier Date: Tue Dec 12 09:11:17 2017 -0500 * lisp/subr.el (run-mode-hooks): Set parse-sexp-lookup-properties if syntax-propertize-function is set (bug#24749). * lisp/progmodes/sh-script.el (sh-set-shell): * lisp/textmodes/texinfo.el (texinfo-mode): * lisp/textmodes/mhtml-mode.el (mhtml-mode): * lisp/progmodes/js.el (js-mode): Don't set parse-sexp-lookup-properties. diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 1f86909362..3d3ea079cf 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3869,7 +3869,6 @@ If one hasn't been set, or if it's stale, prompt for a new one." (setq-local prettify-symbols-alist js--prettify-symbols-alist) (setq-local parse-sexp-ignore-comments t) - (setq-local parse-sexp-lookup-properties t) (setq-local which-func-imenu-joiner-function #'js--which-func-joiner) ;; Comments diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 2a867bb365..bebb1bcba9 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -2392,7 +2392,6 @@ whose value is the shell name (don't quote it)." (funcall mksym "rules") :forward-token (funcall mksym "forward-token") :backward-token (funcall mksym "backward-token"))) - (setq-local parse-sexp-lookup-properties t) (unless sh-use-smie (setq-local sh-kw-alist (sh-feature sh-kw)) (let ((regexp (sh-feature sh-kws-for-done))) diff --git a/lisp/subr.el b/lisp/subr.el index bf51c934cf..8468255ad2 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1876,8 +1876,15 @@ running their FOO-mode-hook." (push hook delayed-mode-hooks)) ;; Normal case, just run the hook as before plus any delayed hooks. (setq hooks (nconc (nreverse delayed-mode-hooks) hooks)) + (and syntax-propertize-function + (not (buffer-local-p 'parse-sexp-lookup-properties)) + ;; `syntax-propertize' sets `parse-sexp-lookup-properties' for us, but + ;; in order for the sexp primitives to automatically call + ;; `syntax-propertize' we need `parse-sexp-lookup-properties' to be + ;; set first. + (setq-local parse-sexp-lookup-properties t)) (setq delayed-mode-hooks nil) - (apply 'run-hooks (cons 'change-major-mode-after-body-hook hooks)) + (apply #'run-hooks (cons 'change-major-mode-after-body-hook hooks)) (if (buffer-file-name) (with-demoted-errors "File local-variables error: %s" (hack-local-variables 'no-mode))) diff --git a/lisp/textmodes/mhtml-mode.el b/lisp/textmodes/mhtml-mode.el index 09da155f48..3e37edefb7 100644 --- a/lisp/textmodes/mhtml-mode.el +++ b/lisp/textmodes/mhtml-mode.el @@ -366,7 +366,6 @@ Code inside a