From a8880a5ee484845d9a526c5ca8d21d31214af22b Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 8 Mar 2020 03:01:00 +0000 Subject: CTAN sync 202003080300 --- language/japanese/ptex-base/LICENSE | 2 +- language/japanese/ptex-base/Makefile | 21 ----------- language/japanese/ptex-base/README.md | 2 +- language/japanese/ptex-base/eptexdefs.lib | 23 ++++++----- language/japanese/ptex2pdf/README.md | 31 ++++++++------- language/japanese/ptex2pdf/ptex2pdf.lua | 63 +++++++++++++++++-------------- 6 files changed, 67 insertions(+), 75 deletions(-) delete mode 100644 language/japanese/ptex-base/Makefile (limited to 'language') diff --git a/language/japanese/ptex-base/LICENSE b/language/japanese/ptex-base/LICENSE index 7392f6e845..1955037a7b 100644 --- a/language/japanese/ptex-base/LICENSE +++ b/language/japanese/ptex-base/LICENSE @@ -1,5 +1,5 @@ Copyright (C) 2010 ASCII MEDIA WORKS. -Copyright (C) 2016-2019 Japanese TeX Development Community +Copyright (C) 2016-2020 Japanese TeX Development Community All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/language/japanese/ptex-base/Makefile b/language/japanese/ptex-base/Makefile deleted file mode 100644 index 7c1b25a82b..0000000000 --- a/language/japanese/ptex-base/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -KANJI = -kanji=jis -FONTMAP = -f ipaex.map -f ptex-ipaex.map -TEXMF = $(shell kpsewhich -var-value=TEXMFHOME) - -all: - echo Nothing to be built. - -.PHONY: install -install: - mkdir -p ${TEXMF}/doc/ptex/ptex-base - cp ./LICENSE ${TEXMF}/doc/ptex/ptex-base/ - cp ./README* ${TEXMF}/doc/ptex/ptex-base/ - cp ./Makefile ${TEXMF}/doc/ptex/ptex-base/ - #cp ./Change* ${TEXMF}/doc/ptex/ptex-base/ - mkdir -p ${TEXMF}/tex/ptex/ptex-base - cp ./ptex.tex ${TEXMF}/tex/ptex/ptex-base/ - cp ./ascii-jplain.tex ${TEXMF}/tex/ptex/ptex-base/ - cp ./kinsoku.tex ${TEXMF}/tex/ptex/ptex-base/ - cp ./*.ini ${TEXMF}/tex/ptex/ptex-base/ - cp ./eptex.src ${TEXMF}/tex/ptex/ptex-base/ - cp ./eptexdefs.lib ${TEXMF}/tex/ptex/ptex-base/ diff --git a/language/japanese/ptex-base/README.md b/language/japanese/ptex-base/README.md index 211b67d7e3..3959a51083 100644 --- a/language/japanese/ptex-base/README.md +++ b/language/japanese/ptex-base/README.md @@ -25,6 +25,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2019-04-03 +2020-03-07 Japanese TeX Development Community diff --git a/language/japanese/ptex-base/eptexdefs.lib b/language/japanese/ptex-base/eptexdefs.lib index 6a4df97e7e..60b4564788 100644 --- a/language/japanese/ptex-base/eptexdefs.lib +++ b/language/japanese/ptex-base/eptexdefs.lib @@ -1,4 +1,4 @@ -%% e-pTeXlib (2018/03/12) +%% e-pTeXlib (2020/02/05) %% derived from $TEXMF/tex/plain/etex/etexdefs.lib (V2.0;8 24-MAR-1998) \module {grouptypes} @@ -80,13 +80,16 @@ \etexifdef definedif = 18 \etexifdef csnameif = 19 \etexifdef fontcharif = 20 -\etexifdef tdirif = 21 -\etexifdef ydirif = 22 -\etexifdef ddirif = 23 -\etexifdef mdirif = 24 -\etexifdef tboxif = 25 -\etexifdef yboxif = 26 -\etexifdef dboxif = 27 -\etexifdef mboxif = 28 -\etexifdef pdfprimitiveif = 29 +\etexifdef incsnameif = 21 +\etexifdef pdfprimitiveif = 22 +\etexifdef tdirif = 23 +\etexifdef ydirif = 24 +\etexifdef ddirif = 25 +\etexifdef mdirif = 26 +\etexifdef tboxif = 27 +\etexifdef yboxif = 28 +\etexifdef dboxif = 29 +\etexifdef mboxif = 30 +\etexifdef jfontif = 31 +\etexifdef tfontif = 32 \endmodule diff --git a/language/japanese/ptex2pdf/README.md b/language/japanese/ptex2pdf/README.md index bf4890b6aa..1fe1e275cc 100644 --- a/language/japanese/ptex2pdf/README.md +++ b/language/japanese/ptex2pdf/README.md @@ -18,17 +18,18 @@ by dvipdfmx. ````` [texlua] ptex2pdf[.lua] { option | basename[.tex] } ... -options: -v version - -h help - -help print full help (installation, TeXworks setup) - -e use eptex class of programs - -u use uptex class of programs - -l use latex based formats - -s stop at dvi - -i retain intermediate files - -ot '' extra options for TeX - -od '' extra options for dvipdfmx - -output-directory '' directory for created files +options: -v version + -h help + -help print full help (installation, TeXworks setup) + -e use eptex class of programs + -u use uptex class of programs + -l use latex based formats + -ld use latex-dev based formats + -s stop at dvi + -i retain intermediate files + -ot '' extra options for TeX + -od '' extra options for dvipdfmx + -output-directory '' directory for created files ````` ## Installation ## @@ -167,14 +168,16 @@ http://github.com/texjporg/ptex2pdf support directories containing dots (thanks kn1cht) - version 20200119.0 check invalid PATH string beforehand on windows +- version 20200307.0 + add -ld option to run (u)platex-dev ## Copyright and License ## Originally based on musixtex.lua from Bob Tennent. -(c) Copyright 2016-2020 Japanese TeX Development Community -(c) Copyright 2013-2020 Norbert Preining norbert@preining.info -(c) Copyright 2012 Bob Tennent rdt@cs.queensu.ca +(c) Copyright 2016-2020 Japanese TeX Development Community +(c) Copyright 2013-2020 Norbert Preining norbert@preining.info +(c) Copyright 2012 Bob Tennent rdt@cs.queensu.ca This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/language/japanese/ptex2pdf/ptex2pdf.lua b/language/japanese/ptex2pdf/ptex2pdf.lua index 4f601437a1..d2668d6df8 100755 --- a/language/japanese/ptex2pdf/ptex2pdf.lua +++ b/language/japanese/ptex2pdf/ptex2pdf.lua @@ -1,7 +1,7 @@ #!/usr/bin/env texlua NAME = "ptex2pdf[.lua]" -VERSION = "20200119.0" +VERSION = "20200307.0" AUTHOR = "Norbert Preining" AUTHOREMAIL = "norbert@preining.info" SHORTDESC = "Convert Japanese TeX documents to pdf" @@ -14,24 +14,25 @@ by dvipdfmx. ]] USAGE = [[ [texlua] ptex2pdf[.lua] { option | basename[.tex] } ... -options: -v version - -h help - -help print full help (installation, TeXworks setup) - -e use eptex class of programs - -u use uptex class of programs - -l use latex based formats - -s stop at dvi - -i retain intermediate files - -ot '' extra options for TeX - -od '' extra options for dvipdfmx - -output-directory '' directory for created files]] +options: -v version + -h help + -help print full help (installation, TeXworks setup) + -e use eptex class of programs + -u use uptex class of programs + -l use latex based formats + -ld use latex-dev based formats + -s stop at dvi + -i retain intermediate files + -ot '' extra options for TeX + -od '' extra options for dvipdfmx + -output-directory '' directory for created files]] LICENSECOPYRIGHT = [[ Originally based on musixtex.lua from Bob Tennent. -(c) Copyright 2016-2020 Japanese TeX Development Community -(c) Copyright 2013-2020 Norbert Preining norbert@preining.info -(c) Copyright 2012 Bob Tennent rdt@cs.queensu.ca +(c) Copyright 2016-2020 Japanese TeX Development Community +(c) Copyright 2013-2020 Norbert Preining norbert@preining.info +(c) Copyright 2012 Bob Tennent rdt@cs.queensu.ca This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -181,6 +182,8 @@ CHANGELOG = [[ support directories containing dots (thanks kn1cht) - version 20200119.0 check invalid PATH string beforehand on windows +- version 20200307.0 + add -ld option to run (u)platex-dev ]] @@ -278,6 +281,7 @@ intermediate = 1 use_eptex = 0 use_uptex = 0 use_latex = 0 +use_latexdev = 0 outputdir = "." prefilename = "" filename = "" @@ -315,6 +319,9 @@ repeat use_uptex = 1 elseif this_arg == "-l" then use_latex = 1 + elseif this_arg == "-ld" then + use_latex = 1 + use_latexdev = 1 elseif this_arg == "-s" then dvipdf = "" elseif this_arg == "-i" then @@ -344,30 +351,30 @@ until narg > #arg whoami() -if use_eptex == 1 then +if use_latex == 1 then if use_uptex == 1 then - if use_latex == 1 then - tex = "uplatex" -- uplatex already as etex extension + if use_latexdev == 1 then + tex = "uplatex-dev" else - tex = "euptex" + tex = "uplatex" -- uplatex already as etex extension end else - if use_latex == 1 then - tex = "platex" -- latex needs etex anyway + if use_latexdev == 1 then + tex = "platex-dev" else - tex = "eptex" + tex = "platex" -- latex needs etex anyway end end else - if use_uptex == 1 then - if use_latex == 1 then - tex = "uplatex" + if use_eptex == 1 then + if use_uptex == 1 then + tex = "euptex" else - tex = "uptex" + tex = "eptex" end else - if use_latex == 1 then - tex = "platex" + if use_uptex == 1 then + tex = "uptex" else tex = "ptex" end -- cgit v1.2.3