From f5f31d5e8f559ba5a579cb6e80948a5d2515b7aa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 2 Sep 2012 22:45:05 +0000 Subject: beamer (31aug12) git-svn-id: svn://tug.org/texlive/trunk@27573 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/beamer/beamerbasefont.sty | 11 +++++++---- .../texmf-dist/tex/latex/beamer/beamerbasercs.sty | 4 ++-- .../tex/latex/beamer/beamerbaseverbatim.sty | 21 +++++++++++++-------- .../tex/latex/beamer/translator/translator.sty | 13 +++++++++---- 4 files changed, 31 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/latex/beamer') diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty index 1b643fb1a5e..0b1c7a543b5 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty @@ -8,7 +8,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasefont.sty,v a0b4f9f91ee9 2012/05/10 15:09:27 joseph $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasefont.sty,v 73834bc85e0c 2012/08/29 19:05:49 joseph $ \ifbeamer@amssymb \RequirePackage{amssymb} @@ -291,9 +291,12 @@ % Some font fixes \ifbeamer@sansmath - \IfFileExists{sansmathaccent.sty} - {\RequirePackage{sansmathaccent}} - {} + \def\@tempa{cmss} + \ifx\mathfamilydefault\@tempa + \IfFileExists{sansmathaccent.sty} + {\DeclareSymbolFont{pureletters}{OT1}{mathkerncmss}{m}{sl}} + {} + \fi \fi \DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty index 8e3fce2ac5e..5852de29b50 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty @@ -10,7 +10,7 @@ % See the file doc/licenses/LICENSE for more details. % Define beamer version -\def\beamer@version{3.20} +\def\beamer@version{3.21} % Get date and version from RCS Ids @@ -37,4 +37,4 @@ \ProvidesClass{\beamer@rcsfile}[\beamer@rcsdate\space#2\space (rcs-revision \beamer@rcsrevision)] } -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasercs.sty,v 352157baec3a 2012/06/01 07:22:53 joseph $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasercs.sty,v efcce0278bdb 2012/08/31 07:46:27 joseph $ diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty index a411a7ed321..2ac7c759e66 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseverbatim.sty @@ -9,7 +9,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaseverbatim.sty,v 70f9d8411e54 2011/09/12 18:58:34 joseph $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaseverbatim.sty,v dfdb135076b3 2012/08/30 16:03:43 joseph $ \mode @@ -42,27 +42,32 @@ \def\beamer@test{#1#2}% \ifx\beamer@test\beamer@stopframefirst% \let\next=\beamer@framewritten% - \else + \else% \def\beamer@test{#1}% - \@onelevel@sanitize\beamer@test - \edef\beamer@test{\beamer@test\space}% - \edef\beamer@test{\expandafter\zap@space\beamer@test\@empty}% + \def\beamer@test@par{\par}% + \ifx\beamer@test\beamer@test@par + \def\beamer@test{^^J}% + \else% + \@onelevel@sanitize\beamer@test + \edef\beamer@test{\beamer@test\space}% + \edef\beamer@test{\expandafter\zap@space\beamer@test\@empty}% + \fi \@temptokena{#2}% \immediate\write\beamer@verbatimfileout{\beamer@test\the\@temptokena}% \let\next=\beamer@processframeline% \fi% \next% - } + }% \long\gdef\beamer@processframeline#1^^M{% \def\beamer@test{#1}% \ifx\beamer@test\beamer@stopframe% \let\next=\beamer@framewritten% - \else + \else% \immediate\write\beamer@verbatimfileout{#1}% \let\next=\beamer@processframeline% \fi% \next% - } + }% } \def\beamer@setupstoppers#1{% diff --git a/Master/texmf-dist/tex/latex/beamer/translator/translator.sty b/Master/texmf-dist/tex/latex/beamer/translator/translator.sty index f0f241be4d5..7a74a1a8d2b 100644 --- a/Master/texmf-dist/tex/latex/beamer/translator/translator.sty +++ b/Master/texmf-dist/tex/latex/beamer/translator/translator.sty @@ -74,12 +74,17 @@ }% } - +\begingroup +\lccode`\A=`\- % +\lowercase{% + \endgroup + \def\trans@marker{-A}% +} \newcommand\translatelet[3][]{% \edef\trans@to{\trans@languagepath}% \setkeys{translator}{#1}% - \let\trans@trans\@empty% + \let\trans@trans\trans@marker% \let\trans@list\@empty% \@for\trans@lang:=\trans@to\do% {% @@ -93,14 +98,14 @@ {% \expandafter\ifx\csname tr@@@\trans@lang @#3\endcsname\relax% \else% - \ifx\trans@trans\@empty% + \ifx\trans@trans\trans@marker% \expandafter\expandafter\expandafter\def \expandafter\expandafter\expandafter\trans@trans \expandafter\expandafter\expandafter{\csname tr@@@\trans@lang @#3\endcsname}% \fi% \fi% }% - \ifx\trans@trans\@empty% + \ifx\trans@trans\trans@marker% \def\trans@trans{#3}% \fi% \let#2=\trans@trans% -- cgit v1.2.3