diff options
Diffstat (limited to 'Master')
27 files changed, 110 insertions, 97 deletions
diff --git a/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md index 93cf02a404d..920e730ce8b 100644 --- a/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md @@ -6,6 +6,11 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2020-03-12] + +### Fixed +- Creation of PDF annotations with `dvips` backend + ## [2020-02-23] ### Fixed @@ -56,7 +61,8 @@ this project uses date-based 'snapshot' version identifiers. - Include `l3backend` in file names - Moved backend code to internal for each 'parent' module -[Unreleased]: https://github.com/latex3/latex3/compare/2020-02-23...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2020-03-12...HEAD +[2020-03-12]: https://github.com/latex3/latex3/compare/2020-02-23...2020-03-12 [2020-02-23]: https://github.com/latex3/latex3/compare/2020-02-21...2020-02-23 [2020-02-21]: https://github.com/latex3/latex3/compare/2020-02-03...2020-02-21 [2020-02-03]: https://github.com/latex3/latex3/compare/2019-11-25...2020-02-03 diff --git a/Master/texmf-dist/doc/latex/l3backend/README.md b/Master/texmf-dist/doc/latex/l3backend/README.md index 82169e18b7c..370b2a991e5 100644 --- a/Master/texmf-dist/doc/latex/l3backend/README.md +++ b/Master/texmf-dist/doc/latex/l3backend/README.md @@ -1,7 +1,7 @@ LaTeX3 Backend Drivers ====================== -Release 2020-02-23 +Release 2020-03-12 This package forms parts of `expl3`, and contains the code used to interface with backends (drivers) across the `expl3` codebase. The functions here are diff --git a/Master/texmf-dist/doc/latex/l3backend/l3backend-code.pdf b/Master/texmf-dist/doc/latex/l3backend/l3backend-code.pdf Binary files differindex 7d1ecc38fbd..e15a5040e07 100644 --- a/Master/texmf-dist/doc/latex/l3backend/l3backend-code.pdf +++ b/Master/texmf-dist/doc/latex/l3backend/l3backend-code.pdf diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md index b0cc92a4240..0d10b39b567 100644 --- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md @@ -7,6 +7,19 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2020-03-12] + +### Added +- Option `ps2pdfopt` + +### Changed +- Normalise `/ID` lines in PDF comparisons +- Normalise `%%` lines in PDF comparisons + +### Fixed +- Enable `cleandir()` recursively +- Install files after *all* directory cleaning/creation + ## [2020-02-21] ### Changed @@ -434,7 +447,8 @@ this project uses date-based 'snapshot' version identifiers. - Rationalise short option names: removed `-d`, `-E`, `-r` - Target `cmdcheck`: specific to LaTeX3 kernel work -[Unreleased]: https://github.com/latex3/l3build/compare/2020-02-21...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2020-03-12...HEAD +[2020-03-12]: https://github.com/latex3/l3build/compare/2020-02-21...2020-03-12 [2020-02-21]: https://github.com/latex3/l3build/compare/2020-02-17...2020-02-21 [2020-02-17]: https://github.com/latex3/l3build/compare/2020-02-03...2020-02-17 [2020-02-03]: https://github.com/latex3/l3build/compare/2020-01-14...2020-02-03 diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md index 2228c502f9c..2817fa8425a 100644 --- a/Master/texmf-dist/doc/latex/l3build/README.md +++ b/Master/texmf-dist/doc/latex/l3build/README.md @@ -1,7 +1,7 @@ l3build: a testing and building system for LaTeX3 ================================================= -Release 2020-02-21 +Release 2020-03-12 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf Binary files differindex 0739a67dabb..069c548b6d5 100644 --- a/Master/texmf-dist/doc/latex/l3build/l3build.pdf +++ b/Master/texmf-dist/doc/latex/l3build/l3build.pdf diff --git a/Master/texmf-dist/doc/man/man1/l3build.1 b/Master/texmf-dist/doc/man/man1/l3build.1 index ca160fe5dc4..01cefeeeb18 100644 --- a/Master/texmf-dist/doc/man/man1/l3build.1 +++ b/Master/texmf-dist/doc/man/man1/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2020-02-21" +.TH l3build 1 "2020-03-12" .SH NAME l3build \- Checking and building packages .SH SYNOPSIS diff --git a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf Binary files differindex 93c69cc3f5f..cd1c5b6893f 100644 --- a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua index 17e63217871..c90c8fbc5a8 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -537,7 +537,8 @@ local function normalize_pdf(content) binary = false stream = true stream_content = "stream" .. os_newline - elseif not match(line, "^ *$") then + elseif not match(line, "^ *$") and not match(line,"^%%%%") then + line = gsub(line,"%/ID %[<[^>]+><[^>]+>]","/ID [<ID-STRING><ID-STRING>]") new_content = new_content .. line .. os_newline end end @@ -768,6 +769,9 @@ function runtest(name, engine, hide, ext, pdfmode, breakout) -- Break the loop if the result is stable if breakout and i < checkruns then if pdfmode then + if fileexists(testdir .. "/" .. name .. dviext) then + dvitopdf(name, testdir, engine, hide) + end rewrite(pdffile,npffile,normalize_pdf) if compare_pdf(name,engine,true) == 0 then break diff --git a/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua b/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua index e3000b45efb..6c420f80a26 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua @@ -204,7 +204,7 @@ function cleandir(dir) if errorlevel ~= 0 then return errorlevel end - return rm(dir, "*") + return rm(dir, "**") end -- Copy files 'quietly' @@ -376,7 +376,7 @@ end -- Remove file(s) based on a glob function rm(source, glob) - for _,i in ipairs(filelist(source, glob)) do + for i,_ in pairs(tree(source, glob)) do rmfile(source,i) end -- os.remove doesn't give a sensible errorlevel diff --git a/Master/texmf-dist/scripts/l3build/l3build-install.lua b/Master/texmf-dist/scripts/l3build/l3build-install.lua index 1007d2ed1b4..4b95f9ef43d 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-install.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-install.lua @@ -108,8 +108,11 @@ function install_files(target,full,dry_run) -- Needed so paths are only cleaned out once local cleanpaths = { } + -- Collect up all file data before copying: + -- ensures no files are lost during clean-up + local installmap = { } - local function install_files(source,dir,files,subdir) + local function create_install_map(source,dir,files,subdir) subdir = subdir or moduledir -- For material associated with secondary tools (BibTeX, MakeIndex) -- the structure needed is slightly different from those items going @@ -172,13 +175,14 @@ function install_files(target,full,dry_run) print("- " .. file) else local path,file = splitpath(file) - errorlevel = cp(file,sourcepaths[file],target .. "/" .. path) - if errorlevel ~= 0 then return errorlevel end + insert(installmap, + {file = file, source = sourcepaths[file], dest = target .. "/" .. path}) end end end return 0 end + local errorlevel = unpack() if errorlevel ~= 0 then return errorlevel end @@ -233,8 +237,8 @@ function install_files(target,full,dry_run) print("\nFor installation inside " .. target .. ":") end - errorlevel = install_files(sourcefiledir,"source",{sourcelist}) - + install_files(docfiledir,"doc", + errorlevel = create_install_map(sourcefiledir,"source",{sourcelist}) + + create_install_map(docfiledir,"doc", {bibfiles,demofiles,docfiles,pdffiles,textfiles,typesetlist}) if errorlevel ~= 0 then return errorlevel end @@ -272,12 +276,21 @@ function install_files(target,full,dry_run) if errorlevel ~= 0 then return errorlevel end - errorlevel = install_files(unpackdir,"tex",{installlist}) - + install_files(unpackdir,"bibtex/bst",{bstfiles},module) - + install_files(unpackdir,"makeindex",{makeindexfiles},module) - + install_files(unpackdir,"scripts",{scriptfiles},module) + errorlevel = create_install_map(unpackdir,"tex",{installlist}) + + create_install_map(unpackdir,"bibtex/bst",{bstfiles},module) + + create_install_map(unpackdir,"makeindex",{makeindexfiles},module) + + create_install_map(unpackdir,"scripts",{scriptfiles},module) + + if errorlevel ~= 0 then return errorlevel end + + -- Files are all copied in one shot: this ensures that cleandir() + -- can't be an issue even if there are complex set-ups + for _,v in ipairs(installmap) do + errorlevel = cp(v.file,v.source,v.dest) + if errorlevel ~= 0 then return errorlevel end + end - return errorlevel + return 0 end function install() diff --git a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua index b76edd913b2..540ac3f384a 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua @@ -1,6 +1,6 @@ --[[ -File l3build-typesetting.lua Copyright (C) 2018,2019 The LaTeX3 Project +File l3build-typesetting.lua Copyright (C) 2018-2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -36,24 +36,15 @@ local match = string.match local os_type = os.type function dvitopdf(name, dir, engine, hide) - if match(engine, "^u?ptex$") then - run( - dir, - (forcecheckepoch and setepoch() or "") .. - "dvipdfmx " .. name .. dviext - .. (hide and (" > " .. os_null) or "") - ) - else - run( - dir, - (forcecheckepoch and setepoch() or "") .. - "dvips " .. name .. dviext - .. (hide and (" > " .. os_null) or "") - .. os_concat .. - "ps2pdf " .. name .. psext - .. (hide and (" > " .. os_null) or "") - ) - end + run( + dir, + (forcecheckepoch and setepoch() or "") .. + "dvips " .. name .. dviext + .. (hide and (" > " .. os_null) or "") + .. os_concat .. + "ps2pdf " .. ps2pdfopt .. name .. psext + .. (hide and (" > " .. os_null) or "") + ) end -- An auxiliary used to set up the environmental variables diff --git a/Master/texmf-dist/scripts/l3build/l3build-variables.lua b/Master/texmf-dist/scripts/l3build/l3build-variables.lua index e69eb5aff1c..dcb25218691 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-variables.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-variables.lua @@ -184,6 +184,7 @@ if flattentds == nil then end maxprintline = maxprintline or 79 packtdszip = packtdszip or false +ps2pdfopt = ps2pdfopt or "" typesetcmds = typesetcmds or "" typesetruns = typesetruns or 3 recordstatus = recordstatus or false diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index ccb05eed316..60b6ac52848 100755 --- a/Master/texmf-dist/scripts/l3build/l3build.lua +++ b/Master/texmf-dist/scripts/l3build/l3build.lua @@ -25,7 +25,7 @@ for those people who are interested. --]] -- Version information -release_date = "2020-02-21" +release_date = "2020-03-12" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx index ac6952ee3e4..1ab76b974d7 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-23} +% \date{Released 2020-03-12} % % \maketitle % @@ -71,23 +71,23 @@ %<*package> \ProvidesExplFile %<*dvipdfmx> - {l3backend-dvipdfmx.def}{2020-02-23}{} + {l3backend-dvipdfmx.def}{2020-03-12}{} {L3 backend support: dvipdfmx} %</dvipdfmx> %<*dvips> - {l3backend-dvips.def}{2020-02-23}{} + {l3backend-dvips.def}{2020-03-12}{} {L3 backend support: dvips} %</dvips> %<*dvisvgm> - {l3backend-dvisvgm.def}{2020-02-23}{} + {l3backend-dvisvgm.def}{2020-03-12}{} {L3 backend support: dvisvgm} %</dvisvgm> %<*pdfmode> - {l3backend-pdfmode.def}{2020-02-23}{} + {l3backend-pdfmode.def}{2020-03-12}{} {L3 backend support: PDF mode} %</pdfmode> %<*xdvipdfmx> - {l3backend-xdvipdfmx.def}{2020-02-23}{} + {l3backend-xdvipdfmx.def}{2020-03-12}{} {L3 backend support: xdvipdfmx} %</xdvipdfmx> %</package> diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx index 1fec3f8c31d..8a855c54c84 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-23} +% \date{Released 2020-03-12} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx index f580a1e884a..6381a09b938 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-23} +% \date{Released 2020-03-12} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx index f94cb38fc02..88114fec28c 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-23} +% \date{Released 2020-03-12} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx index 3549147e912..e6ca6646601 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-23} +% \date{Released 2020-03-12} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx index d43145935be..490d5522339 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-23} +% \date{Released 2020-03-12} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx index fbc9fcd1984..14496bbc89a 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-02-23} +% \date{Released 2020-03-12} % % \maketitle % @@ -253,41 +253,30 @@ % \end{macrocode} % \end{variable} % -% \begin{macro}{\@@_backend_annotation:nnnn, \@@_backend_annotation_aux:nnnn} -% \begin{macro}{pdf.llx, pdf.lly, pdf.urx, pdf.ury} +% \begin{macro}{\@@_backend_annotation:nnnn} % Annotations are objects, but we track them separately. Notably, they are % not in the object data lists. Here, to get the co-ordinates of the % annotation, we need to have the data collected at the PostScript level. % That requires a bit of box trickery (effectively a \LaTeXe{} |picture| % of zero size). Once the data is collected, use it to set up the annotation -% border. There is a split into two parts here to allow an easy way of -% applying the Adobe Reader fix. +% border. % \begin{macrocode} \cs_new_protected:Npn \@@_backend_annotation:nnnn #1#2#3#4 { - \@@_backend_annotation_aux:nnnn {#1} {#2} {#3} {#4} - \int_gincr:N \g_@@_backend_object_int - \int_gset_eq:NN \g_@@_backend_annotation_int \g_@@_backend_object_int - \@@_backend_pdfmark:x - { - - /_objdef { pdf.obj \int_use:N \g_@@_backend_object_int } - pdf.rect ~ - #4 ~ - /ANN - } + \exp_args:Nf \@@_backend_annotation_aux:nnnn + { \dim_eval:n {#1} } {#2} {#3} {#4} } \cs_new_protected:Npn \@@_backend_annotation_aux:nnnn #1#2#3#4 { \box_move_down:nn {#3} { \hbox:n { \__kernel_backend_postscript:n { pdf.save.ll } } } - \hbox:n {#4} \box_move_up:nn {#2} { \hbox:n { - \tex_kern:D \dim_eval:n {#1} \scan_stop: + \tex_kern:D #1 \scan_stop: \__kernel_backend_postscript:n { pdf.save.ur } + \tex_kern:D -#1 \scan_stop: } } \int_gincr:N \g_@@_backend_object_int @@ -296,12 +285,12 @@ { /_objdef { pdf.obj \int_use:N \g_@@_backend_object_int } pdf.rect + #4 ~ /ANN } } % \end{macrocode} % \end{macro} -% \end{macro} % % \begin{macro}[EXP]{\@@_backend_annotation_last:} % Provide the last annotation we created: could get tricky of course if @@ -616,7 +605,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\@@_backend_destination:nn, \@@_backend_destination_rectangle:nn} +% \begin{macro}{\@@_backend_destination:nn, \@@_backend_destination_box:nn} % Here, we need to turn the zoom into a scale. We also need to know where % the current anchor point actually is: worked out in PostScript. For the % rectangle version, we have a bit more PostScript: we need two points. @@ -646,7 +635,7 @@ /DEST } } -\cs_new_protected:Npn \@@_backend_destination_rectangle:nn #1#2 +\cs_new_protected:Npn \@@_backend_destination_box:nn #1#2 { \group_begin: \hbox_set:Nn \l_@@_internal_box {#2} @@ -814,7 +803,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\@@_backend_destination:nn, \@@_backend_destination_rectangle:nn} +% \begin{macro}{\@@_backend_destination:nn, \@@_backend_destination_box:nn} % A simple task: pass the data to the primitive. The |\scan_stop:| deals % with the danger of an unterminated keyword. The zoom given here is a % percentage, but we need to pass it as \emph{per mille}. The rectangle @@ -839,7 +828,7 @@ { xyz ~ zoom \exp_not:N \fp_eval:n { #2 * 10 } } \scan_stop: } -\cs_new_protected:Npx \@@_backend_destination_rectangle:nn #1#2 +\cs_new_protected:Npx \@@_backend_destination_box:nn #1#2 { \group_begin: \hbox_set:Nn \l_@@_internal_box {#2} @@ -1365,7 +1354,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\@@_backend_destination:nn, \@@_backend_destination_rectangle:nn} +% \begin{macro}{\@@_backend_destination:nn, \@@_backend_destination_box:nn} % Here, we need to turn the zoom into a scale. The method for \texttt{FitR} % is from Alexander Grahn: the idea is to avoid needing to do any calculations % in \TeX{} by using the backend data for \texttt{@xpos} and \texttt{@ypos}. @@ -1391,7 +1380,7 @@ ] } } -\cs_new_protected:Npn \@@_backend_destination_rectangle:nn #1#2 +\cs_new_protected:Npn \@@_backend_destination_box:nn #1#2 { \group_begin: \hbox_set:Nn \l_@@_internal_box {#2} diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx index 56bcbb9243f..6121a0255b1 100644 --- a/Master/texmf-dist/source/latex/l3build/l3build.dtx +++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx @@ -152,6 +152,7 @@ \luavarset{flattentds} {true} {Switch to flatten any source structure when creating a TDS structure} \luavarset{maxprintline}{79} {Length of line to use in log files} \luavarset{packtdszip} {false} {Switch to build a TDS-style zip file for CTAN} +\luavarset{ps2pdfopts} {""} {Options for \texttt{ps2pdf}} \luavarset{typesetcmds} {""} {Instructions to be passed to \TeX{} when doing typesetting} \luavarset{typesetruns}{3} {Number of cycles of typesetting to carry out} \luavarset{recordstatus}{false} {Switch to include error level from test runs in \texttt{.tlg} files} @@ -233,7 +234,7 @@ % }^^A % } % -% \date{Released 2020-02-21} +% \date{Released 2020-03-12} % % \maketitle % \tableofcontents @@ -1230,7 +1231,9 @@ % normalization takes place: % \begin{itemize} % \item Replacement of binary streams by the marker |[BINARY STREAM]| +% \item Replacement of \texttt{/ID} values by |ID-STRING| % \item Removal of blank lines +% \item Removal of comment (|%%|) lines % \end{itemize} % % After this normalization takes place, the file can not usually be rendered diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def index 1c40262a278..dd22f6005b2 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvipdfmx.def}{2020-02-23}{} + {l3backend-dvipdfmx.def}{2020-03-12}{} {L3 backend support: dvipdfmx} \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D \cs_new_protected:Npn \__kernel_backend_literal:n #1 @@ -588,7 +588,7 @@ ] } } -\cs_new_protected:Npn \__pdf_backend_destination_rectangle:nn #1#2 +\cs_new_protected:Npn \__pdf_backend_destination_box:nn #1#2 { \group_begin: \hbox_set:Nn \l__pdf_internal_box {#2} diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def index f0efddf4df7..5dbfcf397b9 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvips.def}{2020-02-23}{} + {l3backend-dvips.def}{2020-03-12}{} {L3 backend support: dvips} \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D \cs_new_protected:Npn \__kernel_backend_literal:n #1 @@ -521,29 +521,20 @@ \int_new:N \g__pdf_backend_annotation_int \cs_new_protected:Npn \__pdf_backend_annotation:nnnn #1#2#3#4 { - \__pdf_backend_annotation_aux:nnnn {#1} {#2} {#3} {#4} - \int_gincr:N \g__pdf_backend_object_int - \int_gset_eq:NN \g__pdf_backend_annotation_int \g__pdf_backend_object_int - \__pdf_backend_pdfmark:x - { - - /_objdef { pdf.obj \int_use:N \g__pdf_backend_object_int } - pdf.rect ~ - #4 ~ - /ANN - } + \exp_args:Nf \__pdf_backend_annotation_aux:nnnn + { \dim_eval:n {#1} } {#2} {#3} {#4} } \cs_new_protected:Npn \__pdf_backend_annotation_aux:nnnn #1#2#3#4 { \box_move_down:nn {#3} { \hbox:n { \__kernel_backend_postscript:n { pdf.save.ll } } } - \hbox:n {#4} \box_move_up:nn {#2} { \hbox:n { - \tex_kern:D \dim_eval:n {#1} \scan_stop: + \tex_kern:D #1 \scan_stop: \__kernel_backend_postscript:n { pdf.save.ur } + \tex_kern:D -#1 \scan_stop: } } \int_gincr:N \g__pdf_backend_object_int @@ -552,6 +543,7 @@ { /_objdef { pdf.obj \int_use:N \g__pdf_backend_object_int } pdf.rect + #4 ~ /ANN } } @@ -758,7 +750,7 @@ /DEST } } -\cs_new_protected:Npn \__pdf_backend_destination_rectangle:nn #1#2 +\cs_new_protected:Npn \__pdf_backend_destination_box:nn #1#2 { \group_begin: \hbox_set:Nn \l__pdf_internal_box {#2} diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def index cdb1f4db368..57c28cebbdb 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvisvgm.def}{2020-02-23}{} + {l3backend-dvisvgm.def}{2020-03-12}{} {L3 backend support: dvisvgm} \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D \cs_new_protected:Npn \__kernel_backend_literal:n #1 diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdfmode.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdfmode.def index cd3db136968..776e0813a14 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdfmode.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdfmode.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-pdfmode.def}{2020-02-23}{} + {l3backend-pdfmode.def}{2020-03-12}{} {L3 backend support: PDF mode} \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D \cs_new_protected:Npn \__kernel_backend_literal:n #1 @@ -551,7 +551,7 @@ { xyz ~ zoom \exp_not:N \fp_eval:n { #2 * 10 } } \scan_stop: } -\cs_new_protected:Npx \__pdf_backend_destination_rectangle:nn #1#2 +\cs_new_protected:Npx \__pdf_backend_destination_box:nn #1#2 { \group_begin: \hbox_set:Nn \l__pdf_internal_box {#2} diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xdvipdfmx.def index 8cbba77a3c4..4bbc7405d0a 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-xdvipdfmx.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-xdvipdfmx.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-xdvipdfmx.def}{2020-02-23}{} + {l3backend-xdvipdfmx.def}{2020-03-12}{} {L3 backend support: xdvipdfmx} \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D \cs_new_protected:Npn \__kernel_backend_literal:n #1 @@ -634,7 +634,7 @@ ] } } -\cs_new_protected:Npn \__pdf_backend_destination_rectangle:nn #1#2 +\cs_new_protected:Npn \__pdf_backend_destination_box:nn #1#2 { \group_begin: \hbox_set:Nn \l__pdf_internal_box {#2} |