summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-09-12 20:08:59 +0000
committerKarl Berry <karl@freefriends.org>2023-09-12 20:08:59 +0000
commitf66a2a909e3fd17941f2c4b11efdb3efb09238e7 (patch)
tree77f76d568b7bd884611cc603cd49332eeaaddda4
parentebf85a5bae089f60191aa4e9b3be7076e19013cc (diff)
inconsolata-nerd-font (12sep23)
git-svn-id: svn://tug.org/texlive/trunk@68248 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/inconsolata-nerd-font/CHANGELOG.md24
-rw-r--r--Master/texmf-dist/doc/fonts/inconsolata-nerd-font/README.md6
-rw-r--r--Master/texmf-dist/doc/fonts/inconsolata-nerd-font/inconsolata-nerd-font.pdfbin67426 -> 71967 bytes
-rw-r--r--Master/texmf-dist/source/fonts/inconsolata-nerd-font/inconsolata-nerd-font.dtx86
-rw-r--r--Master/texmf-dist/tex/latex/inconsolata-nerd-font/inconsolata-nerd-font.sty19
5 files changed, 120 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/fonts/inconsolata-nerd-font/CHANGELOG.md b/Master/texmf-dist/doc/fonts/inconsolata-nerd-font/CHANGELOG.md
new file mode 100644
index 00000000000..8e0c017d725
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/inconsolata-nerd-font/CHANGELOG.md
@@ -0,0 +1,24 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+## [Unreleased]
+
+## [v0.2] — 2023–09–12
+
+### Added
+- Add a CHANGELOG file.
+- Additional macros to also easily use the variants of the font.
+- Add a notice on the licenses in the documentation itself.
+
+### Changed
+- The description should be much clearer now, thanks to Petra Rübe-Pugliese from
+ the CTAN team.
+- Do not create a `.tds.zip` any more during build as this is discouraged by the
+ CTAN team.
+- Fix typos and clarify the documentation.
+
+## v0.1 — 2023–09–09
+- First public release
+
+[Unreleased]: https://github.com/stephanlukasczyk/inconsolata-nerd-font/compare/v0.2...HEAD
+[v0.2]: https://github.com/stephanlukasczyk/inconsolata-nerd-font/compare/v0.2...v0.1 \ No newline at end of file
diff --git a/Master/texmf-dist/doc/fonts/inconsolata-nerd-font/README.md b/Master/texmf-dist/doc/fonts/inconsolata-nerd-font/README.md
index d0eacd92fd2..39be40a94ad 100644
--- a/Master/texmf-dist/doc/fonts/inconsolata-nerd-font/README.md
+++ b/Master/texmf-dist/doc/fonts/inconsolata-nerd-font/README.md
@@ -1,8 +1,8 @@
# Inconsolata Nerd Font
-The `inconsolata-nerd-font` package provides a convenient wrapper
-to use the [Inconsolata Nerd Font](https://github.com/ryanoasis/nerd-fonts/tree/master/patched-fonts/Inconsolata)
-with XeTeX or LuaTeX.
+The `inconsolata-nerd-font` package provides
+the [Inconsolata Nerd Font](https://github.com/ryanoasis/nerd-fonts/tree/master/patched-fonts/Inconsolata)
+with support for XeLaTeX or LuaLaTeX.
## License
diff --git a/Master/texmf-dist/doc/fonts/inconsolata-nerd-font/inconsolata-nerd-font.pdf b/Master/texmf-dist/doc/fonts/inconsolata-nerd-font/inconsolata-nerd-font.pdf
index 77a3f22ff09..10f32f4d752 100644
--- a/Master/texmf-dist/doc/fonts/inconsolata-nerd-font/inconsolata-nerd-font.pdf
+++ b/Master/texmf-dist/doc/fonts/inconsolata-nerd-font/inconsolata-nerd-font.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/fonts/inconsolata-nerd-font/inconsolata-nerd-font.dtx b/Master/texmf-dist/source/fonts/inconsolata-nerd-font/inconsolata-nerd-font.dtx
index d276f8eb126..34ef638be70 100644
--- a/Master/texmf-dist/source/fonts/inconsolata-nerd-font/inconsolata-nerd-font.dtx
+++ b/Master/texmf-dist/source/fonts/inconsolata-nerd-font/inconsolata-nerd-font.dtx
@@ -87,8 +87,9 @@
% However, that package provides a pretty old version of the font;
% Additionally, the Nerd Font project extended the font by a huge amount of
% additional glyphs.
-% This package provides a convenient interface to load the font for the
-% \XeTeX{} and \LuaTeX{} engines.
+% This package provides the font itself
+% and a convenient interface to load the font for the
+% \XeLaTeX{} and \LuaLaTeX{} engines.
% \end{abstract}
%
% \tableofcontents
@@ -110,18 +111,30 @@
% The extended version is available from GitHub.\footnote{
% \href{https://github.com/ryanoasis/nerd-fonts/tree/master/patched-fonts/Inconsolata}{github.com/ryanoasis/nerd-fonts/tree/master/patched-fonts/Inconsolata}
% }
-% This package provides a convenient way to use the font
+% This package provides the TrueType font files
+% and a convenient way to use the font
% with the \XeTeX{} or \LuaTeX{} engines.
%
% This user guide gives a brief introduction into the possibilities
% provided by the \pkg{inconsolata-nerd-font} package.
%
+% \subsection{License}\label{sec:doc-license}
+%
+% Permission is granted to copy, distribute, and/or modify this software under
+% the terms of the \LaTeX{} Project Public License~(LPPL), version~1.3c or
+% later~(\href{https://www.latex-project.org/lppl.txt}{https://www.latex-project.org/lppl.txt}).
+% The software has the status \enquote{maintained}.
+%
+% The font files bundled with the package (\texttt{InconsolataNerdFont*.ttf})
+% are licensed under the terms of the SIL Open Font License~(LPPL),
+% version~1.1~(\href{http://scripts.sil.org/OFL}{http://scripts.sil.org/OFL}).
+%
% \subsection{Helper Macros}\label{sec:doc-helper}
%
% The following macro is not strictly part of the package.
% It is actually defined by recent \LaTeX{} kernels.
% However, to make the package compatible with older kernels, too,
-% we provide it if it is not yet defined.
+% we provide it, if it is not yet defined.
%
% The macro's purpose is to check whether the used \LaTeX{} format
% is at least from the given date
@@ -131,7 +144,7 @@
% \cs{IfFormatAtLeastTF} \marg{date} \marg{true} \marg{false}
% \end{syntax}
% We define this macro to execute code depending on the \LaTeX{} format date.
-% It is only defined if it is not already part of the \LaTeX{} kernel,
+% The macro is only defined if it is not already part of the \LaTeX{} kernel,
% which it is for recent versions of the kernel.
% \end{function}
%
@@ -160,13 +173,16 @@
% \end{syntax}
% Set the scaling of the font.
% See the \pkg{fontspec} documentation for more details.
+% The default value is |MatchLowercase| to match the height of the lower-case
+% character of the default main font of your document.
% \end{variable}
%
% \subsection{Font Macros}\label{sec:doc-macros}
%
% While the package sets the default mono-spaced font
% to the selected variant of the Inconsolata Nerd Font,
-% the package provides two additional macros for convenience.
+% the package provides six additional macros for convenience,
+% one pair of each variant of the font.
%
% \begin{function}{\inconsolatanffamily}
% \begin{syntax}
@@ -175,6 +191,20 @@
% A font family for the Inconsolata Nerd Font,
% the default variant provided by this package.
% \end{function}
+% \begin{function}{\inconsolatanfmonofamily}
+% \begin{syntax}
+% \cs{inconsolatanfmonofamily}
+% \end{syntax}
+% A font family for the Inconsolata Nerd Font,
+% the mono variant provided by this package.
+% \end{function}
+% \begin{function}{\inconsolatanfpropofamily}
+% \begin{syntax}
+% \cs{inconsolatanfpropofamily}
+% \end{syntax}
+% A font family for the Inconsolata Nerd Font,
+% the propo variant provided by this package.
+% \end{function}
%
% \begin{function}{\textinconsolatanf}
% \begin{syntax}
@@ -183,6 +213,20 @@
% A convenience macro to typeset a short |text| using the default
% Inconsolata Nerd Font variant.
% \end{function}
+% \begin{function}{\textinconsolatanfmono}
+% \begin{syntax}
+% \cs{textinconsolatanfmono} \marg{text}
+% \end{syntax}
+% A convenience macro to typeset a short |text| using the mono
+% Inconsolata Nerd Font variant.
+% \end{function}
+% \begin{function}{\textinconsolatanfpropo}
+% \begin{syntax}
+% \cs{textinconsolatanfpropo} \marg{text}
+% \end{syntax}
+% A convenience macro to typeset a short |text| using the propo
+% Inconsolata Nerd Font variant.
+% \end{function}
%
% The following sentence uses the \cs{textinconsolatanf}
% to typeset the words \enquote{an example} using Inconsolata Nerd Font:
@@ -239,7 +283,7 @@
%
% Identify the package and give the overall version information.
% \begin{macrocode}
-\ProvidesExplPackage {inconsolata-nerd-font} {2023-09-09} {0.1}
+\ProvidesExplPackage {inconsolata-nerd-font} {2023-09-12} {0.2}
{Support package to use the Inconsolata Nerd Font TrueType fonts}
% \end{macrocode}
%
@@ -269,7 +313,7 @@
\keys_set:nn { inconsolatanerdfont }
{
variant = default,
- scale = 0.9,
+ scale = MatchLowercase,
}
\tl_clear:N \l_@@_variant_tl
% \end{macrocode}
@@ -311,8 +355,15 @@
}
% \end{macrocode}
%
-% Define a font family for the font and a command for esiere usage
-% \begin{macro}{\inconsolatanffamily, \textinconsolatanf}
+% Define a font family for the three fonts and commands for easier usage
+% \begin{macro}{
+% \inconsolatanffamily,
+% \inconsolatanfmonofamily,
+% \inconsolatanfpropofamily,
+% \textinconsolatanf,
+% \textinconsolatanfmono,
+% \textinconsolatanfpropo,
+% }
% \begin{macrocode}
\newfontfamily\inconsolatanffamily{InconsolataNerdFont-Regular.ttf}[
BoldFont = InconsolataNerdFont-Bold.ttf,
@@ -320,7 +371,22 @@
NFSSFamily = inconsolatanf,
Scale = \l_@@_scale_tl,
]
+\newfontfamily\inconsolatanfmonofamily{InconsolataNerdFontMono-Regular.ttf}[
+ BoldFont = InconsolataNerdFontMono-Bold.ttf,
+ FakeStretch = {0.9},
+ NFSSFamily = inconsolatanfmono,
+ Scale = \l_@@_scale_tl,
+]
+\newfontfamily\inconsolatanfpropofamily{InconsolataNerdFontPropo-Regular.ttf}[
+ BoldFont = InconsolataNerdFontPropo-Bold.ttf,
+ FakeStretch = {0.9},
+ NFSSFamily = inconsolatanfpropo,
+ Scale = \l_@@_scale_tl,
+]
+
\DeclareTextFontCommand{\textinconsolatanf}{\inconsolatanffamily}
+\DeclareTextFontCommand{\textinconsolatanfmono}{\inconsolatanffamilymono}
+\DeclareTextFontCommand{\textinconsolatanfpropo}{\inconsolatanffamilypropo}
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/tex/latex/inconsolata-nerd-font/inconsolata-nerd-font.sty b/Master/texmf-dist/tex/latex/inconsolata-nerd-font/inconsolata-nerd-font.sty
index ab870a162fe..26dcd1437a5 100644
--- a/Master/texmf-dist/tex/latex/inconsolata-nerd-font/inconsolata-nerd-font.sty
+++ b/Master/texmf-dist/tex/latex/inconsolata-nerd-font/inconsolata-nerd-font.sty
@@ -43,7 +43,7 @@
\endinput
}%
\providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion }
-\ProvidesExplPackage {inconsolata-nerd-font} {2023-09-09} {0.1}
+\ProvidesExplPackage {inconsolata-nerd-font} {2023-09-12} {0.2}
{Support package to use the Inconsolata Nerd Font TrueType fonts}
\tl_new:N \l__slcd_inf_variant_tl
@@ -60,7 +60,7 @@
\keys_set:nn { inconsolatanerdfont }
{
variant = default,
- scale = 0.9,
+ scale = MatchLowercase,
}
\tl_clear:N \l__slcd_inf_variant_tl
\IfFormatAtLeastTF { 2022-06-01 }
@@ -88,7 +88,22 @@
NFSSFamily = inconsolatanf,
Scale = \l__slcd_inf_scale_tl,
]
+\newfontfamily\inconsolatanfmonofamily{InconsolataNerdFontMono-Regular.ttf}[
+ BoldFont = InconsolataNerdFontMono-Bold.ttf,
+ FakeStretch = {0.9},
+ NFSSFamily = inconsolatanfmono,
+ Scale = \l__slcd_inf_scale_tl,
+]
+\newfontfamily\inconsolatanfpropofamily{InconsolataNerdFontPropo-Regular.ttf}[
+ BoldFont = InconsolataNerdFontPropo-Bold.ttf,
+ FakeStretch = {0.9},
+ NFSSFamily = inconsolatanfpropo,
+ Scale = \l__slcd_inf_scale_tl,
+]
+
\DeclareTextFontCommand{\textinconsolatanf}{\inconsolatanffamily}
+\DeclareTextFontCommand{\textinconsolatanfmono}{\inconsolatanffamilymono}
+\DeclareTextFontCommand{\textinconsolatanfpropo}{\inconsolatanffamilypropo}
\setmonofont{\l__slcd_inf_font_name_tl}[
BoldFont = *-Bold,
Extension = .ttf,