summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-05-02 03:03:15 +0000
committerNorbert Preining <norbert@preining.info>2021-05-02 03:03:15 +0000
commitdb2a2e7b5c4ca1335618a0b5f5c574229bf459f6 (patch)
treed0f4c73e3a871ce1ff86e9e94ac3bcca055bf6e5 /macros
parent33ca54806c387d16002fc16e31418d3a28c2dd63 (diff)
CTAN sync 202105020303
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/easybook/doc/easybook-demo.pdfbin266711 -> 266713 bytes
-rw-r--r--macros/latex/contrib/easybook/doc/easybook-demo.tex4
-rw-r--r--macros/latex/contrib/easybook/doc/easybook.pdfbin466617 -> 467289 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx81
-rw-r--r--macros/latex/contrib/pm-isomath/README.txt6
-rw-r--r--macros/latex/contrib/pm-isomath/pm-isomath.dtx107
-rw-r--r--macros/latex/contrib/pm-isomath/pm-isomath.pdfbin594987 -> 623653 bytes
-rw-r--r--macros/latex/contrib/vcell/README.md2
-rw-r--r--macros/latex/contrib/vcell/vcell.pdfbin147086 -> 134834 bytes
-rw-r--r--macros/latex/contrib/vcell/vcell.sty18
-rw-r--r--macros/latex/contrib/vcell/vcell.tex2
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/README14
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdfbin0 -> 294480 bytes
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.tex94
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-cambria.pdfbin0 -> 60986 bytes
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-lucida.pdfbin0 -> 16379 bytes
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-minion.pdfbin0 -> 27885 bytes
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-msgaramond.pdfbin0 -> 71020 bytes
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-palatino.pdfbin0 -> 94241 bytes
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample.tex75
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/fspcambria.sty9
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/fsplucidaot.sty28
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty20
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/fspmsgaramondot.sty23
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/fsppalatinoot.sty17
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/system-install-fonts/fsplpscel.otfbin0 -> 20472 bytes
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/system-install-fonts/fspmnscel.otfbin0 -> 17944 bytes
-rw-r--r--macros/unicodetex/latex/fontsetup/README2
-rw-r--r--macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdfbin709057 -> 445568 bytes
-rw-r--r--macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex101
-rw-r--r--macros/unicodetex/latex/fontsetup/fspdefault.sty111
-rw-r--r--macros/unicodetex/latex/fontsetup/fspolddefault.sty97
32 files changed, 621 insertions, 190 deletions
diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf
index af3e39f83d..67b4ed5564 100644
--- a/macros/latex/contrib/easybook/doc/easybook-demo.pdf
+++ b/macros/latex/contrib/easybook/doc/easybook-demo.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex
index 3660fb5e5a..c1fed9f9f5 100644
--- a/macros/latex/contrib/easybook/doc/easybook-demo.tex
+++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex
@@ -75,7 +75,7 @@
numsep-all = \ccwd,
part =
{
- format = \addvspace{1pc}\sffamily\large,
+ format += \large,
indent = 0\ccwd,
rule = \tocrule{}[\bfseries]
},
@@ -106,7 +106,7 @@
\url{https://latexstudio.net} \\
\url{https://gitee.com/texl3/easybook}\thanks{Gitee为项目的主要发布地址。}
}
-\date{2021/04.30\hskip\ccwd\relax v1.24x}
+\date{2021/05/01\hskip\ccwd\relax v1.24y}
\frontmatter[roman]
\maketitle
diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf
index 032b2ce546..5bd3115667 100644
--- a/macros/latex/contrib/easybook/doc/easybook.pdf
+++ b/macros/latex/contrib/easybook/doc/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index f7b99b2f5b..7a4ecaeec7 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -56,7 +56,7 @@ The latest version of this license is in
%
% \title{\sffamily easybook 文档类手册}
% \author{瞿毅}
-% \date{2021/04/30\hskip\ccwd\relax v1.24x\thanks{\url{https://gitee.com/texl3/easybook}}}
+% \date{2021/05/01\hskip\ccwd\relax v1.24y\thanks{\url{https://gitee.com/texl3/easybook}}}
%
% \maketitle
% \begin{abstract}
@@ -180,7 +180,7 @@ The latest version of this license is in
% \end{syntax}
% \opt{multoc} 与 \opt{style/multoc} 选项具有相同的效果,但是具有优先性且可单独设置不同目录是否双栏排版。已经预置了中英文的目录标题,可以使用 \opt{title} 选项更改目录标题的名称。\opt{book} 选项使目录标题按照 \opt{chapter} 级别输出,\opt{article} 选项使目录标题按照 \opt{article} 级别输出,默认为 \opt{chapter} 级别。
% \changes{v1.23}{2021/03/15}{为几个目录增加键值列表的选项,可设置标题输出级别以及是否加入主目录。}
-% \changes{v1.24x}{2021/04/04}{目录命令的可选参数增加标题键值。}
+% \changes{v1.24y}{2021/04/04}{目录命令的可选参数增加标题键值。}
% \end{function}
%
% \section{接口选项}
@@ -263,7 +263,7 @@ The latest version of this license is in
% \ding{229} 以上选项路径为 \opt{link/...} \\
% \opt{link} 将超链接选项(包括以上选项)交给 \pkg{hyperref} 处理,除了一些关于 pdf 书签的选项可能会失效,其它由键值选项命令 \tn{hypersetup} 支持的多数选项可用。
% \changes{v1.10}{2021/01/08}{修复了 \opt{linktopage} 选项关闭时目录中标题编号无超链接的问题。}
-% \changes{v1.24x}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。}
+% \changes{v1.24y}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。}
% \end{function}
%
% \begin{optdesc}
@@ -342,7 +342,7 @@ The latest version of this license is in
% \ding{229} 以上选项路径为 \opt{bibset/...}
% \changes{v1.21}{2021/01/11}{增加 \opt{bibset} 选项,可以使用 \hologo{BibTeX} 或 \hologo{biber} 编译参考文献。}
% \changes{v1.23}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。}
-% \changes{v1.24x}{2021/04/09}{可以不载入参考文献包手动配置参考文献格式。}
+% \changes{v1.24y}{2021/04/09}{可以不载入参考文献包手动配置参考文献格式。}
% \end{function}
%
% \begin{optdesc}
@@ -414,7 +414,7 @@ The latest version of this license is in
% \end{syntax}
% 文档类已预置8个定理环境,环境名及对应的定理标题名见小节 \ref{subsec:theorem},如果需要新的定理标题名或定理样式可使用这两个命令。
% \changes{v1.23}{2021/03/12}{重新定义了新定理环境命令 \tn{newtheorem}。}
-% \changes{v1.24x}{2021/04/25}{增加定义定理环境命令 \tn{EbNewtheorem}。}
+% \changes{v1.24y}{2021/04/25}{增加定义定理环境命令 \tn{EbNewtheorem}。}
% \end{function}
%
% \begin{optdesc}
@@ -498,7 +498,7 @@ The latest version of this license is in
% \changes{v1.21}{2021/01/13}{增加配置页眉页脚的选项。}
% \changes{v1.23}{2021/03/08}{优化页眉页脚设置,增加 \opt{chap-mark} 和 \opt{sec-mark} 标志选项。}
% \changes{v1.23}{2021/03/14}{可以手动绘制页眉、页脚和脚注的横线。}
-% \changes{v1.24x}{2021/04/09}{增加 \opt{subsec-mark} 标志选项,仅在 \opt{article} 模式生效。}
+% \changes{v1.24y}{2021/04/09}{增加 \opt{subsec-mark} 标志选项,仅在 \opt{article} 模式生效。}
% \end{function}
%
% \begin{function}[added = 2021-01-13,updated = 2021-03-14]{\easyhead,\easyfoot}
@@ -525,9 +525,10 @@ The latest version of this license is in
%
% \subsection{目录样式}
% \label{subsec:catalog style}
-% \begin{function}[EXP,added = 2021-01-13,updated = 2021-04-20]{format,indent,rule,numsep}
+% \begin{function}[EXP,added = 2021-01-13,updated = 2021-05-01]{format,format+,indent,rule,numsep}
% \begin{syntax}
% format = <目录标题格式>
+% format += <目录标题格式>
% indent = <目录标题左边缩进>
% rule = <目录引导线样式>
% numsep = <编号后间距|(\tn{ccwd})>
@@ -535,9 +536,9 @@ The latest version of this license is in
% \ding{229} 以上选项路径为 \opt{tocset/(level)/...} \\
% \opt{tocset} 将目录样式交给 \pkg{titletoc} 处理,\opt{level} 代表 \opt{part}、\opt{chapter}、\opt{section}、\opt{subsection} 和 \opt{list} 五种级别的目录样式设置,其中 \opt{list} 为图片、表格和代码目录样式的级别。
%
-% \opt{format} 是目录中标题的格式,可以设置字体和加入垂直间距等,垂直间距最好使用无间距重合的 \tn{addvspace} 命令。\opt{indent} 是目录中标题在页面左侧的缩进距离,应该有长度单位。\opt{rule} 选项中一般应当使用 \tn{tocrule} 命令,将会在接下来介绍。\opt{numsep} 是有编号的标题在目录中编号与标题的间距。
+% \opt{format} 是目录中标题的格式,可以设置字体和加入垂直间距等,垂直间距最好使用无间距重合的 \tn{addvspace} 命令,带有加号的 \opt{format+} 选项用于在已有的格式命令后附加内容。\opt{indent} 是目录中标题在页面左侧的缩进距离,应该有长度单位。\opt{rule} 选项中一般应当使用 \tn{tocrule} 命令,将会在接下来介绍。\opt{numsep} 是有编号的标题在目录中编号与标题的间距。
% \changes{v1.21}{2021/01/13}{增加配置目录样式的选项。}
-% \changes{v1.24x}{2021/04/20}{增加目录中编号与标题的间距选项 \opt{numsep}。}
+% \changes{v1.24y}{2021/04/20}{增加目录中编号与标题的间距选项 \opt{numsep}。}
% \end{function}
%
% \begin{function}[added = 2021-01-13,updated = 2021-04-20]{\tocrule,\EbNumberline}
@@ -562,7 +563,7 @@ The latest version of this license is in
% }
% \end{ctexexam}
%
-% \begin{function}[EXP,added = 2021-01-13,updated = 2021-04-19]{list/lolskip,list/belowoffset,tocset/tocline-fig,tocset/tocline-tab,tocset/tocline-lst,tocset/belowoffset,tocset/line-align,tocset/hang,tocset/numsep-all,tocset/indent-all}
+% \begin{function}[EXP,added = 2021-01-13,updated = 2021-05-01]{list/lolskip,list/belowoffset,tocset/tocline-fig,tocset/tocline-tab,tocset/tocline-lst,tocset/belowoffset,tocset/line-align,tocset/hang,tocset/numsep-all,tocset/indent-all,tocset/rule-all}
% \begin{syntax}
% lolskip = <(0.8pc)>
% belowoffset = <(0pc)>
@@ -574,11 +575,13 @@ The latest version of this license is in
% hang = <true|(false)>
% numsep-all = <编号后间距|(\tn{ccwd})>
% indent-all = <目录标题左边缩进>
+% rule-all = <目录引导线样式>
% \end{syntax}
% \ding{229} 以上选项路径为 \opt{tocset/list/...} 或 \opt{tocset/...}
-% \changes{v1.24x}{2021/04/05}{可以设置图、表和代码目录的标签。}
-% \changes{v1.24x}{2021/04/06}{增加目录引导线右边对齐方式。}
-% \changes{v1.24x}{2021/04/19}{给目录增加 \opt{hang} 样式选项。}
+% \changes{v1.24y}{2021/04/05}{可以设置图、表和代码目录的标签。}
+% \changes{v1.24y}{2021/04/06}{增加目录引导线右边对齐方式。}
+% \changes{v1.24y}{2021/04/19}{给目录增加 \opt{hang} 样式选项。}
+% \changes{v1.24y}{2021/05/01}{给目录增加 \opt{format+} 和 \opt{rule-all} 选项。}
% \end{function}
%
% \begin{optdesc}
@@ -597,6 +600,7 @@ The latest version of this license is in
% \item[hang] \opt{hang} 选项使目录标题为悬挂缩进形式,缩进距离为编号及其与标题间距的长度,但此时目录编号会失去超链接。
% \item[numsep-all] 统一设置所有有编号的标题在目录中编号与标题的间距。
% \item[indent-all] 统一设置所有级别的目录标题左边缩进。
+% \item[rule-all] 统一设置所有级别的目录引导线样式。
% \end{optdesc}
%
% \section{常用环境}
@@ -619,7 +623,7 @@ The latest version of this license is in
% \tn{end}\marg{环境名}
% \end{syntax}
% \pkg{enumitem} 宏包为系统预置的列表环境 \env{enumerate}、\env{itemize}和 \env{description} 提供了更灵活的标签以及间距的控制,可使用 \tn{setlist} 命令设置原有的三种列表格式,也可以直接使用可选参数的键值列表,具体选项见 \pkg{enumitem} 宏包文档。已为三种列表预置了三个级别的格式可相互嵌套,默认标签与 \cls{book} 文档类相同,若自定义标签可例如
-% \changes{v1.24x}{2021/04/08}{重新优化列表环境的配置。}
+% \changes{v1.24y}{2021/04/08}{重新优化列表环境的配置。}
% \end{function}
%
% \begin{ctexexam}
@@ -738,7 +742,7 @@ The latest version of this license is in
% \tn{end}\marg{ebparbox}
% \end{syntax}
% 环境 \env{ebparbox} 与 \env{easybox} 类似,同样带有三个可选参数。当使用星号参数时盒子左边带有一条竖线,\meta{颜色名} 选项可以自定义竖线颜色,使用不带有星号的环境则盒子带有竖线颜色的浅色背景。\meta{段落标题} 选项可以设置标题,默认无标题。
-% \changes{v1.24x}{2021/04/19}{优化盒子环境的选项,增加可带有标题的扁平盒子 \env{ebparbox}。}
+% \changes{v1.24y}{2021/04/19}{优化盒子环境的选项,增加可带有标题的扁平盒子 \env{ebparbox}。}
% \end{function}
%
% \subsubsection{行内盒子}
@@ -797,16 +801,17 @@ The latest version of this license is in
% \tn{labelformat}\marg{计数器}\marg{标签引用格式}
% \end{syntax}
% 使用 \tn{ref} 命令进行引用将会自动检测环境并添加相应的前缀,\tn{labelformat} 可以设置标签引用格式,第二个参数中\#1代表 \tn{the}\meta{计数器},可以设置引用序号的前缀和后缀。
-% \changes{v1.24x}{2021/04/11}{取消载入 \pkg{cleveref} 宏包来交叉引用。}
+% \changes{v1.24y}{2021/04/11}{取消载入 \pkg{cleveref} 宏包来交叉引用。}
% \end{function}
%
% \subsubsection{索引}
-% \begin{function}[added = 2021-04-30]{\index,\printindex}
+% \begin{function}[added = 2021-05-01]{\index,\printindex}
% \begin{syntax}
% \tn{index}\marg{标签}
% \tn{printindex*+}\parg{索引名}\oarg{键值列表}
% \end{syntax}
% \pkg{imakeidx} 宏包可使用索引的功能,重新定义了它的 \tn{printindex} 命令用于生成索引目录,键值列表及用法与小节 \ref{subsec:document command} 相同,但 \opt{multoc} 选项和 \pkg{imakeidx} 原本的接口命令 \tn{indexsetup} 部分选项失效。仅做了简单的设置如将索引设为双栏并加入目录,其他选项可另外配置。
+% \changes{v1.24y}{2021/05/01}{重新定义 \tn{printindex} 命令与文档适配。}
% \end{function}
%
% \subsubsection{自定义脚注}
@@ -910,7 +915,7 @@ The latest version of this license is in
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplClass{easybook}{2021/04/30}{1.24x}{beta}
+\ProvidesExplClass{easybook}{2021/05/01}{1.24x}{beta}
\cs_generate_variant:Nn \eb_ctex_define:nn {nx}
\cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -1373,10 +1378,14 @@ The latest version of this license is in
\ctex_define:n {tocset/#1 .meta:nn = {ctex/tocset/#1}{##1}}
\eb_ctex_define:nn {tocset}
{
- #1/format .tl_set:c = l__eb_toc_#1_format_tl,
- #1/indent .tl_set:c = l__eb_toc_#1_indent_tl,
- #1/rule .tl_set:c = l__eb_toc_#1_rule_tl,
- #1/numsep .tl_set:c = eb@toc@#1@numsep
+ #1/format .tl_set:c = l__eb_toc_#1_format_tl,
+ #1/format+ .code:n =
+ {\tl_put_right:cn {l__eb_toc_#1_format_tl}{##1}},
+ #1/format~+ .code:n =
+ {\tl_put_right:cn {l__eb_toc_#1_format_tl}{##1}},
+ #1/indent .tl_set:c = l__eb_toc_#1_indent_tl,
+ #1/rule .tl_set:c = l__eb_toc_#1_rule_tl,
+ #1/numsep .tl_set:c = eb@toc@#1@numsep
}
}
@@ -1462,6 +1471,14 @@ The latest version of this license is in
section/indent = {#1},
subsection/indent = {#1},
list/indent = {#1}
+ },
+ rule-all .meta:n =
+ {
+ part/rule = {#1},
+ chapter/rule = {#1},
+ section/rule = {#1},
+ subsection/rule = {#1},
+ list/rule = {#1}
}
}
\ctex_set:nn {tocset}
@@ -1748,17 +1765,17 @@ The latest version of this license is in
{
\group_begin:
\tl_set_eq:NN \eb@toc@title\indexname
- \tl_set_eq:NN \imki@indexlevel\use_none:n
+ \cs_set_eq:NN \imki@indexlevel\use_none:n
\setkeys{imki}{intoc = false}
\IfValueT{#4}{\keys_set:nn {eb/listoc}{#4}}
- \bool_if:NTF \l__eb_class_book_bool
- {\tl_gset:Nn \imki@firstpagestyle{plain}}
+ \bool_if:NF \l__eb_class_book_bool
+ {\tl_set:Nn \l__eb_toc_type_tl{article}}
+ \tl_set:Nn \imki@indexheaders
{
- \tl_gset:Nn \imki@firstpagestyle{fancy}
- \tl_set:Nn \l__eb_toc_type_tl{article}
+ \eb_title_number_intoc_bool:nn {#2}{#1}
+ \cs_set_eq:NN \thispagestyle\use_none:n
+ \cs_undefine:N \imki@firstpagestyle
}
- \tl_set:Nn \imki@indexheaders
- {\eb_title_number_intoc_bool:nn {#2}{#1}}
\imki@putindex{#3}
\group_end:
}
@@ -2074,7 +2091,7 @@ The latest version of this license is in
group-digits = false
}
\allowdisplaybreaks[4]
-\cs_gset:Npn \ULthickness{.75pt}
+\tl_gset:Nn \ULthickness{.75pt}
\skip_set:Nn \jot{4pt plus 1pt minus 1pt}
\cs_new_protected:Npn \l__eb_math_restore:n #1
{
@@ -2303,7 +2320,7 @@ The latest version of this license is in
\tl_set_eq:NN \eb@toc@title\bibname
\IfValueT{##3}{\keys_set:nn {eb/listoc}{##3}}
\eb_multoc_pre_bool:
- \cs_set:Npn \bibsection
+ \tl_set:Nn \bibsection
{\eb_title_number_intoc_bool:nn {##2}{##1}}
\exp_args:NV \bibliography\l__eb_bib_file_tl
\eb_multoc_post_bool:
@@ -2328,7 +2345,7 @@ The latest version of this license is in
\cs_new_protected:Npn \EbBiblatexPostset
{
\exp_args:NV \addbibresource\l__eb_bib_file_tl
- \cs_gset:Npn \blx@default@theheading{bibintoc}
+ \tl_gset:Nn \blx@default@theheading{bibintoc}
\defbibheading{bibintoc}[\bibname]
{\eb_class_title_level_bool:n {##1}}
\skip_set:Nn \bibitemsep{0ex}
diff --git a/macros/latex/contrib/pm-isomath/README.txt b/macros/latex/contrib/pm-isomath/README.txt
index d6854493af..ec1c259708 100644
--- a/macros/latex/contrib/pm-isomath/README.txt
+++ b/macros/latex/contrib/pm-isomath/README.txt
@@ -1,6 +1,4 @@
-\ProvidesFile{README.txt}[%
- 2020/11/06 v.1.0.07
- README file for pm-isomath.sty]
+ README.txt file for pm-isomath.sty 2021/05/01 v.1.1.00
Distributable under the LaTeX Project Public License,
@@ -10,6 +8,6 @@
This work is "maintained"
This work consists of this file pm-isomath.dtx, a README.txt file
- and the derived files:
+ and the derived files:
pm-isomath.sty, pm-isomath.pdf.
diff --git a/macros/latex/contrib/pm-isomath/pm-isomath.dtx b/macros/latex/contrib/pm-isomath/pm-isomath.dtx
index 106ca10d1d..dba0560e67 100644
--- a/macros/latex/contrib/pm-isomath/pm-isomath.dtx
+++ b/macros/latex/contrib/pm-isomath/pm-isomath.dtx
@@ -57,7 +57,7 @@ This work consists of this file pm-isomath.dtx, a README.txt file
%<style>\ProvidesPackage{pm-isomath}[%
%<txt>\ProvidesFile{README.txt}[%
%<*driver,style,txt>
- 2020/11/06 v.1.0.07
+ 2021/05/01 v.1.1.00
%<txt> README file for pm-isomath.sty]
%<style>Poor man package for typesetting ISO compliant math when using pdfLaTeX]
%</driver,style,txt>
@@ -103,7 +103,7 @@ This work consists of this file pm-isomath.dtx, a README.txt file
%</driver>
% \fi
%
-% \CheckSum{436}%
+% \CheckSum{459}%
% \begin{abstract}
% The ISO regulations for typesetting math in the field of physics
% and technology are pretty stringent and imply legal questions
@@ -651,6 +651,30 @@ This work consists of this file pm-isomath.dtx, a README.txt file
%\end{tabular}\end{lrbox}
%\noindent\resizebox{\textwidth}{!}{\usebox{0}}\egroup
%
+% \subparagraph{ISO upright partial differential}
+% Among the fonts used to typeset math when using \prog{pdflatex},
+% only the LibertinusT1math font contains the upright partial
+% differential symbol that conforms the ISO regulations. All other
+% fonts at the moment available to typeset mathematics do not
+% contain an upright symbol, but they contain the original slanted
+% symbol as used with the CM fonts. With a poor-man trick it is
+% possible ti have available an upright symbol so as to describe
+% the Electrical field as the opposite of the electric potential
+% gradient. Compare the following formulas, where the second one
+% is ISO compliant:
+%\begin{align}
+%E =-\nabla V = -\left(
+%\frac{\partial V}{\partial x}\MathLatin{e}[b](it)_x +
+%\frac{\partial V}{\partial y}\MathLatin{e}[b](it)_y +
+%\frac{\partial V}{\partial z}\MathLatin{e}[b](it)_z +
+%\right)\\[\baselineskip]
+%E =-\nabla V = -\left(
+%\frac{\uppartial V}{\uppartial x}\MathLatin{e}[b](it)_x +
+%\frac{\uppartial V}{\uppartial y}\MathLatin{e}[b](it)_y +
+%\frac{\uppartial V}{\uppartial z}\MathLatin{e}[b](it)_z +
+%\right)\\[\baselineskip]
+%\end{align}
+%
%\section{Final remarks}
% This package |pm-isomath| is far from perfect, and its results are
% questionable; of course poor man solutions are just patches;
@@ -665,6 +689,7 @@ This work consists of this file pm-isomath.dtx, a README.txt file
% by Günter Milde, but tackles the problem of insufficient maximum
% number of math font groups so as to avoid any problem with such
% group limitation, and therefore all the caveats in Milde's package.
+%
% That package is much more comfortable to use than this one; but
% it is subject to a number of conditions that, depending on the
% user environment, may even result in a complete failure. This
@@ -694,18 +719,18 @@ This work consists of this file pm-isomath.dtx, a README.txt file
%\iffalse
%<*style>
%\fi
-% \begin{macrocode}
% Then we verify if the document is being typeset with \pdfLaTeX;
% if it is not, an error flag is raised and reading of this
% package is immediately interrupted. For this purpose we need
% an engine-detecting package, and we generally use the |iftex| one.
+% \begin{macrocode}
\@ifpackageloaded{iftex}{}{\RequirePackage{iftex}}
\unless\ifPDFTeX
\PackageError{pm-isomath}{%
******************************************\MessageBreak
This package should be used only when \MessageBreak
typesetting with pdfLaTeX. \MessageBreak
- Skipping loading the package \MessageBreak
+ Loading this package is skipped \MessageBreak
******************************************\MessageBreak
}{%
******************************************\MessageBreak
@@ -728,12 +753,13 @@ This work consists of this file pm-isomath.dtx, a README.txt file
% option is for deciding if the imaginary unit should be
% defined as ‘i’ or ‘j’. As we have remarked in the previous
% documentation, engineers, especially those who deal with
-% electricity and electrical quantities, but also electronics, control
+% electricity and electrical quantities, but also electronics, control,
% and telecommunications engineers, use ‘j’; all these
% varieties of engineers could not do anything in their profession
% if they don't use complex numbers and quantities (the latter
% called phasors). Possibly they are the applied scientists
-% who use complex numbers more than any other scientist.
+% who use complex numbers more often than any other scientist.
+%
% Note: this option has \emph{not} been used to prepare this
% very document.
% \begin{macrocode}
@@ -741,11 +767,25 @@ This work consists of this file pm-isomath.dtx, a README.txt file
\DeclareOption{engineer}{\engineertrue}
\ProcessOptions*\relax
% \end{macrocode}
-% Are the necessary packages already loaded?
+% Are the necessary packages already loaded? Notice that in previous
+% versions we just loaded |xparse| unless it was already loaded;
+% since 2020 the main functionalities of this package are already
+% contained into the \LaTeX\ kernel, But we are going to use one
+% of those “deprecated” functionalities that did not make their way
+% to the \LaTeX\ kernel. We also use the |xfp| floating point
+% computations available with the \LaTeX3 language.
% \begin{macrocode}
\@ifpackageloaded{amsmath}{}{\RequirePackage{amsmath}}
\@ifpackageloaded{etoolbox}{}{\RequirePackage{etoolbox}}
-\@ifpackageloaded{xparse}{}{\RequirePackage{xparse}}
+\RequirePackage{xparse,xfp}
+% \end{macrocode}
+%
+% Since a trick on the ISO compliant upright partial differential
+% symbol requires the functionalities of the |rotate| and |scale|
+% functionalities, we load also the |graphicx| package if it has not
+% been already loaded.
+% \begin{macrocode}
+\@ifpackageloaded{graphicx}{}{\RequirePackage{graphicx}}
% \end{macrocode}
% Now we have almost all software instruments available. We
% define a macro to switch the definitions of certain math
@@ -860,7 +900,7 @@ This work consists of this file pm-isomath.dtx, a README.txt file
% commands are constructed in such a way as to have a default
% family, series and shape common to both Latin and Greek fonts;
% therefore with three optional arguments that the user can
-% specify with different delimiters but respecting their order,
+% specify with different delimiters, but respecting their order,
% the user can get eight different choice combinations that
% allow the selection of a large number of different looks.
%
@@ -869,9 +909,9 @@ This work consists of this file pm-isomath.dtx, a README.txt file
% mostly differ in the encoding choice for Latin or Greek letters.
%
% The user macros are defined by means of the defining commands
-% provided by the |xparse| package, while the service macros use
-% normal \LaTeX\ commands. The user commands follow this special
-% syntax:
+% provided by the |xparse| package functionalities, while the service
+% macros use normal \LaTeX\ commands. The user commands follow this
+% special syntax:
%\begin{ttsintassi}
%\cs{MathLatin}\marg{Latin letter}\marg{family}\oarg{series}\parg{shape}
%\cs{MathGreek}\marg{Greek letter}\marg{family}\oarg{series}\parg{shape}
@@ -968,9 +1008,9 @@ This work consists of this file pm-isomath.dtx, a README.txt file
\csname M@OT1\endcsname{9}}
% \end{macrocode}
% Imitating the |ISOmath| package we define also the macros
-% for selecting the bold italics (produces results similar
-% to those obtained with package |bm|, but it does not require
-% any math group), and sans serif in both normal and bold
+% for selecting the bold italics math fonts (with results similar
+% to those obtained with package |bm|,without requiring
+% any math group), and sans serif in both normal and bold
% slanted shape.
% \begin{macrocode}
\AtBeginDocument{%
@@ -1030,6 +1070,34 @@ This work consists of this file pm-isomath.dtx, a README.txt file
% the thin space |\,| is absolute and does not change depending
% on the preceding math atom.
%
+% The ISO regulations require that any letter-like symbol that
+% does not refer to a measurable quantity be set in upright shape;
+% we already applied the regulation to the regular differential
+% symbol, that may appear in both the derivative fractions and
+% in the differential integrators. With partial derivatives the
+% default symbol is slanted since the very beginning of \TeX, when the
+% OMS Computer Modern Symbol font was defined; according to the
+% ISO regulations such symbol should be upright. For use with
+% \pdfLaTeX the only font distributed with any \TeX system that
+% contains such an upright symbol is the LibertinusT1math one;
+% all other OMS encoded fonts do no contain it. The defined
+% command |\uppartial| name is identical to the one used by the
+% LibertinusT1math font; therefore it is easy to check if this
+% symbol has already been defined
+%
+% On \texttt{tex.stachexchange.com} some questions were asked on
+% how to produce a suitable upright partial differential symbol,
+% when fonts did not have one available. The solutions we found
+% there are based on rotating and scaling the available slanted
+% partial differential symbol. We follow a similar approach,
+% although a shearing process would be a better solution;
+% we avoid to redefine this symbol if it is already available.
+% The default counterclockwise rotation is fixed to 22°, but may
+% be changed by means of an optional argument. Of course this
+% solution is a patch; we tested it at several sizes but only
+% with the Latin Modern Type~1 fonts. May be with other fonts
+% the results might need some adjustments.
+%
% The command |\unit| for appending the units of measure to
% the numerical value of the measure is added if no packages
% have already defined it; package |siunitx| is a particularly
@@ -1068,6 +1136,15 @@ This work consists of this file pm-isomath.dtx, a README.txt file
\providecommand*\diff{}
\renewcommand*\diff{\ensuremath{\mathop{}\!\MathLatin{d}(n)}}
%
+\newbox{\PMpartial}
+\AtBeginDocument{%
+\@ifdefinable{\uppartial}%
+ {\NewDocumentCommand\uppartial{O{22}}{\setbox\PMpartial\hbox{$\partial$}%
+ \setbox\PMpartial=\hbox{%
+ \scalebox{1}[\fpeval{cosd #1}]{\rotatebox[origin=br]{#1}{\box\PMpartial}}%
+ }\raisebox{0.35ex}{\box\PMpartial}\mkern-1.25mu}}%
+}
+%
\providecommand*\micro{}
\AtBeginDocument{\@ifpackageloaded{textcomp}%
{\renewcommand*\micro{\textormath{\textmu}{\ISOmu(rs)}}}%
diff --git a/macros/latex/contrib/pm-isomath/pm-isomath.pdf b/macros/latex/contrib/pm-isomath/pm-isomath.pdf
index 371beae039..a1afcb8d5c 100644
--- a/macros/latex/contrib/pm-isomath/pm-isomath.pdf
+++ b/macros/latex/contrib/pm-isomath/pm-isomath.pdf
Binary files differ
diff --git a/macros/latex/contrib/vcell/README.md b/macros/latex/contrib/vcell/README.md
index b45e138f87..6da287ecb0 100644
--- a/macros/latex/contrib/vcell/README.md
+++ b/macros/latex/contrib/vcell/README.md
@@ -3,7 +3,7 @@ The LaTeX `vcell` package
Vertical alignment of content inside table cells
-Release 2020-05-16
+Release 2021-04-15
Overview
--------
diff --git a/macros/latex/contrib/vcell/vcell.pdf b/macros/latex/contrib/vcell/vcell.pdf
index a0629885c0..83f31832b3 100644
--- a/macros/latex/contrib/vcell/vcell.pdf
+++ b/macros/latex/contrib/vcell/vcell.pdf
Binary files differ
diff --git a/macros/latex/contrib/vcell/vcell.sty b/macros/latex/contrib/vcell/vcell.sty
index 7e6c98d5b6..ac1f9e6df0 100644
--- a/macros/latex/contrib/vcell/vcell.sty
+++ b/macros/latex/contrib/vcell/vcell.sty
@@ -1,5 +1,5 @@
%
-% vcell.sty V1.0.1 version (16-May-2020)
+% vcell.sty V1.0.2 version (15-April-2021)
%
% Author: Xavier Dionne <info@latex-tables.com>
%
@@ -10,11 +10,13 @@
% https://www.latex-project.org/lppl/lppl-1-3c/
%
% Changelog :
+% [v 1.0.2] - Fixed a compatibility issue with `calc`
% [v 1.0.1] - Fixed an issue where the height was calculated
% twice if the cell had a depth
\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesPackage{vcell}[2020/05/16 v1.0.1]
+\ProvidesPackage{vcell}[2021/04/30 v1.0.2]
+\def\@cell@setlength#1#2{#1 #2\relax}
\newdimen\rowheight
\newdimen\rowht
\newdimen\rowdp
@@ -24,17 +26,17 @@
\def\resetcellcount{%
\global\@cellusecount 1\relax\global\@cellcount 1\relax%
- \global\setlength\rowht{\arraystretch\ht\strutbox}%
- \global\setlength\rowdp{\arraystretch\dp\strutbox}%
- \global\setlength\rowheight{\dimexpr\rowht+\rowdp}%
+ \global\@cell@setlength\rowht{\arraystretch\ht\strutbox}%
+ \global\@cell@setlength\rowdp{\arraystretch\dp\strutbox}%
+ \global\@cell@setlength\rowheight{\dimexpr\rowht+\rowdp}%
}
\resetcellcount
\def\savecellheight{%
- \ifdim\ht\@celltemp>\rowht\global\setlength{\rowht}{\ht\@celltemp}\fi%
- \ifdim\dp\@celltemp>\rowdp\global\setlength{\rowdp}{\dp\@celltemp}\fi%
- \ifdim\dimexpr\dp\@celltemp+\ht\@celltemp>\rowheight{\global\setlength{\rowheight}{\dimexpr\dp\@celltemp+\ht\@celltemp}}\fi
+ \ifdim\ht\@celltemp>\rowht\global\@cell@setlength{\rowht}{\ht\@celltemp}\fi%
+ \ifdim\dp\@celltemp>\rowdp\global\@cell@setlength{\rowdp}{\dp\@celltemp}\fi%
+ \ifdim\dimexpr\dp\@celltemp+\ht\@celltemp>\rowheight{\global\@cell@setlength{\rowheight}{\dimexpr\dp\@celltemp+\ht\@celltemp}}\fi
}
\long\def\savecellbox#1{%
\global\sbox\@celltemp{\hbox{\ifdim\hsize=\textwidth #1\else \vbox{#1}\fi}}%
diff --git a/macros/latex/contrib/vcell/vcell.tex b/macros/latex/contrib/vcell/vcell.tex
index 5f228bbd9d..a2e9d30f33 100644
--- a/macros/latex/contrib/vcell/vcell.tex
+++ b/macros/latex/contrib/vcell/vcell.tex
@@ -12,7 +12,7 @@
\begin{document}
\title{The package \texttt{vcell} : Vertical alignment for cells}
\author{Xavier Dionne\thanks{The author wrote this package for its online table generator (\texttt{https://latex-tables.com}). You can contact him at info [at] latex-tables [dot] com.}}
-\date{May 16, 2020}
+\date{April 30, 2021}
\maketitle
\section{Introduction}
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/README b/macros/unicodetex/latex/fontsetup-nonfree/README
new file mode 100644
index 0000000000..be697bf46e
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup-nonfree/README
@@ -0,0 +1,14 @@
+ The fontsetup-nonfree package
+ (Version 1.01, GPL3)
+
+This package accompanies fontsetup, and inludes support for nonfree fonts.
+
+For more information read the file fontsetup-nonfree-doc.pdf in
+the doc subdirectory.
+
+Antonis Tsolomitis
+Professor
+University of the Aegean
+Department of Mathematics
+83200 Samos, Greece
+
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdf b/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdf
new file mode 100644
index 0000000000..050161c789
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.tex b/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.tex
new file mode 100644
index 0000000000..17b83b6e1d
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.tex
@@ -0,0 +1,94 @@
+\documentclass{book}
+\usepackage[default]{fontsetup}
+\usepackage{graphicx,fullpage,supertabular}
+\begin{document}
+
+
+ \begin{center}
+ {\LARGE The \texttt{fontsetup-nonfree} package}\\[1ex]
+ \textit{by}\\[1ex]
+ {\large Antonis Tsolomitis}\\
+University of the Aegean\\ Department of Mathematics\\[1ex]
+ \textsc{29} April \textsc{2021}\\[1ex]
+ Version 1.01, \textsc{gpl3}
+ \end{center}
+
+ This package is part of the fontsetup package but for license issues it has been
+ separated from the rest. For general information about the use of fontsetup check
+ the file fontsetup-doc.pdf of the (free) fontsetup package. This package must
+ be installed to access the commercial fonts that supports.
+
+\bigskip
+
+\textbf{Summary of installation steps to support all commercial fonts supported}
+
+\medskip
+
+\begin{enumerate}
+\item Install as system fonts the supplied \verb|fspmnscel.otf|
+ and \verb|fsplpscel.otf| (in \verb|C:\Windows\Fonts\| on MS-Windows or in
+ \verb|/home/user/.fonts/| in Linux or system-wide install as administrator)
+\item Repeat the previous step for all MinionPro and MyriadPro fonts from the
+ installation of the free Adobe Acrobat Reader.
+\item Repeat the above for the MS-Garamond fonts (\verb|Gara.ttf|, \verb|Garabd.ttf|
+ and \verb|Garait.ttf|) as well as for the Linotype Palatino fonts
+ found in some versions of Microsoft Windows (\verb|palabi.ttf|, \verb|palab.ttf|,
+ \verb|palai.ttf|, and \verb|pala.ttf|).
+\item Repeat the above for the Cambria fonts (\verb|cambria.ttc|, \verb|cambriab.ttf|,
+ \verb|cambriai.ttf|, \verb|cambriaz.ttf|).
+\item Install the commercial Lucida fonts (if available) in your TeX tree.
+%\item Install \verb|euler.otf| in your TeX tree from
+% here: \verb|https://github.com/khaledhosny/euler-otf|
+\end{enumerate}
+
+\bigskip
+
+
+
+
+Samples of the supported commercial fonts follow.
+
+\newpage
+
+\begin{center}
+{\Large Cambria and CambriaMath: option \verb|cambria|}\\
+Cambria Fonts must be installed as system fonts\\[1cm]
+\includegraphics[scale=1.2]{fspsample-cambria.pdf}
+\end{center}
+
+\newpage
+
+\begin{center}
+{\Large Lucida and Lucida-Math (commercial): option \verb|lucida|}\\[1cm]
+\includegraphics[scale=1.2]{fspsample-lucida.pdf}
+\end{center}
+
+\newpage
+
+\begin{center}
+{\Large MinionPro (commercial) and Stix2Math: option \verb|minion|}\\
+MinionPro Fonts and the supplied fspmnscel.otf must
+be installed as system fonts\\[1cm]
+\includegraphics[scale=1.2]{fspsample-minion.pdf}
+\end{center}
+
+\newpage
+
+\begin{center}
+{\Large MS-Garamond (commercial) and Garamond-Math: option \verb|msgaramond|}\\
+MS-Garamond Fonts must be installed as system fonts\\[1cm]
+\includegraphics[scale=1.2]{fspsample-msgaramond.pdf}
+\end{center}
+
+\newpage
+
+\begin{center}
+{\Large Linotype Palatino (commercial) and texgyrepagella-math: option \verb|palatino|}\\
+Linotype Palatino Fonts and the supplied fsplpscel.otf must be installed as system fonts\\[1cm]
+\includegraphics[scale=1.2]{fspsample-palatino.pdf}
+\end{center}
+
+\newpage
+
+
+\end{document}
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-cambria.pdf b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-cambria.pdf
new file mode 100644
index 0000000000..f003f22208
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-cambria.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-lucida.pdf b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-lucida.pdf
new file mode 100644
index 0000000000..bebf3ceff9
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-lucida.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-minion.pdf b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-minion.pdf
new file mode 100644
index 0000000000..ef26ae6481
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-minion.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-msgaramond.pdf b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-msgaramond.pdf
new file mode 100644
index 0000000000..e411c077d6
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-msgaramond.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-palatino.pdf b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-palatino.pdf
new file mode 100644
index 0000000000..48644e576d
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-palatino.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample.tex b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample.tex
new file mode 100644
index 0000000000..23ec736e02
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample.tex
@@ -0,0 +1,75 @@
+%% after xelatex run
+%% pdfcrop fspsample.pdf output.pdf
+%% to crop it
+\documentclass{article}
+\pagestyle{empty}
+\usepackage{xgreek,graphicx}
+\pagestyle{empty}
+%\usepackage[greek]{babel}
+%\usepackage[utf8x]{inputenc}
+%\usepackage{amsfonts}
+
+\usepackage[default]{fontsetup}
+%\usepackage[gfsartemisia]{fontsetup}
+%\usepackage[gfsdidot]{fontsetup}
+%\usepackage[gfsdidotclassic]{fontsetup}
+%\usepackage[gfsneohellenic]{fontsetup}
+%\usepackage[cambria]{fontsetup}
+%\usepackage[lucida]{fontsetup}
+%\usepackage[kerkis]{fontsetup}
+%\usepackage[fira]{fontsetup}
+%\usepackage[times]{fontsetup}
+%\usepackage[palatino]{fontsetup}
+%\usepackage[stixtwo]{fontsetup}
+%\usepackage[neokadmus]{fontsetup}
+%\usepackage[msgaramond]{fontsetup}
+%\usepackage[ebgaramond]{fontsetup}
+%\usepackage[minion]{fontsetup}
+%\usepackage[neoeuler]{fontsetup}
+%\usepackage[libertinus]{fontsetup}
+%\usepackage[olddefault]{fontsetup}
+
+
+
+\newtheorem{theorem}{Theorem}
+\newtheorem{theoremg}[theorem]{Θεώρημα}
+
+
+\begin{document}
+
+\begin{theorem}[Dominated convergence of Lebesgue]
+%Let $g$ be an
+Assume that $g$ is an
+in\-te\-grable func\-tion defined on the measurable set $E$ and that
+ $(\,f_n)_{n\in\mathbb N}$ is a sequence of mea\-sur\-able functions so that
+ $|\,f_n|\leq g$. If $f$ is a function so that $f_n\to f$ almost everywhere
+ then $$\lim_{n\to\infty}\int f_n=\int f.$$
+\end{theorem}
+\textit{Proof}: The function $g-f_n$ is non-negative and thus from Fatou lemma
+we have that $\int(g-f\,)\leq\liminf\int(g-f_n)$. Since $|\,f\,|\leq g$ and
+$|\,f_n|\leq g$ the functions $f$ and $f_n$ are integrable and we have
+$$\int g-\int f\,\leq \int g-\limsup\int f_n,$$ so
+$$\int f\,\geq \limsup \int f_n.$$
+\par
+\begin{theoremg}[Κυριαρχημένης σύγκλισης του Lebesgue]
+ Έστω ότι
+η $g$ είναι μια ολοκληρώσιμη συνάρτηση ορισμένη στο μετρήσιμο σύνολο
+$E$ και η $(\,f_n)_{n\in\mathbb N}$ είναι μια ακολουθία μετρήσιμων συναρτήσεων ώστε
+$|\,f_n| ≤ g$. Υποθέτουμε ότι υπάρχει μια συνάρτηση $f$
+ώστε η $(f_n)_{n\in\mathbb N}$ να
+τείνει στην $f$ σχεδόν παντού. Τότε
+$$\lim \int f_n =\int f.$$
+\end{theoremg}
+\textit{Απόδειξη}: Η συνάρτηση $g − f_n$ είναι μη αρνητική και άρα από
+το Λήμμα του Fatou ισχύει
+$\int (f-g) ≤ \liminf \int (g-f_n)$. Επειδή
+$|\,f\,| ≤ g$ και $|\,f_n| ≤g$ οι $f$ και $f_n$ είναι ολοκληρώσιμες, έχουμε
+$$\int g −\int f\, ≤ \int g − \limsup\int f_n,$$
+άρα
+$$\int f\,\geq \limsup \int f_n.$$
+
+
+
+
+
+\end{document}
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fspcambria.sty b/macros/unicodetex/latex/fontsetup-nonfree/fspcambria.sty
new file mode 100644
index 0000000000..b2947bb3d6
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup-nonfree/fspcambria.sty
@@ -0,0 +1,9 @@
+%%
+%% Load Cambria fonts (C) A. Tsolomitis
+%%
+\RequirePackage{fontspec}
+\setmainfont[Contextuals=AlternateOff,BoldFont=Cambria-Bold,ItalicFont=Cambria-Italic,BoldItalicFont=Cambria-BoldItalic]{Cambria}
+\RequirePackage{unicode-math}
+\setmathfont{Cambria Math}
+
+\endinput
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fsplucidaot.sty b/macros/unicodetex/latex/fontsetup-nonfree/fsplucidaot.sty
new file mode 100644
index 0000000000..2287f48685
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup-nonfree/fsplucidaot.sty
@@ -0,0 +1,28 @@
+\RequirePackage{fontspec}
+\setmainfont[% main font
+ UprightFont=LucidaBrightOT,
+ ItalicFont=LucidaBrightOT-Italic,
+ BoldFont=LucidaBrightOT-Demi,
+ BoldItalicFont=LucidaBrightOT-DemiItalic,
+ SmallCapsFeatures={Numbers=OldStyle},
+ ]{LucidaBrightOT.otf}
+\setsansfont[%
+ UprightFont=LucidaSansOT,
+ ItalicFont=LucidaSansOT-Italic,
+ BoldFont=LucidaSansOT-Demi,
+ BoldItalicFont=LucidaSansOT-DemiItalic,
+ SmallCapsFeatures={Numbers=OldStyle},
+]{LucidaSansOT.otf}
+%
+\setmonofont[%
+ UprightFont=LucidaSansTypewriterOT,
+ ItalicFont=LucidaSansTypewriterOT-Oblique,
+ BoldFont=LucidaSansTypewriterOT-Bold,
+ BoldItalicFont=LucidaSansTypewriterOT-BoldOblique,
+ SmallCapsFeatures={Numbers=OldStyle},
+ ]{LucidaSansTypewriterOT.otf}
+% support for OpenType math fonts:
+\RequirePackage{unicode-math}
+\setmathfont{LucidaBrightMathOT.otf}
+\setmathfont[version=bold]{LucidaBrightMathOT-Demi.otf}
+
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty b/macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty
new file mode 100644
index 0000000000..47e5eab3fe
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty
@@ -0,0 +1,20 @@
+
+
+
+\RequirePackage{fontspec}
+\defaultfontfeatures{Ligatures=TeX}
+\setmainfont[SmallCapsFeatures={Numbers=OldStyle}]{Minion Pro}
+\setsansfont[SmallCapsFeatures={Numbers=OldStyle}]{Myriad Pro}
+\newfontfamily{\defaultfont}[SmallCapsFeatures={Numbers=OldStyle}]{Minion Pro}
+\newfontfamily{\greekfont}[SmallCapsFont=fspmnscel]{Minion Pro}
+\RequirePackage[Latin, Greek]{ucharclasses}
+\setDefaultTransitions{\defaultfont}{}
+\setTransitionsForLatin{\defaultfont}{}
+\setTransitionsForGreek{\greekfont}{}
+
+\RequirePackage{unicode-math}
+\setmathfont{STIXTwoMath-Regular.otf}
+\setmathfont[range=\mathup/{num,latin,Latin,greek,Greek}]{Minion Pro}
+\setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{Minion Pro Bold}
+\setmathfont[range=\mathit/{num,latin,Latin,greek,Greek}]{Minion Pro Italic}
+\setmathfont[range=\mathbfit/{num,latin,Latin,greek,Greek}]{Minion Pro Bold Italic}
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fspmsgaramondot.sty b/macros/unicodetex/latex/fontsetup-nonfree/fspmsgaramondot.sty
new file mode 100644
index 0000000000..3d3907cb8b
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup-nonfree/fspmsgaramondot.sty
@@ -0,0 +1,23 @@
+%\RequirePackage[no-math]{fontspec}
+\RequirePackage{fontspec}
+\defaultfontfeatures{Ligatures=TeX}
+%\RequirePackage[garamond]{mathdesign}
+
+
+\newfontfamily{\defaultfont}{Garamond}
+\newfontfamily{\greekfont}{Garamond}
+
+\RequirePackage[Latin, Greek]{ucharclasses}
+\setDefaultTransitions{\defaultfont}{}
+\setTransitionsForLatin{\defaultfont}{}
+\setTransitionsForGreek{\greekfont}{}
+
+\RequirePackage{unicode-math}
+\setmathfont{Garamond-Math.otf}
+\setmathfont[range=\mathup/{num,latin,Latin,greek,Greek}]{Garamond}
+\setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{Garamond Bold}
+\setmathfont[range=\mathit/{num,latin,Latin,greek,Greek}]{Garamond Italic}
+\setmathfont[range=\mathbfit/{num,latin,Latin,greek,Greek}]{Garamond Bold}
+
+
+\endinput
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fsppalatinoot.sty b/macros/unicodetex/latex/fontsetup-nonfree/fsppalatinoot.sty
new file mode 100644
index 0000000000..3487754dde
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup-nonfree/fsppalatinoot.sty
@@ -0,0 +1,17 @@
+\RequirePackage{fontspec}
+\defaultfontfeatures{Ligatures=TeX}
+
+\newfontfamily{\defaultfont}[SmallCapsFeatures={Numbers=OldStyle}]{Palatino Linotype}
+
+\newfontfamily{\greekfont}[SmallCapsFont=fsplpscel]{Palatino Linotype}
+
+\RequirePackage[Latin, Greek]{ucharclasses}
+\setDefaultTransitions{\defaultfont}{}
+\setTransitionsForLatin{\defaultfont}{}
+\setTransitionsForGreek{\greekfont}{}
+
+\RequirePackage{unicode-math}
+\setmathfont{texgyrepagella-math.otf}
+
+
+\endinput
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/system-install-fonts/fsplpscel.otf b/macros/unicodetex/latex/fontsetup-nonfree/system-install-fonts/fsplpscel.otf
new file mode 100644
index 0000000000..b505b6b96f
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup-nonfree/system-install-fonts/fsplpscel.otf
Binary files differ
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/system-install-fonts/fspmnscel.otf b/macros/unicodetex/latex/fontsetup-nonfree/system-install-fonts/fspmnscel.otf
new file mode 100644
index 0000000000..c0e233f43c
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup-nonfree/system-install-fonts/fspmnscel.otf
Binary files differ
diff --git a/macros/unicodetex/latex/fontsetup/README b/macros/unicodetex/latex/fontsetup/README
index 0dd9e72a3d..4a44a55be8 100644
--- a/macros/unicodetex/latex/fontsetup/README
+++ b/macros/unicodetex/latex/fontsetup/README
@@ -1,5 +1,5 @@
The fontsetup package
- (Version 1.009, GPL3)
+ (Version 1.01, GPL3)
This simple package makes it trivial to switch quickly between
different quality fonts supporting Mathematics.
diff --git a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
index d06eddfc53..88a39bf5cd 100644
--- a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
index 62c5d1238a..f8b31a2b97 100644
--- a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
+++ b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
@@ -10,7 +10,7 @@
{\large Antonis Tsolomitis}\\
University of the Aegean\\ Department of Mathematics\\[1ex]
\textsc{29} January \textsc{2021}\\[1ex]
- Version 1.009, \textsc{gpl3}
+ Version 1.01, \textsc{gpl3}
\end{center}
This package is a simple wrapper-type package that makes the setup of fonts easy and
@@ -23,6 +23,19 @@ University of the Aegean\\ Department of Mathematics\\[1ex]
The package will include more font combinations in the future, however there are
some restrictions. The fonts must have some commercial-level quality and must support
Mathematics.
+
+ Starting with version 1.01 the package is split in two; the main package called ``fontsetup''
+ and the fontsetup-nonfree package that contains the support and sample files for the
+ non-free fonts. This facilitates the installation for users of texlive since the latter does not
+ install the support for non-free fonts. For a user who wants to install the support for
+ non-free fonts (Cambria, Lucida, Adobe-Minion, MS-Garamond, and Linotype-Palatino) it can be
+ easily done following the guide for the contrib repository here:
+
+ https://contrib.texlive.info
+
+ The main package will load the style files for the nonfree fonts if the fontsetup-nonfree
+ package is installed; that is, there is no other package that the user needs to
+ load in the TeX file.
The options (in alphabetic order after the default option) are as follows:
@@ -54,7 +67,8 @@ University of the Aegean\\ Department of Mathematics\\[1ex]
similarly to the default option.
\item[cambria] Loads the Cambria fonts of Microsoft. These must be already installed
as a system font (in \verb|C:\Windows\Fonts| in MS-Windows, in \verb|/home/user/.fonts/| in Linux
- or elsewhere by the system administratior).
+ or elsewhere by the system administratior). This option works only if
+ fontsetup-nonfree is installed.
\item[ebgaramond] Loads the EB-Garamond fonts with Garamond-Math.
\item[fira] Loads the Fira family, a sans-serif font.
\item[gfsartemisia] Loads the GFSArtemisia, a font family designed to be used
@@ -70,19 +84,22 @@ University of the Aegean\\ Department of Mathematics\\[1ex]
\item[gfsneohellenic] Loads the GFSNeohellenic family with GFSNeohellenic-Math.
\item[kerkis] Loads the kerkis font family and texgyrebonum-math.
\item[libertinus] Loads the Libertinus and LibertinusMath fonts.
- \item[lucida] Loads the Lucida font family if available (a commercial font).
+ \item[lucida] Loads the Lucida font family if available (a commercial font). This option works only if
+ fontsetup-nonfree is installed.
\item[minion] Loads the MinionPro family. To install it, find the fonts MinionPro and
MyriadPro from the installation of Adobe PDF Reader and install the fonts to your system
(in \verb|C:\Windows\Fonts| in MS-Windows, in \verb|/home/user/.fonts/| in Linux
or elsewhere by the system administratior). Moreover, install the supplied
fspmnscel.otf as a system font to have access to Greek small caps.
Mathematics is from stix2
- with letters replaced from MinionPro. Sans is MyriadPro.
+ with letters replaced from MinionPro. Sans is MyriadPro. This option works only if
+ fontsetup-nonfree is installed.
\item[msgaramond] Loads the MS-Garamond fonts. These must be system installed
(in \verb|C:\Windows\Fonts| in MS-Windows, in \verb|/home/user/.fonts/| in Linux
or elsewhere by the system administratior). Mathematics is from
Garamond-Math with letters replaced
- from MS-Garamond.
+ from MS-Garamond. This option works only if
+ fontsetup-nonfree is installed.
\item[neoeuler] Loads the Concrete fonts with the Euler for Mathematics.
Needs euler.otf to be instaled in the TeX installation.
\item[palatino] Loads the Linotype Palatino Fonts available from some versions of Windows.
@@ -90,7 +107,8 @@ University of the Aegean\\ Department of Mathematics\\[1ex]
in \verb|/home/user/.fonts/| in Linux or elsewhere by the system administratior). The supplied
fsplpscel.otf must be also
system-installed to allow access to Greek small caps.
- Mathematics font is texgyrepagella-math.
+ Mathematics font is texgyrepagella-math. This option works only if
+ fontsetup-nonfree is installed.
\item[stixtwo] Loads the stix2 fonts, a Times-type font.
\item[times] Loads the FreeSerifb fonts, a Times font and stix2 for Mathematics
with letters replaced from FreeSerifb.
@@ -116,50 +134,31 @@ to another among the supported ones.
\medskip
-You do not have to do any of these steps if you rely on free fonts
-(except step 6 if you want to use the \verb|neoeuler| option) and do not want
-to use the commercial ones.
-
-\medskip
-
-\begin{enumerate}
-\item Install as system fonts the supplied \verb|fspmnscel.otf|
- and \verb|fsplpscel.otf| (in \verb|C:\Windows\Fonts\| on MS-Windows or in
- \verb|/home/user/.fonts/| in Linux or system-wide install as administrator)
-\item Repeat the previous step for all MinionPro and MyriadPro fonts from the
- installation of the free Adobe Acrobat Reader.
-\item Repeat the above for the MS-Garamond fonts (\verb|Gara.ttf|, \verb|Garabd.ttf|
- and \verb|Garait.ttf|) as well as for the Linotype Palatino fonts
- found in some versions of Microsoft Windows (\verb|palabi.ttf|, \verb|palab.ttf|,
- \verb|palai.ttf|, and \verb|pala.ttf|).
-\item Repeat the above for the Cambria fonts (\verb|cambria.ttc|, \verb|cambriab.ttf|,
- \verb|cambriai.ttf|, \verb|cambriaz.ttf|).
-\item Install the commercial Lucida fonts (if available) in your TeX tree.
-\item Install \verb|euler.otf| in your TeX tree from
+For accessing the free fonts there is nothing to install (provided
+you have a full installation of TeX system) unless you want to access
+the \verb|neoeuler| option. For this you have to install
+\verb|euler.otf| in your TeX tree from
here: \verb|https://github.com/khaledhosny/euler-otf|
-\end{enumerate}
-\bigskip
+\medskip
+To access commercial fonts supported by this package check the
+documentation of the fontsetup-nonfree package.
+\medskip
You can indeed suggest a new combination of fonts and I will add them. However, I do
reserve the right to reject them if the font quality is bad or if Mathematics is not supported
with a matching font.
-Samples follow.
-
-\newpage
+Samples for the free fonts follow. Samples for the nonfree fonts can be found in
-\begin{center}
-{\Large Cambria and CambriaMath: option \verb|cambria|}\\
-Cambria Fonts must be installed as system fonts\\[1cm]
-\includegraphics[scale=1.2]{fspsample-cambria.pdf}
-\end{center}
+\noindent fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdf
\newpage
+
\begin{center}
{\Large ComputerModern fonts (Book weight): option \verb|default|}\\[1cm]
\includegraphics[scale=1.2]{fspsample-newdefault.pdf}
@@ -233,29 +232,6 @@ Cambria Fonts must be installed as system fonts\\[1cm]
\newpage
-\begin{center}
-{\Large Lucida and Lucida-Math (commercial): option \verb|lucida|}\\[1cm]
-\includegraphics[scale=1.2]{fspsample-lucida.pdf}
-\end{center}
-
-\newpage
-
-\begin{center}
-{\Large MinionPro (commercial) and Stix2Math: option \verb|minion|}\\
-MinionPro Fonts and the supplied fspmnscel.otf must
-be installed as system fonts\\[1cm]
-\includegraphics[scale=1.2]{fspsample-minion.pdf}
-\end{center}
-
-\newpage
-
-\begin{center}
-{\Large MS-Garamond (commercial) and Garamond-Math: option \verb|msgaramond|}\\
-MS-Garamond Fonts must be installed as system fonts\\[1cm]
-\includegraphics[scale=1.2]{fspsample-msgaramond.pdf}
-\end{center}
-
-\newpage
\begin{center}
{\Large Concrete fonts and NeoEuler Math: option \verb|neoeuler|}\\
@@ -265,13 +241,6 @@ NeoEuler font must be installed in TeX tree\\[1cm]
\newpage
-\begin{center}
-{\Large Linotype Palatino (commercial) and texgyrepagella-math: option \verb|palatino|}\\
-Linotype Palatino Fonts and the supplied fsplpscel.otf must be installed as system fonts\\[1cm]
-\includegraphics[scale=1.2]{fspsample-palatino.pdf}
-\end{center}
-
-\newpage
\begin{center}
{\Large Stix2 and Stix2Math: option \verb|stixtwo|}\\[1cm]
diff --git a/macros/unicodetex/latex/fontsetup/fspdefault.sty b/macros/unicodetex/latex/fontsetup/fspdefault.sty
index da0a494155..686a045394 100644
--- a/macros/unicodetex/latex/fontsetup/fspdefault.sty
+++ b/macros/unicodetex/latex/fontsetup/fspdefault.sty
@@ -2,22 +2,66 @@
\RequirePackage{fontspec}
\RequirePackage{unicode-math}
\setmainfont[%
-ItalicFont=NewCM10-BookItalic.otf,%
-BoldFont=NewCM10-Bold.otf,%
-BoldItalicFont=NewCM10-BoldItalic.otf,%
-SlantedFont=NewCM10-Book.otf,%
-SlantedFeatures={FakeSlant=0.25},
-BoldSlantedFont=NewCM10-Bold.otf,%
-BoldSlantedFeatures={FakeSlant=0.25},
-SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Book.otf}
+ SizeFeatures={%
+{Size=-8, Font=NewCM08-Book.otf,
+ ItalicFont=NewCM08-BookItalic.otf,%
+ BoldFont=NewCM10-Bold.otf,%
+ BoldItalicFont=NewCM10-BoldItalic.otf,%
+ SlantedFont=NewCM08-Book.otf,%
+ BoldSlantedFont=NewCM10-Bold.otf,%
+ SmallCapsFeatures={Numbers=OldStyle}},
+{Size=8, Font=NewCM08-Book.otf,
+ ItalicFont=NewCM08-BookItalic.otf,%
+ BoldFont=NewCM10-Bold.otf,%
+ BoldItalicFont=NewCM10-BoldItalic.otf,%
+ SlantedFont=NewCM08-Book.otf,%
+ BoldSlantedFont=NewCM10-Bold.otf,%
+ SmallCapsFeatures={Numbers=OldStyle}},
+{Size= 9-, Font = NewCM10-Book.otf,
+ ItalicFont=NewCM10-BookItalic.otf,%
+ BoldFont=NewCM10-Bold.otf,%
+ BoldItalicFont=NewCM10-BoldItalic.otf,%
+ SlantedFont=NewCM10-Book.otf,%
+ BoldSlantedFont=NewCM10-Bold.otf,%
+ SmallCapsFeatures={Numbers=OldStyle}}%
+ },%
+ SmallCapsFeatures={Numbers=OldStyle},%
+ BoldSlantedFont=NewCM10-Bold.otf,%
+ SlantedFont=NewCM10-Book.otf,%
+ BoldItalicFont=NewCM10-BoldItalic.otf,%
+ BoldFont=NewCM10-Bold.otf,%
+ ItalicFont=NewCM10-BookItalic.otf,%
+ SlantedFeatures={FakeSlant=0.25},%
+ BoldSlantedFeatures={FakeSlant=0.25},%
+]{NewCM10-Book.otf}
\setsansfont[%
-ItalicFont=NewCMSans10-BookOblique.otf,%
-BoldFont=NewCMSans10-Bold.otf,%
-BoldItalicFont=NewCMSans10-BoldOblique.otf,%
-SlantedFont=NewCMSans10-BookOblique.otf,%
-BoldSlantedFont=NewCMSans10-BoldOblique.otf,%
-SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Book.otf}
+ SizeFeatures={%
+{Size= -8, Font=NewCMSans08-Book.otf,%
+ ItalicFont=NewCMSans08-BookOblique.otf,%
+ BoldFont=NewCMSans10-Bold.otf,%
+ BoldItalicFont=NewCMSans10-BoldOblique.otf,%
+ SmallCapsFeatures={Numbers=OldStyle},%
+},
+{Size= 8, Font=NewCMSans08-Book.otf,%
+ ItalicFont=NewCMSans08-BookOblique.otf,%
+ BoldFont=NewCMSans10-Bold.otf,%
+ BoldItalicFont=NewCMSans10-BoldOblique.otf,%
+ SmallCapsFeatures={Numbers=OldStyle},%
+},
+{Size= 9-, Font=NewCMSans10-Book.otf,%
+ ItalicFont=NewCMSans10-BookOblique.otf,%
+ BoldFont=NewCMSans10-Bold.otf,%
+ BoldItalicFont=NewCMSans10-BoldOblique.otf,%
+ SmallCapsFeatures={Numbers=OldStyle},%
+}},
+ ItalicFont=NewCMSans10-BookOblique.otf,%
+ BoldFont=NewCMSans10-Bold.otf,%
+ BoldItalicFont=NewCMSans10-BoldOblique.otf,%
+ SmallCapsFeatures={Numbers=OldStyle},%
+ SlantedFont=NewCMSans10-BookOblique.otf,%
+ BoldSlantedFont=NewCMSans10-BoldOblique.otf,%
+]{NewCMSans10-Book.otf}
\setmonofont[%
ItalicFont=NewCMMono10-BookItalic.otf,%
@@ -36,13 +80,16 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Book.otf}
\newcommand{\prosgegrammeni}{\addfontfeature{StylisticSet=1}}
\newcommand{\textprosgegrammeni}[1]{{\prosgegrammeni#1}}
%
-\newfontfamily{\ivbce}[StylisticSet=2]{NewCMSans10-Book.otf}
+%\newfontfamily{\ivbce}[StylisticSet=2]{NewCMSans10-Book.otf}
+\newcommand{\ivbce}{\sffamily\addfontfeature{StylisticSet=2}}
\newcommand{\textivbce}[1]{{\ivbce#1}}
%
-\newfontfamily{\ivbcealt}[StylisticSet=3]{NewCMSans10-Book.otf}
+%\newfontfamily{\ivbcealt}[StylisticSet=3]{NewCMSans10-Book.otf}
+\newcommand{\ivbcealt}{\sffamily\addfontfeature{StylisticSet=3}}
\newcommand{\textivbcealt}[1]{{\ivbcealt#1}}
%
-\newfontfamily{\vibce}[StylisticSet=4]{NewCMSans10-Book.otf}
+%\newfontfamily{\vibce}[StylisticSet=4]{NewCMSans10-Book.otf}
+\newcommand{\vibce}{\sffamily\addfontfeature{StylisticSet=4}}
\newcommand{\textvibce}[1]{{\vibce#1}}
%
%% math (upright) sans Greek
@@ -233,19 +280,21 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Book.otf}
\DeclareRobustCommand\nleftleftarrows{\mathrel{\char"E032}}
%
% select ss02 lookup table for IPA symbols
-\newfontfamily{\ipatext}[StylisticSet=5,%
-BoldFont=NewCM10-Bold.otf,%
-SlantedFont=NewCM10-Regular.otf,%
-SlantedFeatures={FakeSlant=0.25},
-BoldSlantedFont=NewCM10-Bold.otf,%
-BoldSlantedFeatures={FakeSlant=0.25},
-SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Book.otf}
+%\newfontfamily{\ipatext}[StylisticSet=5,%
+%BoldFont=NewCM10-Bold.otf,%
+%SlantedFont=NewCM10-Regular.otf,%
+%SlantedFeatures={FakeSlant=0.25},
+%BoldSlantedFont=NewCM10-Bold.otf,%
+%BoldSlantedFeatures={FakeSlant=0.25},
+%SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Book.otf}
+\newcommand{\ipatext}{\addfontfeature{StylisticSet=5}}
\newcommand{\textipa}[1]{{\ipatext#1}}
-\newfontfamily{\ipatextsans}[StylisticSet=5,%
-ItalicFont=NewCMSans10-BookOblique.otf,%
-BoldFont=NewCMSans10-Bold.otf,%
-BoldItalicFont=NewCMSans10-BoldOblique.otf,%
-SlantedFont=NewCMSans10-Oblique.otf,%
-BoldSlantedFont=NewCMSans10-BoldOblique.otf,%
-SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Book.otf}
+%\newfontfamily{\ipatextsans}[StylisticSet=5,%
+%ItalicFont=NewCMSans10-BookOblique.otf,%
+%BoldFont=NewCMSans10-Bold.otf,%
+%BoldItalicFont=NewCMSans10-BoldOblique.otf,%
+%SlantedFont=NewCMSans10-Oblique.otf,%
+%BoldSlantedFont=NewCMSans10-BoldOblique.otf,%
+%SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Book.otf}
+\newcommand{\ipatextsans}{\sffamily\addfontfeature{StylisticSet=5}}
\newcommand{\textsansipa}[1]{{\ipatextsans#1}}
diff --git a/macros/unicodetex/latex/fontsetup/fspolddefault.sty b/macros/unicodetex/latex/fontsetup/fspolddefault.sty
index 1c52a8ff0c..3660ec706e 100644
--- a/macros/unicodetex/latex/fontsetup/fspolddefault.sty
+++ b/macros/unicodetex/latex/fontsetup/fspolddefault.sty
@@ -2,22 +2,56 @@
\RequirePackage{fontspec}
\RequirePackage{unicode-math}
\setmainfont[%
-ItalicFont=NewCM10-Italic.otf,%
-BoldFont=NewCM10-Bold.otf,%
-BoldItalicFont=NewCM10-BoldItalic.otf,%
-SlantedFont=NewCM10-Regular.otf,%
-SlantedFeatures={FakeSlant=0.25},
-BoldSlantedFont=NewCM10-Bold.otf,%
-BoldSlantedFeatures={FakeSlant=0.25},
-SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Regular.otf}
+ SizeFeatures={%
+{Size=-8, Font=NewCM08-Regular.otf,
+ ItalicFont=NewCM08-Italic.otf,%
+ BoldFont=NewCM10-Bold.otf,%
+ BoldItalicFont=NewCM10-BoldItalic.otf,%
+ SlantedFont=NewCM08-Regular.otf,%
+ BoldSlantedFont=NewCM10-Bold.otf,%
+ SmallCapsFeatures={Numbers=OldStyle}},
+{Size=8, Font=NewCM08-Regular.otf,
+ ItalicFont=NewCM08-Italic.otf,%
+ BoldFont=NewCM10-Bold.otf,%
+ BoldItalicFont=NewCM10-BoldItalic.otf,%
+ SlantedFont=NewCM08-Regular.otf,%
+ BoldSlantedFont=NewCM10-Bold.otf,%
+ SmallCapsFeatures={Numbers=OldStyle}},
+{Size= 9-, Font = NewCM10-Regular.otf,
+ ItalicFont=NewCM10-Italic.otf,%
+ BoldFont=NewCM10-Bold.otf,%
+ BoldItalicFont=NewCM10-BoldItalic.otf,%
+ SlantedFont=NewCM10-Regular.otf,%
+ BoldSlantedFont=NewCM10-Bold.otf,%
+ SmallCapsFeatures={Numbers=OldStyle}}%
+ },%
+ SlantedFeatures={FakeSlant=0.25},%
+ BoldSlantedFeatures={FakeSlant=0.25},%
+]{NewCM10-Regular.otf}
\setsansfont[%
-ItalicFont=NewCMSans10-Oblique.otf,%
-BoldFont=NewCMSans10-Bold.otf,%
-BoldItalicFont=NewCMSans10-BoldOblique.otf,%
+ SizeFeatures={%
+{Size= -8, Font=NewCMSans08-Regular.otf,%
+ ItalicFont=NewCMSans08-Oblique.otf,%
+ BoldFont=NewCMSans10-Bold.otf,%
+ BoldItalicFont=NewCMSans10-BoldOblique.otf,%
+ SmallCapsFeatures={Numbers=OldStyle},%
+},
+{Size= 8, Font=NewCMSans08-Regular.otf,%
+ ItalicFont=NewCMSans08-Oblique.otf,%
+ BoldFont=NewCMSans10-Bold.otf,%
+ BoldItalicFont=NewCMSans10-BoldOblique.otf,%
+ SmallCapsFeatures={Numbers=OldStyle},%
+},
+{Size= 9-, Font=NewCMSans10-Regular.otf,%
+ ItalicFont=NewCMSans10-Oblique.otf,%
+ BoldFont=NewCMSans10-Bold.otf,%
+ BoldItalicFont=NewCMSans10-BoldOblique.otf,%
+ SmallCapsFeatures={Numbers=OldStyle},%
+}},
SlantedFont=NewCMSans10-Oblique.otf,%
BoldSlantedFont=NewCMSans10-BoldOblique.otf,%
-SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Regular.otf}
+]{NewCMSans10-Regular.otf}
\setmonofont[%
ItalicFont=NewCMMono10-Italic.otf,%
@@ -36,13 +70,16 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Regular.otf}
\newcommand{\prosgegrammeni}{\addfontfeature{StylisticSet=1}}
\newcommand{\textprosgegrammeni}[1]{{\prosgegrammeni#1}}
%
-\newfontfamily{\ivbce}[StylisticSet=2]{NewCMSans10-Regular.otf}
+%\newfontfamily{\ivbce}[StylisticSet=2]{NewCMSans10-Regular.otf}
+\newcommand{\ivbce}{\sffamily\addfontfeature{StylisticSet=2}}
\newcommand{\textivbce}[1]{{\ivbce#1}}
%
-\newfontfamily{\ivbcealt}[StylisticSet=3]{NewCMSans10-Regular.otf}
+%\newfontfamily{\ivbcealt}[StylisticSet=3]{NewCMSans10-Regular.otf}
+\newcommand{\ivbcealt}{\sffamily\addfontfeature{StylisticSet=3}}
\newcommand{\textivbcealt}[1]{{\ivbcealt#1}}
%
-\newfontfamily{\vibce}[StylisticSet=4]{NewCMSans10-Regular.otf}
+%\newfontfamily{\vibce}[StylisticSet=4]{NewCMSans10-Regular.otf}
+\newcommand{\vibce}{\sffamily\addfontfeature{StylisticSet=4}}
\newcommand{\textvibce}[1]{{\vibce#1}}
%
%% math (upright) sans Greek
@@ -233,19 +270,21 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Regular.otf}
\DeclareRobustCommand\nleftleftarrows{\mathrel{\char"E032}}
%
% select ss02 lookup table for IPA symbols
-\newfontfamily{\ipatext}[StylisticSet=5,%
-BoldFont=NewCM10-Bold.otf,%
-SlantedFont=NewCM10-Regular.otf,%
-SlantedFeatures={FakeSlant=0.25},
-BoldSlantedFont=NewCM10-Bold.otf,%
-BoldSlantedFeatures={FakeSlant=0.25},
-SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Regular.otf}
+%\newfontfamily{\ipatext}[StylisticSet=5,%
+%BoldFont=NewCM10-Bold.otf,%
+%SlantedFont=NewCM10-Regular.otf,%
+%SlantedFeatures={FakeSlant=0.25},
+%BoldSlantedFont=NewCM10-Bold.otf,%
+%BoldSlantedFeatures={FakeSlant=0.25},
+%SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Regular.otf}
+\newcommand{\ipatext}{\addfontfeature{StylisticSet=5}}
\newcommand{\textipa}[1]{{\ipatext#1}}
-\newfontfamily{\ipatextsans}[StylisticSet=5,%
-ItalicFont=NewCMSans10-Oblique.otf,%
-BoldFont=NewCMSans10-Bold.otf,%
-BoldItalicFont=NewCMSans10-BoldOblique.otf,%
-SlantedFont=NewCMSans10-Oblique.otf,%
-BoldSlantedFont=NewCMSans10-BoldOblique.otf,%
-SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Regular.otf}
+%\newfontfamily{\ipatextsans}[StylisticSet=5,%
+%ItalicFont=NewCMSans10-Oblique.otf,%
+%BoldFont=NewCMSans10-Bold.otf,%
+%BoldItalicFont=NewCMSans10-BoldOblique.otf,%
+%SlantedFont=NewCMSans10-Oblique.otf,%
+%BoldSlantedFont=NewCMSans10-BoldOblique.otf,%
+%SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Regular.otf}
+\newcommand{\ipatextsans}{\sffamily\addfontfeature{StylisticSet=5}}
\newcommand{\textsansipa}[1]{{\ipatextsans#1}}