summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/luafindfont/luafindfont.lua22
-rw-r--r--Master/texmf-dist/doc/man/man1/luafindfont.12
-rw-r--r--Master/texmf-dist/doc/man/man1/luafindfont.man1.pdfbin24076 -> 23919 bytes
-rw-r--r--Master/texmf-dist/doc/support/luafindfont/CHANGELOG1
-rw-r--r--Master/texmf-dist/doc/support/luafindfont/luafindfont-doc.pdfbin86485 -> 92140 bytes
-rw-r--r--Master/texmf-dist/doc/support/luafindfont/luafindfont-doc.tex5
-rwxr-xr-xMaster/texmf-dist/scripts/luafindfont/luafindfont.lua22
7 files changed, 33 insertions, 19 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/luafindfont/luafindfont.lua b/Build/source/texk/texlive/linked_scripts/luafindfont/luafindfont.lua
index d3532b643ed..f1d513a508b 100755
--- a/Build/source/texk/texlive/linked_scripts/luafindfont/luafindfont.lua
+++ b/Build/source/texk/texlive/linked_scripts/luafindfont/luafindfont.lua
@@ -4,10 +4,10 @@
-- FILE: luafindfont.lua
-- DESCRIPTION: search for fonts in the database
-- REQUIREMENTS: luatex v.0.80 or later; packages lualibs, xindex-lapp
--- AUTHOR: Herbert Voß (C) 2022-05-05
+-- AUTHOR: Herbert Voß (C) 2022-09-02
-----------------------------------------------------------------------
luafindfont = luafindfont or { }
- local version = 0.09
+ local version = 0.10
luafindfont.version = version
--[[
@@ -146,11 +146,10 @@ if vlevel > 0 then
print("We are using "..luaVersion)
if font_str[2] ~= "" then
print('Looking for font \"'..font_str[1]..' & '..font_str[2]..'\"')
+ else
+ print('Looking for font \"'..font_str[1]..'\"')
end
end
-if font_str[1] == "*" or vlevel > 0 then
- print('Looking for font \"'..font_str[1]..'\"')
-end
function getFileParts(fullpath,part)
local path, file, ext = string.match(fullpath, "(.-)([^/]-([^%.]+))$")
@@ -172,17 +171,24 @@ function getFileLocation()
print("No cache path found ... ")
return ""
end
- if os.type == "windows" then
+ local windows = (os.type == "windows")
+ if windows then logprint ("System: Windows")
+ else logprint ("System: macOS or Linux")
+ end
+ if windows then
paths = string.split(cachepaths,";")
else
paths = string.split(cachepaths,":")
end
- logprint ("Pathes: "..paths[1]..", "..paths[2])
+ logprint ("Paths: [1]"..paths[1])
+ if #paths > 1 then
+ logprint(" [2]"..paths[2])
+ end
local file = paths[1].."/luatex-cache/generic/names"
logprint("try path: "..file)
local f,err = io.open (file.."/test.tmp", "w")
if not f and #paths > 1 then
- logprint("first path has no file, I'll try the second one ...")
+ logprint("first path has no file, I'll try the second one, if exists ...")
file = paths[2].."/luatex-cache/generic/names"
logprint("try path: "..file)
f,err = io.open (file.."/test.tmp", "w")
diff --git a/Master/texmf-dist/doc/man/man1/luafindfont.1 b/Master/texmf-dist/doc/man/man1/luafindfont.1
index 6814193feac..26f976c4036 100644
--- a/Master/texmf-dist/doc/man/man1/luafindfont.1
+++ b/Master/texmf-dist/doc/man/man1/luafindfont.1
@@ -1,6 +1,6 @@
.\" Manpage for luafindfont.
.\" Contact hvoss@tug.org to correct errors or typos.
-.TH luafindfont 1 "07 may 2022" "0.09" "luafindfont man page"
+.TH luafindfont 1 "02 sep 2022" "0.10" "luafindfont man page"
.SH NAME
luafindfont
\- retrieve font informations of all installed system and TeX fonts.
diff --git a/Master/texmf-dist/doc/man/man1/luafindfont.man1.pdf b/Master/texmf-dist/doc/man/man1/luafindfont.man1.pdf
index 79471db4889..b9be0eb4184 100644
--- a/Master/texmf-dist/doc/man/man1/luafindfont.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/luafindfont.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/luafindfont/CHANGELOG b/Master/texmf-dist/doc/support/luafindfont/CHANGELOG
index acd81406f38..2dde2ffbc7d 100644
--- a/Master/texmf-dist/doc/support/luafindfont/CHANGELOG
+++ b/Master/texmf-dist/doc/support/luafindfont/CHANGELOG
@@ -1,3 +1,4 @@
+0.10 2022-09-02 - fix for Windows and path setting
0.09 2022-05-07 - load first a luc.gz database, if present
0.08 2022-05-05 - added --no-symbolic-names as a synonym
- edited some output messages
diff --git a/Master/texmf-dist/doc/support/luafindfont/luafindfont-doc.pdf b/Master/texmf-dist/doc/support/luafindfont/luafindfont-doc.pdf
index 913da1bc1d2..f63d3e5ebc9 100644
--- a/Master/texmf-dist/doc/support/luafindfont/luafindfont-doc.pdf
+++ b/Master/texmf-dist/doc/support/luafindfont/luafindfont-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/luafindfont/luafindfont-doc.tex b/Master/texmf-dist/doc/support/luafindfont/luafindfont-doc.tex
index 59ac70890cf..82225231529 100644
--- a/Master/texmf-dist/doc/support/luafindfont/luafindfont-doc.tex
+++ b/Master/texmf-dist/doc/support/luafindfont/luafindfont-doc.tex
@@ -1,4 +1,4 @@
- %% $Id: luafindfont-doc.tex 545 2022-05-08 14:21:52Z herbert $
+ %% $Id: luafindfont-doc.tex 599 2022-09-02 09:48:32Z herbert $
%
\listfiles\setcounter{errorcontextlines}{100}
\documentclass[paper=a4,fontsize=11pt,DIV=14,parskip=half-,
@@ -81,7 +81,7 @@
\def\setVersion#1{\setVVersion#1!!}
\def\setVVersion#1=#2!!{\def\luafindfontVersion{#2}}
-\setVersion{version = 0.09}% can be automatically changed by perl
+\setVersion{version = 0.10}% can be automatically changed by perl
\setkeys{hv}{cleanup={},force}
@@ -98,6 +98,7 @@
Thanks to: \\
Gerhard Bachmaier;
Karl Berry;
+{\setmainfont[Scale=MatchUppercase]{NotoSerifGeorgian-Medium.ttf} მამუკა ჯიბლაძე} (Mamuka Jibladze);
Rolf Niepraschk;
\clearpage
diff --git a/Master/texmf-dist/scripts/luafindfont/luafindfont.lua b/Master/texmf-dist/scripts/luafindfont/luafindfont.lua
index d3532b643ed..f1d513a508b 100755
--- a/Master/texmf-dist/scripts/luafindfont/luafindfont.lua
+++ b/Master/texmf-dist/scripts/luafindfont/luafindfont.lua
@@ -4,10 +4,10 @@
-- FILE: luafindfont.lua
-- DESCRIPTION: search for fonts in the database
-- REQUIREMENTS: luatex v.0.80 or later; packages lualibs, xindex-lapp
--- AUTHOR: Herbert Voß (C) 2022-05-05
+-- AUTHOR: Herbert Voß (C) 2022-09-02
-----------------------------------------------------------------------
luafindfont = luafindfont or { }
- local version = 0.09
+ local version = 0.10
luafindfont.version = version
--[[
@@ -146,11 +146,10 @@ if vlevel > 0 then
print("We are using "..luaVersion)
if font_str[2] ~= "" then
print('Looking for font \"'..font_str[1]..' & '..font_str[2]..'\"')
+ else
+ print('Looking for font \"'..font_str[1]..'\"')
end
end
-if font_str[1] == "*" or vlevel > 0 then
- print('Looking for font \"'..font_str[1]..'\"')
-end
function getFileParts(fullpath,part)
local path, file, ext = string.match(fullpath, "(.-)([^/]-([^%.]+))$")
@@ -172,17 +171,24 @@ function getFileLocation()
print("No cache path found ... ")
return ""
end
- if os.type == "windows" then
+ local windows = (os.type == "windows")
+ if windows then logprint ("System: Windows")
+ else logprint ("System: macOS or Linux")
+ end
+ if windows then
paths = string.split(cachepaths,";")
else
paths = string.split(cachepaths,":")
end
- logprint ("Pathes: "..paths[1]..", "..paths[2])
+ logprint ("Paths: [1]"..paths[1])
+ if #paths > 1 then
+ logprint(" [2]"..paths[2])
+ end
local file = paths[1].."/luatex-cache/generic/names"
logprint("try path: "..file)
local f,err = io.open (file.."/test.tmp", "w")
if not f and #paths > 1 then
- logprint("first path has no file, I'll try the second one ...")
+ logprint("first path has no file, I'll try the second one, if exists ...")
file = paths[2].."/luatex-cache/generic/names"
logprint("try path: "..file)
f,err = io.open (file.."/test.tmp", "w")