summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/stex/mikoslides
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-20 22:31:24 +0000
committerKarl Berry <karl@freefriends.org>2019-03-20 22:31:24 +0000
commit2b006ec0e0cafe12255f874f9c44786ab6f38901 (patch)
treec40f5796e1b34e3f051abd84d049e092e4ffd0ab /Master/texmf-dist/tex/latex/stex/mikoslides
parent8e508e8b0218f17eb318645073096f2cf645cc78 (diff)
stex (20mar19)
git-svn-id: svn://tug.org/texlive/trunk@50489 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/stex/mikoslides')
-rw-r--r--Master/texmf-dist/tex/latex/stex/mikoslides/beamerthemeJacobs.sty6
-rw-r--r--Master/texmf-dist/tex/latex/stex/mikoslides/mikoaffiliation.sty54
-rw-r--r--Master/texmf-dist/tex/latex/stex/mikoslides/mikoslides.cls33
-rw-r--r--Master/texmf-dist/tex/latex/stex/mikoslides/mikoslides.sty223
4 files changed, 154 insertions, 162 deletions
diff --git a/Master/texmf-dist/tex/latex/stex/mikoslides/beamerthemeJacobs.sty b/Master/texmf-dist/tex/latex/stex/mikoslides/beamerthemeJacobs.sty
index ac3fdde35c4..2581f00c04c 100644
--- a/Master/texmf-dist/tex/latex/stex/mikoslides/beamerthemeJacobs.sty
+++ b/Master/texmf-dist/tex/latex/stex/mikoslides/beamerthemeJacobs.sty
@@ -5,9 +5,7 @@
\ProvidesPackage{beamerthemeJacobs}
\typeout{Beamer KWARC theme}
\author[Kohlhase]{Michael Kohlhase}
-\institute{\texttt{http://kwarc.info/kohlhase}\\
- Computer Science\\
- Jacobs University Bremen, Germany}
+\institute{Computer Science, Jacobs University Bremen, Germany\\\url{http://kwarc.info}}
\mode
<presentation>
@@ -60,7 +58,7 @@
\setlength\leftmargini{1em}
\setlength\leftmarginii{1em}
\setlength\leftmarginiii{1em}
-\newcommand{\vstretch}[1]{\vspace*{\stretch{#1}}}
+\providecommand{\vstretch}[1]{\vspace*{\stretch{#1}}}
\beamer@descriptionwidth=1cm
diff --git a/Master/texmf-dist/tex/latex/stex/mikoslides/mikoaffiliation.sty b/Master/texmf-dist/tex/latex/stex/mikoslides/mikoaffiliation.sty
deleted file mode 100644
index 3004b99b7ba..00000000000
--- a/Master/texmf-dist/tex/latex/stex/mikoslides/mikoaffiliation.sty
+++ /dev/null
@@ -1,54 +0,0 @@
-\RequirePackage[ngerman,USenglish]{babel}
-
-\newcommand{\mikoand}[1]% joint work with
-{{\large\sc Michael Kohlhase}\\{\normalsize\green{joint work with #1}}\\[1ex]\mikoaffiliation}
-
-\newcommand{\miko}
-{{\large\sc Michael Kohlhase}\\[1ex]
-\JacobsAffiliation}
-
-\newcommand{\mikoJacobsDFKI}{\mikoJacobsDfki}
-\newcommand{\mikoJacobsDfki}
-{{\large\sc Michael Kohlhase}\\[1ex]
-\JacobsDfkiAffiliation}
-
-\newcommand{\JacobsAffiliation}
-{{\begin{small}
- Computer Science\\
- School of Engineering \& Science \\
- Jacobs University Bremen, Germany \\
- \end{small}}
-{\color{black}\normalsize\url{http://kwarc.info/kohlhase}}}
-
-\newcommand{\mikoboth}
-{\begin{creator}
-{\large\sc Michael Kohlhase}\\[1ex]
-{\small\begin{tabular}{c@{\qquad}c}
-School of Engineering \& Science & School of Computer Science \\
-Jacobs University Bremen & Carnegie Mellon yUniversity
-\end{tabular}}
-{\color{black}\normalsize\url{http://kwarc.info/kohlhase}}
-\end{creator}}
-
-\newcommand{\JacobsDfkiAffiliation}
-{\begin{small}
-\begin{tabular}{c@{\qquad}c}
-Computer Science
-&\iflanguage{german}{Sichere Kognitive Systeme}{Safe and Secure Cognitive Systems} \\
-%School of Engineering \& Science
-%& DFKI Bremen\\
-Jacobs University, Bremen
-&\iflanguage{german}{Deutsches Forschungszentrum f\"ur KI}{German Research Center for AI}\\
-\end{tabular}
-\end{small}
-{\color{black}\normalsize\url{http://kwarc.info/kohlhase}}}
-
-\newcommand{\mikocmu}
-{\begin{creator}
-{\large\sc Michael Kohlhase}\\[1ex]
-{\small\begin{tabular}{c}
-School of Computer Science \\
-Carnegie Mellon University \\
-\end{tabular}}\\
-{\color{black}\normalsize\url{http://kwarc.info/kohlhase}}
-\end{center}}
diff --git a/Master/texmf-dist/tex/latex/stex/mikoslides/mikoslides.cls b/Master/texmf-dist/tex/latex/stex/mikoslides/mikoslides.cls
index e678b2e8cef..fab70a55370 100644
--- a/Master/texmf-dist/tex/latex/stex/mikoslides/mikoslides.cls
+++ b/Master/texmf-dist/tex/latex/stex/mikoslides/mikoslides.cls
@@ -7,29 +7,28 @@
%% mikoslides.dtx (with options: `cls')
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{mikoslides}[2016/04/06 v1.1 Jacobs slides Class]
-\newif\ifnotes\notesfalse
-\DeclareOption{notes}{\notestrue\PassOptionsToPackage{\CurrentOption}{mikoslides}}
-\DeclareOption{slides}{\notesfalse\PassOptionsToPackage{\CurrentOption}{mikoslides}}
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{omdoc}
- \PassOptionsToClass{\CurrentOption}{beamer}
- \PassOptionsToPackage{\CurrentOption}{mikoslides}}
-\ProcessOptions
-\ifnotes
+\ProvidesClass{mikoslides}[2019/03/20 v1.2 MiKo slides Class]
+\RequirePackage{kvoptions}
+\RequirePackage{etoolbox}
+\SetupKeyvalOptions{family=mks@cls,prefix=mks@cls@}
+\DeclareStringOption[article]{class}
+\AddToKeyvalOption*{class}{\PassOptionsToClass{class=\mks@cls@class}{omdoc}
+ \ifdefstring{\mks@cls@class}{book}{\PassOptionsToPackage{topsect=part}{mikoslides}}{}
+ \ifdefstring{\mks@cls@class}{report}{\PassOptionsToPackage{topsect=part}{mikoslides}}}{}
+\DeclareBoolOption{notes}
+\DeclareComplementaryOption{slides}{notes}
+\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{omdoc}
+ \PassOptionsToClass{\CurrentOption}{beamer}
+ \PassOptionsToPackage{\CurrentOption}{mikoslides}}
+\ProcessKeyvalOptions{mks@cls}
+\ifmks@cls@notes
\LoadClass{omdoc}
- \RequirePackage{a4wide}
- \RequirePackage{marginnote}
- \RequirePackage{mdframed}
- \RequirePackage[notheorems,noamsthm,noxcolor]{beamerarticle}
- \RequirePackage[bookmarks,bookmarksopen,bookmarksnumbered,breaklinks,
- linkcolor=black,citecolor=black,urlcolor=cyan,filecolor=cyan,colorlinks]{hyperref}
\else
- \LoadClass[notheorems,noamsthm,10pt]{beamer}
+ \LoadClass[10pt,notheorems]{beamer}
\newcounter{Item}
\newcounter{paragraph}
\newcounter{subparagraph}
\newcounter{Hfootnote}
- \usetheme{Jacobs}
\fi
\RequirePackage{mikoslides}
\endinput
diff --git a/Master/texmf-dist/tex/latex/stex/mikoslides/mikoslides.sty b/Master/texmf-dist/tex/latex/stex/mikoslides/mikoslides.sty
index 75d40a942ee..cd19d98152b 100644
--- a/Master/texmf-dist/tex/latex/stex/mikoslides/mikoslides.sty
+++ b/Master/texmf-dist/tex/latex/stex/mikoslides/mikoslides.sty
@@ -7,46 +7,63 @@
%% mikoslides.dtx (with options: `package')
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{mikoslides}[2016/04/06 v1.1 Jacobs slides Package]
-\newif\if@mikoslides@mh@\@mikoslides@mh@false
-\DeclareOption{mh}{\@mikoslides@mh@true
- \PassOptionsToPackage{\CurrentOption}{stex}
- \PassOptionsToPackage{\CurrentOption}{smglom}
- \PassOptionsToPackage{\CurrentOption}{tikzinput}}
-\newif\ifnotes\notesfalse
-\DeclareOption{notes}{\notestrue}
-\DeclareOption{slides}{\notesfalse}
-\newif\ifsectocframes\sectocframesfalse
-\DeclareOption{sectocframes}{\sectocframestrue}
-\newif\ifframeimages\frameimagesfalse
-\DeclareOption{frameimages}{\frameimagestrue}
-\newif\if@part\@partfalse
-\DeclareOption{report}{\@parttrue\PassOptionsToPackage{\CurrentOption}{omdoc}}
-\DeclareOption{book}{\@parttrue\PassOptionsToPackage{\CurrentOption}{omdoc}}
-\newif\ifproblems\problemstrue
-\DeclareOption{noproblems}{\problemsfalse}
-\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{stex}
+\ProvidesPackage{mikoslides}[2019/03/20 v1.2 MiKo slides Package]
+\RequirePackage{kvoptions}
+\SetupKeyvalOptions{family=mks@sty,prefix=mks@sty@}
+\DeclareStringOption[section]{topsect}
+\DeclareBoolOption{mh}
+\AddToKeyvalOption*{mh}{
+ \PassOptionsToPackage{mh}{stex}
+ \PassOptionsToPackage{mh}{smglom}
+ \PassOptionsToPackage{mh}{tikzinput}}
+\newif\ifnotes\notestrue
+\DeclareBoolOption{notes}
+\AddToKeyvalOption*{notes}{\notestrue\PassOptionsToPackage{notes}{statements}}
+\DeclareComplementaryOption{slides}{notes}
+\AddToKeyvalOption*{slides}{\notesfalse\PassOptionsToPackage{nontheorem}{statements}}
+\DeclareBoolOption{sectocframes}
+\AddToKeyvalOption*{sectocframes}{\PassOptionsToPackage{msection}{statements}}
+\DeclareBoolOption{frameimages}
+\DeclareBoolOption{noproblems}
+\DeclareDefaultOption{\PassOptionsToPackage{\CurrentOption}{stex}
\PassOptionsToPackage{\CurrentOption}{smglom}
\PassOptionsToPackage{\CurrentOption}{tikzinput}}
-\ProcessOptions
-\if@mikoslides@mh@\RequirePackage{mikoslides-mh}\fi
-\RequirePackage{stex}
-\RequirePackage{smglom}
-\RequirePackage{tikzinput}
+\ProcessKeyvalOptions{mks@sty}
+\ifmks@sty@notes
+\RequirePackage{a4wide}
+\RequirePackage{marginnote}
+\RequirePackage{xcolor}
+\RequirePackage{mdframed}
+\RequirePackage[noxcolor,noamsthm]{beamerarticle}
+\fi
+\ifmks@sty@mh\RequirePackage{mikoslides-mh}\fi
+\RequirePackage{etoolbox}
\RequirePackage{amssymb}
\RequirePackage{amsmath}
\RequirePackage{comment}
\RequirePackage{textcomp}
\RequirePackage{url}
+\RequirePackage{graphicx}
+\RequirePackage{stex-logo}
+\RequirePackage{pgf}
+\ifmks@sty@notes
+\RequirePackage[bookmarks,bookmarksopen,bookmarksnumbered,breaklinks,
+linkcolor=black,citecolor=black,urlcolor=cyan,filecolor=cyan,colorlinks]{hyperref}
+\fi
+\RequirePackage{metakeys}
+\ifmks@sty@notes
+\renewcommand\usetheme[2][]{\usepackage[#1]{beamernotestheme#2}}
+\fi
\newcounter{slide}
\newlength{\slidewidth}\setlength{\slidewidth}{12.8cm}
\newlength{\slideheight}\setlength{\slideheight}{9cm}
-\ifnotes%
+\ifmks@sty@notes%
\renewenvironment{note}{\ignorespaces}{}%
\else%
\excludecomment{note}%
\fi%
-\ifnotes
+\newcommand\ninputref[2][]{\ifmks@sty@notes\inputref[#1]{#2}\fi}
+\ifmks@sty@notes
\newlength{\slideframewidth}
\setlength{\slideframewidth}{1.5pt}
\addmetakey{frame}{label}
@@ -55,6 +72,7 @@
\addmetakey[yes]{frame}{fragile}
\addmetakey[yes]{frame}{shrink}
\addmetakey[yes]{frame}{squeeze}
+ \addmetakey[yes]{frame}{t}
\renewenvironment{frame}[1][]{%
\metasetkeys{frame}{#1}%
\stepcounter{slide}%
@@ -93,30 +111,29 @@
\fi %ifnotes
\newrobustcmd\frameimage[2][]{%
\stepcounter{slide}%
- \ifframeimages%
+ \ifmks@sty@frameimages%
\def\Gin@ewidth{}\setkeys{Gin}{#1}%
- \ifnotes%
- \else%
- \vfill%
- \fi%
+ \ifmks@sty@notes\else\vfill\fi%
\ifx\Gin@ewidth\@empty%
\mycgraphics[width=\slidewidth,#1]{#2}\else\mycgraphics[#1]{#2}%
\fi%
\par\strut\hfill{\footnotesize Slide \arabic{slide}}%
- \ifnotes%
- \else%
- \vfill%
- \fi%
+ \ifmks@sty@notes\else\vfill\fi%
\fi%
}% ifframeimages
+\ifmks@sty@notes\newcommand\pause{}\fi
+\ifmks@sty@notes\newenvironment{nomtext}[1][]{\begin{omtext}[#1]}{\end{omtext}}%
+\else\excludecomment{nomtext}\fi%
+\ifmks@sty@notes\newenvironment{nomgroup}[2][]{\begin{omgroup}[#1]{#2}}{\end{omgroup}}%
+\else\excludecomment{nomgroup}\fi%
\newlength{\slidelogoheight}
-\ifnotes%
+\ifmks@sty@notes%
\setlength{\slidelogoheight}{.4cm}%
\else%
\setlength{\slidelogoheight}{1cm}%
\fi%
\newsavebox{\slidelogo}%
-\sbox{\slidelogo}{\includegraphics[height=\slidelogoheight]{jacobs-logo}}%
+\sbox{\slidelogo}{\sTeX}%
\newrobustcmd{\setslidelogo}[1]{%
\sbox{\slidelogo}{\includegraphics[height=\slidelogoheight]{#1}}%
}%
@@ -143,11 +160,11 @@
\def\licensing{{\usebox{\cclogo}}}%
\else%
\def\licensing{%
- \ifcchref%
- \href{#1}{\usebox{\cclogo}}%
- \else%
- {\usebox{\cclogo}}%
- \fi%
+ \ifcchref%
+ \href{#1}{\usebox{\cclogo}}%
+ \else%
+ {\usebox{\cclogo}}%
+ \fi%
}%
\fi%
}%
@@ -157,20 +174,21 @@
{\licensing\hfill\copyrightnotice\hfill\arabic{slide}\hfill\usebox{\slidelogo}}%
}%
}%
+\sffamily
\AtBeginDocument{%
- \definecolor{green}{rgb}{0,.5,0}%
- \definecolor{purple}{cmyk}{.3,1,0,.17}%
+\definecolor{green}{rgb}{0,.5,0}%
+\definecolor{purple}{cmyk}{.3,1,0,.17}%
}%
\def\defemph#1{{\textcolor{magenta}{#1}}}
\def\notemph#1{{\textcolor{magenta}{#1}}}
\def\stDMemph#1{{\textcolor{blue}{#1}}}
\def\@@lec#1{(\textcolor{green}{#1})}
-\pgfdeclareimage[width=.9em]{miko@small@dbend}{dangerous-bend}
+\pgfdeclareimage[width=.8em]{miko@small@dbend}{dangerous-bend}
\def\smalltextwarning{%
\pgfuseimage{miko@small@dbend}%
\xspace%
}%
-\pgfdeclareimage[width=1.5em]{miko@dbend}{dangerous-bend}
+\pgfdeclareimage[width=1.2em]{miko@dbend}{dangerous-bend}
\newrobustcmd\textwarning{%
\raisebox{-.05cm}{\pgfuseimage{miko@dbend}}%
\xspace%
@@ -186,45 +204,76 @@
\newrobustcmd\putat[2]{%
\begin{picture}(0,0)\put(#1){#2}\end{picture}%
}%
-\ifsectocframes%
- \if@part%
- \newcounter{mpart}%
- \newcounter{mchapter}%
- \newcounter{msection}[mchapter]%
- \else%
- \newcounter{msection}%
- \fi%
- \newcounter{msubsection}[msection]%
- \newcounter{msubsubsection}[msubsection]%
- \newcounter{msubsubsubsection}[msubsubsection]%
+\ifmks@sty@sectocframes%
+\ifdefstring\mks@sty@topsect{part}{%
+ \newcounter{mpart}\newcounter{mchapter}\newcounter{msection}[mchapter]}
+{\ifdefstring\mks@sty@topsect{chapter}{%
+ \newcounter{mchapter}\newcounter{msection}[mchapter]}
+ {\newcounter{msection}}}
+\newcounter{msubsection}[msection]%
+\newcounter{msubsubsection}[msubsection]%
+\newcounter{msubsubsubsection}[msubsubsection]%
\fi% ifsectocframes
-\ifnotes\else% only in slides
- \renewenvironment{omgroup}[2][]{%
- \metasetkeys{omgroup}{#1}\sref@target%
- \advance\section@level by 1%
- \ifsectocframes%
- \begin{frame}%
- \vfill\Large\centering%
- \red{%
- \ifcase\section@level\or%
- \stepcounter{mpart}Part \Roman{mpart}\or%
- \stepcounter{mchapter}Chapter \arabic{mchapter}\or
- \stepcounter{msection}\if@part\arabic{mchapter}.\fi\arabic{msection}\or
- \stepcounter{msubsection}\if@part\arabic{mchapter}.\fi\arabic{msection}.\arabic{msubsection}\or
- \stepcounter{msubsubsection}\if@part\arabic{mchapter}.\fi\arabic{msection}.\arabic{msubsection}.\arabic{msubsubsection}.\or
- \stepcounter{msubsubsubsection}\if@part\arabic{mchapter}.\fi\arabic{msection}.\arabic{msubsection}.\arabic{msubsubsection}.\arabic{msubsubsubsection}%
- \fi% end ifcase
- \quad #2%
- }%
- \vfill%
- \end{frame}%
- \fi %ifsectocframes
- }
- {\advance\section@level by -1}%
-\fi% ifnotes
+\RequirePackage{stex}
+\RequirePackage{smglom}
+\RequirePackage{tikzinput}
+\section@level=2
+\ifdefstring{\mks@sty@topsect}{part}{\section@level=0}{}
+\ifdefstring{\mks@sty@topsect}{chapter}{\section@level=1}{}
+\ifmks@sty@notes\else% only in slides
+\def\part@prefix{\ifdefstring\mks@sty@topsect{part}{\arabic{mchapter}.}{}}
+\renewenvironment{omgroup}[2][]{%
+ \metasetkeys{omgroup}{#1}\sref@target%
+ \advance\section@level by 1%
+ \ifmks@sty@sectocframes%
+ \stepcounter{slide}
+ \begin{frame}[noframenumbering]%
+ \vfill\Large\centering%
+ \red{%
+ \ifcase\section@level\or
+ \stepcounter{mpart}
+ \def\@@label{Part \Roman{mpart}}
+ \def\currentsectionlevel{part}
+ \or%
+ \stepcounter{mchapter}
+ \def\@@label{Chapter \arabic{mchapter}}
+ \def\currentsectionlevel{chapter}
+ \or
+ \stepcounter{msection}
+ \def\@@label{\part@prefix\arabic{msection}}
+ \def\currentsectionlevel{section}
+ \or
+ \stepcounter{msubsection}
+ \def\@@label{\part@prefix\arabic{msection}.\arabic{msubsection}}
+ \def\currentsectionlevel{subsection}
+ \or
+ \stepcounter{msubsubsection}
+ \def\@@label{\part@prefix\arabic{msection}.\arabic{msubsection}.\arabic{msubsubsection}}
+ \def\currentsectionlevel{subsubsection}
+ \or
+ \stepcounter{msubsubsubsection}
+ \def\@@label{\part@prefix\arabic{msection}.\arabic{msubsection}.\arabic{msubsubsection}.\arabic{msubsubsubsection}}
+ \def\currentsectionlevel{subsubsubsection}
+ \fi% end ifcase
+ \@@label\sref@label@id\@@label
+ \quad #2%
+ }%
+ \vfill%
+ \end{frame}%
+ \fi %ifmks@sty@sectocframes
+}
+{\advance\section@level by -1}%
+\fi% ifmks@sty@notes
+\def\inserttheorembodyfont{\normalfont}
+\defbeamertemplate{theorem begin}{miko}
+{\inserttheoremheadfont\inserttheoremname\inserttheoremnumber
+ \ifx\inserttheoremaddition\@empty\else\ (\inserttheoremaddition)\fi%
+ \inserttheorempunctuation\inserttheorembodyfont\xspace}
+\defbeamertemplate{theorem end}{miko}{}
+\setbeamertemplate{theorems}[miko]
\expandafter\def\csname Parent2\endcsname{}
-\ifnotes%
- \renewenvironment{columns}{%
+\ifmks@sty@notes%
+ \renewenvironment{columns}[1][]{%
\par\noindent%
\begin{minipage}%
\slidewidth\centering\leavevmode%
@@ -232,13 +281,13 @@
\end{minipage}\par\noindent%
}%
\newsavebox\columnbox%
- \renewenvironment{column}[1]{%
- \begin{lrbox}{\columnbox}\begin{minipage}{#1}%
+ \renewenvironment<>{column}[2][]{%
+ \begin{lrbox}{\columnbox}\begin{minipage}{#2}%
}{%
\end{minipage}\end{lrbox}\usebox\columnbox%
}%
-\fi%
-\ifproblems%
+\fi% ifnotes
+\ifmks@sty@noproblems%
\newenvironment{problems}{}{}%
\else%
\excludecomment{problems}%