texlive[55927] Master: marcellus (24jul20)
commits+karl at tug.org
commits+karl at tug.org
Fri Jul 24 23:51:37 CEST 2020
Revision: 55927
http://tug.org/svn/texlive?view=revision&revision=55927
Author: karl
Date: 2020-07-24 23:51:37 +0200 (Fri, 24 Jul 2020)
Log Message:
-----------
marcellus (24jul20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/fonts/marcellus/README
trunk/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.pdf
trunk/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.tex
trunk/Master/texmf-dist/tex/latex/marcellus/marcellus.sty
trunk/Master/tlpkg/tlpsrc/marcellus.tlpsrc
Removed Paths:
-------------
trunk/Master/texmf-dist/fonts/enc/dvips/marcellus/
trunk/Master/texmf-dist/fonts/map/dvips/marcellus/
trunk/Master/texmf-dist/fonts/tfm/public/marcellus/
trunk/Master/texmf-dist/fonts/type1/public/marcellus/
trunk/Master/texmf-dist/fonts/vf/public/marcellus/
trunk/Master/texmf-dist/tex/latex/marcellus/LY1Marcellus-LF.fd
trunk/Master/texmf-dist/tex/latex/marcellus/LY1Marcellus-Sup.fd
trunk/Master/texmf-dist/tex/latex/marcellus/OT1Marcellus-LF.fd
trunk/Master/texmf-dist/tex/latex/marcellus/OT1Marcellus-Sup.fd
trunk/Master/texmf-dist/tex/latex/marcellus/T1Marcellus-LF.fd
trunk/Master/texmf-dist/tex/latex/marcellus/T1Marcellus-Sup.fd
trunk/Master/texmf-dist/tex/latex/marcellus/TS1Marcellus-LF.fd
Modified: trunk/Master/texmf-dist/doc/fonts/marcellus/README
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/marcellus/README 2020-07-24 21:51:15 UTC (rev 55926)
+++ trunk/Master/texmf-dist/doc/fonts/marcellus/README 2020-07-24 21:51:37 UTC (rev 55927)
@@ -1,8 +1,8 @@
This is the README for the marcellus package, version
-2019-10-13.
+2020-07-23.
-This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
-support for the Marcellus family of fonts, designed by
+This package provides
+the Marcellus family of fonts, designed by
Brian J. Bonislawsky. Marcellus is a flared-serif family,
inspired by classic Roman inscription letterforms. There is
currently just a regular weight and small-caps. The regular
@@ -14,8 +14,7 @@
preferred URL for "tex-archive" is http://mirrors.ctan.org.
Unzip the archive at the root of an appropriate texmf tree,
likely a personal or local tree. If necessary, update the
-file-name database (e.g., texhash). Update the font-map
-files by enabling the Map file marcellus.map.
+file-name database (e.g., texhash).
To use, add
@@ -24,24 +23,17 @@
to the preamble of your document. This will activate
Marcellus as the main (serifed) text font.
-LuaLaTeX and xeLaTeX users who might prefer type1 fonts or
-who wish to avoid fontspec may use the type1 option.
-
Options scaled=<number> or scale=<number> may be used to
scale the fonts.
The only figure style is proportional lining.
-Font encodings supported are OT1, T1, LY1, and TS1.
+The Truetype fonts were obtained from
-The original Truetype fonts were obtained from
-
https://fonts.google.com/specimen/Marcellus
-and are licensed under the SIL Open Font License,
-version 1.1; the text may be found in the doc directory.
-The type1 versions were created using fontforge. The
-support files were created using autoinst and otftotfm and
-are licensed under the terms of the LaTeX Project Public
-License. The maintainer of this package is Bob Tennent (rdt
-at cs.queensu.ca)
+and are licensed under the SIL Open Font License, version
+1.1; the text may be found in the doc directory. The rest
+of the package is licensed under the terms of the LaTeX
+Project Public License. The maintainer of this package is
+Bob Tennent (rdt at cs.queensu.ca)
Modified: trunk/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.tex
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.tex 2020-07-24 21:51:15 UTC (rev 55926)
+++ trunk/Master/texmf-dist/doc/fonts/marcellus/marcellus-samples.tex 2020-07-24 21:51:37 UTC (rev 55927)
@@ -1,5 +1,4 @@
\documentclass{article}
-\usepackage[T1]{fontenc}
\usepackage{marcellus}
\usepackage{lipsum}
\begin{document}
Deleted: trunk/Master/texmf-dist/tex/latex/marcellus/LY1Marcellus-LF.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/marcellus/LY1Marcellus-LF.fd 2020-07-24 21:51:15 UTC (rev 55926)
+++ trunk/Master/texmf-dist/tex/latex/marcellus/LY1Marcellus-LF.fd 2020-07-24 21:51:37 UTC (rev 55927)
@@ -1,39 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{LY1Marcellus-LF.fd}
- [2019/05/11 (autoinst) Font definitions for LY1/Marcellus-LF.]
-
-\expandafter\ifx\csname Marcellus at scale\endcsname\relax
- \let\Marcellus@@scale\@empty
-\else
- \edef\Marcellus@@scale{s*[\csname Marcellus at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{Marcellus-LF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{LY1}{Marcellus-LF}{regular}{sc}{
- <-> \Marcellus@@scale MarcellusSmallCaps-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{Marcellus-LF}{regular}{n}{
- <-> \Marcellus@@scale Marcellus-Regular-lf-ly1
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% m --> regular
-
-\DeclareFontShape{LY1}{Marcellus-LF}{m}{sc}{
- <-> ssub * Marcellus-LF/regular/sc
-}{}
-
-\DeclareFontShape{LY1}{Marcellus-LF}{m}{n}{
- <-> ssub * Marcellus-LF/regular/n
-}{}
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/marcellus/LY1Marcellus-Sup.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/marcellus/LY1Marcellus-Sup.fd 2020-07-24 21:51:15 UTC (rev 55926)
+++ trunk/Master/texmf-dist/tex/latex/marcellus/LY1Marcellus-Sup.fd 2020-07-24 21:51:37 UTC (rev 55927)
@@ -1,39 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{LY1Marcellus-Sup.fd}
- [2019/05/11 (autoinst) Font definitions for LY1/Marcellus-Sup.]
-
-\expandafter\ifx\csname Marcellus at scale\endcsname\relax
- \let\Marcellus@@scale\@empty
-\else
- \edef\Marcellus@@scale{s*[\csname Marcellus at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{Marcellus-Sup}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{LY1}{Marcellus-Sup}{regular}{sc}{
- <-> \Marcellus@@scale MarcellusSmallCaps-sup-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{Marcellus-Sup}{regular}{n}{
- <-> \Marcellus@@scale Marcellus-Regular-sup-ly1
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% m --> regular
-
-\DeclareFontShape{LY1}{Marcellus-Sup}{m}{sc}{
- <-> ssub * Marcellus-Sup/regular/sc
-}{}
-
-\DeclareFontShape{LY1}{Marcellus-Sup}{m}{n}{
- <-> ssub * Marcellus-Sup/regular/n
-}{}
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/marcellus/OT1Marcellus-LF.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/marcellus/OT1Marcellus-LF.fd 2020-07-24 21:51:15 UTC (rev 55926)
+++ trunk/Master/texmf-dist/tex/latex/marcellus/OT1Marcellus-LF.fd 2020-07-24 21:51:37 UTC (rev 55927)
@@ -1,39 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{OT1Marcellus-LF.fd}
- [2019/05/11 (autoinst) Font definitions for OT1/Marcellus-LF.]
-
-\expandafter\ifx\csname Marcellus at scale\endcsname\relax
- \let\Marcellus@@scale\@empty
-\else
- \edef\Marcellus@@scale{s*[\csname Marcellus at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{Marcellus-LF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{OT1}{Marcellus-LF}{regular}{sc}{
- <-> \Marcellus@@scale MarcellusSmallCaps-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Marcellus-LF}{regular}{n}{
- <-> \Marcellus@@scale Marcellus-Regular-lf-ot1
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% m --> regular
-
-\DeclareFontShape{OT1}{Marcellus-LF}{m}{sc}{
- <-> ssub * Marcellus-LF/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{Marcellus-LF}{m}{n}{
- <-> ssub * Marcellus-LF/regular/n
-}{}
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/marcellus/OT1Marcellus-Sup.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/marcellus/OT1Marcellus-Sup.fd 2020-07-24 21:51:15 UTC (rev 55926)
+++ trunk/Master/texmf-dist/tex/latex/marcellus/OT1Marcellus-Sup.fd 2020-07-24 21:51:37 UTC (rev 55927)
@@ -1,39 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{OT1Marcellus-Sup.fd}
- [2019/05/11 (autoinst) Font definitions for OT1/Marcellus-Sup.]
-
-\expandafter\ifx\csname Marcellus at scale\endcsname\relax
- \let\Marcellus@@scale\@empty
-\else
- \edef\Marcellus@@scale{s*[\csname Marcellus at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{Marcellus-Sup}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{OT1}{Marcellus-Sup}{regular}{sc}{
- <-> \Marcellus@@scale MarcellusSmallCaps-sup-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Marcellus-Sup}{regular}{n}{
- <-> \Marcellus@@scale Marcellus-Regular-sup-ot1
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% m --> regular
-
-\DeclareFontShape{OT1}{Marcellus-Sup}{m}{sc}{
- <-> ssub * Marcellus-Sup/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{Marcellus-Sup}{m}{n}{
- <-> ssub * Marcellus-Sup/regular/n
-}{}
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/marcellus/T1Marcellus-LF.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/marcellus/T1Marcellus-LF.fd 2020-07-24 21:51:15 UTC (rev 55926)
+++ trunk/Master/texmf-dist/tex/latex/marcellus/T1Marcellus-LF.fd 2020-07-24 21:51:37 UTC (rev 55927)
@@ -1,39 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{T1Marcellus-LF.fd}
- [2019/05/11 (autoinst) Font definitions for T1/Marcellus-LF.]
-
-\expandafter\ifx\csname Marcellus at scale\endcsname\relax
- \let\Marcellus@@scale\@empty
-\else
- \edef\Marcellus@@scale{s*[\csname Marcellus at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{Marcellus-LF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{T1}{Marcellus-LF}{regular}{sc}{
- <-> \Marcellus@@scale MarcellusSmallCaps-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Marcellus-LF}{regular}{n}{
- <-> \Marcellus@@scale Marcellus-Regular-lf-t1
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% m --> regular
-
-\DeclareFontShape{T1}{Marcellus-LF}{m}{sc}{
- <-> ssub * Marcellus-LF/regular/sc
-}{}
-
-\DeclareFontShape{T1}{Marcellus-LF}{m}{n}{
- <-> ssub * Marcellus-LF/regular/n
-}{}
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/marcellus/T1Marcellus-Sup.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/marcellus/T1Marcellus-Sup.fd 2020-07-24 21:51:15 UTC (rev 55926)
+++ trunk/Master/texmf-dist/tex/latex/marcellus/T1Marcellus-Sup.fd 2020-07-24 21:51:37 UTC (rev 55927)
@@ -1,39 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{T1Marcellus-Sup.fd}
- [2019/05/11 (autoinst) Font definitions for T1/Marcellus-Sup.]
-
-\expandafter\ifx\csname Marcellus at scale\endcsname\relax
- \let\Marcellus@@scale\@empty
-\else
- \edef\Marcellus@@scale{s*[\csname Marcellus at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{Marcellus-Sup}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{T1}{Marcellus-Sup}{regular}{sc}{
- <-> \Marcellus@@scale MarcellusSmallCaps-sup-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Marcellus-Sup}{regular}{n}{
- <-> \Marcellus@@scale Marcellus-Regular-sup-t1
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% m --> regular
-
-\DeclareFontShape{T1}{Marcellus-Sup}{m}{sc}{
- <-> ssub * Marcellus-Sup/regular/sc
-}{}
-
-\DeclareFontShape{T1}{Marcellus-Sup}{m}{n}{
- <-> ssub * Marcellus-Sup/regular/n
-}{}
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/marcellus/TS1Marcellus-LF.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/marcellus/TS1Marcellus-LF.fd 2020-07-24 21:51:15 UTC (rev 55926)
+++ trunk/Master/texmf-dist/tex/latex/marcellus/TS1Marcellus-LF.fd 2020-07-24 21:51:37 UTC (rev 55927)
@@ -1,39 +0,0 @@
-%% Generated by autoinst on 2019/05/11
-%%
-\ProvidesFile{TS1Marcellus-LF.fd}
- [2019/05/11 (autoinst) Font definitions for TS1/Marcellus-LF.]
-
-\expandafter\ifx\csname Marcellus at scale\endcsname\relax
- \let\Marcellus@@scale\@empty
-\else
- \edef\Marcellus@@scale{s*[\csname Marcellus at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{Marcellus-LF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{TS1}{Marcellus-LF}{regular}{sc}{
- <-> \Marcellus@@scale MarcellusSmallCaps-lf-sc-ts1
-}{}
-
-\DeclareFontShape{TS1}{Marcellus-LF}{regular}{n}{
- <-> \Marcellus@@scale Marcellus-Regular-lf-ts1
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% m --> regular
-
-\DeclareFontShape{TS1}{Marcellus-LF}{m}{sc}{
- <-> ssub * Marcellus-LF/regular/sc
-}{}
-
-\DeclareFontShape{TS1}{Marcellus-LF}{m}{n}{
- <-> ssub * Marcellus-LF/regular/n
-}{}
-
-\endinput
Modified: trunk/Master/texmf-dist/tex/latex/marcellus/marcellus.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/marcellus/marcellus.sty 2020-07-24 21:51:15 UTC (rev 55926)
+++ trunk/Master/texmf-dist/tex/latex/marcellus/marcellus.sty 2020-07-24 21:51:37 UTC (rev 55927)
@@ -1,33 +1,24 @@
\ProvidesPackage{marcellus}[%
- 2019/10/13 (Bob Tennent) Supports Marcellus fonts for all LaTeX engines. ]
+ 2020/07/23 (Bob Tennent) Supports Marcellus fonts for XeLaTeX or LuaLaTeX. ]
-\RequirePackage{ifxetex,ifluatex,textcomp}
+\RequirePackage{iftex}
-\newif\ifmarcellus at ttf
-\ifxetex
- \marcellus at ttftrue
-\else\ifluatex
- \marcellus at ttftrue
-\else % [pdf]LaTeX
- \marcellus at ttffalse
-\fi\fi
+\ifpdftex
+\PackageError{marcellus}{%
+ *****************************************\MessageBreak
+ Please process using XeLaTeX or luaLaTeX\MessageBreak
+ *****************************************}
+\fi
+
\newcommand*{\Marcellus at scale}{1}
\RequirePackage{xkeyval}
\DeclareOptionX{scaled}{\renewcommand*{\Marcellus at scale}{#1}}
\DeclareOptionX{scale}{\renewcommand*{\Marcellus at scale}{#1}}
-\DeclareOptionX{type1}{\marcellus at ttffalse}
-
\ProcessOptionsX\relax
-\ifmarcellus at ttf
- \RequirePackage{fontspec}
-\else
- \RequirePackage{fontenc,fontaxes,mweights}
-\fi
-
-\ifmarcellus at ttf
+\RequirePackage{fontspec}
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
@@ -46,20 +37,8 @@
]
{Marcellus}
-\else % type1
-
- \def\mdseries at rm{m}
- \def\bfseries at rm{m}
- \def\marcellusfamily{Marcellus-LF}
- \renewcommand*\rmdefault{\marcellusfamily}
- \newcommand*\marcellus{\fontfamily{\marcellusfamily}\selectfont}
-
-\fi
-
% turn off defaults in case other fonts are selected:
-\ifmarcellus at ttf
- \defaultfontfeatures{}
-\fi
+\defaultfontfeatures{}
\endinput
Modified: trunk/Master/tlpkg/tlpsrc/marcellus.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/marcellus.tlpsrc 2020-07-24 21:51:15 UTC (rev 55926)
+++ trunk/Master/tlpkg/tlpsrc/marcellus.tlpsrc 2020-07-24 21:51:37 UTC (rev 55927)
@@ -1 +0,0 @@
-execute addMap ${PKGNAME}.map
More information about the tex-live-commits
mailing list.