texlive[65332] Master/texmf-dist: lyluatex (22dec22)
commits+karl at tug.org
commits+karl at tug.org
Thu Dec 22 22:11:13 CET 2022
Revision: 65332
http://tug.org/svn/texlive?view=revision&revision=65332
Author: karl
Date: 2022-12-22 22:11:12 +0100 (Thu, 22 Dec 2022)
Log Message:
-----------
lyluatex (22dec22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/support/lyluatex/README.md
trunk/Master/texmf-dist/doc/support/lyluatex/lyluatex.pdf
trunk/Master/texmf-dist/doc/support/lyluatex/lyluatex.tex
trunk/Master/texmf-dist/doc/support/lyluatex/lyluatexbase.cls
trunk/Master/texmf-dist/doc/support/lyluatex/lyluatexmanual.cls
trunk/Master/texmf-dist/scripts/lyluatex/lyluatex.lua
trunk/Master/texmf-dist/tex/luatex/lyluatex/lyluatex.sty
Modified: trunk/Master/texmf-dist/doc/support/lyluatex/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/support/lyluatex/README.md 2022-12-22 13:19:02 UTC (rev 65331)
+++ trunk/Master/texmf-dist/doc/support/lyluatex/README.md 2022-12-22 21:11:12 UTC (rev 65332)
@@ -84,6 +84,14 @@
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).
Modified: trunk/Master/texmf-dist/doc/support/lyluatex/lyluatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/support/lyluatex/lyluatex.tex
===================================================================
--- trunk/Master/texmf-dist/doc/support/lyluatex/lyluatex.tex 2022-12-22 13:19:02 UTC (rev 65331)
+++ trunk/Master/texmf-dist/doc/support/lyluatex/lyluatex.tex 2022-12-22 21:11:12 UTC (rev 65332)
@@ -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}
Modified: trunk/Master/texmf-dist/doc/support/lyluatex/lyluatexbase.cls
===================================================================
--- trunk/Master/texmf-dist/doc/support/lyluatex/lyluatexbase.cls 2022-12-22 13:19:02 UTC (rev 65331)
+++ trunk/Master/texmf-dist/doc/support/lyluatex/lyluatexbase.cls 2022-12-22 21:11:12 UTC (rev 65332)
@@ -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}
Modified: trunk/Master/texmf-dist/doc/support/lyluatex/lyluatexmanual.cls
===================================================================
--- trunk/Master/texmf-dist/doc/support/lyluatex/lyluatexmanual.cls 2022-12-22 13:19:02 UTC (rev 65331)
+++ trunk/Master/texmf-dist/doc/support/lyluatex/lyluatexmanual.cls 2022-12-22 21:11:12 UTC (rev 65332)
@@ -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}
Modified: trunk/Master/texmf-dist/scripts/lyluatex/lyluatex.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/lyluatex/lyluatex.lua 2022-12-22 13:19:02 UTC (rev 65331)
+++ trunk/Master/texmf-dist/scripts/lyluatex/lyluatex.lua 2022-12-22 21:11:12 UTC (rev 65332)
@@ -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 @@
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 @@
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: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 @@
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
Modified: trunk/Master/texmf-dist/tex/luatex/lyluatex/lyluatex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/lyluatex/lyluatex.sty 2022-12-22 13:19:02 UTC (rev 65331)
+++ trunk/Master/texmf-dist/tex/luatex/lyluatex/lyluatex.sty 2022-12-22 21:11:12 UTC (rev 65332)
@@ -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}
More information about the tex-live-commits
mailing list.