diff options
author | Karl Berry <karl@freefriends.org> | 2019-08-16 20:37:07 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-08-16 20:37:07 +0000 |
commit | 29f8471607e3a9d4b654af95f7e6a458df75b0c6 (patch) | |
tree | 989a48001373c95a43685e816372c61b4a5624d0 /Master/texmf-dist | |
parent | 52666635596eb23f4f1930a163bf235201cefbca (diff) |
cmsrb (16aug19)
git-svn-id: svn://tug.org/texlive/trunk@51887 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/fonts/cmsrb/README.md | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/fonts/cmsrb/cmsrb-SR.pdf | bin | 428946 -> 444360 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/fonts/cmsrb/cmsrb-SR.tex | 33 | ||||
-rw-r--r-- | Master/texmf-dist/doc/fonts/cmsrb/cmsrb.pdf | bin | 425473 -> 440827 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/fonts/cmsrb/cmsrb.tex | 31 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/cmsrb/cmsrb.sty | 71 |
6 files changed, 105 insertions, 32 deletions
diff --git a/Master/texmf-dist/doc/fonts/cmsrb/README.md b/Master/texmf-dist/doc/fonts/cmsrb/README.md index 1a443942266..b56e3e2a317 100644 --- a/Master/texmf-dist/doc/fonts/cmsrb/README.md +++ b/Master/texmf-dist/doc/fonts/cmsrb/README.md @@ -1,5 +1,5 @@ The cmsrb font package -version 3.0 (March 22, 2019) +version 3.1 (August 16, 2019) Uroš Stefanović This material is subject to the GNU General Public License. diff --git a/Master/texmf-dist/doc/fonts/cmsrb/cmsrb-SR.pdf b/Master/texmf-dist/doc/fonts/cmsrb/cmsrb-SR.pdf Binary files differindex 89171308690..325017fc0bc 100644 --- a/Master/texmf-dist/doc/fonts/cmsrb/cmsrb-SR.pdf +++ b/Master/texmf-dist/doc/fonts/cmsrb/cmsrb-SR.pdf diff --git a/Master/texmf-dist/doc/fonts/cmsrb/cmsrb-SR.tex b/Master/texmf-dist/doc/fonts/cmsrb/cmsrb-SR.tex index e04a9a0c0a0..9f68b14ae0e 100644 --- a/Master/texmf-dist/doc/fonts/cmsrb/cmsrb-SR.tex +++ b/Master/texmf-dist/doc/fonts/cmsrb/cmsrb-SR.tex @@ -7,9 +7,10 @@ \usepackage[nomath]{cmsrb} \DeclareSymbolFont{cmsrbex}{OMX}{cmsrbex}{m}{n} \DeclareMathSymbol{\srbintop}{\mathop}{cmsrbex}{"52} -\DeclareMathSymbol{\srbointop}{\mathop}{cmsrbex}{"49} +\DeclareMathSymbol{\srbointop}{\mathop}{cmsrbex}{"48} \newcommand{\srbint}{\relax\srbintop\displaylimits} \newcommand{\srboint}{\relax\srbointop\displaylimits} +\usepackage{amssymb} \input glyphtounicode.tex \pdfgentounicode=1 @@ -27,7 +28,7 @@ \begin{document} \title{Пакет \texttt{cmsrb}} \author{Урош Стефановић\footnote{\texttt{urostajms@gmail.com}}} - \date{\today{} в3.0} + \date{\today{} в3.1} \maketitle \section{Зашто \textsf{cmsrb}?} @@ -117,7 +118,17 @@ Пакет \textsf{cmsrb} учитава подразумеване \textit{Computer Modern} математичке фонтове, али учита само величине веће или једнаке 10\textit{pt}, за бољи визуелни ефекат. Такође, пакет сада мења подразумевани знак за интеграл $\int$ у $\srbint$ (усправни интеграл је традиционално коришћен у српском језику, са \verb|\limits| опцијом). - Иначе, промене у математичким фонтовима могу да се спрече коришћењем \textsf{nomath} опције: + Да би се спречила промена симбола интеграла, довољно је користити \textsf{noint} опцију: + \begin{verbatim} + \usepackage[noint]{cmsrb} + \end{verbatim} + + Такође, у српском језику боље је коришћење знакова $\leqslant$ и $\geqslant$ уместо знакова $\leq$ и $\geq$. Ако се користи пакет \textsf{amssymb}, ти знаци ће аутоматски бити промењени (исто важи и за $\nleqslant$ и $\ngeqslant$). Наравно, ову промену је могуће спречити опцијом \textsf{nosymb}: + \begin{verbatim} + \usepackage[nosymb]{cmsrb} + \end{verbatim} + + Иначе, било које промене у математичким фонтовима могу да се спрече коришћењем \textsf{nomath} опције: \begin{verbatim} \usepackage[nomath]{cmsrb} \end{verbatim} @@ -203,12 +214,12 @@ \usepackage{cmsrb} \newcommand{\ud}{\,\mathrm{d}} \begin{document} - $$ \int_0^1 e^x\ud x $$ + $$ \int_0^1 e^x\ud x \geq 0 $$ \end{document} \end{Verbatim} \noindent\textbf{Резултат 5:} \\ - $$ \srbint_0^1 e^x\,\mathrm{d} x $$ \\[1cm] + $$ \srbint_0^1 e^x\,\mathrm{d} x \geqslant 0 $$ \\[1cm] \noindent\textbf{Пример 6: } \begin{Verbatim} @@ -216,12 +227,12 @@ \usepackage[nomath]{cmsrb} \newcommand{\ud}{\,\mathrm{d}} \begin{document} - $$ \int_0^1 e^x\ud x $$ + $$ \int_0^1 e^x\ud x \geq 0 $$ \end{document} \end{Verbatim} \noindent\textbf{Резултат 6:} \\ - $$ \int_0^1 e^x\,\mathrm{d} x $$\\[1cm] + $$ \int_0^1 e^x\,\mathrm{d} x \geq 0 $$\\[1cm] \noindent\textbf{Пример 7: } \begin{Verbatim} @@ -240,6 +251,14 @@ \section{Историја верзија} + \subsection*{3.1} + + \begin{itemize} + \item Исправљени багови. + \item Опције \textsf{noint} и \textsf{nosymb} су додате. + \item Измењени знаци $\leq$, $\geq$, $\nleq$, $\ngeq$. + \end{itemize} + \subsection*{3.0} \begin{itemize} diff --git a/Master/texmf-dist/doc/fonts/cmsrb/cmsrb.pdf b/Master/texmf-dist/doc/fonts/cmsrb/cmsrb.pdf Binary files differindex 47c2afcde75..20159f65c26 100644 --- a/Master/texmf-dist/doc/fonts/cmsrb/cmsrb.pdf +++ b/Master/texmf-dist/doc/fonts/cmsrb/cmsrb.pdf diff --git a/Master/texmf-dist/doc/fonts/cmsrb/cmsrb.tex b/Master/texmf-dist/doc/fonts/cmsrb/cmsrb.tex index d31ad485fa8..5f8aa7ed041 100644 --- a/Master/texmf-dist/doc/fonts/cmsrb/cmsrb.tex +++ b/Master/texmf-dist/doc/fonts/cmsrb/cmsrb.tex @@ -6,9 +6,10 @@ \usepackage[nomath]{cmsrb} \DeclareSymbolFont{cmsrbex}{OMX}{cmsrbex}{m}{n} \DeclareMathSymbol{\srbintop}{\mathop}{cmsrbex}{"52} -\DeclareMathSymbol{\srbointop}{\mathop}{cmsrbex}{"49} +\DeclareMathSymbol{\srbointop}{\mathop}{cmsrbex}{"48} \newcommand{\srbint}{\relax\srbintop\displaylimits} \newcommand{\srboint}{\relax\srbointop\displaylimits} +\usepackage{amssymb} \input glyphtounicode.tex \pdfgentounicode=1 @@ -26,7 +27,7 @@ \begin{document} \title{The \texttt{cmsrb} package} \author{Uroš Stefanović\footnote{\texttt{urostajms@gmail.com}}} - \date{\today{} v3.0} + \date{\today{} v3.1} \maketitle \section{Why \textsf{cmsrb}?} @@ -116,6 +117,16 @@ The \textsf{cmsrb} package load default Computer Modern math fonts, but load only fonts with size lower or equal 10pt, for better visual effect. Also, it change integral sign from $\int$ to $\srbint$ (upright integral is traditionally used in Serbian language, with \verb|\limits| option). + To prevent change for the integral symbols, it's enough to use \textsf{noint} option: + \begin{verbatim} + \usepackage[noint]{cmsrb} + \end{verbatim} + + Also, in Serbian language is better to use the symbols $\leqslant$ and $\geqslant$ than the symbols $\leq$ и $\geq$. If one use package \textsf{amssymb}, this signs will be replaced automatically (also $\nleqslant$ and $\ngeqslant$ will be used). Of course, one can stop this change with option \textsf{nosymb}: + \begin{verbatim} + \usepackage[nosymb]{cmsrb} + \end{verbatim} + However, one can use \textsf{nomath} option to prevent any change in math fonts: \begin{verbatim} \usepackage[nomath]{cmsrb} @@ -202,12 +213,12 @@ \usepackage{cmsrb} \newcommand{\ud}{\,\mathrm{d}} \begin{document} - $$ \int_0^1 e^x\ud x $$ + $$ \int_0^1 e^x\ud x \geq 0 $$ \end{document} \end{Verbatim} \noindent\textbf{Result 5:} \\ - $$ \srbint_0^1 e^x\,\mathrm{d} x $$ \\[1cm] + $$ \srbint_0^1 e^x\,\mathrm{d} x \geqslant 0 $$ \\[1cm] \noindent\textbf{Example 6: } \begin{Verbatim} @@ -215,12 +226,12 @@ \usepackage[nomath]{cmsrb} \newcommand{\ud}{\,\mathrm{d}} \begin{document} - $$ \int_0^1 e^x\ud x $$ + $$ \int_0^1 e^x\ud x \geq 0 $$ \end{document} \end{Verbatim} \noindent\textbf{Result 6:} \\ - $$ \int_0^1 e^x\,\mathrm{d} x $$\\[1cm] + $$ \int_0^1 e^x\,\mathrm{d} x \geq 0 $$\\[1cm] \noindent\textbf{Example 7: } \begin{Verbatim} @@ -239,6 +250,14 @@ \section{Version history} + \subsection*{3.1} + + \begin{itemize} + \item Bugs fixed. + \item Options \textsf{noint} and \textsf{nosymb} are active. + \item Symbols $\leq$, $\geq$, $\nleq$, $\ngeq$ are changed. + \end{itemize} + \subsection*{3.0} \begin{itemize} diff --git a/Master/texmf-dist/tex/latex/cmsrb/cmsrb.sty b/Master/texmf-dist/tex/latex/cmsrb/cmsrb.sty index f67e55bb608..8163505e1a5 100644 --- a/Master/texmf-dist/tex/latex/cmsrb/cmsrb.sty +++ b/Master/texmf-dist/tex/latex/cmsrb/cmsrb.sty @@ -1,9 +1,9 @@ -\ProvidesPackage{cmsrb}[2019/03/22 v3.0 cmsrb] +\ProvidesPackage{cmsrb}[2019/08/16 v3.1 cmsrb] \RequirePackage[TS1,T1,OT2,X2,T2A]{fontenc} \renewcommand{\rmdefault}{cmsrbr} \renewcommand{\sfdefault}{cmsrbs} \renewcommand{\ttdefault}{cmsrbt} -\AtBeginDocument{% +\AtBeginDocument{ \DeclareTextComposite{\v}{OT2}{c}{113} \DeclareTextComposite{\v}{OT2}{C}{81} \DeclareTextComposite{\v}{OT2}{s}{120} @@ -137,6 +137,12 @@ } \DeclareOption{nomath}{\endinput} +\newif\ifsrb@noint +\srb@nointtrue +\DeclareOption{noint}{\srb@nointfalse} +\newif\ifsrb@nosymb +\srb@nosymbtrue +\DeclareOption{nosymb}{\srb@nosymbfalse} \ProcessOptions\relax \DeclareFontFamily{OT1}{cmrsrbm}{} @@ -157,28 +163,57 @@ \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}{"49} +\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}% -{\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 - }\ilimits@ - }% -}{} +\@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} +{ +\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 |