texlive[66880] Master: lyluatex (18apr23)
commits+karl at tug.org
commits+karl at tug.org
Tue Apr 18 21:37:13 CEST 2023
Revision: 66880
http://tug.org/svn/texlive?view=revision&revision=66880
Author: karl
Date: 2023-04-18 21:37:13 +0200 (Tue, 18 Apr 2023)
Log Message:
-----------
lyluatex (18apr23)
Modified Paths:
--------------
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
trunk/Master/tlpkg/libexec/ctan2tds
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 2023-04-18 13:34:24 UTC (rev 66879)
+++ trunk/Master/texmf-dist/doc/support/lyluatex/lyluatex.tex 2023-04-18 19:37:13 UTC (rev 66880)
@@ -93,7 +93,7 @@
\apptocmd{\@title}{\par {\large #1 \par}}{}{}
}
\makeatother
-\subtitle{1.1.4}
+\subtitle{1.1.5}
\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 2023-04-18 13:34:24 UTC (rev 66879)
+++ trunk/Master/texmf-dist/doc/support/lyluatex/lyluatexbase.cls 2023-04-18 19:37:13 UTC (rev 66880)
@@ -5,7 +5,7 @@
% This file is part of lyluatex.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{lyluatexbase}[2023/04/15 v1.1.4] %%LYLUATEX_DATE LYLUATEX_VERSION
+\ProvidesClass{lyluatexbase}[2023/04/18 v1.1.5] %%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 2023-04-18 13:34:24 UTC (rev 66879)
+++ trunk/Master/texmf-dist/doc/support/lyluatex/lyluatexmanual.cls 2023-04-18 19:37:13 UTC (rev 66880)
@@ -5,7 +5,7 @@
% This file is part of lyluatex.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{lyluatexmanual}[2023/04/15 v1.1.4] %%LYLUATEX_DATE LYLUATEX_VERSION
+\ProvidesClass{lyluatexmanual}[2023/04/18 v1.1.5] %%LYLUATEX_DATE LYLUATEX_VERSION
\LoadClass{lyluatexbase}
Modified: trunk/Master/texmf-dist/scripts/lyluatex/lyluatex.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/lyluatex/lyluatex.lua 2023-04-18 13:34:24 UTC (rev 66879)
+++ trunk/Master/texmf-dist/scripts/lyluatex/lyluatex.lua 2023-04-18 19:37:13 UTC (rev 66880)
@@ -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.4', --LYLUATEX_VERSION
- date = "2023/04/15", --LYLUATEX_DATE
+ version = '1.1.5', --LYLUATEX_VERSION
+ date = "2023/04/18", --LYLUATEX_DATE
description = "Module lyluatex.",
author = "The Gregorio Project − (see Contributors.md)",
copyright = "2015-2023 - jperon and others",
@@ -112,7 +112,7 @@
else
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)
@@ -825,19 +825,20 @@
return lib.readlinematching('TeX%-GS', io.popen('"'..self.program..'" --help', 'r'))
end
-function Score:lilypond_version(number)
- local result = lib.readlinematching('GNU LilyPond', io.popen('"'..self.program..'" --version', 'r'))
- if result then
- if number then return result:match('%d+%.%d+%.?%d*')
- else
- info(
- "Compiling score %s with LilyPond executable '%s'.",
- self.output, self.program
- )
- debug(result)
- return true
- end
+function Score:lilypond_version()
+ local version = self._lilypond_version
+ if not version then
+ version = lib.readlinematching('GNU LilyPond', io.popen('"'..self.program..'" --version', 'r'))
+ info(
+ "Compiling score %s with LilyPond executable '%s'.",
+ self.output, self.program
+ )
+ if not version then return end
+ version = ly.v{version:match('(%d+)%.(%d+)%.?(%d*)')}
+ debug("VERSION " .. tostring(version))
+ self._lilypond_version = version
end
+ return version
end
function Score:ly_fixbadlycroppedstaffgroupbrackets()
@@ -854,17 +855,21 @@
function Score:ly_fonts()
if self['pass-fonts'] then
- return string.format([[
+ local fonts_def
+ if self:lilypond_version() >= ly.v{2, 25, 4} then
+ fonts_def = [[fonts.roman = "%s"
+ fonts.sans = "%s"
+ fonts.typewriter = "%s"]]
+ else
+ fonts_def = [[
#(define fonts
(make-pango-font-tree "%s"
"%s"
"%s"
(/ staff-height pt 20)))
-]],
- self.rmfamily,
- self.sffamily,
- self.ttfamily
- )
+]]
+ end
+ return fonts_def:format(self.rmfamily, self.sffamily, self.ttfamily)
else
return '%% fonts not set'
end
@@ -1398,6 +1403,26 @@
end
+do
+ local _ = {}
+ function _:__sub(other)
+ for i = 1, lib.max(#self, #other) do
+ local diff = (self[i] or 0) - (other[i] or 0)
+ if diff ~= 0 then return diff, i end
+ end
+ return 0
+ end
+ function _:__eq(other) return self - other == 0 end
+ function _:__lt(other) return self - other < 0 end
+ function _:__call(v)
+ for i = 1, #v do v[i] = tonumber(v[i]) end
+ return setmetatable(v, self)
+ end
+ function _:__tostring() return table.concat(self, ".") end
+ ly.v = setmetatable(_, _)
+end
+
+
function ly.write_to_file(file, content)
local f = io.open(Score.tmpdir..'/'..file, 'w')
if not f then err('Unable to write to file %s', file) end
Modified: trunk/Master/texmf-dist/tex/luatex/lyluatex/lyluatex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/lyluatex/lyluatex.sty 2023-04-18 13:34:24 UTC (rev 66879)
+++ trunk/Master/texmf-dist/tex/luatex/lyluatex/lyluatex.sty 2023-04-18 19:37:13 UTC (rev 66880)
@@ -5,7 +5,7 @@
% This file is part of lyluatex.
\NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{lyluatex}[2023/04/15 v1.1.4] %%LYLUATEX_DATE LYLUATEX_VERSION
+\ProvidesPackage{lyluatex}[2023/04/18 v1.1.5] %%LYLUATEX_DATE LYLUATEX_VERSION
% Dependencies
\RequirePackage{graphicx}
Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds 2023-04-18 13:34:24 UTC (rev 66879)
+++ trunk/Master/tlpkg/libexec/ctan2tds 2023-04-18 19:37:13 UTC (rev 66880)
@@ -345,6 +345,7 @@
'context-chromato', "&MAKEcopy",
'context-cmscbf', "&MAKEcopy",
'context-cmttbf', "&MAKEcopy",
+ 'context-collatingmarks', "die 'skipping, generic filename'",
'context-construction-plan',"&MAKEcopy",
'context-cyrillicnumbers', "&MAKEcopy",
'context-degrade', "&MAKEcopy",
@@ -358,6 +359,7 @@
'context-gnuplot', "&MAKEcopy",
'context-handlecsv', "&MAKEcopy",
'context-inifile', "die 'skipping, removed with advent of lmtx'",
+ 'context-interval-calendar', "die 'skipping, generic filename'",
'context-layout', "&MAKEcopy",
'context-letter', "&MAKEcopy",
'context-lettrine', "&MAKEcopy",
More information about the tex-live-commits
mailing list.