diff --git a/japanese-otf-uptex/00otf-uptex.txt b/japanese-otf-uptex/00otf-uptex.txt
index 29fb78f..43b231f 100644
--- a/japanese-otf-uptex/00otf-uptex.txt
+++ b/japanese-otf-uptex/00otf-uptex.txt
@@ -1,5 +1,5 @@
 [ Title ]
-japanese-otf-uptex Ver.0.24  2019/09/07
+japanese-otf-uptex Ver.0.25  2020/02/28
 
 
 [ Abstract ]
@@ -388,3 +388,12 @@ https://github.com/t-tk/japanese-otf-uptex
     Increment version number.
   script/CheckDVICode.pm ::
     Make half width U+00B7 in VFs.
+2020.02.28 Ver0.25
+  sty/otf.sty, sty/mlutf.sty ::
+    Increment version number.
+  script/CheckDVICode.pm, script/sp_list_j.txt,
+  test/uplatex/sp_jp_{utf,text}.tex ::
+    Update references:
+    Adobe-Japan1-7 cid2code.txt (Version 07/30/2019).
+  COPYRIGHT ::
+    Update year.
diff --git a/japanese-otf-uptex/COPYRIGHT b/japanese-otf-uptex/COPYRIGHT
index 7ccde03..8cee4f3 100644
--- a/japanese-otf-uptex/COPYRIGHT
+++ b/japanese-otf-uptex/COPYRIGHT
@@ -1,5 +1,5 @@
 Copyright (C) 2003--2019 SAITO Shuzaburo and INOUE Koichi
-Copyright (C) 2007--2019 TANAKA Takuji
+Copyright (C) 2007--2020 TANAKA Takuji
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/japanese-otf-uptex/script/CheckDVICode.pm b/japanese-otf-uptex/script/CheckDVICode.pm
index 6ef5e52..3af7198 100644
--- a/japanese-otf-uptex/script/CheckDVICode.pm
+++ b/japanese-otf-uptex/script/CheckDVICode.pm
@@ -268,6 +268,9 @@ sub is_ucs_jpn_range{
 	return 1 if ($dvicode<=0x1F1FF); # Enclosed Alphanumeric Supplement
 	return 1 if ($dvicode<=0x1F2FF); # Enclosed Ideographic Supplement
 
+	return 0 if ($dvicode< 0x1F780);
+	return 1 if ($dvicode<=0x1F7FF); # Geometric Shapes Extended
+
 	return 0 if ($dvicode< 0x20000);
 	return 1 if ($dvicode<=0x2A6DF); # CJK Unified Ideographs Extension B
 	return 1 if ($dvicode<=0x2B73F); # CJK Unified Ideographs Extension C
diff --git a/japanese-otf-uptex/script/sp_list_j.txt b/japanese-otf-uptex/script/sp_list_j.txt
index a6ab70c..2092c57 100644
--- a/japanese-otf-uptex/script/sp_list_j.txt
+++ b/japanese-otf-uptex/script/sp_list_j.txt
@@ -1,6 +1,6 @@
 %
 % This file is generated from the data of UniJIS-UTF32
-% in cid2code.txt (Version 07/30/2018)
+% in cid2code.txt (Version 07/30/2019)
 % for Adobe-Japan1-7
 %
 % Reference:
@@ -26,15 +26,15 @@
 1F142,1F143,1F144,1F145,1F146,1F147,1F148,1F149,1F202,1F237
 1F170,1F171,1F172,1F173,1F174,1F175,1F176,1F177,1F178,1F179
 1F17A,1F17B,1F17C,1F17D,1F17E,1F17F,1F180,1F181,1F182,1F183
-1F184,1F185,1F186,1F187,1F188,1F189,2F945,2090E,26951,2B7D8
-2F8FC,2F995,2F8EA,2F822,26222,20BB7,29D4B,2F833,2B78E,2F8AC
-20A64,2F903,2B746,2B777,2F90B,20B9F,2F828,2F921,2F83F,2F873
-2D544,2000B,2F852,2967F,2F947,201A2,2E569,2B751,2F8B2,27FB7
-23CFE,2F91A,25AD7,2F89A,2F90F,2123D,2F81A,24D14,2F862,2B789
-2F9D0,2F9DF,2567F,266B0,20628,2008A,20984,2F82C,2F86D,2F8B6
-26999,233CC,2F8DB,2A9E6,2B7BD,2F96C,2E278,2053F,2626A,200B0
-2E6EA,28987,28E17,2B81A,242EE,2F8E1,23CBE,20611,2F9F4,2F804
-2363A,233FE,22609
+1F184,1F185,1F186,1F187,1F188,1F189,1F79C,2F945,2090E,26951
+2B7D8,2F8FC,2F995,2F8EA,2F822,26222,20BB7,29D4B,2F833,2B78E
+2F8AC,20A64,2F903,2B746,2B777,2F90B,20B9F,2F828,2F921,2F83F
+2F873,2D544,2000B,2F852,2967F,2F947,201A2,2E569,2B751,2F8B2
+27FB7,23CFE,2F91A,25AD7,2F89A,2F90F,2123D,2F81A,24D14,2F862
+2B789,2F9D0,2F9DF,2567F,266B0,20628,2008A,20984,2F82C,2F86D
+2F8B6,26999,233CC,2F8DB,2A9E6,2B7BD,2F96C,2E278,2053F,2626A
+200B0,2E6EA,28987,28E17,2B81A,242EE,2F8E1,23CBE,20611,2F9F4
+2F804,2363A,233FE,22609
 
 %Adobe-Japan1-5
 2131B,2146E,218BD,216B4,21E34,231C4,235C4,2373F,23763,247F1
diff --git a/japanese-otf-uptex/sty/mlutf.sty b/japanese-otf-uptex/sty/mlutf.sty
index 497ec37..cf6a7e7 100644
--- a/japanese-otf-uptex/sty/mlutf.sty
+++ b/japanese-otf-uptex/sty/mlutf.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.24 ttk]
+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.25 ttk]
 %force catcode of \" be 12
 \count@\catcode`\"
 \catcode`\"=12
diff --git a/japanese-otf-uptex/sty/otf.sty b/japanese-otf-uptex/sty/otf.sty
index d2d4415..b92d403 100644
--- a/japanese-otf-uptex/sty/otf.sty
+++ b/japanese-otf-uptex/sty/otf.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{otf}[2019/04/01 v1.7b8 psitau, u0.24 ttk]
+\ProvidesPackage{otf}[2019/04/01 v1.7b8 psitau, u0.25 ttk]
 \RequirePackage{keyval}
 %for processing options 
 \newif\if@kana \@kanafalse
diff --git a/japanese-otf-uptex/test/uplatex/sp_jp_text.tex b/japanese-otf-uptex/test/uplatex/sp_jp_text.tex
index e771679..24203b5 100644
--- a/japanese-otf-uptex/test/uplatex/sp_jp_text.tex
+++ b/japanese-otf-uptex/test/uplatex/sp_jp_text.tex
@@ -1,6 +1,6 @@
 %
 % This file is generated from the data of UniJIS-UTF32
-% in cid2code.txt (Version 02/05/2019)
+% in cid2code.txt (Version 07/30/2019)
 % for Adobe-Japan1-7
 %
 % Reference:
@@ -26,15 +26,15 @@
 🅂🅃🅄🅅🅆🅇🅈🅉🈂🈷
 🅰🅱🅲🅳🅴🅵🅶🅷🅸🅹
 🅺🅻🅼🅽🅾🅿🆀🆁🆂🆃
-🆄🆅🆆🆇🆈🆉眞𠤎𦥑𫟘
-沿芽槪割𦈢𠮷𩵋卿𫞎憲
-𠩤浩𫝆𫝷滋𠮟勺爵周将
-𭕄𠀋城𩙿真𠆢𮕩𫝑成𧾷
-𣳾炭𥫗彫潮𡈽冬𤴔姬𫞉
-諭輸𥙿𦚰𠘨𠂊𠦄卉寃拔
-𦦙𣏌杞𪧦𫞽絣𮉸𠔿𦉪𠂰
-𮛪𨦇𨸗𫠚𤋮桒𣲾𠘑嶲你
-𣘺𣏾𢘉
+🆄🆅🆆🆇🆈🆉🞜眞𠤎𦥑
+𫟘沿芽槪割𦈢𠮷𩵋卿𫞎
+憲𠩤浩𫝆𫝷滋𠮟勺爵周
+将𭕄𠀋城𩙿真𠆢𮕩𫝑成
+𧾷𣳾炭𥫗彫潮𡈽冬𤴔姬
+𫞉諭輸𥙿𦚰𠘨𠂊𠦄卉寃
+拔𦦙𣏌杞𪧦𫞽絣𮉸𠔿𦉪
+𠂰𮛪𨦇𨸗𫠚𤋮桒𣲾𠘑嶲
+你𣘺𣏾𢘉
 
 Adobe-Japan1-5\\
 𡌛𡑮𡢽𡚴𡸴𣇄𣗄𣜿𣝣𤟱
diff --git a/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex b/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex
index b1d08c6..3f9a1e6 100644
--- a/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex
+++ b/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex
@@ -1,6 +1,6 @@
 %
 % This file is generated from the data of UniJIS-UTF32
-% in cid2code.txt (Version 02/05/2019)
+% in cid2code.txt (Version 07/30/2019)
 % for Adobe-Japan1-7
 %
 % Reference:
@@ -26,15 +26,15 @@
 \UTF{1F142}\UTF{1F143}\UTF{1F144}\UTF{1F145}\UTF{1F146}\UTF{1F147}\UTF{1F148}\UTF{1F149}\UTF{1F202}\UTF{1F237}%
 \UTF{1F170}\UTF{1F171}\UTF{1F172}\UTF{1F173}\UTF{1F174}\UTF{1F175}\UTF{1F176}\UTF{1F177}\UTF{1F178}\UTF{1F179}%
 \UTF{1F17A}\UTF{1F17B}\UTF{1F17C}\UTF{1F17D}\UTF{1F17E}\UTF{1F17F}\UTF{1F180}\UTF{1F181}\UTF{1F182}\UTF{1F183}%
-\UTF{1F184}\UTF{1F185}\UTF{1F186}\UTF{1F187}\UTF{1F188}\UTF{1F189}\UTF{2F945}\UTF{2090E}\UTF{26951}\UTF{2B7D8}%
-\UTF{2F8FC}\UTF{2F995}\UTF{2F8EA}\UTF{2F822}\UTF{26222}\UTF{20BB7}\UTF{29D4B}\UTF{2F833}\UTF{2B78E}\UTF{2F8AC}%
-\UTF{20A64}\UTF{2F903}\UTF{2B746}\UTF{2B777}\UTF{2F90B}\UTF{20B9F}\UTF{2F828}\UTF{2F921}\UTF{2F83F}\UTF{2F873}%
-\UTF{2D544}\UTF{2000B}\UTF{2F852}\UTF{2967F}\UTF{2F947}\UTF{201A2}\UTF{2E569}\UTF{2B751}\UTF{2F8B2}\UTF{27FB7}%
-\UTF{23CFE}\UTF{2F91A}\UTF{25AD7}\UTF{2F89A}\UTF{2F90F}\UTF{2123D}\UTF{2F81A}\UTF{24D14}\UTF{2F862}\UTF{2B789}%
-\UTF{2F9D0}\UTF{2F9DF}\UTF{2567F}\UTF{266B0}\UTF{20628}\UTF{2008A}\UTF{20984}\UTF{2F82C}\UTF{2F86D}\UTF{2F8B6}%
-\UTF{26999}\UTF{233CC}\UTF{2F8DB}\UTF{2A9E6}\UTF{2B7BD}\UTF{2F96C}\UTF{2E278}\UTF{2053F}\UTF{2626A}\UTF{200B0}%
-\UTF{2E6EA}\UTF{28987}\UTF{28E17}\UTF{2B81A}\UTF{242EE}\UTF{2F8E1}\UTF{23CBE}\UTF{20611}\UTF{2F9F4}\UTF{2F804}%
-\UTF{2363A}\UTF{233FE}\UTF{22609}
+\UTF{1F184}\UTF{1F185}\UTF{1F186}\UTF{1F187}\UTF{1F188}\UTF{1F189}\UTF{1F79C}\UTF{2F945}\UTF{2090E}\UTF{26951}%
+\UTF{2B7D8}\UTF{2F8FC}\UTF{2F995}\UTF{2F8EA}\UTF{2F822}\UTF{26222}\UTF{20BB7}\UTF{29D4B}\UTF{2F833}\UTF{2B78E}%
+\UTF{2F8AC}\UTF{20A64}\UTF{2F903}\UTF{2B746}\UTF{2B777}\UTF{2F90B}\UTF{20B9F}\UTF{2F828}\UTF{2F921}\UTF{2F83F}%
+\UTF{2F873}\UTF{2D544}\UTF{2000B}\UTF{2F852}\UTF{2967F}\UTF{2F947}\UTF{201A2}\UTF{2E569}\UTF{2B751}\UTF{2F8B2}%
+\UTF{27FB7}\UTF{23CFE}\UTF{2F91A}\UTF{25AD7}\UTF{2F89A}\UTF{2F90F}\UTF{2123D}\UTF{2F81A}\UTF{24D14}\UTF{2F862}%
+\UTF{2B789}\UTF{2F9D0}\UTF{2F9DF}\UTF{2567F}\UTF{266B0}\UTF{20628}\UTF{2008A}\UTF{20984}\UTF{2F82C}\UTF{2F86D}%
+\UTF{2F8B6}\UTF{26999}\UTF{233CC}\UTF{2F8DB}\UTF{2A9E6}\UTF{2B7BD}\UTF{2F96C}\UTF{2E278}\UTF{2053F}\UTF{2626A}%
+\UTF{200B0}\UTF{2E6EA}\UTF{28987}\UTF{28E17}\UTF{2B81A}\UTF{242EE}\UTF{2F8E1}\UTF{23CBE}\UTF{20611}\UTF{2F9F4}%
+\UTF{2F804}\UTF{2363A}\UTF{233FE}\UTF{22609}
 
 Adobe-Japan1-5\\
 \UTF{2131B}\UTF{2146E}\UTF{218BD}\UTF{216B4}\UTF{21E34}\UTF{231C4}\UTF{235C4}\UTF{2373F}\UTF{23763}\UTF{247F1}%