5 files changed, 142 insertions, 59 deletions
diff --git a/Master/texmf-dist/tex/latex/libris/libris.sty b/Master/texmf-dist/tex/latex/libris/libris.sty
index 9dc634b3b42..4f1fa147786 100644
--- a/Master/texmf-dist/tex/latex/libris/libris.sty
+++ b/Master/texmf-dist/tex/latex/libris/libris.sty
@@ -1,23 +1,54 @@
-%% Copyright 2008 Clea F. Rees
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-%   http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-% 
-% The Current Maintainer of this work is Clea F. Rees.
-%
-% This work consists of all files listed in manifest.txt.
+%%
+%% This is file `libris.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% librisadf.dtx  (with options: `sty')
+%% Copyright (C) 2008-2024 Clea F. Rees.
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%% 
+%% This work has the LPPL maintenance status `maintained'.
+%% 
+%% The Current Maintainer of this work is Clea F. Rees.
+%% 
+%% This file may only be distributed together with a copy of the package
+%% librisadf. You may however distribute the package librisadf without
+%% such generated files.
+%% 
+%% This work consists of all files listed in manifest.txt.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{libris}[2008/12/13 v1.0 libris]
+\RequirePackage{svn-prov}
+\ProvidesPackageSVN[libris.sty]{$Id: librisadf.dtx 10402 2024-09-27 02:35:48Z cfrees $}[v1.1 \revinfo]
+\DefineFileInfoSVN[libris]
 \RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
-\RequirePackage{nfssext-cfr}
+\RequirePackage{nfssext-cfr}[2024/01/01]
+\IfFormatAtLeastTF {2020-02-02}{%
+  \DeclareEncodingSubset{TS1}{yly}{1}%
+  \DeclareEncodingSubset{TS1}{ylyw}{1}%
+}{%
+  \RequirePackage{textcomp}}
+\UndeclareTextCommand{\textperthousand}{T1}
+\ExplSyntaxOn
+\keys_define:nn { libris }
+{
+  scale .tl_set:N = \yly@scale,
+  scale .initial:V = \@empty,
+}
+\ProcessKeyOptions[libris]
+\ExplSyntaxOff
 \renewcommand{\sfdefault}{yly}
-\endinput
 %% end libris.sty
+%% end libris.sty
+\endinput
+%%
+%% End of file `libris.sty'.
diff --git a/Master/texmf-dist/tex/latex/libris/t1yly.fd b/Master/texmf-dist/tex/latex/libris/t1yly.fd
index 93220b3c665..425d3fa6a33 100644
--- a/Master/texmf-dist/tex/latex/libris/t1yly.fd
+++ b/Master/texmf-dist/tex/latex/libris/t1yly.fd
@@ -5,36 +5,49 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t1yly.fd}
-   [2010/06/27 Fontinst v1.933 font definitions for T1/yly.]
+   [2024/09/27 Fontinst v1.933 font definitions for T1/yly.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yly@scale\endcsname\relax
+  \let\yly@@scale\@empty
+\else
+  \edef\yly@@scale{s*[\csname yly@scale\endcsname]}%
+\fi
 
 \DeclareFontFamily{T1}{yly}{}
 
 \DeclareFontShape{T1}{yly}{m}{n}{
-   <-> ylyr8t
+   <-> \yly@@scale ylyr8t
 }{}
 
 \DeclareFontShape{T1}{yly}{m}{it}{
-   <-> ylyri8t
+   <-> \yly@@scale ylyri8t
 }{}
 
 \DeclareFontShape{T1}{yly}{b}{n}{
-   <-> ylyb8t
+   <-> \yly@@scale ylyb8t
 }{}
 
 \DeclareFontShape{T1}{yly}{b}{it}{
-   <-> ylybi8t
+   <-> \yly@@scale ylybi8t
 }{}
 
 \DeclareFontShape{T1}{yly}{m}{sc}{<->ssub * yly/m/n}{}
-\DeclareFontShape{T1}{yly}{m}{si}{<->ssub * yly/m/it}{}
-\DeclareFontShape{T1}{yly}{m}{sl}{<->ssub * yly/m/si}{}
+\DeclareFontShape{T1}{yly}{m}{sl}{<->ssub * yly/m/it}{}
+\DeclareFontShape{T1}{yly}{m}{scsl}{<->ssub * yly/m/sl}{}
+\DeclareFontShape{T1}{yly}{m}{scit}{<->ssub * yly/m/scsl}{}
+\DeclareFontShape{T1}{yly}{m}{si}{<->ssub * yly/m/scit}{}
 \DeclareFontShape{T1}{yly}{bx}{n}{<->ssub * yly/b/n}{}
 \DeclareFontShape{T1}{yly}{b}{sc}{<->ssub * yly/b/n}{}
 \DeclareFontShape{T1}{yly}{bx}{sc}{<->ssub * yly/b/sc}{}
 \DeclareFontShape{T1}{yly}{bx}{it}{<->ssub * yly/b/it}{}
-\DeclareFontShape{T1}{yly}{b}{si}{<->ssub * yly/b/it}{}
-\DeclareFontShape{T1}{yly}{bx}{si}{<->ssub * yly/b/si}{}
-\DeclareFontShape{T1}{yly}{b}{sl}{<->ssub * yly/b/si}{}
+\DeclareFontShape{T1}{yly}{b}{sl}{<->ssub * yly/b/it}{}
 \DeclareFontShape{T1}{yly}{bx}{sl}{<->ssub * yly/b/sl}{}
+\DeclareFontShape{T1}{yly}{b}{scsl}{<->ssub * yly/b/sl}{}
+\DeclareFontShape{T1}{yly}{bx}{scsl}{<->ssub * yly/b/scsl}{}
+\DeclareFontShape{T1}{yly}{b}{scit}{<->ssub * yly/b/scsl}{}
+\DeclareFontShape{T1}{yly}{bx}{scit}{<->ssub * yly/b/scit}{}
+\DeclareFontShape{T1}{yly}{b}{si}{<->ssub * yly/b/scit}{}
+\DeclareFontShape{T1}{yly}{bx}{si}{<->ssub * yly/b/si}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/libris/t1ylyw.fd b/Master/texmf-dist/tex/latex/libris/t1ylyw.fd
index 87b4a276f18..247d8136ad7 100644
--- a/Master/texmf-dist/tex/latex/libris/t1ylyw.fd
+++ b/Master/texmf-dist/tex/latex/libris/t1ylyw.fd
@@ -5,36 +5,49 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t1ylyw.fd}
-   [2010/06/27 Fontinst v1.933 font definitions for T1/ylyw.]
+   [2024/09/27 Fontinst v1.933 font definitions for T1/ylyw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yly@scale\endcsname\relax
+  \let\yly@@scale\@empty
+\else
+  \edef\yly@@scale{s*[\csname yly@scale\endcsname]}%
+\fi
 
 \DeclareFontFamily{T1}{ylyw}{}
 
 \DeclareFontShape{T1}{ylyw}{m}{n}{
-   <-> ylyrw8t
+   <-> \yly@@scale ylyrw8t
 }{}
 
 \DeclareFontShape{T1}{ylyw}{m}{it}{
-   <-> ylyriw8t
+   <-> \yly@@scale ylyriw8t
 }{}
 
 \DeclareFontShape{T1}{ylyw}{b}{n}{
-   <-> ylybw8t
+   <-> \yly@@scale ylybw8t
 }{}
 
 \DeclareFontShape{T1}{ylyw}{b}{it}{
-   <-> ylybiw8t
+   <-> \yly@@scale ylybiw8t
 }{}
 
 \DeclareFontShape{T1}{ylyw}{m}{sc}{<->ssub * ylyw/m/n}{}
-\DeclareFontShape{T1}{ylyw}{m}{si}{<->ssub * ylyw/m/it}{}
-\DeclareFontShape{T1}{ylyw}{m}{sl}{<->ssub * ylyw/m/si}{}
+\DeclareFontShape{T1}{ylyw}{m}{sl}{<->ssub * ylyw/m/it}{}
+\DeclareFontShape{T1}{ylyw}{m}{scsl}{<->ssub * ylyw/m/sl}{}
+\DeclareFontShape{T1}{ylyw}{m}{scit}{<->ssub * ylyw/m/scsl}{}
+\DeclareFontShape{T1}{ylyw}{m}{si}{<->ssub * ylyw/m/scit}{}
 \DeclareFontShape{T1}{ylyw}{bx}{n}{<->ssub * ylyw/b/n}{}
 \DeclareFontShape{T1}{ylyw}{b}{sc}{<->ssub * ylyw/b/n}{}
 \DeclareFontShape{T1}{ylyw}{bx}{sc}{<->ssub * ylyw/b/sc}{}
 \DeclareFontShape{T1}{ylyw}{bx}{it}{<->ssub * ylyw/b/it}{}
-\DeclareFontShape{T1}{ylyw}{b}{si}{<->ssub * ylyw/b/it}{}
-\DeclareFontShape{T1}{ylyw}{bx}{si}{<->ssub * ylyw/b/si}{}
-\DeclareFontShape{T1}{ylyw}{b}{sl}{<->ssub * ylyw/b/si}{}
+\DeclareFontShape{T1}{ylyw}{b}{sl}{<->ssub * ylyw/b/it}{}
 \DeclareFontShape{T1}{ylyw}{bx}{sl}{<->ssub * ylyw/b/sl}{}
+\DeclareFontShape{T1}{ylyw}{b}{scsl}{<->ssub * ylyw/b/sl}{}
+\DeclareFontShape{T1}{ylyw}{bx}{scsl}{<->ssub * ylyw/b/scsl}{}
+\DeclareFontShape{T1}{ylyw}{b}{scit}{<->ssub * ylyw/b/scsl}{}
+\DeclareFontShape{T1}{ylyw}{bx}{scit}{<->ssub * ylyw/b/scit}{}
+\DeclareFontShape{T1}{ylyw}{b}{si}{<->ssub * ylyw/b/scit}{}
+\DeclareFontShape{T1}{ylyw}{bx}{si}{<->ssub * ylyw/b/si}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/libris/ts1yly.fd b/Master/texmf-dist/tex/latex/libris/ts1yly.fd
index 33c01ff57fc..e43a62bec62 100644
--- a/Master/texmf-dist/tex/latex/libris/ts1yly.fd
+++ b/Master/texmf-dist/tex/latex/libris/ts1yly.fd
@@ -5,36 +5,49 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{ts1yly.fd}
-   [2010/06/27 Fontinst v1.933 font definitions for TS1/yly.]
+   [2024/09/27 Fontinst v1.933 font definitions for TS1/yly.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yly@scale\endcsname\relax
+  \let\yly@@scale\@empty
+\else
+  \edef\yly@@scale{s*[\csname yly@scale\endcsname]}%
+\fi
 
 \DeclareFontFamily{TS1}{yly}{}
 
 \DeclareFontShape{TS1}{yly}{m}{n}{
-   <-> ylyr8c
+   <-> \yly@@scale ylyr8c
 }{}
 
 \DeclareFontShape{TS1}{yly}{m}{it}{
-   <-> ylyri8c
+   <-> \yly@@scale ylyri8c
 }{}
 
 \DeclareFontShape{TS1}{yly}{b}{n}{
-   <-> ylyb8c
+   <-> \yly@@scale ylyb8c
 }{}
 
 \DeclareFontShape{TS1}{yly}{b}{it}{
-   <-> ylybi8c
+   <-> \yly@@scale ylybi8c
 }{}
 
 \DeclareFontShape{TS1}{yly}{m}{sc}{<->ssub * yly/m/n}{}
-\DeclareFontShape{TS1}{yly}{m}{si}{<->ssub * yly/m/it}{}
-\DeclareFontShape{TS1}{yly}{m}{sl}{<->ssub * yly/m/si}{}
+\DeclareFontShape{TS1}{yly}{m}{sl}{<->ssub * yly/m/it}{}
+\DeclareFontShape{TS1}{yly}{m}{scsl}{<->ssub * yly/m/sl}{}
+\DeclareFontShape{TS1}{yly}{m}{scit}{<->ssub * yly/m/scsl}{}
+\DeclareFontShape{TS1}{yly}{m}{si}{<->ssub * yly/m/scit}{}
 \DeclareFontShape{TS1}{yly}{bx}{n}{<->ssub * yly/b/n}{}
 \DeclareFontShape{TS1}{yly}{b}{sc}{<->ssub * yly/b/n}{}
 \DeclareFontShape{TS1}{yly}{bx}{sc}{<->ssub * yly/b/sc}{}
 \DeclareFontShape{TS1}{yly}{bx}{it}{<->ssub * yly/b/it}{}
-\DeclareFontShape{TS1}{yly}{b}{si}{<->ssub * yly/b/it}{}
-\DeclareFontShape{TS1}{yly}{bx}{si}{<->ssub * yly/b/si}{}
-\DeclareFontShape{TS1}{yly}{b}{sl}{<->ssub * yly/b/si}{}
+\DeclareFontShape{TS1}{yly}{b}{sl}{<->ssub * yly/b/it}{}
 \DeclareFontShape{TS1}{yly}{bx}{sl}{<->ssub * yly/b/sl}{}
+\DeclareFontShape{TS1}{yly}{b}{scsl}{<->ssub * yly/b/sl}{}
+\DeclareFontShape{TS1}{yly}{bx}{scsl}{<->ssub * yly/b/scsl}{}
+\DeclareFontShape{TS1}{yly}{b}{scit}{<->ssub * yly/b/scsl}{}
+\DeclareFontShape{TS1}{yly}{bx}{scit}{<->ssub * yly/b/scit}{}
+\DeclareFontShape{TS1}{yly}{b}{si}{<->ssub * yly/b/scit}{}
+\DeclareFontShape{TS1}{yly}{bx}{si}{<->ssub * yly/b/si}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/libris/ts1ylyw.fd b/Master/texmf-dist/tex/latex/libris/ts1ylyw.fd
index e1f188edabe..3611eafc32e 100644
--- a/Master/texmf-dist/tex/latex/libris/ts1ylyw.fd
+++ b/Master/texmf-dist/tex/latex/libris/ts1ylyw.fd
@@ -5,36 +5,49 @@
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{ts1ylyw.fd}
-   [2010/06/27 Fontinst v1.933 font definitions for TS1/ylyw.]
+   [2024/09/27 Fontinst v1.933 font definitions for TS1/ylyw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yly@scale\endcsname\relax
+  \let\yly@@scale\@empty
+\else
+  \edef\yly@@scale{s*[\csname yly@scale\endcsname]}%
+\fi
 
 \DeclareFontFamily{TS1}{ylyw}{}
 
 \DeclareFontShape{TS1}{ylyw}{m}{n}{
-   <-> ylyr8c
+   <-> \yly@@scale ylyr8c
 }{}
 
 \DeclareFontShape{TS1}{ylyw}{m}{it}{
-   <-> ylyri8c
+   <-> \yly@@scale ylyri8c
 }{}
 
 \DeclareFontShape{TS1}{ylyw}{b}{n}{
-   <-> ylyb8c
+   <-> \yly@@scale ylyb8c
 }{}
 
 \DeclareFontShape{TS1}{ylyw}{b}{it}{
-   <-> ylybi8c
+   <-> \yly@@scale ylybi8c
 }{}
 
 \DeclareFontShape{TS1}{ylyw}{m}{sc}{<->ssub * ylyw/m/n}{}
-\DeclareFontShape{TS1}{ylyw}{m}{si}{<->ssub * ylyw/m/it}{}
-\DeclareFontShape{TS1}{ylyw}{m}{sl}{<->ssub * ylyw/m/si}{}
+\DeclareFontShape{TS1}{ylyw}{m}{sl}{<->ssub * ylyw/m/it}{}
+\DeclareFontShape{TS1}{ylyw}{m}{scsl}{<->ssub * ylyw/m/sl}{}
+\DeclareFontShape{TS1}{ylyw}{m}{scit}{<->ssub * ylyw/m/scsl}{}
+\DeclareFontShape{TS1}{ylyw}{m}{si}{<->ssub * ylyw/m/scit}{}
 \DeclareFontShape{TS1}{ylyw}{bx}{n}{<->ssub * ylyw/b/n}{}
 \DeclareFontShape{TS1}{ylyw}{b}{sc}{<->ssub * ylyw/b/n}{}
 \DeclareFontShape{TS1}{ylyw}{bx}{sc}{<->ssub * ylyw/b/sc}{}
 \DeclareFontShape{TS1}{ylyw}{bx}{it}{<->ssub * ylyw/b/it}{}
-\DeclareFontShape{TS1}{ylyw}{b}{si}{<->ssub * ylyw/b/it}{}
-\DeclareFontShape{TS1}{ylyw}{bx}{si}{<->ssub * ylyw/b/si}{}
-\DeclareFontShape{TS1}{ylyw}{b}{sl}{<->ssub * ylyw/b/si}{}
+\DeclareFontShape{TS1}{ylyw}{b}{sl}{<->ssub * ylyw/b/it}{}
 \DeclareFontShape{TS1}{ylyw}{bx}{sl}{<->ssub * ylyw/b/sl}{}
+\DeclareFontShape{TS1}{ylyw}{b}{scsl}{<->ssub * ylyw/b/sl}{}
+\DeclareFontShape{TS1}{ylyw}{bx}{scsl}{<->ssub * ylyw/b/scsl}{}
+\DeclareFontShape{TS1}{ylyw}{b}{scit}{<->ssub * ylyw/b/scsl}{}
+\DeclareFontShape{TS1}{ylyw}{bx}{scit}{<->ssub * ylyw/b/scit}{}
+\DeclareFontShape{TS1}{ylyw}{b}{si}{<->ssub * ylyw/b/scit}{}
+\DeclareFontShape{TS1}{ylyw}{bx}{si}{<->ssub * ylyw/b/si}{}
 
 \endinput