From 8441f31cd34519760d11af39eed6db71dd2ca2d8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 12 Dec 2018 21:34:12 +0000 Subject: ptex2pdf (12dec18) git-svn-id: svn://tug.org/texlive/trunk@49396 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/texlive/linked_scripts/ptex2pdf/ptex2pdf.lua | 6 ++++-- Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 9 +++++---- Master/texmf-dist/doc/latex/ptex2pdf/README.md | 2 ++ Master/texmf-dist/scripts/ptex2pdf/ptex2pdf.lua | 6 ++++-- Master/tlpkg/libexec/ctan2tds | 9 +++++++++ 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/ptex2pdf/ptex2pdf.lua b/Build/source/texk/texlive/linked_scripts/ptex2pdf/ptex2pdf.lua index 2bba4546eaa..e05b75c4951 100755 --- a/Build/source/texk/texlive/linked_scripts/ptex2pdf/ptex2pdf.lua +++ b/Build/source/texk/texlive/linked_scripts/ptex2pdf/ptex2pdf.lua @@ -1,7 +1,7 @@ #!/usr/bin/env texlua NAME = "ptex2pdf[.lua]" -VERSION = "20180514.0" +VERSION = "20181212.0" AUTHOR = "Norbert Preining" AUTHOREMAIL = "norbert@preining.info" SHORTDESC = "Convert Japanese TeX documents to pdf" @@ -177,6 +177,8 @@ CHANGELOG = [[ - version 20180514.0 Windows: for uptex use command_line_encoding=utf8, for all other turn it off (set to none) +- version 20181212.0 + support directories containing dots (thanks kn1cht) ]] @@ -399,7 +401,7 @@ else end else -- if it has already an extension, we need to drop it to get the dvi name - bname = string.gsub(filename, "^(.*)%.[^.]+$", "%1") + bname = string.gsub(filename, "^(.*)%.[^./]+$", "%1") end -- filename may contain "/", but the intermediate output is written -- in current directory, so we need to drop it diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 22a0ee30c1d..837023405d2 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -7811,7 +7811,7 @@ checking the TL development repository. =item B] [--delete] [I [I]]]> -=item B] [show|add|delete] [I]> +=item B] [show|add|remove] [I]> With only C, show general configuration information for TeX Live, including active configuration files, path settings, and more. This is @@ -7845,15 +7845,16 @@ additional texmf trees, completely under user control. C shows the list of additional trees, C I adds a tree to the list, and C I removes a tree from the list (if present). The trees should not contain an C file (or files -might not be found if the C becomes stale). This works by -manipulating the Kpathsea variable C, in +will not be found if the C becomes stale). This works by +manipulating the Kpathsea variable C, in (by default) C. Example: tlmgr conf auxtrees add /quick/test/tree tlmgr conf auxtrees remove /quick/test/tree In all cases the configuration file can be explicitly specified via the -option C<--conffile> I, if desired. +option C<--conffile> I, e.g., if you don't want to change the +system-wide configuration. Warning: The general facility for changing configuration values is here, but tinkering with settings in this way is strongly discouraged. Again, diff --git a/Master/texmf-dist/doc/latex/ptex2pdf/README.md b/Master/texmf-dist/doc/latex/ptex2pdf/README.md index 75d8c8afcfd..6cbd1d68788 100644 --- a/Master/texmf-dist/doc/latex/ptex2pdf/README.md +++ b/Master/texmf-dist/doc/latex/ptex2pdf/README.md @@ -163,6 +163,8 @@ http://github.com/texjporg/ptex2pdf - version 20180514.0 Windows: for uptex use command_line_encoding=utf8, for all other turn it off (set to none) +- version 20181212.0 + support directories containing dots (thanks kn1cht) ## Copyright and License ## diff --git a/Master/texmf-dist/scripts/ptex2pdf/ptex2pdf.lua b/Master/texmf-dist/scripts/ptex2pdf/ptex2pdf.lua index 2bba4546eaa..e05b75c4951 100755 --- a/Master/texmf-dist/scripts/ptex2pdf/ptex2pdf.lua +++ b/Master/texmf-dist/scripts/ptex2pdf/ptex2pdf.lua @@ -1,7 +1,7 @@ #!/usr/bin/env texlua NAME = "ptex2pdf[.lua]" -VERSION = "20180514.0" +VERSION = "20181212.0" AUTHOR = "Norbert Preining" AUTHOREMAIL = "norbert@preining.info" SHORTDESC = "Convert Japanese TeX documents to pdf" @@ -177,6 +177,8 @@ CHANGELOG = [[ - version 20180514.0 Windows: for uptex use command_line_encoding=utf8, for all other turn it off (set to none) +- version 20181212.0 + support directories containing dots (thanks kn1cht) ]] @@ -399,7 +401,7 @@ else end else -- if it has already an extension, we need to drop it to get the dvi name - bname = string.gsub(filename, "^(.*)%.[^.]+$", "%1") + bname = string.gsub(filename, "^(.*)%.[^./]+$", "%1") end -- filename may contain "/", but the intermediate output is written -- in current directory, so we need to drop it diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 49b168efebd..ddb32168e86 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1446,6 +1446,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'pst-cox' => '&POSTpstcox', 'pst-geo' => '&POSTpstgeo', 'ptex-fontmaps' => '&POSTptex_fontmaps', + 'ptex2pdf' => '&POSTptex2pdf', 'pxbase' => '&POSTpxbase', 'pxchfon' => '&POSTpxchfon', 'recipebook' => '&POST_rmsymlink', @@ -6138,6 +6139,14 @@ sub POSTptex_fontmaps { &SYSTEM ("$MV database $fmiscdest/$package"); } +sub POSTptex2pdf { + print "POST$package - preserve tlpostcode/ptex2pdf-tlpost.pl\n"; + my $dirpath = "tlpkg/tlpostcode"; + my $dest = "$TOPDEST/$dirpath"; + &xmkdir ($dest); + &SYSTEM ("$CP $Master/$dirpath/ptex2pdf-tlpost.pl $dest/"); +} + sub POSTknitting { print "POST$package - move generic .tex file\n"; my $dest = "$DEST/tex/plain/$package"; -- cgit v1.2.3