summaryrefslogtreecommitdiff
path: root/support/lyluatex
diff options
context:
space:
mode:
Diffstat (limited to 'support/lyluatex')
-rw-r--r--support/lyluatex/README.md8
-rw-r--r--support/lyluatex/lyluatex.lua24
-rw-r--r--support/lyluatex/lyluatex.pdfbin2015945 -> 2028734 bytes
-rw-r--r--support/lyluatex/lyluatex.sty2
-rw-r--r--support/lyluatex/lyluatex.tex2
-rw-r--r--support/lyluatex/lyluatexbase.cls2
-rw-r--r--support/lyluatex/lyluatexmanual.cls2
7 files changed, 29 insertions, 11 deletions
diff --git a/support/lyluatex/README.md b/support/lyluatex/README.md
index 7aa096a18d..10a9a7965c 100644
--- a/support/lyluatex/README.md
+++ b/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/support/lyluatex/lyluatex.lua b/support/lyluatex/lyluatex.lua
index f947bde48a..b6188b71d6 100644
--- a/support/lyluatex/lyluatex.lua
+++ b/support/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/support/lyluatex/lyluatex.pdf b/support/lyluatex/lyluatex.pdf
index b1473f70d9..88d11e9e04 100644
--- a/support/lyluatex/lyluatex.pdf
+++ b/support/lyluatex/lyluatex.pdf
Binary files differ
diff --git a/support/lyluatex/lyluatex.sty b/support/lyluatex/lyluatex.sty
index 21e9d1263b..dd2a710dd3 100644
--- a/support/lyluatex/lyluatex.sty
+++ b/support/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}
diff --git a/support/lyluatex/lyluatex.tex b/support/lyluatex/lyluatex.tex
index f0d079c550..f31e5b7a04 100644
--- a/support/lyluatex/lyluatex.tex
+++ b/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/support/lyluatex/lyluatexbase.cls b/support/lyluatex/lyluatexbase.cls
index f67030c343..aeae5786ac 100644
--- a/support/lyluatex/lyluatexbase.cls
+++ b/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/support/lyluatex/lyluatexmanual.cls b/support/lyluatex/lyluatexmanual.cls
index bb53945d18..6081a3549b 100644
--- a/support/lyluatex/lyluatexmanual.cls
+++ b/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}