From d74545af2334960d43ae45714b4eddb5ecdbd528 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Sun, 7 Nov 2021 01:41:07 +0100 Subject: [PATCH] digraphs: parse recent plan9 character additions Fix syntax warnings for 2020-05-19 change in upstream repository to support higher-plane unicode references. Record download rule for future validation. --- Makefile | 6 +++++- tools/mkdigraphs-plan9 | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 961f472..e635f5f 100644 --- a/Makefile +++ b/Makefile @@ -44,13 +44,17 @@ data/digraphs-shiar.inc.pl: tools/mkdigraphs-shiar shiar.inc.txt data/xorg-compose: $(download) tools/wget-ifmodified http://cgit.freedesktop.org/xorg/lib/libX11/plain/nls/en_US.UTF-8/Compose.pre $@ - data/digraphs-xorg.inc.pl: tools/mkdigraphs-xorg data/xorg-compose $(call cmdsave,$^) data/digraphs-vim.inc.pl: tools/mkdigraphs-vim $(call cmdsave,$<) +data/digraphs-plan9.txt: + tools/wget-ifmodified https://9fans.github.io/usr/local/plan9/lib/keyboard $@ +data/digraphs-plan9.inc.pl: tools/mkdigraphs-plan9 data/digraphs-plan9.txt + $(call cmdsave,$^) + data/digraphs.inc.pl: tools/mkdigraphlist data/digraphs-rfc.inc.pl data/digraphs-vim.inc.pl data/digraphs-shiar.inc.pl data/unicode-char.inc.pl $(call cmdsave,$<) diff --git a/tools/mkdigraphs-plan9 b/tools/mkdigraphs-plan9 index 54b8b3c..31bab3c 100755 --- a/tools/mkdigraphs-plan9 +++ b/tools/mkdigraphs-plan9 @@ -5,7 +5,7 @@ use utf8; use open IO => ':utf8', ':std'; use Data::Dump 'pp'; -our $VERSION = '1.00'; +our $VERSION = '1.01'; # translation table for deprecated code points my %replace = ( @@ -23,8 +23,9 @@ say "# automatically generated by $0"; say 'use utf8;'; say '+{'; while ($_ = readline) { - my ($chrhex, $mnems, $sample, $name) = m{\A([0-9A-F]{4}) (.{11}) (.)\t(.*)}i + my ($chrhex, $mnems, $sample, $name) = m{\A([0-9A-F ]{5}) (.{11}) (.)\h(.*)}i or warn("syntax error on line $.: $_"), next; + $chrhex =~ s/ $//; my $chrnum = hex $chrhex; my $chr = chr $chrnum; $chr eq $sample -- 2.30.0