From e6cb7eab17b3ef76d3f96c8e23782a91190102a8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 5 Nov 2015 00:01:25 +0000 Subject: latex3 (4nov15) git-svn-id: svn://tug.org/texlive/trunk@38776 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/l3build/l3build.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/tex/latex/l3build') diff --git a/Master/texmf-dist/tex/latex/l3build/l3build.lua b/Master/texmf-dist/tex/latex/l3build/l3build.lua index 7238c9a2167..a3f6a1662c6 100644 --- a/Master/texmf-dist/tex/latex/l3build/l3build.lua +++ b/Master/texmf-dist/tex/latex/l3build/l3build.lua @@ -1511,8 +1511,10 @@ function ctan(standalone) end if errorlevel == 0 then for _,i in ipairs(textfiles) do - cp(i, ".", ctandir .. "/" .. ctanpkg) - cp(i, ".", tdsdir .. "/doc/" .. tdsroot .. "/" .. bundle) + for _,j in pairs({unpackdir, "."}) do + cp(i, j, ctandir .. "/" .. ctanpkg) + cp(i, j, tdsdir .. "/doc/" .. tdsroot .. "/" .. bundle) + end end dirzip(tdsdir, ctanpkg .. ".tds") if packtdszip then @@ -1676,7 +1678,7 @@ if versionform ~= "" and not setversion_update_line then for _,i in pairs({"Class", "File", "Package"}) do if string.match( line, - "^\\Provides" .. i .. "{[a-zA-Z0-9%-]+}%[[^%]]*%]$" + "^\\Provides" .. i .. "{[a-zA-Z0-9%-%.]+}%[[^%]]*%]$" ) then line = string.gsub(line, "%[%d%d%d%d/%d%d/%d%d", "[" .. string.gsub(date, "%-", "/")) @@ -1695,7 +1697,7 @@ if versionform ~= "" and not setversion_update_line then for _,i in pairs({"Class", "File", "Package"}) do if string.match( line, - "^\\ProvidesExpl" .. i .. " *{[a-zA-Z0-9%-]+}" + "^\\ProvidesExpl" .. i .. " *{[a-zA-Z0-9%-%.]+}" ) then line = string.gsub( line, -- cgit v1.2.3