texlive[46453] Build/source/texk/makejvf: makejvf: support new JFM

commits+hironobu at tug.org commits+hironobu at tug.org
Sat Jan 27 03:24:20 CET 2018 

Revision: 46453
          http://tug.org/svn/texlive?view=revision&revision=46453
Author:   hironobu
Date:     2018-01-27 03:24:19 +0100 (Sat, 27 Jan 2018)
Log Message:
-----------
makejvf: support new JFM spec

Modified Paths:
--------------
    trunk/Build/source/texk/makejvf/ChangeLog
    trunk/Build/source/texk/makejvf/Makefile.am
    trunk/Build/source/texk/makejvf/Makefile.in
    trunk/Build/source/texk/makejvf/makejvf.test
    trunk/Build/source/texk/makejvf/tfmread.c
    trunk/Build/source/texk/makejvf/version.h

Added Paths:
-----------
    trunk/Build/source/texk/makejvf/tests/testnewu.tfm
    trunk/Build/source/texk/makejvf/tests/testnewu.vf
    trunk/Build/source/texk/makejvf/tests/uni10.cnf

Modified: trunk/Build/source/texk/makejvf/ChangeLog
===================================================================
--- trunk/Build/source/texk/makejvf/ChangeLog	2018-01-27 02:23:14 UTC (rev 46452)
+++ trunk/Build/source/texk/makejvf/ChangeLog	2018-01-27 02:24:19 UTC (rev 46453)
@@ -1,3 +1,8 @@
+2018-01-27  Hironobu Yamashita  <h.y.acetaminophen at gmail.com>
+
+	* tfmread.c: Support new JFM spec (3-byte characters in TYPE > 0).
+	* version.h: Bump version.
+
 2018-01-14  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* uniblock.c: Update references Unicode blocks Blocks-10.0.0.txt

Modified: trunk/Build/source/texk/makejvf/Makefile.am
===================================================================
--- trunk/Build/source/texk/makejvf/Makefile.am	2018-01-27 02:23:14 UTC (rev 46452)
+++ trunk/Build/source/texk/makejvf/Makefile.am	2018-01-27 02:24:19 UTC (rev 46453)
@@ -1,7 +1,7 @@
 ## Makefile.am for the TeX Live subdirectory texk/makejvfk/
 ##
 ## Copyright (C) 2010-2015 Peter Breitenlohner <tex-live at tug.org>
-## Copyright (C) 2016-2017 Japanese TeX Development Community <issue at texjp.org>
+## Copyright (C) 2016-2018 Japanese TeX Development Community <issue at texjp.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES)
@@ -36,7 +36,9 @@
 	tests/rml.tfm \
 	tests/rmlv.tfm \
 	tests/tmin10.tfm \
-	tests/tmin10.vf
+	tests/tmin10.vf \
+	tests/testnewu.tfm \
+	tests/testnewu.vf
 
-DISTCLEANFILES = min10.vf rml.tfm rmlv.tfm tmin10.vf
+DISTCLEANFILES = min10.vf rml.tfm rmlv.tfm tmin10.vf testnewu.vf urml.tfm
 

Modified: trunk/Build/source/texk/makejvf/Makefile.in
===================================================================
--- trunk/Build/source/texk/makejvf/Makefile.in	2018-01-27 02:23:14 UTC (rev 46452)
+++ trunk/Build/source/texk/makejvf/Makefile.in	2018-01-27 02:24:19 UTC (rev 46453)
@@ -555,11 +555,12 @@
 LDADD = $(PTEXENC_LIBS) $(KPATHSEA_LIBS)
 EXTRA_DIST = COPYRIGHT COPYRIGHT.jis Changes.txt README.txt \
 	tests/min10.tfm tests/min10.vf tests/rml.tfm tests/rmlv.tfm \
-	tests/tmin10.tfm tests/tmin10.vf
+	tests/tmin10.tfm tests/tmin10.vf tests/testnewu.tfm \
+	tests/testnewu.vf
 dist_check_SCRIPTS = makejvf.test
 TESTS = makejvf.test
 dist_man1_MANS = makejvf.1
-DISTCLEANFILES = min10.vf rml.tfm rmlv.tfm tmin10.vf
+DISTCLEANFILES = min10.vf rml.tfm rmlv.tfm tmin10.vf testnewu.vf urml.tfm
 all: c-auto.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 

Modified: trunk/Build/source/texk/makejvf/makejvf.test
===================================================================
--- trunk/Build/source/texk/makejvf/makejvf.test	2018-01-27 02:23:14 UTC (rev 46452)
+++ trunk/Build/source/texk/makejvf/makejvf.test	2018-01-27 02:24:19 UTC (rev 46453)
@@ -1,6 +1,6 @@
 #! /bin/sh -vx
 # $Id$
-# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2017-2018 Karl Berry <tex-live at tug.org>
 # Copyright 2010-2013 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
@@ -12,6 +12,10 @@
   cmp $srcdir/tests/tmin10.vf tmin10.vf && \
   cmp $srcdir/tests/rmlv.tfm rmlv.tfm || exit 1
 
+./makejvf -e -i -u custom -t $srcdir/tests/uni10.cnf -m $srcdir/tests/testnewu urml && \
+  cmp $srcdir/tests/testnewu.vf testnewu.vf && \
+  cmp $srcdir/tests/rml.tfm urml.tfm || exit 1
+
 TEXMFCNF=$srcdir/../kpathsea \
 	./makejvf -k0 -a abc && exit 1
 

Added: trunk/Build/source/texk/makejvf/tests/testnewu.tfm
===================================================================
(Binary files differ)

Index: trunk/Build/source/texk/makejvf/tests/testnewu.tfm
===================================================================
--- trunk/Build/source/texk/makejvf/tests/testnewu.tfm	2018-01-27 02:23:14 UTC (rev 46452)
+++ trunk/Build/source/texk/makejvf/tests/testnewu.tfm	2018-01-27 02:24:19 UTC (rev 46453)

Property changes on: trunk/Build/source/texk/makejvf/tests/testnewu.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Build/source/texk/makejvf/tests/testnewu.vf
===================================================================
(Binary files differ)

Index: trunk/Build/source/texk/makejvf/tests/testnewu.vf
===================================================================
--- trunk/Build/source/texk/makejvf/tests/testnewu.vf	2018-01-27 02:23:14 UTC (rev 46452)
+++ trunk/Build/source/texk/makejvf/tests/testnewu.vf	2018-01-27 02:24:19 UTC (rev 46453)

Property changes on: trunk/Build/source/texk/makejvf/tests/testnewu.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Build/source/texk/makejvf/tests/uni10.cnf
===================================================================
--- trunk/Build/source/texk/makejvf/tests/uni10.cnf	                        (rev 0)
+++ trunk/Build/source/texk/makejvf/tests/uni10.cnf	2018-01-27 02:24:19 UTC (rev 46453)
@@ -0,0 +1,61 @@
+% makejvf settings for upjpn* in uptex-fonts
+% based on Blocks-10.0.0.txt (Date: 2017-04-12, 17:30:00 GMT [KW])
+% and Adobe-Japan1-6/cid2code.txt (Version 10/24/2017)
+%
+% Following code points are omitted:
+%   U+0FD6, U+2E40, U+A7B5, U+AB53
+
+CHARSET	0000..007F,% Basic Latin
++	0080..00FF,% Latin-1 Supplement
++	0100..017F,% Latin Extended-A
++	0180..024F,% Latin Extended-B
++	0250..02AF,% IPA Extensions
++	02B0..02FF,% Spacing Modifier Letters
++	0300..036F,% Combining Diacritical Marks
++	0370..03FF,% Greek and Coptic
++	0400..04FF,% Cyrillic
++	1E00..1EFF,% Latin Extended Additional
++	1F00..1FFF,% Greek Extended
++	2000..206F,% General Punctuation
++	2070..209F,% Superscripts and Subscripts
++	20A0..20CF,% Currency Symbols
++	20D0..20FF,% Combining Diacritical Marks for Symbols
++	2100..214F,% Letterlike Symbols
++	2150..218F,% Number Forms
++	2190..21FF,% Arrows
++	2200..22FF,% Mathematical Operators
++	2300..23FF,% Miscellaneous Technical
++	2400..243F,% Control Pictures
++	2460..24FF,% Enclosed Alphanumerics
++	2500..257F,% Box Drawing
++	2580..259F,% Block Elements
++	25A0..25FF,% Geometric Shapes
++	2600..26FF,% Miscellaneous Symbols
++	2700..27BF,% Dingbats
++	2900..297F,% Supplemental Arrows-B
++	2980..29FF,% Miscellaneous Mathematical Symbols-B
++	2B00..2BFF,% Miscellaneous Symbols and Arrows
++	2E80..2EFF,% CJK Radicals Supplement
++	2F00..2FDF,% Kangxi Radicals
++	3000..303F,% CJK Symbols and Punctuation
++	3040..309F,% Hiragana
++	30A0..30FF,% Katakana
++	3190..319F,% Kanbun
++	31F0..31FF,% Katakana Phonetic Extensions
++	3200..32FF,% Enclosed CJK Letters and Months
++	3300..33FF,% CJK Compatibility
++	3400..4DBF,% CJK Unified Ideographs Extension A
++	4E00..9FFF,% CJK Unified Ideographs
++	E000..F8FF,% Private Use Area
++	F900..FAFF,% CJK Compatibility Ideographs
++	FB00..FB4F,% Alphabetic Presentation Forms
++	FE10..FE1F,% Vertical Forms
++	FE30..FE4F,% CJK Compatibility Forms
++	FF00..FFEF,% Halfwidth and Fullwidth Forms
++	1F100..1F1FF,% Enclosed Alphanumeric Supplement
++	1F200..1F2FF,% Enclosed Ideographic Supplement
++	20000..2A6DF,% CJK Unified Ideographs Extension B
++	2A700..2B73F,% CJK Unified Ideographs Extension C
++	2B740..2B81F,% CJK Unified Ideographs Extension D
++	2CEB0..2EBEF,% CJK Unified Ideographs Extension F
++	2F800..2FA1F,% CJK Compatibility Ideographs Supplement


Property changes on: trunk/Build/source/texk/makejvf/tests/uni10.cnf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Build/source/texk/makejvf/tfmread.c
===================================================================
--- trunk/Build/source/texk/makejvf/tfmread.c	2018-01-27 02:23:14 UTC (rev 46452)
+++ trunk/Build/source/texk/makejvf/tfmread.c	2018-01-27 02:24:19 UTC (rev 46453)
@@ -14,8 +14,9 @@
 	int i,ctype=0,w_ind,w,ll=0,rr=0,tag,gk_ind,gk2_ind;
 
 	for (i = 0 ; i < nt ; i++) {
-		if (upair(&char_type[i*4]) == kcode) {
-			ctype = upair(&char_type[i*4+2]);
+		/* support new JFM spec by texjporg */
+		if (upair(&char_type[i*4])+char_type[i*4+2]*65536 == kcode) {
+			ctype = char_type[i*4+3];
 			break;
 		}
 	}

Modified: trunk/Build/source/texk/makejvf/version.h
===================================================================
--- trunk/Build/source/texk/makejvf/version.h	2018-01-27 02:23:14 UTC (rev 46452)
+++ trunk/Build/source/texk/makejvf/version.h	2018-01-27 02:24:19 UTC (rev 46453)
@@ -1,2 +1,2 @@
-#define VERSION "20180114"
+#define VERSION "20180127"
 #define BUG_ADDRESS "issue at texjp.org"

More information about the tex-live-commits mailing list