From f924abc8c9fb862548450537598422d1d91349e9 Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Tue, 31 Mar 2020 03:02:35 +0000
Subject: CTAN sync 202003310302

---
 fonts/cmsrb/tex/cmsrb.sty | 306 ++++++++++++++++++++++++----------------------
 1 file changed, 158 insertions(+), 148 deletions(-)

(limited to 'fonts/cmsrb/tex/cmsrb.sty')

diff --git a/fonts/cmsrb/tex/cmsrb.sty b/fonts/cmsrb/tex/cmsrb.sty
index 8163505e1a..bea81d6433 100644
--- a/fonts/cmsrb/tex/cmsrb.sty
+++ b/fonts/cmsrb/tex/cmsrb.sty
@@ -1,9 +1,43 @@
-\ProvidesPackage{cmsrb}[2019/08/16  v3.1 cmsrb]
-\RequirePackage[TS1,T1,OT2,X2,T2A]{fontenc}
+\ProvidesPackage{cmsrb}[2020/03/30  v4.0 cmsrb]
 \renewcommand{\rmdefault}{cmsrbr}
 \renewcommand{\sfdefault}{cmsrbs}
 \renewcommand{\ttdefault}{cmsrbt}
-\AtBeginDocument{
+\newif\ifsrb@encotii
+\srb@encotiifalse
+\newif\ifsrb@encti
+\srb@enctifalse
+\newif\ifsrb@enctsi
+\srb@enctsifalse
+\newif\ifsrb@encxii
+\srb@encxiifalse
+\newif\ifsrb@enctiia
+\srb@enctiiafalse
+\def\srb@etiia{T2A}
+\def\srb@eotii{OT2}
+\def\srb@exii{X2}
+\def\srb@eti{T1}
+\def\srb@etsi{TS1}
+\def\@srb@def@nc@dings{
+\def\srbt@mp@a##1{
+\edef\srbt@mp@b{##1}
+\ifx\srbt@mp@b\srb@eti\srb@enctitrue\fi
+\ifx\srbt@mp@b\srb@etsi\srb@enctsitrue\fi
+\ifx\srbt@mp@b\srb@etiia\srb@enctiiatrue\fi
+\ifx\srbt@mp@b\srb@exii\srb@encxiitrue\fi
+\ifx\srbt@mp@b\srb@eotii\srb@encotiitrue\fi}
+\def\cdp@elt##1##2##3##4{\srbt@mp@a{##1}}
+\cdp@list}
+\@onlypreamble\@srb@def@nc@dings
+\@onlypreamble\srbt@mp@a
+\@onlypreamble\srbt@mp@b
+\@onlypreamble\srb@etiia
+\@onlypreamble\srb@eotii
+\@onlypreamble\srb@exii
+\@onlypreamble\srb@eti
+\@onlypreamble\srb@etsi
+\AtBeginDocument{%
+\@srb@def@nc@dings
+\ifsrb@encotii
 \DeclareTextComposite{\v}{OT2}{c}{113}
 \DeclareTextComposite{\v}{OT2}{C}{81}
 \DeclareTextComposite{\v}{OT2}{s}{120}
@@ -30,119 +64,136 @@
 \DeclareTextSymbol{\CYRKJE}{OT2}{130}
 \DeclareTextSymbol{\cyrsje}{OT2}{139}
 \DeclareTextSymbol{\CYRSJE}{OT2}{131}
-\DeclareTextSymbolDefault{\cyrgje}{OT2}
-\DeclareTextSymbolDefault{\CYRGJE}{OT2}
-\DeclareTextSymbolDefault{\cyrzje}{OT2}
-\DeclareTextSymbolDefault{\CYRZJE}{OT2}
-\DeclareTextSymbolDefault{\cyrkje}{OT2}
-\DeclareTextSymbolDefault{\CYRKJE}{OT2}
-\DeclareTextSymbolDefault{\cyrsje}{OT2}
-\DeclareTextSymbolDefault{\CYRSJE}{OT2}
-\DeclareTextAccentDefault{\C}{T2A}
-\DeclareTextAccentDefault{\f}{T2A}
-\DeclareTextCompositeCommand{\'}{T2A}{\cyrg}{\cyrgje}
-\DeclareTextCompositeCommand{\'}{T2A}{\CYRG}{\CYRGJE}
-\DeclareTextCompositeCommand{\'}{T2A}{\cyrk}{\cyrkje}
-\DeclareTextCompositeCommand{\'}{T2A}{\CYRK}{\CYRKJE}
-\DeclareTextCompositeCommand{\'}{T2A}{\cyrs}{\cyrsje}
-\DeclareTextCompositeCommand{\'}{T2A}{\CYRS}{\CYRSJE}
-\DeclareTextCompositeCommand{\'}{T2A}{\cyrz}{\cyrzje}
-\DeclareTextCompositeCommand{\'}{T2A}{\CYRZ}{\CYRZJE}
-\DeclareTextCompositeCommand{\'}{X2}{\cyrg}{\cyrgje}
-\DeclareTextCompositeCommand{\'}{X2}{\CYRG}{\CYRGJE}
-\DeclareTextCompositeCommand{\'}{X2}{\cyrk}{\cyrkje}
-\DeclareTextCompositeCommand{\'}{X2}{\CYRK}{\CYRKJE}
-\DeclareTextCompositeCommand{\'}{X2}{\cyrs}{\cyrsje}
-\DeclareTextCompositeCommand{\'}{X2}{\CYRS}{\CYRSJE}
-\DeclareTextCompositeCommand{\'}{X2}{\cyrz}{\cyrzje}
-\DeclareTextCompositeCommand{\'}{X2}{\CYRZ}{\CYRZJE}
-\DeclareTextCommand{\CYRA}{T1}{A}
-\DeclareTextCommand{\CYRB}{T1}{B}
-\DeclareTextCommand{\CYRV}{T1}{V}
-\DeclareTextCommand{\CYRG}{T1}{G}
-\DeclareTextCommand{\CYRD}{T1}{D}
-\DeclareTextCommand{\CYRDJE}{T1}{\DJ}
-\DeclareTextCommand{\CYRE}{T1}{E}
-\DeclareTextCommand{\CYRZH}{T1}{\v Z}
-\DeclareTextCommand{\CYRZ}{T1}{Z}
-\DeclareTextCommand{\CYRI}{T1}{I}
-\DeclareTextCommand{\CYRJE}{T1}{J}
-\DeclareTextCommand{\CYRK}{T1}{K}
-\DeclareTextCommand{\CYRL}{T1}{L}
+\DeclareTextAccent{\`}{OT2}{144}
+\DeclareTextAccent{\^}{OT2}{145}
+\DeclareTextAccent{\r}{OT2}{146}
+\DeclareTextAccent{\=}{OT2}{147}
+\DeclareTextAccent{\f}{OT2}{148}
+\DeclareTextAccent{\C}{OT2}{149}
+\DeclareTextSymbol{\quotedblbase}{OT2}{150}
+\fi
+\ifsrb@encxii
+\DeclareTextCommand{\cyrgje}{X2}{\'\cyrg}
+\DeclareTextCommand{\CYRGJE}{X2}{\'\CYRG}
+\DeclareTextCommand{\cyrzje}{X2}{\'\cyrz}
+\DeclareTextCommand{\CYRZJE}{X2}{\'\CYRZ}
+\DeclareTextCommand{\cyrkje}{X2}{\'\cyrk}
+\DeclareTextCommand{\CYRKJE}{X2}{\'\CYRK}
+\DeclareTextCommand{\cyrsje}{X2}{\'\cyrs}
+\DeclareTextCommand{\CYRSJE}{X2}{\'\CYRS}
+\fi
+\ifsrb@enctiia
+\DeclareTextSymbol{\cyrgje}{T2A}{161}
+\DeclareTextSymbol{\CYRGJE}{T2A}{129}
+\DeclareTextSymbol{\cyrzje}{T2A}{166}
+\DeclareTextSymbol{\CYRZJE}{T2A}{134}
+\DeclareTextSymbol{\cyrkje}{T2A}{169}
+\DeclareTextSymbol{\CYRKJE}{T2A}{137}
+\DeclareTextSymbol{\cyrsje}{T2A}{177}
+\DeclareTextSymbol{\CYRSJE}{T2A}{145}
+\DeclareTextComposite{\'}{T2A}{\cyrg}{161}
+\DeclareTextComposite{\'}{T2A}{\CYRG}{129}
+\DeclareTextComposite{\'}{T2A}{\cyrk}{169}
+\DeclareTextComposite{\'}{T2A}{\CYRK}{137}
+\DeclareTextComposite{\'}{T2A}{\cyrs}{177}
+\DeclareTextComposite{\'}{T2A}{\CYRS}{145}
+\DeclareTextComposite{\'}{T2A}{\cyrz}{166}
+\DeclareTextComposite{\'}{T2A}{\CYRZ}{134}
+\fi
+\ifsrb@enctsi
+\DeclareTextSymbol{\DH}{TS1}{208}
+\DeclareTextSymbol{\cyrb}{TS1}{248}
+\DeclareTextSymbol{\cyrg}{TS1}{249}
+\DeclareTextSymbol{\cyrd}{TS1}{250}
+\DeclareTextSymbol{\cyrp}{TS1}{251}
+\DeclareTextSymbol{\cyrt}{TS1}{252}
+\fi
+\ifsrb@encti
+\DeclareTextSymbol{\CYRA}{T1}{65}
+\DeclareTextSymbol{\CYRB}{T1}{66}
+\DeclareTextSymbol{\CYRV}{T1}{86}
+\DeclareTextSymbol{\CYRG}{T1}{71}
+\DeclareTextSymbol{\CYRD}{T1}{68}
+\DeclareTextSymbol{\CYRDJE}{T1}{208}
+\DeclareTextSymbol{\CYRE}{T1}{69}
+\DeclareTextSymbol{\CYRZH}{T1}{154}
+\DeclareTextSymbol{\CYRZ}{T1}{90}
+\DeclareTextSymbol{\CYRI}{T1}{73}
+\DeclareTextSymbol{\CYRJE}{T1}{74}
+\DeclareTextSymbol{\CYRK}{T1}{75}
+\DeclareTextSymbol{\CYRL}{T1}{76}
 \DeclareTextCommand{\CYRLJE}{T1}{Lj}
-\DeclareTextCommand{\CYRM}{T1}{M}
-\DeclareTextCommand{\CYRN}{T1}{N}
+\DeclareTextSymbol{\CYRM}{T1}{77}
+\DeclareTextSymbol{\CYRN}{T1}{78}
 \DeclareTextCommand{\CYRNJE}{T1}{Nj}
-\DeclareTextCommand{\CYRO}{T1}{O}
-\DeclareTextCommand{\CYRP}{T1}{P}
-\DeclareTextCommand{\CYRR}{T1}{R}
-\DeclareTextCommand{\CYRS}{T1}{S}
-\DeclareTextCommand{\CYRT}{T1}{T}
-\DeclareTextCommand{\CYRTSHE}{T1}{\'C}
-\DeclareTextCommand{\CYRU}{T1}{U}
-\DeclareTextCommand{\CYRF}{T1}{F}
-\DeclareTextCommand{\CYRH}{T1}{H}
-\DeclareTextCommand{\CYRC}{T1}{C}
-\DeclareTextCommand{\CYRCH}{T1}{\v C}
+\DeclareTextSymbol{\CYRO}{T1}{79}
+\DeclareTextSymbol{\CYRP}{T1}{80}
+\DeclareTextSymbol{\CYRR}{T1}{82}
+\DeclareTextSymbol{\CYRS}{T1}{83}
+\DeclareTextSymbol{\CYRT}{T1}{84}
+\DeclareTextSymbol{\CYRTSHE}{T1}{130}
+\DeclareTextSymbol{\CYRU}{T1}{85}
+\DeclareTextSymbol{\CYRF}{T1}{70}
+\DeclareTextSymbol{\CYRH}{T1}{72}
+\DeclareTextSymbol{\CYRC}{T1}{67}
+\DeclareTextSymbol{\CYRCH}{T1}{131}
 \DeclareTextCommand{\CYRDZHE}{T1}{D\v z}
-\DeclareTextCommand{\CYRSH}{T1}{\v S}
+\DeclareTextSymbol{\CYRSH}{T1}{146}
 \DeclareTextCommand{\CYRGJE}{T1}{\'G}
 \DeclareTextCommand{\CYRKJE}{T1}{\'K}
-\DeclareTextCommand{\CYRZJE}{T1}{\'Z}
-\DeclareTextCommand{\CYRSJE}{T1}{\'S}
+\DeclareTextSymbol{\CYRZJE}{T1}{153}
+\DeclareTextSymbol{\CYRSJE}{T1}{145}
 \DeclareTextCommand{\CYRDZE}{T1}{Dz}
 \DeclareTextCompositeCommand{\'}{T1}{\CYRG}{\CYRGJE}
 \DeclareTextCompositeCommand{\'}{T1}{\CYRK}{\CYRKJE}
-\DeclareTextCompositeCommand{\'}{T1}{\CYRS}{\CYRSJE}
-\DeclareTextCompositeCommand{\'}{T1}{\CYRZ}{\CYRZJE}
-\DeclareTextCommand{\cyra}{T1}{a}
-\DeclareTextCommand{\cyrb}{T1}{b}
-\DeclareTextCommand{\cyrv}{T1}{v}
-\DeclareTextCommand{\cyrg}{T1}{g}
-\DeclareTextCommand{\cyrd}{T1}{d}
-\DeclareTextCommand{\cyrdje}{T1}{\dj}
-\DeclareTextCommand{\cyre}{T1}{e}
-\DeclareTextCommand{\cyrzh}{T1}{\v z}
-\DeclareTextCommand{\cyrz}{T1}{z}
-\DeclareTextCommand{\cyri}{T1}{i}
-\DeclareTextCommand{\cyrje}{T1}{j}
-\DeclareTextCommand{\cyrk}{T1}{k}
-\DeclareTextCommand{\cyrl}{T1}{l}
+\DeclareTextComposite{\'}{T1}{\CYRS}{145}
+\DeclareTextComposite{\'}{T1}{\CYRZ}{153}
+\DeclareTextSymbol{\cyra}{T1}{97}
+\DeclareTextSymbol{\cyrb}{T1}{98}
+\DeclareTextSymbol{\cyrv}{T1}{118}
+\DeclareTextSymbol{\cyrg}{T1}{103}
+\DeclareTextSymbol{\cyrd}{T1}{100}
+\DeclareTextSymbol{\cyrdje}{T1}{158}
+\DeclareTextSymbol{\cyre}{T1}{101}
+\DeclareTextSymbol{\cyrzh}{T1}{186}
+\DeclareTextSymbol{\cyrz}{T1}{122}
+\DeclareTextSymbol{\cyri}{T1}{105}
+\DeclareTextSymbol{\cyrje}{T1}{106}
+\DeclareTextSymbol{\cyrk}{T1}{107}
+\DeclareTextSymbol{\cyrl}{T1}{108}
 \DeclareTextCommand{\cyrlje}{T1}{lj}
-\DeclareTextCommand{\cyrm}{T1}{m}
-\DeclareTextCommand{\cyrn}{T1}{n}
+\DeclareTextSymbol{\cyrm}{T1}{109}
+\DeclareTextSymbol{\cyrn}{T1}{110}
 \DeclareTextCommand{\cyrnje}{T1}{nj}
-\DeclareTextCommand{\cyro}{T1}{o}
-\DeclareTextCommand{\cyrp}{T1}{p}
-\DeclareTextCommand{\cyrr}{T1}{r}
-\DeclareTextCommand{\cyrs}{T1}{s}
-\DeclareTextCommand{\cyrt}{T1}{t}
-\DeclareTextCommand{\cyrtshe}{T1}{\'c}
-\DeclareTextCommand{\cyru}{T1}{u}
-\DeclareTextCommand{\cyrf}{T1}{f}
-\DeclareTextCommand{\cyrh}{T1}{h}
-\DeclareTextCommand{\cyrc}{T1}{c}
-\DeclareTextCommand{\cyrch}{T1}{\v c}
+\DeclareTextSymbol{\cyro}{T1}{111}
+\DeclareTextSymbol{\cyrp}{T1}{112}
+\DeclareTextSymbol{\cyrr}{T1}{114}
+\DeclareTextSymbol{\cyrs}{T1}{115}
+\DeclareTextSymbol{\cyrt}{T1}{116}
+\DeclareTextSymbol{\cyrtshe}{T1}{162}
+\DeclareTextSymbol{\cyru}{T1}{117}
+\DeclareTextSymbol{\cyrf}{T1}{102}
+\DeclareTextSymbol{\cyrh}{T1}{104}
+\DeclareTextSymbol{\cyrc}{T1}{99}
+\DeclareTextSymbol{\cyrch}{T1}{163}
 \DeclareTextCommand{\cyrdzhe}{T1}{d\v z}
-\DeclareTextCommand{\cyrsh}{T1}{\v s}
+\DeclareTextSymbol{\cyrsh}{T1}{178}
 \DeclareTextCommand{\cyrgje}{T1}{\'g}
 \DeclareTextCommand{\cyrkje}{T1}{\'k}
-\DeclareTextCommand{\cyrzje}{T1}{\'z}
-\DeclareTextCommand{\cyrsje}{T1}{\'s}
+\DeclareTextSymbol{\cyrzje}{T1}{185}
+\DeclareTextSymbol{\cyrsje}{T1}{177}
 \DeclareTextCommand{\cyrdze}{T1}{dz}
 \DeclareTextCompositeCommand{\'}{T1}{\cyrg}{\cyrgje}
 \DeclareTextCompositeCommand{\'}{T1}{\cyrk}{\cyrkje}
-\DeclareTextCompositeCommand{\'}{T1}{\cyrs}{\cyrsje}
-\DeclareTextCompositeCommand{\'}{T1}{\cyrz}{\cyrzje}
+\DeclareTextComposite{\'}{T1}{\cyrs}{177}
+\DeclareTextComposite{\'}{T1}{\cyrz}{185}
+\fi
 }
 
-\DeclareOption{nomath}{\endinput}
-\newif\ifsrb@noint
-\srb@nointtrue
-\DeclareOption{noint}{\srb@nointfalse}
-\newif\ifsrb@nosymb
-\srb@nosymbtrue
-\DeclareOption{nosymb}{\srb@nosymbfalse}
+\newif\ifsrb@math
+\srb@mathfalse
+\DeclareOption{math}{\srb@mathtrue}
+\DeclareOption*{\PackageWarning{cmsrb}{Package option `\CurrentOption' unknown or obsolete}}
 \ProcessOptions\relax
 
 \DeclareFontFamily{OT1}{cmrsrbm}{}
@@ -156,64 +207,23 @@
 \DeclareFontFamily{OML}{cmmsrbm}{}
 \DeclareFontShape{OML}{cmmsrbm}{m}{it}{<5><6><7><8><9>gen*cmmi <10->cmmi10}{}
 \DeclareFontShape{OML}{cmmsrbm}{b}{it}{<5><6><7><8><9>gen*cmmib <10->cmmib10}{}
-\DeclareSymbolFont{operators} {OT1}{cmrsrbm}{m}{n}
-\DeclareSymbolFont{letters} {OML}{cmmsrbm}{m}{it}
-\DeclareMathAlphabet      {\mathbf}{OT1}{cmrsrbm}{bx}{n}
-\DeclareMathAlphabet      {\mathit}{OT1}{cmrsrbm}{m}{it}
-\DeclareMathAlphabet      {\mathsf}{OT1}{cmsssrbm}{m}{n}
-\DeclareMathAlphabet      {\mathtt}{OT1}{cmttsrbm}{m}{n}
+\DeclareSymbolFont{operators}{OT1}{cmrsrbm}{m}{n}
+\DeclareSymbolFont{letters}{OML}{cmmsrbm}{m}{it}
+\DeclareMathAlphabet{\mathbf}{OT1}{cmrsrbm}{bx}{n}
+\DeclareMathAlphabet{\mathit}{OT1}{cmrsrbm}{m}{it}
+\DeclareMathAlphabet{\mathsf}{OT1}{cmsssrbm}{m}{n}
+\DeclareMathAlphabet{\mathtt}{OT1}{cmttsrbm}{m}{n}
 
 \AtBeginDocument{
-\ifsrb@noint
-\DeclareSymbolFont{cmsrbex}{OMX}{cmsrbex}{m}{n}
-\DeclareMathSymbol{\srbintop}{\mathop}{cmsrbex}{"52}
-\DeclareMathSymbol{\srbointop}{\mathop}{cmsrbex}{"48}
-\newcommand{\srbint}{\relax\srbintop\displaylimits}
-\newcommand{\srboint}{\relax\srbointop\displaylimits}
-\let\intop\srbintop
-\let\ointop\srbointop
-\let\int\srbint
-\let\oint\srboint
-\@ifpackageloaded{amsmath}
-{
-\let\ilimits@\displaylimits
-\renewcommand{\MultiIntegral}[1]{
-  \edef\ints@c{\noexpand\intop
-    \ifnum#1=\z@\noexpand\intdots@\else\noexpand\intkern@\fi
-    \ifnum#1>\tw@\noexpand\intop\noexpand\intkern@\fi
-    \ifnum#1>\thr@@\noexpand\intop\noexpand\intkern@\fi
-    \noexpand\intop
-    \noexpand\displaylimits
-  }
-  \futurelet\@let@token\ints@a
-}
-\def\ints@b{
-  \mkern-7mu\mathchoice{\mkern2mu}{}{}{}
-  \mathop\bgroup
-    \mkern7mu\mathchoice{\mkern-2mu}{}{}{}
-    \let\displaylimits\egroup
-}
-\def\intkern@{\mkern -6mu }
-\def\ints@#1{\mkern -3mu
-\mathop{\mkern 3mu
-\intop
-\ifnum #1=\z@ \intdots@ \else
-\intkern@
-\ifnum #1>\tw@ \intop\intkern@
-\ifnum #1>\thr@@ \intop\intkern@ \fi\fi\fi
-\intop }\displaylimits }}{}
-\fi
-
-\ifsrb@nosymb
-\@ifpackageloaded{amssymb}
-{
+\ifsrb@math
+\RequirePackage{cmupint}
+\RequirePackage{amssymb}
 \let\le\leqslant
 \let\ge\geqslant
 \let\leq\leqslant
 \let\geq\geqslant
 \let\nleq\nleqslant
 \let\ngeq\ngeqslant
-}
 \fi
 }
 \endinput
\ No newline at end of file
-- 
cgit v1.2.3

