From fa4b456400bb2b415dcbbfe785542c50e9dd61e3 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 9 Feb 2024 03:00:44 +0000 Subject: CTAN sync 202402090300 --- .../generic/evangelion-jfm/Eva-JFM_doc-sc.pdf | Bin 265161 -> 265483 bytes .../generic/evangelion-jfm/Evangelion-JFM.dtx | 4 ++-- macros/luatex/generic/evangelion-jfm/LICENSE | 2 +- macros/luatex/generic/evangelion-jfm/README.md | 4 +++- macros/luatex/generic/evangelion-jfm/jfm-eva.lua | 13 +++++++------ macros/luatex/generic/evangelion-jfm/make.sh | 2 +- 6 files changed, 14 insertions(+), 11 deletions(-) (limited to 'macros/luatex/generic') diff --git a/macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-sc.pdf b/macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-sc.pdf index d67ad71d65..36b355f26f 100644 Binary files a/macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-sc.pdf and b/macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-sc.pdf differ diff --git a/macros/luatex/generic/evangelion-jfm/Evangelion-JFM.dtx b/macros/luatex/generic/evangelion-jfm/Evangelion-JFM.dtx index cb47b2a246..fb72657714 100644 --- a/macros/luatex/generic/evangelion-jfm/Evangelion-JFM.dtx +++ b/macros/luatex/generic/evangelion-jfm/Evangelion-JFM.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment -% Copyright © 2023, RadioNoiseE (Jing Huang) +% Copyright © 2023-2024, RadioNoiseE (Jing Huang) % Evangelion Japanese Font Metric for LuaTeX -% Current Version: 1.0.5 (b) +% Current Version: 1.0.5 (c) % Dev URL: https://github.com/RadioNoiseE/Evangelion-JFM % \fi %<*batchfile> diff --git a/macros/luatex/generic/evangelion-jfm/LICENSE b/macros/luatex/generic/evangelion-jfm/LICENSE index f1eae30f73..4f53d7d23e 100644 --- a/macros/luatex/generic/evangelion-jfm/LICENSE +++ b/macros/luatex/generic/evangelion-jfm/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 黄京 +Copyright (c) 2023-2024 黄京 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/macros/luatex/generic/evangelion-jfm/README.md b/macros/luatex/generic/evangelion-jfm/README.md index 87abb3e19f..0cd9307572 100644 --- a/macros/luatex/generic/evangelion-jfm/README.md +++ b/macros/luatex/generic/evangelion-jfm/README.md @@ -48,10 +48,12 @@ This package is also available on [CTAN](https://www.ctan.org/pkg/evangelion-jfm ## 状态・現在のバージョン・Current Version -`Ver 1.0.5 (b)` +`Ver 1.0.5 (c)` ## 历史・変更ログ・Changelog +- 2024.2.8 Ver 1.0.5 (c): fix the variable scope for `extd_ratio`, this should fix the nil error. + - 2023.8.25 Ver 1.0.5 (b): add feature `prop` and `propw` for japanese typesetting. - 2023.8.23 Ver 1.0.5 (a): add character `U+2E3A` and `U+2E3B` to be compatible with Source Han Fonts' ligatures. diff --git a/macros/luatex/generic/evangelion-jfm/jfm-eva.lua b/macros/luatex/generic/evangelion-jfm/jfm-eva.lua index 502295772b..08d1031764 100644 --- a/macros/luatex/generic/evangelion-jfm/jfm-eva.lua +++ b/macros/luatex/generic/evangelion-jfm/jfm-eva.lua @@ -1,13 +1,13 @@ ---- Evangelion Japanese Font Metric for LuaTeX ----- Current Version: 1.0.5 (b) +---- Current Version: 1.0.5 (c) ---- Dev URL: https://github.com/RadioNoiseE/Evangelion-JFM ----- Copyright 2023, RadioNoiseE © +---- Copyright 2023-2024, RadioNoiseE © -- 初始化 local lang_jp, lang_tc, lang_sc, dir_vt, font_extd, punc_lg, punc_hg, std_nil, al_hw, al_fw, as_nil, fw_prop, fw_xprop -if luatexja.jfont.jfm_feature then +if luatexja.jfont.jfm_feature then lang_jp = luatexja.jfont.jfm_feature.jp lang_tc = luatexja.jfont.jfm_feature.trad lang_sc = luatexja.jfont.jfm_feature.smpl @@ -61,8 +61,9 @@ if not ((lang_jp and not (lang_tc or lang_sc)) or end -- 壓縮比例設定 -if font_extd == true then - local extd_ratio = (type(font_extd) == 'string') and tonumber(font_extd) or 1.25 +local extd_ratio = (type(font_extd) == 'string') and tonumber(font_extd) or 1.25 +if font_extd == false then + extd_ratio = nil end -- 行間標點字間距補足 @@ -402,7 +403,7 @@ local eva = { [8] = { -- 閉括號類 chars = {')', '〕', ']', '}', '〉', '》', '」', '』', '】', '⦆', '〙', '〗', '〟', '’', '”'}, - width = context_width(0.5), + width = context_width(0.5), height = context_height(), depth = context_depth(), italic = 0, diff --git a/macros/luatex/generic/evangelion-jfm/make.sh b/macros/luatex/generic/evangelion-jfm/make.sh index 375a9758c8..ad7f5c27a7 100644 --- a/macros/luatex/generic/evangelion-jfm/make.sh +++ b/macros/luatex/generic/evangelion-jfm/make.sh @@ -1,4 +1,4 @@ -## RadioNoiseE, 2023. +## RadioNoiseE, 2023, 2024. ## Evangelion Japanese Font Metric # Init -- cgit v1.2.3