diff options
author | Karl Berry <karl@freefriends.org> | 2022-12-22 21:11:12 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-12-22 21:11:12 +0000 |
commit | 283c13bc8af415603f39687dcfd37fafca3c0506 (patch) | |
tree | e7e74794d6d6c0b8567839a62e4b3231209d565e | |
parent | a779c622afeb3ccf66cfb7d68af93f09dbb83d3e (diff) |
lyluatex (22dec22)
git-svn-id: svn://tug.org/texlive/trunk@65332 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/support/lyluatex/README.md | 8 | ||||
-rw-r--r-- | Master/texmf-dist/doc/support/lyluatex/lyluatex.pdf | bin | 2015945 -> 2028734 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/lyluatex/lyluatex.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/support/lyluatex/lyluatexbase.cls | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/support/lyluatex/lyluatexmanual.cls | 2 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/lyluatex/lyluatex.lua | 24 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/lyluatex/lyluatex.sty | 2 |
7 files changed, 29 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/support/lyluatex/README.md b/Master/texmf-dist/doc/support/lyluatex/README.md index 7aa096a18df..10a9a7965ca 100644 --- a/Master/texmf-dist/doc/support/lyluatex/README.md +++ b/Master/texmf-dist/doc/support/lyluatex/README.md @@ -84,6 +84,14 @@ as follows: That way, documents typeset with `lilypond-book` can be adapted to use `lyluatex` without much difficulty. +## Note about MiKTeX + +The main author doesn’t use MiKTeX, and won’t make any effort to support it. +Nevertheless, pull requests in order to support it will be taken in account. + +Actually, *lyluatex* works with MiKTeX with *LilyPond 2.22*: there’s a known +bug with *LilyPond 2.24*: #301. + # Credits See [Contributors.md](Contributors.md). diff --git a/Master/texmf-dist/doc/support/lyluatex/lyluatex.pdf b/Master/texmf-dist/doc/support/lyluatex/lyluatex.pdf Binary files differindex b1473f70d9b..88d11e9e048 100644 --- a/Master/texmf-dist/doc/support/lyluatex/lyluatex.pdf +++ b/Master/texmf-dist/doc/support/lyluatex/lyluatex.pdf diff --git a/Master/texmf-dist/doc/support/lyluatex/lyluatex.tex b/Master/texmf-dist/doc/support/lyluatex/lyluatex.tex index f0d079c550b..f31e5b7a044 100644 --- a/Master/texmf-dist/doc/support/lyluatex/lyluatex.tex +++ b/Master/texmf-dist/doc/support/lyluatex/lyluatex.tex @@ -93,7 +93,7 @@ \apptocmd{\@title}{\par {\large #1 \par}}{}{} } \makeatother -\subtitle{1.1.1} +\subtitle{1.1.2} \author{Fr.~Jacques Peron \and Urs Liska \and Br. Samuel Springuel} \date{\lyluatexmanualdate} diff --git a/Master/texmf-dist/doc/support/lyluatex/lyluatexbase.cls b/Master/texmf-dist/doc/support/lyluatex/lyluatexbase.cls index f67030c3432..aeae5786ac3 100644 --- a/Master/texmf-dist/doc/support/lyluatex/lyluatexbase.cls +++ b/Master/texmf-dist/doc/support/lyluatex/lyluatexbase.cls @@ -5,7 +5,7 @@ % This file is part of lyluatex. \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{lyluatexbase}[2022/11/07 v1.1.1] %%LYLUATEX_DATE LYLUATEX_VERSION +\ProvidesClass{lyluatexbase}[2022/12/21 v1.1.2] %%LYLUATEX_DATE LYLUATEX_VERSION \LoadClass[DIV=11]{scrartcl} \RequirePackage{lyluatex} diff --git a/Master/texmf-dist/doc/support/lyluatex/lyluatexmanual.cls b/Master/texmf-dist/doc/support/lyluatex/lyluatexmanual.cls index bb53945d187..6081a3549bc 100644 --- a/Master/texmf-dist/doc/support/lyluatex/lyluatexmanual.cls +++ b/Master/texmf-dist/doc/support/lyluatex/lyluatexmanual.cls @@ -5,7 +5,7 @@ % This file is part of lyluatex. \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{lyluatexmanual}[2022/11/07 v1.1.1] %%LYLUATEX_DATE LYLUATEX_VERSION +\ProvidesClass{lyluatexmanual}[2022/12/21 v1.1.2] %%LYLUATEX_DATE LYLUATEX_VERSION \LoadClass{lyluatexbase} diff --git a/Master/texmf-dist/scripts/lyluatex/lyluatex.lua b/Master/texmf-dist/scripts/lyluatex/lyluatex.lua index f947bde48ac..b6188b71d6b 100755 --- a/Master/texmf-dist/scripts/lyluatex/lyluatex.lua +++ b/Master/texmf-dist/scripts/lyluatex/lyluatex.lua @@ -1,8 +1,8 @@ -- luacheck: ignore ly log self luatexbase internalversion font fonts tex token kpse status ly_opts local err, warn, info, log = luatexbase.provides_module({ name = "lyluatex", - version = '1.1.1', --LYLUATEX_VERSION - date = "2022/11/07", --LYLUATEX_DATE + version = '1.1.2', --LYLUATEX_VERSION + date = "2022/12/21", --LYLUATEX_DATE description = "Module lyluatex.", author = "The Gregorio Project − (see Contributors.md)", copyright = "2015-2022 - jperon and others", @@ -105,7 +105,13 @@ end local function extract_includepaths(includepaths) includepaths = includepaths:explode(',') - local cfd = Score.currfiledir:gsub('^$', './') + + if lib.tex_engine.dist == 'MiKTeX' then + local cfd = Score.currfiledir:gsub('^$', '.\\') + else + local cfd = Score.currfiledir:gsub('^$', './') + end + table.insert(includepaths, 1, cfd) for i, path in ipairs(includepaths) do -- delete initial space (in case someone puts a space after the comma) @@ -143,8 +149,13 @@ local function locate(file, includepaths, ext) result = d..file if lfs.isfile(result) then break end end - if not lfs.isfile(result) and ext and file:match('%.[^%.]+$') ~= ext then return locate(file..ext, includepaths) end - if not lfs.isfile(result) then result = kpse.find_file(file) end + if not (result and lfs.isfile(result)) then + if ext and file:match('%.[^%.]+$') ~= ext then + return locate(file..ext, includepaths) + else + return kpse.find_file(file) + end + end return result end @@ -788,7 +799,7 @@ function Score:is_odd_page() return tex.count['c@page'] % 2 == 1 end function Score:lilypond_cmd() local input, mode = '-s -', 'w' - if self.debug then + if self.debug or lib.tex_engine.dist == 'MiKTeX' then local f = io.open(self.output..'.ly', 'w') f:write(self.complete_ly_code) f:close() @@ -806,7 +817,6 @@ function Score:lilypond_cmd() cmd = cmd..'-I "'..dir:gsub('^%./', lfs.currentdir()..'/')..'" ' end cmd = cmd..'-o "'..self.output..'" '..input - if lib.tex_engine.dist == 'MiKTeX' then cmd = '"'..cmd..'"' end debug("Command:\n"..cmd) return cmd, mode end diff --git a/Master/texmf-dist/tex/luatex/lyluatex/lyluatex.sty b/Master/texmf-dist/tex/luatex/lyluatex/lyluatex.sty index 21e9d1263b7..dd2a710dd31 100644 --- a/Master/texmf-dist/tex/luatex/lyluatex/lyluatex.sty +++ b/Master/texmf-dist/tex/luatex/lyluatex/lyluatex.sty @@ -5,7 +5,7 @@ % This file is part of lyluatex. \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{lyluatex}[2022/11/07 v1.1.1] %%LYLUATEX_DATE LYLUATEX_VERSION +\ProvidesPackage{lyluatex}[2022/12/21 v1.1.2] %%LYLUATEX_DATE LYLUATEX_VERSION % Dependencies \RequirePackage{graphicx} |