diff options
author | Karl Berry <karl@freefriends.org> | 2009-01-24 16:35:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-01-24 16:35:39 +0000 |
commit | 89bd3c91a3106d658db88156e2006b8920c0e9cf (patch) | |
tree | 3b8afa1e521d8f253dbb6e0053ba79c82a64aeb1 /Master/texmf-dist/tex | |
parent | bc73750e2889e33eec7f44eb8ca8ebe6e99708a7 (diff) |
cmll update (22jan09)
git-svn-id: svn://tug.org/texlive/trunk@11958 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/cmll/cmll.sty | 81 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/cmll/ucmllr.fd | 9 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/cmll/ucmllss.fd | 5 |
3 files changed, 78 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/cmll/cmll.sty b/Master/texmf-dist/tex/latex/cmll/cmll.sty index 0dfafc81651..26fcacf180e 100644 --- a/Master/texmf-dist/tex/latex/cmll/cmll.sty +++ b/Master/texmf-dist/tex/latex/cmll/cmll.sty @@ -7,7 +7,9 @@ %% cmll.dtx (with options: `package') %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{cmll}[2006/02/22 Linear Logic symbols for Computer Modern] +\ProvidesPackage{cmll}[2009/01/23 Linear Logic symbols for Computer Modern] +\let\cmll@ifemu=\iffalse +\DeclareOption{emu}{\let\cmll@ifemu=\iftrue} \def\cmll@style{auto} \DeclareOption*{\edef\cmll@style{\CurrentOption}} \ProcessOptions\relax @@ -15,9 +17,16 @@ \def\cmll@use@auto{% \@ifpackageloaded{euler}{% \def\cmll@style{euler}}{% - \ifthenelse{\equal{\rmdefault}{cmss}}{% - \def\cmll@style{ss}}{% - \def\cmll@style{cm}}}% + \@ifpackageloaded{txfonts}{% + \let\cmll@ifemu=\iftrue% + \def\cmll@style{cm}}{% + \@ifpackageloaded{pxfonts}{% + \let\cmll@ifemu=\iftrue% + \def\cmll@style{cm}}{% + \ifthenelse{\equal{\rmdefault}{cmss}}{% + \def\cmll@style{ss}}{% + \def\cmll@style{cm}}% + }}}% \csname cmll@use@\cmll@style\endcsname} \def\cmll@use@cm{% \DeclareSymbolFont{llsymbols}{U}{cmllr}{m}{n}% @@ -38,16 +47,60 @@ \DeclareMathSymbol{\oc}{\mathord}{EulerFraktur}{"21}% \DeclareMathSymbol{\wn}{\mathord}{EulerFraktur}{"3F}} \csname cmll@use@\cmll@style\endcsname -\DeclareMathSymbol{\parr}{\mathbin}{llsymbols}{0} -\DeclareMathSymbol{\shpos}{\mathord}{llsymbols}{1} -\DeclareMathSymbol{\shneg}{\mathord}{llsymbols}{2} -\DeclareMathSymbol{\shift}{\mathord}{llsymbols}{3} -\DeclareMathSymbol{\coh}{\mathrel}{llsymbols}{4} -\DeclareMathSymbol{\scoh}{\mathrel}{llsymbols}{5} -\DeclareMathSymbol{\incoh}{\mathrel}{llsymbols}{6} -\DeclareMathSymbol{\sincoh}{\mathrel}{llsymbols}{7} -\DeclareMathSymbol{\bigwith}{\mathop}{llsymbols}{8} -\DeclareMathSymbol{\bigparr}{\mathop}{llsymbols}{10} +\newcommand\invampemu{% + \mathbin{\mathchoice% + {\rotatebox[origin=c]{180}{$\&$}}% + {\rotatebox[origin=c]{180}{$\&$}}% + {\rotatebox[origin=c]{180}{$\scriptstyle\&$}}% + {\rotatebox[origin=c]{180}{$\scriptscriptstyle\&$}}% + }} +\newcommand\bigwithemu{% + \mathop{\mathchoice% + {\vcenter{\hbox{\relsize{+4}$\&$}}}% + {\vcenter{\hbox{\relsize{+2}$\&$}}}% + {\vcenter{\hbox{\relsize{+0.5}$\&$}}}% + {\vcenter{\hbox{\relsize{-1}$\&$}}}% + }} +\newcommand\biginvampemu{% + \mathop{\mathchoice% + {\vcenter{\hbox{\relsize{+4}$\invamp$}}}% + {\vcenter{\hbox{\relsize{+2}$\invamp$}}}% + {\vcenter{\hbox{\relsize{+0.5}$\invamp$}}}% + {\vcenter{\hbox{\relsize{-1}$\invamp$}}}}} +\cmll@ifemu + \@ifundefined{invamp}{% + \RequirePackage{graphicx}% + \let\invamp=\invampemu + }{}% + \RequirePackage{relsize}% + \let\bigwith=\bigwithemu + \let\biginvamp=\biginvampemu + \def\cmll@declare@symbol#1#2#3#4{% + \@ifundefined{#1}{% + \expandafter\DeclareMathSymbol% + \expandafter{\csname#1\endcsname}{#2}{#3}{#4}}{}} +\else + \def\cmll@declare@symbol#1#2#3#4{% + \expandafter\DeclareMathSymbol% + \expandafter{\csname#1\endcsname}{#2}{#3}{#4}} +\fi +\cmll@declare@symbol{invamp}{\mathbin}{llsymbols}{0} +\let\parr=\invamp +\cmll@declare@symbol{shpos}{\mathord}{llsymbols}{1} +\cmll@declare@symbol{shneg}{\mathord}{llsymbols}{2} +\cmll@declare@symbol{shift}{\mathord}{llsymbols}{3} +\cmll@declare@symbol{coh}{\mathrel}{llsymbols}{4} +\cmll@declare@symbol{scoh}{\mathrel}{llsymbols}{5} +\cmll@declare@symbol{incoh}{\mathrel}{llsymbols}{6} +\cmll@declare@symbol{sincoh}{\mathrel}{llsymbols}{7} +\cmll@declare@symbol{bigwith}{\mathop}{llsymbols}{8} +\cmll@declare@symbol{biginvamp}{\mathop}{llsymbols}{10} +\let\bigparr=\biginvamp +\cmll@declare@symbol{multimapboth}{\mathrel}{llsymbols}{12} +\cmll@declare@symbol{Bot}{\mathord}{llsymbols}{13} +\cmll@declare@symbol{Perp}{\mathrel}{llsymbols}{13} +\cmll@declare@symbol{simbot}{\mathord}{llsymbols}{14} +\cmll@declare@symbol{simperp}{\mathrel}{llsymbols}{14} \endinput %% %% End of file `cmll.sty'. diff --git a/Master/texmf-dist/tex/latex/cmll/ucmllr.fd b/Master/texmf-dist/tex/latex/cmll/ucmllr.fd index ea51225ef1c..2806f50681e 100644 --- a/Master/texmf-dist/tex/latex/cmll/ucmllr.fd +++ b/Master/texmf-dist/tex/latex/cmll/ucmllr.fd @@ -8,10 +8,15 @@ %% \DeclareFontShape{U}{cmllr}{m}{n}{% <5><6><7><8><9>gen*cmllr% - <10->cmllr10}{} + <10><10.95>cmllr10% + <12><14.4>cmllr12% + <17.28->cmllr17% + }{} \DeclareFontShape{U}{cmllr}{bx}{n}{% <5><6><7><8><9>gen*cmllbx% - <10->cmllbx10}{} + <10><10.95>cmllbx10% + <12->cmllbx12% + }{} \endinput %% %% End of file `ucmllr.fd'. diff --git a/Master/texmf-dist/tex/latex/cmll/ucmllss.fd b/Master/texmf-dist/tex/latex/cmll/ucmllss.fd index 52335e02a6b..7a050112da3 100644 --- a/Master/texmf-dist/tex/latex/cmll/ucmllss.fd +++ b/Master/texmf-dist/tex/latex/cmll/ucmllss.fd @@ -9,7 +9,10 @@ \DeclareFontShape{U}{cmllss}{m}{n}{% <-8>cmllss8% <9>cmllss9% - <10->cmllss10}{} + <10>cmllss10 + <12><14.4>cmllss12% + <17.28->cmllss17% + }{} \DeclareFontShape{U}{cmllss}{bx}{n}{% <->cmllssbx10}{} \endinput |