mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-30 04:10:54 -08:00
* admin/charsets/mapconv: * build-aux/gitlog-to-changelog (parse_amend_file, git_dir_option): * lisp/progmodes/verilog-mode.el (verilog-delay-re): (verilog-type-font-keywords, verilog-read-always-signals-recurse): (verilog-is-number): * lisp/progmodes/vera-mode.el (vera-font-lock-keywords): * test/src/emacs-module-tests.el (mod-test-sum-test): * lisp/xml.el: (xml--entity-replacement-text): * lisp/version.el (emacs-repository-version-git): * lisp/textmodes/sgml-mode.el (sgml-quote): * lisp/textmodes/css-mode.el (css-escapes-re) (css--colors-regexp): * lisp/progmodes/prolog.el (prolog-syntax-propertize-function): * lisp/progmodes/hideif.el (hif-token-regexp, hif-tokenize): * lisp/progmodes/ebnf-dtd.el: (ebnf-dtd-attlistdecl) (ebnf-dtd-entitydecl, ebnf-dtd-lex): * lisp/progmodes/ebnf-ebx.el (ebnf-ebx-hex-character): * lisp/progmodes/ebnf-abn.el (ebnf-abn-character): * lisp/progmodes/cperl-mode.el (cperl-highlight-charclass) (cperl-find-pods-heres): * lisp/progmodes/cc-mode.el (c-maybe-quoted-number-head) (c-maybe-quoted-number, c-parse-quotes-before-change) (c-parse-quotes-after-change, c-quoted-number-head-before-point) (c-quoted-number-straddling-point): * lisp/progmodes/ada-mode.el (featurep, ada-in-numeric-literal-p) (ada-font-lock-keywords): * lisp/org/org-mobile.el (org-mobile-copy-agenda-files) * lisp/org/org-table.el (org-table-number-regexp): (org-mobile-update-checksum-for-capture-file): * lisp/nxml/xsd-regexp.el (xsdre-gen-categories): * lisp/nxml/xmltok.el (let*): * lisp/nxml/rng-xsd.el (rng-xsd-convert-hex-binary) (rng-xsd-convert-any-uri): * lisp/nxml/rng-uri.el (rng-uri-file-name-1) (rng-uri-unescape-multibyte, rng-uri-unescape-unibyte) (rng-uri-unescape-unibyte-match) (rng-uri-unescape-unibyte-replace): * lisp/nxml/rng-cmpct.el (rng-c-process-escapes): * lisp/nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set): * lisp/net/shr-color.el (shr-color->hexadecimal): * lisp/mail/rfc2231.el (rfc2231-decode-encoded-string): * lisp/international/mule-cmds.el (read-char-by-name): * lisp/htmlfontify.el (hfy-hex-regex): * lisp/gnus/nneething.el (nneething-decode-file-name): * lisp/gnus/mml-sec.el (mml-secure-find-usable-keys): * lisp/gnus/gnus-art.el (gnus-button-mid-or-mail-heuristic-alist): * lisp/faces.el (read-color): * lisp/epg.el (epg--status-ERRSIG, epg--status-VALIDSIG) (epg--status-SIG_CREATED, epg--decode-percent-escape) (epg--decode-hexstring, epg--decode-quotedstring) (epg-dn-from-string): * lisp/emulation/cua-rect.el (cua-incr-rectangle): * lisp/dnd.el (dnd-unescape-uri): * lisp/cedet/semantic/lex.el (semantic-lex-number-expression): * lisp/cedet/semantic/java.el (semantic-java-number-regexp): * lisp/calc/calc-lang.el (pascal): * lisp/calc/calc-ext.el (math-read-number-fancy): * lisp/calc/calc-aent.el (math-read-token): Replace various combinations of [0-9a-fA-F] with [[:xdigit:]]. (Bug#36167)
152 lines
4.8 KiB
Bash
Executable file
152 lines
4.8 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
# Copyright (C) 2015-2019 Free Software Foundation, Inc.
|
|
|
|
# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
|
|
# National Institute of Advanced Industrial Science and Technology (AIST)
|
|
# Registration Number H13PRO009
|
|
|
|
# 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 <https://www.gnu.org/licenses/>.
|
|
|
|
# Commentary:
|
|
|
|
# Convert charset map of various format into this:
|
|
# 0xXX 0xYYYY
|
|
# where,
|
|
# XX is a code point of the charset in hexa-decimal,
|
|
# YYYY is the corresponding Unicode character code in hexa-decimal.
|
|
# Arguments are:
|
|
# $1: source map file
|
|
# $2: address pattern for sed (optionally with substitution command)
|
|
# $3: format of source map file
|
|
# GLIBC-1 GLIBC-2 GLIBC-2-7 CZYBORRA IANA UNICODE UNICODE2 YASUOKA
|
|
# $4: awk script
|
|
|
|
## So that eg [A-F] as used by KANJI-DATABASE branch below works as expected.
|
|
## Otherwise with LANG=en_US.utf8, CNS-6.map was generated with a
|
|
## bogus entry. By experiment, LC_COLLATE=C was not enough.
|
|
export LC_ALL=C
|
|
|
|
BASE=`expr "$1" : '.*/\(.*\)' '|' "$1"` # basename
|
|
FILE="admin/charsets/mapfiles/$BASE"
|
|
BASE=`expr "$BASE" : '\(.*\)\.gz$' '|' "$BASE"` # remove any .gz suffix
|
|
AWK=${AWK:-awk}
|
|
|
|
case "$3" in
|
|
GLIBC*)
|
|
FILE="$BASE in localedata/charmaps of glibc";
|
|
SOURCE="";;
|
|
CZYBORRA)
|
|
BASE="$BASE.gz";
|
|
SOURCE="http://czyborra.com/charsets/${BASE}";;
|
|
IANA)
|
|
SOURCE="http://www.iana.org/assignments/charset-reg/${BASE}";;
|
|
UNICODE)
|
|
SOURCE="http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/${BASE}";;
|
|
UNICODE2)
|
|
SOURCE="http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/${BASE}";;
|
|
YASUOKA)
|
|
BASE="$BASE.Z";
|
|
SOURCE="http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/CJKtable/${BASE}";;
|
|
KANJI-DATABASE)
|
|
SOURCE="http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4";;
|
|
*)
|
|
printf 'Unknown file type: %s\n' "$3"
|
|
exit 1;;
|
|
esac
|
|
|
|
if [ -n "$SOURCE" ] ; then
|
|
echo "# Generated from $FILE which is a copy of";
|
|
echo "# $SOURCE"
|
|
else
|
|
echo "# Generated from $FILE"
|
|
fi
|
|
|
|
|
|
if [ -n "$4" ] ; then
|
|
if [ -f "$4" ] ; then
|
|
AWKPROG="$AWK -f $4"
|
|
else
|
|
echo "Awk program does not exist: $4"
|
|
exit 1
|
|
fi
|
|
else
|
|
AWKPROG=cat
|
|
fi
|
|
|
|
if [ "$3" = "GLIBC-1" ] ; then
|
|
# Source format is:
|
|
# <UYYYY> /xXX
|
|
gunzip -c $1 | sed -n -e "${2}p" \
|
|
| sed -e 's,<U\([^>]*\)>[ ]*/x\(..\).*,0x\2 0x\1,' \
|
|
| sort | ${AWKPROG}
|
|
elif [ "$3" = "GLIBC-2" ] ; then
|
|
# Source format is:
|
|
# <UYYYY> /xXX/xZZ
|
|
gunzip -c $1 | sed -n -e "${2}p" \
|
|
| sed -e 's,<U\([^>]*\)>[ ]*/x\(..\)/x\(..\).*,0x\2\3 0x\1,' \
|
|
| sort | ${AWKPROG}
|
|
elif [ "$3" = "GLIBC-2-7" ] ; then
|
|
# Source format is:
|
|
# <UYYYY> /xXX/xZZ
|
|
# We must drop MSBs of XX and ZZ
|
|
gunzip -c $1 | sed -n -e "${2}p" \
|
|
| sed -e 's/xa/x2/g' -e 's/xb/x3/g' -e 's/xc/x4/g' \
|
|
-e 's/xd/x5/g' -e 's/xe/x6/g' -e 's/xf/x7/g' \
|
|
-e 's,<U\([^>]*\)>[ ]*/x\(..\)/x\(..\).*,0x\2\3 0x\1,' \
|
|
| sort | ${AWKPROG}
|
|
elif [ "$3" = "CZYBORRA" ] ; then
|
|
# Source format is:
|
|
# =XX U+YYYY
|
|
sed -n -e "${2}p" < $1 \
|
|
| sed -e 's/=\(..\)[^U]*U+\([0-9A-F]*\).*/0x\1 0x\2/' \
|
|
| sort | ${AWKPROG}
|
|
elif [ "$3" = "IANA" ] ; then
|
|
# Source format is:
|
|
# 0xXX 0xYYYY
|
|
sed -n -e "${2}p" < $1 \
|
|
| sed -e 's/\(0x[[:xdigit:]]*\)[^0]*\(0x[[:xdigit:]]*\).*/\1 \2/' \
|
|
| sort | ${AWKPROG}
|
|
elif [ "$3" = "UNICODE" ] ; then
|
|
# Source format is:
|
|
# YYYY XX
|
|
# We perform reverse sort to prefer the first one in the
|
|
# duplicated mappings (e.g. 0x20->U+0020, 0x20->U+00A0).
|
|
sed -n -e "${2}p" < $1 \
|
|
| sed -e 's/\([0-9A-F]*\)[^0-9A-F]*\([0-9A-F]*\).*/0x\2 0x\1/' \
|
|
| sort -r
|
|
elif [ "$3" = "UNICODE2" ] ; then
|
|
# Source format is:
|
|
# 0xXXXX 0xYYYY # ...
|
|
sed -n -e "${2}p" < $1 \
|
|
| sed -e 's/\([0-9A-Fx]*\)[^0]*\([0-9A-Fx]*\).*/\1 \2/' \
|
|
| ${AWKPROG} | sort -n -k 4,4
|
|
elif [ "$3" = "YASUOKA" ] ; then
|
|
# Source format is:
|
|
# YYYY 0-XXXX (XXXX is a Kuten code)
|
|
sed -n -e "${2}p" < $1 \
|
|
| sed -e 's/\([0-9A-F]*\)[^0]*0-\([0-9]*\).*/0x\2 0x\1/' \
|
|
| sort | ${AWKPROG}
|
|
elif [ "$3" = "KANJI-DATABASE" ] ; then
|
|
# Source format is:
|
|
# C?-XXXX U+YYYYY .....
|
|
sed -n -e "${2}p" < $1 \
|
|
| sed -e 's/...\(....\) U+\([0-9A-F]*\).*/0x\1 0x\2/' \
|
|
| sort | ${AWKPROG}
|
|
else
|
|
printf 'Invalid arguments: %s\n' "$3"
|
|
exit 1
|
|
fi
|