diff options
| author | Norbert Preining <norbert@preining.info> | 2019-10-04 03:01:00 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2019-10-04 03:01:00 +0000 |
| commit | 9d9c04e14d0da9dd7829d0ec896aabfd50414fd8 (patch) | |
| tree | f67d308a037384664193d9a2cfca27d8b0579701 /fonts | |
| parent | 93c3758895674cc9ea3e8aaeeb3cf5d1bdc0e3be (diff) | |
CTAN sync 201910040301
Diffstat (limited to 'fonts')
73 files changed, 350 insertions, 127 deletions
diff --git a/fonts/adforn/OrnementsADF.tfm b/fonts/adforn/OrnementsADF.tfm Binary files differnew file mode 100644 index 0000000000..a01f5757ad --- /dev/null +++ b/fonts/adforn/OrnementsADF.tfm diff --git a/fonts/adforn/README b/fonts/adforn/README index 0e70b2e4d9..dc22120ca6 100644 --- a/fonts/adforn/README +++ b/fonts/adforn/README @@ -33,7 +33,8 @@ Clea F. Rees (ReesC21 <at> cardiff <dot> ac <dot> uk) Versioning ---------- -Version 1.1 corrects a bug **if** I've understood the problem correctly, which -I'm far from convinced of. +Version 1.1a corrects a bug **if** I've understood the problem correctly, which +I'm far from convinced of. (All it does is add a pair of curly brackets in the +.sty.) -2019/09/24 +2019/10/02 diff --git a/fonts/adforn/adforn-test.tex b/fonts/adforn/adforn-test.tex deleted file mode 100644 index 79f58317c1..0000000000 --- a/fonts/adforn/adforn-test.tex +++ /dev/null @@ -1,22 +0,0 @@ -% !TEX TS-program = pdflatex -% !TEX encoding = UTF-8 Unicode -\listfiles -\documentclass[12pt]{article} -\title{Brief Article} -\author{The Author} -\makeatletter -\newcommand{\adfornset}{% -0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75} -\newcommand{\adfornshow}{% - \@for \xx:=\adfornset \do {\xx: \adforn{\xx}\\}} -\makeatother - -\pdfmapfile{+ OrnementsADF.map} -\usepackage{adforn} - -\begin{document} -\setlength{\parindent}{0pt} - -\adfornshow - -\end{document}
\ No newline at end of file diff --git a/fonts/adforn/adforn.pdf b/fonts/adforn/adforn.pdf Binary files differdeleted file mode 100644 index ac774e9015..0000000000 --- a/fonts/adforn/adforn.pdf +++ /dev/null diff --git a/fonts/adfsymbols/ArrowsADF.tfm b/fonts/adfsymbols/ArrowsADF.tfm Binary files differnew file mode 100644 index 0000000000..aeb5540e69 --- /dev/null +++ b/fonts/adfsymbols/ArrowsADF.tfm diff --git a/fonts/adfsymbols/BulletsADF.tfm b/fonts/adfsymbols/BulletsADF.tfm Binary files differnew file mode 100644 index 0000000000..4b15af5d3f --- /dev/null +++ b/fonts/adfsymbols/BulletsADF.tfm diff --git a/fonts/adfsymbols/README b/fonts/adfsymbols/README index 8e013be8dc..63854411b8 100644 --- a/fonts/adfsymbols/README +++ b/fonts/adfsymbols/README @@ -33,7 +33,7 @@ Clea F. Rees (ReesC21 <at> cardiff <dot> ac <dot> uk) Changes ------- -Version 1.2 fixes a bug **if** I've understood the problem correctly, which I'm -far from sure about. +Version 1.2a fixes a bug **if** I've understood the problem correctly, which I'm +far from sure about. (All it does is add a pair of curly brackets in the .sty.) -2019/09/24 +2019/10/02 diff --git a/fonts/adfsymbols/adfsymbols.pdf b/fonts/adfsymbols/adfsymbols.pdf Binary files differdeleted file mode 100644 index d978ad3f27..0000000000 --- a/fonts/adfsymbols/adfsymbols.pdf +++ /dev/null diff --git a/fonts/countriesofeurope/Changes b/fonts/countriesofeurope/Changes index 7660320dc1..45892627a9 100644 --- a/fonts/countriesofeurope/Changes +++ b/fonts/countriesofeurope/Changes @@ -1,2 +1,3 @@ +0.23 2019-10-03 - added color and Ligature option 0.22 2018-12-27 - added OpenType font and outline option 0.21 2012-04-18 - first CTAN version
\ No newline at end of file diff --git a/fonts/countriesofeurope/README b/fonts/countriesofeurope/README index 07739755f2..a46e6021b1 100644 --- a/fonts/countriesofeurope/README +++ b/fonts/countriesofeurope/README @@ -4,7 +4,6 @@ The fonts are copyrighted by Ingo Zimmermann (ingofonts.com) and can be used under the Open Font License. All other files are copyrighted by Rolf Niepraschk and -Herbert Voß and can be used under the LaTeX Public Project Licence. +Herbert Voß and can be used under the LaTeX Project Public Licence. -v0.22 2018-12-27 hvoss@tug.org
\ No newline at end of file diff --git a/fonts/countriesofeurope/doc/CountriesofEurope.pdf b/fonts/countriesofeurope/doc/CountriesofEurope.pdf Binary files differdeleted file mode 100644 index 205dfa914d..0000000000 --- a/fonts/countriesofeurope/doc/CountriesofEurope.pdf +++ /dev/null diff --git a/fonts/countriesofeurope/doc/countriesofeurope.bib b/fonts/countriesofeurope/doc/countriesofeurope.bib new file mode 100644 index 0000000000..9465016c33 --- /dev/null +++ b/fonts/countriesofeurope/doc/countriesofeurope.bib @@ -0,0 +1,18 @@ +@ctan{countriesofeurope, +title = {The Countriesofeurope package}, +subtitle = {A font with the images of the countries of Europe}, +author = {Zimmermann, Ingo and Voß, Herbert and Niepraschk, Rolf}, +url = {http://www.ctan.org/pkg/countriesofeurope}, +urldate = {2019-10-203}, +date = {2019-10-03}, +version = {0.23} +} + +@online{ingofonts, +title={Fonts and typography that leave a mark}, +author={Ingo Zimmermann}, +url={http://www.ingoFonts.de}, +urldate = {2019-10-03}, +note={for corporate design, promotion, web, publishing. Buy fonts directly from the maker. At ingoFonts you’ll find fonts of all styles, + including free test versions of all fonts to download and try out.}, +} diff --git a/fonts/countriesofeurope/doc/countriesofeurope.pdf b/fonts/countriesofeurope/doc/countriesofeurope.pdf Binary files differnew file mode 100644 index 0000000000..2b4be170a9 --- /dev/null +++ b/fonts/countriesofeurope/doc/countriesofeurope.pdf diff --git a/fonts/countriesofeurope/doc/CountriesofEurope.tex b/fonts/countriesofeurope/doc/countriesofeurope.tex index 9bee1d3eca..b812cd4ef6 100644 --- a/fonts/countriesofeurope/doc/CountriesofEurope.tex +++ b/fonts/countriesofeurope/doc/countriesofeurope.tex @@ -1,14 +1,16 @@ +%\listfiles +%% $Id: countriesofeurope.tex 1095 2019-10-03 06:05:39Z herbert $ +\documentclass[11pt,english,BCOR=10mm,DIV=13,toc=bibliography,parskip=false, + headings=small,headinclude=false,footinclude=false,oneside]{pst-doc} +\usepackage[Scale=7.5]{countriesofeurope} +\let\pstFV\fileversion -%--------------------------- -\listfiles - -\documentclass{article} \usepackage{ifluatex} +\usepackage{dtk-logos} \ifluatex\else - \pdfmapfile{+CountriesofEurope.map} % only needed, if the map is not enabled with updmap + \pdfmapfile{+countriesofeurope.map} % only needed, if the map is not enabled with updmap \fi \usepackage{lmodern,array,longtable,graphicx,ifthen,ragged2e,libertinus} -\usepackage[Scale=7.5]{CountriesofEurope} \makeatletter \newcommand\Country[2][]{{% @@ -21,14 +23,25 @@ \newcounter{N} +\renewcommand\bgImage{% + \EUCountry[Scale=3,outline,fillcolor=blue!20,linecolor=black]{Germany}} + +\usepackage{biblatex} +\addbibresource{\jobname.bib} \begin{document} -\author{Rolf Niepraschk \and Herbert Voß} -\title{Package \texttt{CountriesofEurope}} + +\title{Package \texttt{countriesofeurope}} +\subtitle{Printing all european countries as a character of a font (v.\,0.23)} +\author{Rolf Niepraschk\\Herbert Voß\\Ingo Zimmermann} +\docauthor{Herbert Voß} +\date{\today} \maketitle +\section{Introduction} \begin{sloppypar} -This package defines the two macros \verb|\CountriesofEuropeFamily| and \verb|\EUCountry[options]{name}|, +This package defines the two macros \Lcs{countriesofeuropefamily} (short version is \Lcs{CoEF}) +and \Lcs{EUCountry}\verb|[options]{name}|, which allow to print one of the european countries as a single character with the given scaling or with an individual scaling. @@ -43,11 +56,14 @@ The font can be loaded with an optional argument for the scaling factor, which is preset to 1: \begin{verbatim} -\usepackage[Scale=10]{CountriesofEurope}% scaled to 10 +\usepackage[Scale=10]{countriesofeurope}% scaled to 10 \end{verbatim} + +\section{Default use} + The countris itself are available by a macro from the following list. The characters are -at the position 128--166 in the Type~1 font \verb|CountriesofEurope.pfb| and also available +at the position 128--166 in the Type~1 font \LFile{countriesofeurope.pfb} and also available with the \verb|\char| primitive. The following table shows the countries in their original size with a scaling of 7.5: @@ -94,12 +110,12 @@ with a scaling of 7.5: \end{longtable} -\noindent\rule{\textwidth}{.5mm} +\noindent\rule{\textwidth}{.5mm} The countries in the original size with the given bounding box and the text command \verb|\huge|: -% \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[1]CountriesofEurope}{} +% \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[1]countriesofeurope}{} \medskip @@ -107,7 +123,7 @@ The countries in the original size with the given bounding box and the text comm \fboxsep=0pt \noindent% \ifluatex - \fontspec{CountriesofEurope.otf} + \fontspec[Scale=1]{countriesofeurope.otf} \huge \setcounter{N}{63724}% \whiledo{\value{N} > 63686}{% @@ -122,8 +138,9 @@ The countries in the original size with the given bounding box and the text comm \fi \endgroup +\rmfamily -\clearpage +\section{Outline font} All countries can be printed as outline, e.\,g.: @@ -134,10 +151,11 @@ All countries can be printed as outline, e.\,g.: +\begingroup \ifluatex - \fontspec{CountriesofEurope.otf} + \CoEF \else - \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[1]CountriesofEurope}{} + \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[1]countriesofeurope}{} \fi \begin{longtable}{cccc} @@ -183,25 +201,112 @@ All countries can be printed as outline, e.\,g.: \end{longtable} +\endgroup + +\section{Ligatures} \rmfamily The countries are internally defined as a ligature so that abreviations of the countries can be -used for printing: +used for printing. +% +%\begin{verbatim} +%\CoEF ge au +%\end{verbatim} +% +These Ligatures are enabled by default! -\begin{verbatim} -\CountriesofEuropeFamily -ge au -\end{verbatim} +%\begin{verbatim} +%\defaultfontfeatures+[\countriesofeuropefamily]{Ligatures=Common} +%\end{verbatim} + +%leads to +\begingroup \ifluatex - \fontspec{CountriesofEurope.otf} + \CoEF +% \defaultfontfeatures+[\countriesofeuropefamily]{Ligatures=Common} \else - \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[1]CountriesofEurope}{} + \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[1]countriesofeurope}{} \fi -\CountriesofEuropeFamily -ge au +\verb|{\CoEF ge GE}| $\rightarrow$ {\CoEF ge GE} +\endgroup + + + + +\def\TAB#1{\tabular[b]{@{}l@{}}#1\endtabular} +\begin{longtable}{ll ll}\toprule +\emph{Ligature} & \emph{Output} & \emph{Ligature} & \emph{Output}\\\midrule +\endfirsthead +\midrule +\emph{Ligature} & \emph{Output} & \emph{Ligature} & \emph{Output}\\\midrule +\endhead +AL & \CoEF AL & AN & \CoEF AN \\\hline +AU & \CoEF AU & BELA & \CoEF BELA \\\hline +BELG & \CoEF BELG & BO & \CoEF BO\\\hline +BU & \CoEF BU & CR & \CoEF CR\\\hline +CZ & \CoEF CZ & \TAB{DAN\\DAE} & \CoEF DAN\\\hline +EST & \CoEF EST & FI & \CoEF FI \\\hline +FR & \CoEF FR & GE & \CoEF GE \\ +\TAB{EN\\GREA\\BR} & \CoEF BR & GRI & \CoEF GRI \\\hline +HU & \CoEF HU & IC & \CoEF IC \\\hline +IR & \CoEF IR & IT & \CoEF IT \\\hline +LA & \CoEF LA & LIE & \CoEF LIE\\\hline +LIT & \CoEF LIT & LU & \CoEF LU \\\hline +MAC & \CoEF MAC & MAL & \CoEF MAL\\\hline +MOL & \CoEF MOL & MON & \CoEF MON \\\hline +NE & \CoEF NE & NO & \CoEF NO\\\hline +POL & \CoEF POL & POR & \CoEF POR \\\hline +RO & \CoEF RO & SE & \CoEF SE \\\hline +SLOVA& \CoEF SLOVA& SLOVE& \CoEF SLOVE \\\hline +SP & \CoEF SP & \TAB{SWE\\SV} & \CoEF SWE\\\hline +SWI & \CoEF SWI & & \\\bottomrule +\end{longtable} + +%\defaultfontfeatures[\countriesofeuropefamily]{Ligatures=NoCommon} + + +%The Ligatures can also be enabled by + +%\begin{verbatim} +%\usepackage[Ligatures=Common]{countriesofeurope} +%\end{verbatim} + + +\rmfamily +\section{Color options} + + + +With the optional arguments \Lkeyword{fillcolor} and \Lkeyword{linecolor} the countries can printed with +different colors. The option \Lkeyword{fillcolor} is only valiD, if the option \Lkeyword{outline} is +set, too. + + + +\verb|\EUCountry[Scale=37.5,outline,fillcolor=blue!20,linecolor=blue]{Germany}| +\ifluatex + \fontspec{countriesofeurope.otf} +\else + \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[1]countriesofeurope}{} +\fi + + +\fbox{\EUCountry[Scale=5,outline,fillcolor=blue!20,linecolor=blue]{Germany}} + + + +\rmfamily +\bgroup +\raggedright +\nocite{*} +%\bibliographystyle{plain} +\printbibliography +\egroup + +\printindex diff --git a/fonts/countriesofeurope/fonts/afm/CountriesofEurope.afm b/fonts/countriesofeurope/fonts/afm/countriesofeurope.afm index 6ffbab04ee..6ffbab04ee 100644 --- a/fonts/countriesofeurope/fonts/afm/CountriesofEurope.afm +++ b/fonts/countriesofeurope/fonts/afm/countriesofeurope.afm diff --git a/fonts/countriesofeurope/fonts/enc/CountriesofEurope.enc b/fonts/countriesofeurope/fonts/enc/countriesofeurope.enc index 799897b4aa..568dff0a40 100644 --- a/fonts/countriesofeurope/fonts/enc/CountriesofEurope.enc +++ b/fonts/countriesofeurope/fonts/enc/countriesofeurope.enc @@ -1,5 +1,5 @@ -/CountriesofEurope [ +/countriesofeurope [ %00 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef @@ -49,4 +49,4 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def -% Command line: 'otftotfm CountriesofEurope.otf foo' +% Command line: 'otftotfm countriesofeurope.otf foo' diff --git a/fonts/countriesofeurope/fonts/map/CountriesofEurope.map b/fonts/countriesofeurope/fonts/map/CountriesofEurope.map deleted file mode 100644 index e8b38479e2..0000000000 --- a/fonts/countriesofeurope/fonts/map/CountriesofEurope.map +++ /dev/null @@ -1 +0,0 @@ -CountriesofEurope CountriesofEurope "CountriesofEurope ReEncodeFont" <CountriesofEurope.enc <CountriesofEurope.pfb diff --git a/fonts/countriesofeurope/fonts/map/countriesofeurope.map b/fonts/countriesofeurope/fonts/map/countriesofeurope.map new file mode 100644 index 0000000000..37ed0bd262 --- /dev/null +++ b/fonts/countriesofeurope/fonts/map/countriesofeurope.map @@ -0,0 +1 @@ +countriesofeurope countriesofeurope "countriesofeurope ReEncodeFont" <countriesofeurope.enc <countriesofeurope.pfb diff --git a/fonts/countriesofeurope/fonts/opentype/CountriesofEurope.otf b/fonts/countriesofeurope/fonts/opentype/countriesofeurope.otf Binary files differindex 6e1013291e..6e1013291e 100644 --- a/fonts/countriesofeurope/fonts/opentype/CountriesofEurope.otf +++ b/fonts/countriesofeurope/fonts/opentype/countriesofeurope.otf diff --git a/fonts/countriesofeurope/fonts/tfm/CountriesofEurope.tfm b/fonts/countriesofeurope/fonts/tfm/countriesofeurope.tfm Binary files differindex 72226007b6..72226007b6 100644 --- a/fonts/countriesofeurope/fonts/tfm/CountriesofEurope.tfm +++ b/fonts/countriesofeurope/fonts/tfm/countriesofeurope.tfm diff --git a/fonts/countriesofeurope/fonts/type1/CountriesofEurope.pfb b/fonts/countriesofeurope/fonts/type1/countriesofeurope.pfb Binary files differindex b4d1942088..b4d1942088 100644 --- a/fonts/countriesofeurope/fonts/type1/CountriesofEurope.pfb +++ b/fonts/countriesofeurope/fonts/type1/countriesofeurope.pfb diff --git a/fonts/countriesofeurope/latex/CountriesofEurope.sty b/fonts/countriesofeurope/latex/countriesofeurope.sty index 4fd2039f0f..ca07f5b1ef 100644 --- a/fonts/countriesofeurope/latex/CountriesofEurope.sty +++ b/fonts/countriesofeurope/latex/countriesofeurope.sty @@ -12,14 +12,16 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{CountriesofEurope}% - [2018/12/27 v0.22 CountriesofEurope Font (hv,RN)] +\ProvidesPackage{countriesofeurope}% + [2018/12/29 v0.23 countriesofeurope Font (hv,RN)] +\PassOptionsToPackage{rgb}{xcolor} +\RequirePackage{ifxetex,ifluatex,xkeyval,graphicx,xcolor} -\RequirePackage{ifxetex,ifluatex,xkeyval,graphicx} - -\newcommand*\CountriesofEurope@scale{1} +\newcommand*\countriesofeurope@scale{1} +\newcommand*\countriesofeurope@ligatures{ResetAll} \RequirePackage{xkeyval} -\DeclareOptionX{Scale}{\renewcommand*\CountriesofEurope@scale{#1}} +\DeclareOptionX{Scale}{\renewcommand*\countriesofeurope@scale{#1}} +\DeclareOptionX{Ligatures}{\renewcommand*\countriesofeurope@ligatures{#1}} \ProcessOptionsX\relax \newif\ifCoE@outline @@ -28,10 +30,17 @@ \define@key{CoE}{Scale}[1]{\def\CoE@Scale{#1}} \define@key{CoE}{outline}[true]{\lowercase{\CoE@boolkey{#1}}{outline}} +\define@key{CoE}{fillcolor}[]{\def\CoE@fillcolor{#1}} +\define@key{CoE}{linecolor}[black]{\def\CoE@linecolor{#1}} % \def\setCoEkeys#1{\edef\x{\noexpand\setkeys{CoE}{#1}}\x} -\setCoEkeys{outline=false,Scale=1} +\setCoEkeys{outline=false,Scale=1,fillcolor=,linecolor=black} + +\def\getPDFsyntax#1,#2,#3\@nil#4{\gdef#4{#1 #2 #3}} +\def\getPDFcolor#1#2{\extractcolorspecs{#1}\Col@A\Col@B\relax + \expandafter\getPDFsyntax\Col@B\@nil#2\relax +} \newif\if@CoE@newengine \@CoE@newenginefalse \ifxetex\@CoE@newenginetrue @@ -40,25 +49,40 @@ \fi \if@CoE@newengine - \def\set@Outline{\pdfextension literal direct { 1 Tr 0 w }\relax} - \def\unset@Outline{\pdfextension literal direct { 0 Tr 0 w }\relax} + \def\set@Outline{% + \ifx\CoE@fillcolor\@empty + \pdfextension literal direct { 1 Tr 0 w }\relax + \else + \getPDFcolor{\CoE@linecolor}\CoE@pdf@linecolor + \getPDFcolor{\CoE@fillcolor}\CoE@pdf@fillcolor + \pdfextension literal direct{ \CoE@pdf@fillcolor\space rg \CoE@pdf@linecolor\space RG 2 Tr 0 w }\relax + \fi} + \def\unset@Outline{\pdfextension literal direct{ 0 Tr 0 w }\relax}% \else - \def\set@Outline{\pdfliteral direct { 1 Tr 0 w }\relax} - \def\unset@Outline{\pdfliteral direct { 0 Tr 0 w }\relax} + \def\set@Outline{% + \ifx\relax\CoE@fillcolor\relax + \pdfliteral direct { 1 Tr 0 w }\relax + \else + \getPDFcolor{\CoE@linecolor}\CoE@pdf@linecolor + \getPDFcolor{\CoE@fillcolor}\CoE@pdf@fillcolor + \pdfliteral direct{ \CoE@pdf@fillcolor\space rg \CoE@pdf@linecolor\space RG 2 Tr 0 w }\relax + \fi}% + \def\unset@Outline{\pdfliteral direct{ 0 Tr 0 w }\relax}% \fi \newcommand\EUCountry[2][]{{% \expandafter\setCoEkeys\expandafter{#1}% - \CountriesofEuropeFamily\scalebox{\CoE@Scale}{% - \ifCoE@outline\set@Outline\fi - \csname#2\endcsname - \ifCoE@outline\unset@Outline\fi + \countriesofeuropefamily\scalebox{\CoE@Scale}{% + \ifCoE@outline\set@Outline\fi% + \csname#2\endcsname% + \ifCoE@outline\unset@Outline\fi% }}} \if@CoE@newengine \RequirePackage{fontspec} - \newfontface\CountriesofEuropeFamily{CountriesofEurope.otf}[Scale=\CountriesofEurope@scale] - \let\CoEF\CountriesofEuropeFamily + \newfontface\countriesofeuropefamily{countriesofeurope.otf}% + [Scale=\countriesofeurope@scale,Ligatures=\countriesofeurope@ligatures] + \let\CoEF\countriesofeuropefamily \DeclareTextCommand{\Albania}{TU}{\char"F8EC}% 63724 \DeclareTextCommand{\Andorra}{TU}{\char"F8EB} \DeclareTextCommand{\Austria}{TU}{\char"F8EA} @@ -101,9 +125,9 @@ \else \RequirePackage[T1]{fontenc} \RequirePackage{textcomp} - \DeclareFontFamily{U}{CountriesofEurope}{} - \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[\CountriesofEurope@scale]CountriesofEurope}{} - \providecommand\CountriesofEuropeFamily{\usefont{U}{CountriesofEurope}{m}{n}} + \DeclareFontFamily{U}{countriesofeurope}{} + \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[\countriesofeurope@scale]countriesofeurope}{} + \providecommand\countriesofeuropefamily{\usefont{U}{countriesofeurope}{m}{n}} \DeclareTextCommand{\Albania}{U}{\char128} \DeclareTextCommand{\Andorra}{U}{\char129} \DeclareTextCommand{\Austria}{U}{\char130} @@ -144,7 +168,7 @@ \DeclareTextCommand{\Sweden}{U}{\char165} \DeclareTextCommand{\Switzerland}{U}{\char166} \fi -% otftotfm --encoding=CountriesofEurope.enc --no-map CountriesofEurope.otf CountriesofEurope +% otftotfm --encoding=countriesofeurope.enc --no-map countriesofeurope.otf countriesofeurope \endinput diff --git a/fonts/newpx/README b/fonts/newpx/README index e6569e34cd..f728c2620f 100644 --- a/fonts/newpx/README +++ b/fonts/newpx/README @@ -1,11 +1,15 @@ This package, based initially on pxfonts, provides many fixes and enhancements to that package, splitting it in two parts---newpxtext and newpxmath---which may be run independently of one another. It provides scaling, improved metrics, and other options. For proper operation, the packages require that the packages newtxmath, pxfonts and TeXGyrePagella be installed and their map files enabled. The text package now relies on an extension of the TeXGyrePagella Type1 fonts that is provided with this package. The accompanying MANIFEST-newpx.txt provides details of the extension as requested by GUST-FONT-LICENSE.txt -Current version: 1.40 2019-09-27 +Current version: 1.401 2019-10-02 This material is subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3 for the details of that license. Changes in version 1.40 +1. Changed name of file newpx.subs to newpx-subs.tex. +2. Placed the \pdfglyphtounicode lines in a conditional block in newpxmath.sty so it could continue to be used with other engines. (Thanks Hironobu Yamashita.) + +Changes in version 1.40 1. Reworked the math italics to improve the rendering of some subscripts and superscripts, where formerly, overlaps could occur with superscripts like j, f, p and y with base shapes, such as D, that are round on the right. Increasing the left side-bearing of j, etc, helps with superscripts but makes those letters leave a large gap when used as subscripts. 2. Corrected and enhanced the subscriptcorrection option to newpxmath so that it now fixes the above problem. I regret that this option is incompatible with xy-pic, both depending on making _ an active character but with very different behaviors. Newpxmath will detect if xy is loaded and disable subscriptcorrection if so. 3. Added new script alphabets to math italics by extending the encoding from oml to full 256 slots, so they can be used without wasting math families. diff --git a/fonts/newpx/doc/newpxdoc.pdf b/fonts/newpx/doc/newpxdoc.pdf Binary files differindex 8381b1ae57..e036e06df0 100644 --- a/fonts/newpx/doc/newpxdoc.pdf +++ b/fonts/newpx/doc/newpxdoc.pdf diff --git a/fonts/newpx/doc/newpxdoc.tex b/fonts/newpx/doc/newpxdoc.tex index 756509ac5b..9e70498119 100644 --- a/fonts/newpx/doc/newpxdoc.tex +++ b/fonts/newpx/doc/newpxdoc.tex @@ -432,7 +432,7 @@ Version 1.6.3 of {\tt pdfx} from February 2019 mishandles math accents. A fix i \end{verbatim} and then use \verb|$x_{\jj}$| instead of \verb|$x_j$|, turning $x_j$ into $x_{\jj}$. -If you do enable {\tt subscriptcorrection}, there is a default correction table in the {\tt sty} file, but the sty file also looks for a file named, {\tt newpx.subs}. There is already such a file located in the {\tt newpx} distribution in the \verb|tex/latex/newpx| folder. (The contents of this file are also listed at the end of this appendix, from which they may be more easily copied.) If you wish to make changes to this file, copy the file to your home TeX folder where it will be found by TeX before the one in the distribution. (The contents of this file are also listed at the end of this appendix, from which they may be more easily copied.) The entries in the file are lines like +If you do enable {\tt subscriptcorrection}, there is a default correction table in the {\tt sty} file, but the sty file also looks for a file named, {\tt newpx-subs.tex}. There is already such a file located in the {\tt newpx} distribution in the \verb|tex/latex/newpx| folder. (The contents of this file are also listed at the end of this appendix, from which they may be more easily copied.) If you wish to make changes to this file, copy the file to your home TeX folder where it will be found by TeX before the one in the distribution. (The contents of this file are also listed at the end of this appendix, from which they may be more easily copied.) The entries in the file are lines like \begin{verbatim} {j}{-3} \end{verbatim} @@ -481,12 +481,12 @@ The AMS fonts replacement, {\tt zplsym} corrects the former misplacement of \ver \subsection{symbols} \fonttable{zplsy} \newpage -\subsection{A sample newpx.subs} +\subsection{A sample newpx-subs.tex} You may either copy the entire block below, starting with the line \verb|\begin{...| and ending after the line beginning \verb|\end{| and pasting it into the top of your document before the \verb|\documentclass...| line, which will allow for easy editing and will write the file to the same folder as your document, or make your own file, omitting those outer two lines. \begin{verbatim} -\begin{filecontents*}{newpx.subs} +\begin{filecontents*}{newpx-subs.tex} {f}{-2.5} {j}{-1.5} {p}{-1} diff --git a/fonts/newpx/tex/newpx.subs b/fonts/newpx/tex/newpx-subs.tex index 02c4b277db..02c4b277db 100644 --- a/fonts/newpx/tex/newpx.subs +++ b/fonts/newpx/tex/newpx-subs.tex diff --git a/fonts/newpx/tex/newpxmath.sty b/fonts/newpx/tex/newpxmath.sty index 2058b34925..5f83df3dfa 100644 --- a/fonts/newpx/tex/newpxmath.sty +++ b/fonts/newpx/tex/newpxmath.sty @@ -11,8 +11,8 @@ % of glyph collisions. % These modifications are by Michael Sharpe, msharpe at ucsd dot edu -\def\fileversion{1.40} -\def\filedate{2019/09/22} +\def\fileversion{1.401} +\def\filedate{2019/10/02} \ProvidesPackage{newpxmath} [\filedate\space v\fileversion] %\@ifundefined{newpxmathLoaded}{}{\endinput} @@ -179,8 +179,8 @@ amssymbols,uprightGreek} \PackageError{newpxmath}{xy package is not compatible with the subscriptcorrection macros}{Either remove xy or disable subscriptcorrection} \fi % ifx - \IfFileExists{newpx.subs}{\loadsubfile{newpx.subs}}% - {\def\px@sb{\px@sb@dflt}\message{File newpx.subs not found. Using basic defaults for subscript correction.^^J}} + \IfFileExists{newpx-subs.tex}{\loadsubfile{newpx-subs.tex}}% + {\def\px@sb{\px@sb@dflt}\message{File newpx-subs.tex not found. Using basic defaults for subscript correction.^^J}} \fi } @@ -2202,6 +2202,8 @@ $\m@th\hfil #2#3\hfil$\crcr}}}} \repeat \typeout{***}} %%%%%%% Additional pdf to unicode values not in Ross Moore's collection +% Conditional needed for engines other than pdflatex +\ifx\pdfglyphtounicode\@undefined \else \pdfglyphtounicode{nPerp}{2AEB 2215}% .. .. \pdfglyphtounicode{periodcentered.B}{00B7} \pdfglyphtounicode{periodcentered.BB}{22C5} @@ -2213,5 +2215,5 @@ $\m@th\hfil #2#3\hfil$\crcr}}}} \pdfglyphtounicode{emptyset.alt2}{2205} \pdfglyphtounicode{transpose}{1D40} \pdfglyphtounicode{hermitconj}{22B9} - +\fi \endinput diff --git a/fonts/newtx/README b/fonts/newtx/README index b001283b5e..3f44c62973 100644 --- a/fonts/newtx/README +++ b/fonts/newtx/README @@ -1,10 +1,15 @@ This package, initially based on txfonts, provides many fixes and enhancements to the txfonts package, splitting it into two separate packages---newtxtext and newtxmath, which may be run independently of one another. It provides scaling, improved metrics, and other options. In particular, newtxmath offers a libertine option which substitutes Linux Libertine (provided with TeXLive and MikTeX) italic and Greek letters for the default Times letters, providing a good match for the Libertine text font, which is heavier than Computer Modern but lighter than Times, and in my experience, looks very sharp and clear on the screen. -Current version: 1.60 2019-09-27 +Current version: 1.601 2019-10-02 This material is subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3 for the details of that license. +Changes in version 1.601 +1. 1. Changed name of file newtx.subs to newtx-subs.tex, with similar changes for other such files. +2. Placed the \pdfglyphtounicode lines in a conditional block in newpxmath.sty so it could continue to be used with other engines. (Thanks Hironobu Yamashita.) +3. Added option ebgaramond to substitute ebgaramond Roman and Greek Letters for Times in math. + Changes in version 1.60 1. Reworked the math italics to improve the rendering of some subscripts and superscripts, where formerly, overlaps could occur with superscripts like j, f, p and y with base shapes, such as D, that are round on the right. Increasing the left side-bearing of j, etc, helps with superscripts but makes those letters leave a large gap when used as subscripts. 2. Corrected and enhanced the subscriptcorrection option to newtxmath so that it now fixes the above problem. I regret that this option is incompatible with xy-pic, both depending on making _ an active character but with very different behaviors. Newtxmath will detect if xy is loaded and disable subscriptcorrection if so. diff --git a/fonts/newtx/doc/newtxdoc.pdf b/fonts/newtx/doc/newtxdoc.pdf Binary files differindex c0614f0aca..cecad11531 100644 --- a/fonts/newtx/doc/newtxdoc.pdf +++ b/fonts/newtx/doc/newtxdoc.pdf diff --git a/fonts/newtx/doc/newtxdoc.tex b/fonts/newtx/doc/newtxdoc.tex index 5ee34386c6..2ea9040c7e 100644 --- a/fonts/newtx/doc/newtxdoc.tex +++ b/fonts/newtx/doc/newtxdoc.tex @@ -221,6 +221,7 @@ Don't use these unless you know what you're doing. \item {\tt varvw} causes the math italic letters \verb|v,w| to be replaced by versions which are more distinctive---eg, useful for distinguishing math italic \verb|v| from \verb|\nu|; \item {\tt libertine} loads different versions of math italic and bold math italic based on \textsf{Libertine} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default; \item (new in version 1.55) {\tt stix2} loads different versions of math italic and bold math italic based on \textsf{StixTwoMath} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. See the documentation to the {\tt SticksToo} package, which contains more details and some math samples. +\item (new in version 1.60) {\tt ebgaramond} loads different versions of math italic and bold math italic based on \textsf{EBGaramond} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. See the end of Appendix 2 for an example of a preamble. \item {\tt minion} loads different versions of math italic and bold math italic based on \textsf{MinionPro} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default---see the extended discussion below; \item {\tt garamondx} loads different versions of math italic and bold math italic based on \textsf{garamondx} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default. \item {\tt baskervaldx} (or {\tt Baskervaldx}) loads different versions of math italic and bold math italic based on \textsf{Baskervaldx} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default. @@ -235,7 +236,7 @@ Don't use these unless you know what you're doing. \usepackage[scaled=.95]{cabin} % sans serif \usepackage[utopia,vvarbb]{newtxmath} \end{verbatim} -\item the {\tt libertine} option also replaces both slanted and upright Greek symbols by the corresponding Libertine glyphs, and similarly for {\tt minion}, {\tt garamondx}, {\tt stix2} and {\tt cochineal}; +\item the {\tt libertine} option also replaces both slanted and upright Greek symbols by the corresponding Libertine glyphs, and similarly for {\tt minion}, {\tt garamondx}, {\tt ebgaramond}, {\tt stix2}, {\tt xcharter} and {\tt cochineal}; \item {\tt cmintegrals} instructs \textsf{newtxmath} to load a thicker version of the Computer Modern integral in place of the \textsf{newtxmath} default---the txfonts integral (identical to the integral in the Wolfram fonts), which is not to everyone's taste---a consequence is that none of the special forms of \textsf{txfonts} integrals are available; \textbf{as of version 1.5, this option does nothing, as the new default is slanted integrals.} @@ -774,7 +775,7 @@ Version 1.6.3 of {\tt pdfx} from February 2019 mishandles math accents. A fix i \end{verbatim} and then use \verb|$x_{\jj}$| instead of \verb|$x_j$|, turning $x_j$ into $x_{\jj}$. -If you do enable {\tt subscriptcorrection}, there is a default correction table in the {\tt sty} file, but the sty file also looks for a file named, e.g., {\tt newtx.subs} if you are using the {\tt newtx} default math letters. There is already such a file located in the {\tt newtx} distribution in the \verb|/tex/latex/| folder. If you wish to make changes to this file, copy the file to your home TeX folder where it will be found by TeX before the one in the distribution. The entries in the file are lines like +If you do enable {\tt subscriptcorrection}, there is a default correction table in the {\tt sty} file, but the sty file also looks for a file named, e.g., {\tt newtx-subs.tex} if you are using the {\tt newtx} default math letters. There is already such a file located in the {\tt newtx} distribution in the \verb|/tex/latex/| folder. If you wish to make changes to this file, copy the file to your home TeX folder where it will be found by TeX before the one in the distribution. The entries in the file are lines like \begin{verbatim} {j}{-3} \end{verbatim} @@ -784,16 +785,17 @@ each of which will have the same effect as the above macro if the first item in \end{verbatim} The complete list of file names recognized for specifying subscript corrections is: \begin{verbatim} -newtx.subs -libertine.subs -xcharter.subs -cochineal.subs -baskervillef.subs -stickstoo.subs -garamond.subs -baskervald.subs -utopia.subs -minion.subs +newtx-subs.tex +newtx-libertine-subs.tex +newtx-xcharter-subs.tex +newtx-cochineal-subs.tex +baskervillef-subs.tex +newtx-stickstoo-subs.tex +newtx-garamond-subs.tex +newtx-ebgaramond-subs.tex +newtx-baskervald-subs.tex +newtx-utopia-subs.tex +newtx-minion-subs.tex \end{verbatim} \subsection{New glyphs added} \textbf{(For enhanced packages only)} Math family 1 {\tt (letters)} has been extended from 128 slots to 256, retaining the {\tt OML} encoding of the first 128. Most of additional slots have been allocated to a script font from the old STIX collection and an upright modification of that font. @@ -810,7 +812,7 @@ $\bullet$ Hermitian transpose \verb|\hermtransp| or \verb|\htransp| is used like $\bullet$ Independence can use \verb|\Perp|, $\Perp$, and there is a new \verb|\nPerp|, $\nPerp$ for the negation. \subsection{Adaptive vector accent} The \LaTeX\ macro \verb|\overrightarrow| provides a right arrow with adaptive width, but not matching the vector head of {\tt newtxmath}. Likewise, the {\tt esvect} provides a similar service with a choice of vector heads, none of which match {\tt newtxmath}. I've added code to provide a matching adaptive vector accent and which uses the same macro name, \verb|\vv|, as {\tt esvect}. -For a comparison of thse vector accents, \verb|$\vec{XY} \vv{XY} \overrightarrow{XY}$| renders as\\ +For a comparison of these vector accents, \verb|$\vec{XY} \vv{XY} \overrightarrow{XY}$| renders as\\ $\vec{XY} \vv{XY} \overrightarrow{XY}$.\\ $\bullet$ \verb|$\vv{AB}$| renders as $\vv{AB}$.\\ $\bullet$ \verb|$\vv*{AB}{x}$| renders as $\vv*{AB}{x}$. This provides better horizontal spacing of subscripts than \verb|$\vv{AB}_{x}$|, $\vv{AB}_{x}$.\\ @@ -836,4 +838,45 @@ The AMS fonts replacement, {\tt ntxsym} corrects the former misplacement of \ver \subsection{symbols} \fonttable{ntxsy} \newpage + +\subsection{A sample newtx-subs.tex} +You may either copy the entire block below, starting with the line \verb|\begin{...| and ending after the line beginning \verb|\end{| +and pasting it into the top of your document before the \verb|\documentclass...| line, which will allow for easy editing and will write the file to the same folder as your document, or make your own file, omitting those outer two lines. + +\begin{verbatim} +\begin{filecontents*}{newtx-subs.tex} +{f}{-3} +{j}{-3} +{p}{-1} +{y}{-1} +{A}{-3} +{B}{-1} +{D}{-1} +{H}{-1} +{I}{-1} +{K}{-1} +{L}{-1} +{M}{-1} +{N}{-0.5} +{P}{-1} +{X}{-1} +{\rho}{-1.5} +{\mu}{-1} +\end{filecontents*} +\end{verbatim} +\subsection*{The {\tt ebgaramond} option to newtxmath} +As {\tt ebgaramond} has an x-height considerably smaller than {\tt newtx}, some amount of scaling is useful to bridge the gap. In making the replacement letters, I increased the size of the EBGaramond letters by 5\%, so make some scaling combination that compensates for this. The weights of {\tt ebgaramond} used in the substitutions were regular and semibold. This dictates one of the options used for {\tt ebgaramond}. + +\textsc{Example preamble:}\\ +\begin{verbatim} +\usepackage[lining,semibold,scaled=1.05]{ebgaramond} +% Latex BOLD renders with ebgaramond semibold +\usepackage[T1]{fontenc} % best for Western European languages +\usepackage{textcomp} % required to get special symbols +\usepackage[varqu,varl]{inconsolata}% a typewriter font must be defined +\usepackage{amsthm}% must be loaded before newtxmath +\usepackage[ebgaramond,vvarbb,subscriptcorrection]{newtxmath} % STIX Bbb +\usepackage{bm}% load after all math to give access to bold math +\end{verbatim} + \end{document}
\ No newline at end of file diff --git a/fonts/newtx/tex/newtx-ebgaramond-subs.tex b/fonts/newtx/tex/newtx-ebgaramond-subs.tex new file mode 100644 index 0000000000..7cabd181e1 --- /dev/null +++ b/fonts/newtx/tex/newtx-ebgaramond-subs.tex @@ -0,0 +1,18 @@ +{f}{-.5} +{j}{-3} +{p}{-2.5} +{y}{-2.5} +{A}{-2.5} +{B}{-1} +{D}{-1} +{H}{-1} +{I}{-1} +{K}{-1} +{L}{-1} +{M}{-1} +{N}{-0.5} +{P}{-1} +{X}{-1} +{\rho}{-3.5} +{\mu}{-1} +{\beta}{-1} diff --git a/fonts/newtx/tex/libertine.subs b/fonts/newtx/tex/newtx-libertine-subs.tex index 818147701e..82f4f2c693 100644 --- a/fonts/newtx/tex/libertine.subs +++ b/fonts/newtx/tex/newtx-libertine-subs.tex @@ -1,5 +1,5 @@ {f}{-1.5} -{j}{-1} +{j}{-2} {p}{-.5} {y}{-1} {A}{-1.5} diff --git a/fonts/newtx/tex/newtxmath.sty b/fonts/newtx/tex/newtxmath.sty index a7ad97ac76..a423dacd19 100644 --- a/fonts/newtx/tex/newtxmath.sty +++ b/fonts/newtx/tex/newtxmath.sty @@ -10,8 +10,8 @@ % of glyph collisions. % These modifications are by Michael Sharpe, msharpe at ucsd dot edu -\def\fileversion{1.60} -\def\filedate{2019/09/20} +\def\fileversion{1.601} +\def\filedate{2019/10/02} \ProvidesPackage{newtxmath}[\filedate\space v\fileversion ] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -234,6 +234,8 @@ amssymbols,uprightGreek,nosubscriptcorrection} \iftx@ntxmath\tx@isenhtrue\else \iftx@libertine\tx@isenhtrue\else \iftx@ch\tx@isenhtrue\else + \iftx@ebgm\tx@isenhtrue\else + \fi \fi \fi \fi @@ -319,63 +321,70 @@ amssymbols,uprightGreek,nosubscriptcorrection} % Math Italic % %%%%%%%%%%%%%%% \iftx@libertine - \def\tx@subs{libertine.subs} + \def\tx@subs{newtx-libertine-subs.tex} \DeclareSymbolFont{letters}{OML}{nxlmi}{m}{it} \SetSymbolFont{letters}{bold}{OML}{nxlmi}{b}{it} \DeclareFontSubstitution{OML}{nxlmi}{m}{it} \else \iftx@minion - \def\tx@subs{minion.subs} + \def\tx@subs{newtx-minion-subs.tex} \DeclareSymbolFont{letters}{OML}{zmnmi}{m}{it} \SetSymbolFont{letters}{bold}{OML}{zmnmi}{b}{it} \DeclareFontSubstitution{OML}{zmnmi}{m}{it} \else \iftx@gm - \def\tx@subs{garamond.subs} + \def\tx@subs{newtx-garamond-subs.tex} \DeclareSymbolFont{letters}{OML}{zgmmi}{m}{it} \SetSymbolFont{letters}{bold}{OML}{zgmmi}{b}{it} \DeclareFontSubstitution{OML}{zgmmi}{m}{it} \else \iftx@bv - \def\tx@subs{baskervald.subs} + \def\tx@subs{newtx-baskervald-subs.tex} \DeclareSymbolFont{letters}{OML}{zbvmi}{m}{it} \SetSymbolFont{letters}{bold}{OML}{zbvmi}{b}{it} \DeclareFontSubstitution{OML}{zbvmi}{m}{it} \else \iftx@ut - \def\tx@subs{utopia.subs} + \def\tx@subs{newtx-utopia-subs.tex} \DeclareSymbolFont{letters}{OML}{zutmi}{m}{it} \SetSymbolFont{letters}{bold}{OML}{zutmi}{b}{it} \DeclareFontSubstitution{OML}{zutmi}{m}{it} \else \iftx@ch - \def\tx@subs{xcharter.subs} + \def\tx@subs{newtx-xcharter-subs.tex} \DeclareSymbolFont{letters}{OML}{zchmi}{m}{it} \SetSymbolFont{letters}{bold}{OML}{zchmi}{b}{it} \DeclareFontSubstitution{OML}{zchmi}{m}{it} \else \iftx@coch - \def\tx@subs{cochineal.subs} + \def\tx@subs{newtx-cochineal-subs.tex} \DeclareSymbolFont{letters}{OML}{zcochmi}{m}{it} \SetSymbolFont{letters}{bold}{OML}{zcochmi}{b}{it} \DeclareFontSubstitution{OML}{zcochmi}{m}{it} \else \iftx@ba - \def\tx@subs{baskervillef.subs} + \def\tx@subs{newtx-baskervillef-subs.tex} \DeclareSymbolFont{letters}{OML}{zbami}{m}{it} \SetSymbolFont{letters}{bold}{OML}{zbami}{b}{it} \DeclareFontSubstitution{OML}{zbami}{m}{it} \else \iftx@stxtwo - \def\tx@subs{stickstoo.subs} + \def\tx@subs{newtx-stickstoo-subs.tex} \DeclareSymbolFont{letters}{OML}{ntxstx2mi}{m}{it} \SetSymbolFont{letters}{bold}{OML}{ntxstx2mi}{b}{it} \DeclareFontSubstitution{OML}{ntxstx2mi}{m}{it} \else - \def\tx@subs{newtx.subs} - \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it} - \DeclareFontSubstitution{OML}{ntxmi}{m}{it} + \iftx@ebgm + \def\tx@subs{newtx-ebgaramond-subs.tex} + \DeclareSymbolFont{letters}{OML}{ntxebgmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{ntxebgmi}{b}{it} + \DeclareFontSubstitution{OML}{ntxebgmi}{m}{it} + \else + \def\tx@subs{newtx-subs.tex} + \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it} + \DeclareFontSubstitution{OML}{ntxmi}{m}{it} + \fi \fi \fi \fi @@ -387,6 +396,17 @@ amssymbols,uprightGreek,nosubscriptcorrection} \fi \iftx@isenh + \DeclareMathSymbol{0}{\mathord}{letters}{132} + \DeclareMathSymbol{1}{\mathord}{letters}{133} + \DeclareMathSymbol{2}{\mathord}{letters}{134} + \DeclareMathSymbol{3}{\mathord}{letters}{135} + \DeclareMathSymbol{4}{\mathord}{letters}{136} + \DeclareMathSymbol{5}{\mathord}{letters}{137} + \DeclareMathSymbol{6}{\mathord}{letters}{138} + \DeclareMathSymbol{7}{\mathord}{letters}{139} + \DeclareMathSymbol{8}{\mathord}{letters}{140} + \DeclareMathSymbol{9}{\mathord}{letters}{141} + \iftx@upscr \DeclareRobustCommand{\mathscr}[1]{\ntx@alfa{#1}{196}{222}{248}{249}{}{letters}} \DeclareMathSymbol{\imathscr}{\mathord}{letters}{248} @@ -2616,6 +2636,8 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \repeat \typeout{***}} %%%%%%% Additional pdf to unicode values not in Ross Moore's collection +% Conditional needed for engines other than pdflatex +\ifx\pdfglyphtounicode\@undefined \else \pdfglyphtounicode{nPerp}{2AEB 2215}% .. .. \pdfglyphtounicode{periodcentered.B}{00B7} \pdfglyphtounicode{periodcentered.BB}{22C5} @@ -2627,5 +2649,5 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \pdfglyphtounicode{emptyset.alt2}{2205} \pdfglyphtounicode{transpose}{1D40} \pdfglyphtounicode{hermitconj}{22B9} - +\fi \endinput diff --git a/fonts/newtx/tfm/ebgBMI.tfm b/fonts/newtx/tfm/ebgBMI.tfm Binary files differnew file mode 100644 index 0000000000..272989c492 --- /dev/null +++ b/fonts/newtx/tfm/ebgBMI.tfm diff --git a/fonts/newtx/tfm/ebgBRM.tfm b/fonts/newtx/tfm/ebgBRM.tfm Binary files differnew file mode 100644 index 0000000000..199c860697 --- /dev/null +++ b/fonts/newtx/tfm/ebgBRM.tfm diff --git a/fonts/newtx/tfm/ebgMI.tfm b/fonts/newtx/tfm/ebgMI.tfm Binary files differnew file mode 100644 index 0000000000..6984a54abe --- /dev/null +++ b/fonts/newtx/tfm/ebgMI.tfm diff --git a/fonts/newtx/tfm/ebgMRM.tfm b/fonts/newtx/tfm/ebgMRM.tfm Binary files differnew file mode 100644 index 0000000000..6e4ac78403 --- /dev/null +++ b/fonts/newtx/tfm/ebgMRM.tfm diff --git a/fonts/newtx/tfm/ebgbmia.tfm b/fonts/newtx/tfm/ebgbmia.tfm Binary files differnew file mode 100644 index 0000000000..4b92c125b9 --- /dev/null +++ b/fonts/newtx/tfm/ebgbmia.tfm diff --git a/fonts/newtx/tfm/ebgmi0.tfm b/fonts/newtx/tfm/ebgmi0.tfm Binary files differnew file mode 100644 index 0000000000..ead467ba4f --- /dev/null +++ b/fonts/newtx/tfm/ebgmi0.tfm diff --git a/fonts/newtx/tfm/ebgmia.tfm b/fonts/newtx/tfm/ebgmia.tfm Binary files differnew file mode 100644 index 0000000000..f5dfe1a094 --- /dev/null +++ b/fonts/newtx/tfm/ebgmia.tfm diff --git a/fonts/newtx/tfm/ntxebgbmi.tfm b/fonts/newtx/tfm/ntxebgbmi.tfm Binary files differnew file mode 100644 index 0000000000..38f3ed3f23 --- /dev/null +++ b/fonts/newtx/tfm/ntxebgbmi.tfm diff --git a/fonts/newtx/tfm/ntxebgbmia.tfm b/fonts/newtx/tfm/ntxebgbmia.tfm Binary files differnew file mode 100644 index 0000000000..1b8cfe8ddb --- /dev/null +++ b/fonts/newtx/tfm/ntxebgbmia.tfm diff --git a/fonts/newtx/tfm/ntxebgmi.tfm b/fonts/newtx/tfm/ntxebgmi.tfm Binary files differnew file mode 100644 index 0000000000..0c55208984 --- /dev/null +++ b/fonts/newtx/tfm/ntxebgmi.tfm diff --git a/fonts/newtx/tfm/ntxebgmia.tfm b/fonts/newtx/tfm/ntxebgmia.tfm Binary files differnew file mode 100644 index 0000000000..8737350d6d --- /dev/null +++ b/fonts/newtx/tfm/ntxebgmia.tfm diff --git a/fonts/newtx/type1/XCharterMathBMI.pfb b/fonts/newtx/type1/XCharterMathBMI.pfb Binary files differdeleted file mode 100644 index e77b256d14..0000000000 --- a/fonts/newtx/type1/XCharterMathBMI.pfb +++ /dev/null diff --git a/fonts/newtx/type1/XCharterMathBRM.pfb b/fonts/newtx/type1/XCharterMathBRM.pfb Binary files differdeleted file mode 100644 index 4cdfb00df7..0000000000 --- a/fonts/newtx/type1/XCharterMathBRM.pfb +++ /dev/null diff --git a/fonts/newtx/type1/XCharterMathMI.pfb b/fonts/newtx/type1/XCharterMathMI.pfb Binary files differdeleted file mode 100644 index bb002d8376..0000000000 --- a/fonts/newtx/type1/XCharterMathMI.pfb +++ /dev/null diff --git a/fonts/newtx/type1/XCharterMathRM.pfb b/fonts/newtx/type1/XCharterMathRM.pfb Binary files differdeleted file mode 100644 index 6519febc89..0000000000 --- a/fonts/newtx/type1/XCharterMathRM.pfb +++ /dev/null diff --git a/fonts/newtx/type1/ebgBMI.pfb b/fonts/newtx/type1/ebgBMI.pfb Binary files differnew file mode 100644 index 0000000000..d32d023d83 --- /dev/null +++ b/fonts/newtx/type1/ebgBMI.pfb diff --git a/fonts/newtx/type1/ebgBRM.pfb b/fonts/newtx/type1/ebgBRM.pfb Binary files differnew file mode 100644 index 0000000000..c3a8abdafe --- /dev/null +++ b/fonts/newtx/type1/ebgBRM.pfb diff --git a/fonts/newtx/type1/ebgMI.pfb b/fonts/newtx/type1/ebgMI.pfb Binary files differnew file mode 100644 index 0000000000..be78eab5ed --- /dev/null +++ b/fonts/newtx/type1/ebgMI.pfb diff --git a/fonts/newtx/type1/ebgMRM.pfb b/fonts/newtx/type1/ebgMRM.pfb Binary files differnew file mode 100644 index 0000000000..5afdd4bd9c --- /dev/null +++ b/fonts/newtx/type1/ebgMRM.pfb diff --git a/fonts/newtx/vf/ebgbmia.vf b/fonts/newtx/vf/ebgbmia.vf Binary files differnew file mode 100644 index 0000000000..a010a0448e --- /dev/null +++ b/fonts/newtx/vf/ebgbmia.vf diff --git a/fonts/newtx/vf/ebgmi0.vf b/fonts/newtx/vf/ebgmi0.vf Binary files differnew file mode 100644 index 0000000000..b493b26639 --- /dev/null +++ b/fonts/newtx/vf/ebgmi0.vf diff --git a/fonts/newtx/vf/ebgmia.vf b/fonts/newtx/vf/ebgmia.vf Binary files differnew file mode 100644 index 0000000000..a0216bb651 --- /dev/null +++ b/fonts/newtx/vf/ebgmia.vf diff --git a/fonts/newtx/vf/ntxebgbmi.vf b/fonts/newtx/vf/ntxebgbmi.vf Binary files differnew file mode 100644 index 0000000000..c17e44a9d7 --- /dev/null +++ b/fonts/newtx/vf/ntxebgbmi.vf diff --git a/fonts/newtx/vf/ntxebgbmia.vf b/fonts/newtx/vf/ntxebgbmia.vf Binary files differnew file mode 100644 index 0000000000..e81ef0d20e --- /dev/null +++ b/fonts/newtx/vf/ntxebgbmia.vf diff --git a/fonts/newtx/vf/ntxebgmi.vf b/fonts/newtx/vf/ntxebgmi.vf Binary files differnew file mode 100644 index 0000000000..2c0e3870a7 --- /dev/null +++ b/fonts/newtx/vf/ntxebgmi.vf diff --git a/fonts/newtx/vf/ntxebgmia.vf b/fonts/newtx/vf/ntxebgmia.vf Binary files differnew file mode 100644 index 0000000000..10e54878d6 --- /dev/null +++ b/fonts/newtx/vf/ntxebgmia.vf diff --git a/fonts/xcharter/README b/fonts/xcharter/README index d10af8bc87..af2d84876a 100644 --- a/fonts/xcharter/README +++ b/fonts/xcharter/README @@ -1,6 +1,6 @@ XCharter Fonts Michael Sharpe - 2019-08-17 + 2019-10-03 This package is an extension of Bitstream Charter, whose original license is reproduced below, as required under the terms of that license. The extension provides small caps, oldstyle figures and superior figures in all four styles, accompanied by LaTeX font support files. The font files themselves are in otf and pfb formats. The fonts are licensed as Free fonts under the same terms as the original from Bitstream. All other support files are subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3 @@ -19,10 +19,13 @@ Original Bitstream Free font license: BITSTREAM CHARTER is a registered trademark of Bitstream Inc. -Portions of the font modifications are Copyright (c) 2009--2012, Andrey Panov; Copyright (c) 2013--2018, Michael Sharpe. +Portions of the font modifications are Copyright (c) 2009--2012, Andrey Panov; Copyright (c) 2013--2019, Michael Sharpe. -Current version: 1.20 2019-09-27 +Current version: 1.201 2019-10-03 + +Changes in version 1.201 +Changed name of subscript adjustments file from xcharter.subs to newtx-xcharter-subs.tex. Changes in version 1.20 The mathematical parts of fonts have been enhanced so that, when used with newtxmath, they can produce pdf files that satisfy PDF/A-1b. See the newtxmath documentation for details. Note that \hslash, \hbar, \lambdaslsh and \lambdabar are now built from Charter glyphs. diff --git a/fonts/xcharter/afm/XCharterMathBMI.afm b/fonts/xcharter/afm/XCharterMathBMI.afm index e11f324973..965238e5d8 100644 --- a/fonts/xcharter/afm/XCharterMathBMI.afm +++ b/fonts/xcharter/afm/XCharterMathBMI.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 Comment Generated by FontForge 20190801 -Comment Creation Date: Thu Sep 19 17:02:12 2019 +Comment Creation Date: Mon Sep 23 17:07:40 2019 FontName XCharterMathBMI FullName XCharter Math Bold Italic FamilyName XCharterMath diff --git a/fonts/xcharter/afm/XCharterMathBRM.afm b/fonts/xcharter/afm/XCharterMathBRM.afm index d5f3da1680..ab64834a40 100644 --- a/fonts/xcharter/afm/XCharterMathBRM.afm +++ b/fonts/xcharter/afm/XCharterMathBRM.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 Comment Generated by FontForge 20190801 -Comment Creation Date: Fri Sep 20 14:25:55 2019 +Comment Creation Date: Mon Sep 23 17:08:34 2019 FontName XCharterMathBRM FullName XCharter Math Bold Roman FamilyName XCharterMath diff --git a/fonts/xcharter/afm/XCharterMathMI.afm b/fonts/xcharter/afm/XCharterMathMI.afm index 753ef8e018..b9fbe482ca 100644 --- a/fonts/xcharter/afm/XCharterMathMI.afm +++ b/fonts/xcharter/afm/XCharterMathMI.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 Comment Generated by FontForge 20190801 -Comment Creation Date: Thu Sep 19 17:02:25 2019 +Comment Creation Date: Mon Sep 23 17:04:54 2019 FontName XCharterMathMI FullName XCharter Math Italic FamilyName XCharterMath diff --git a/fonts/xcharter/afm/XCharterMathRM.afm b/fonts/xcharter/afm/XCharterMathRM.afm index 41b8a3bc52..4c7f743772 100644 --- a/fonts/xcharter/afm/XCharterMathRM.afm +++ b/fonts/xcharter/afm/XCharterMathRM.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 Comment Generated by FontForge 20190801 -Comment Creation Date: Thu Sep 19 12:20:57 2019 +Comment Creation Date: Mon Sep 23 17:06:37 2019 FontName XCharterMathRM FullName XCharter Math Roman FamilyName XCharterMath diff --git a/fonts/xcharter/tex/xcharter.subs b/fonts/xcharter/tex/newtx-xcharter-subs.tex index e88ea8eb7c..e88ea8eb7c 100644 --- a/fonts/xcharter/tex/xcharter.subs +++ b/fonts/xcharter/tex/newtx-xcharter-subs.tex diff --git a/fonts/xcharter/tfm/ebgbmia.tfm b/fonts/xcharter/tfm/ebgbmia.tfm Binary files differnew file mode 100644 index 0000000000..4b92c125b9 --- /dev/null +++ b/fonts/xcharter/tfm/ebgbmia.tfm diff --git a/fonts/xcharter/tfm/ebgmi.tfm b/fonts/xcharter/tfm/ebgmi.tfm Binary files differnew file mode 100644 index 0000000000..ead467ba4f --- /dev/null +++ b/fonts/xcharter/tfm/ebgmi.tfm diff --git a/fonts/xcharter/tfm/ebgmi0.tfm b/fonts/xcharter/tfm/ebgmi0.tfm Binary files differnew file mode 100644 index 0000000000..ead467ba4f --- /dev/null +++ b/fonts/xcharter/tfm/ebgmi0.tfm diff --git a/fonts/xcharter/tfm/ebgmia.tfm b/fonts/xcharter/tfm/ebgmia.tfm Binary files differnew file mode 100644 index 0000000000..f5dfe1a094 --- /dev/null +++ b/fonts/xcharter/tfm/ebgmia.tfm diff --git a/fonts/xcharter/type1/XCharterMathBMI.pfb b/fonts/xcharter/type1/XCharterMathBMI.pfb Binary files differindex 67e25755df..e77b256d14 100644 --- a/fonts/xcharter/type1/XCharterMathBMI.pfb +++ b/fonts/xcharter/type1/XCharterMathBMI.pfb diff --git a/fonts/xcharter/type1/XCharterMathBRM.pfb b/fonts/xcharter/type1/XCharterMathBRM.pfb Binary files differindex fa7a778e26..4cdfb00df7 100644 --- a/fonts/xcharter/type1/XCharterMathBRM.pfb +++ b/fonts/xcharter/type1/XCharterMathBRM.pfb diff --git a/fonts/xcharter/type1/XCharterMathMI.pfb b/fonts/xcharter/type1/XCharterMathMI.pfb Binary files differindex 60c80615f9..bb002d8376 100644 --- a/fonts/xcharter/type1/XCharterMathMI.pfb +++ b/fonts/xcharter/type1/XCharterMathMI.pfb diff --git a/fonts/xcharter/type1/XCharterMathRM.pfb b/fonts/xcharter/type1/XCharterMathRM.pfb Binary files differindex c3d6307042..6519febc89 100644 --- a/fonts/xcharter/type1/XCharterMathRM.pfb +++ b/fonts/xcharter/type1/XCharterMathRM.pfb |