From 2527a7b311b3d39a759e168a763718e6e5c22eaa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 9 Apr 2012 16:29:36 +0000 Subject: mdframed (8apr12) git-svn-id: svn://tug.org/texlive/trunk@25884 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/mdframed/mdframed-example-default.pdf | Bin 269180 -> 269981 bytes .../latex/mdframed/mdframed-example-default.tex | 6 +- .../latex/mdframed/mdframed-example-pstricks.pdf | Bin 76458 -> 76950 bytes .../latex/mdframed/mdframed-example-pstricks.tex | 6 +- .../doc/latex/mdframed/mdframed-example-texsx.pdf | Bin 214208 -> 231529 bytes .../doc/latex/mdframed/mdframed-example-texsx.tex | 117 ++++++++++++++++++++- .../doc/latex/mdframed/mdframed-example-tikz.pdf | Bin 271278 -> 286150 bytes .../doc/latex/mdframed/mdframed-example-tikz.tex | 97 +++++------------ Master/texmf-dist/doc/latex/mdframed/mdframed.pdf | Bin 807688 -> 812313 bytes 9 files changed, 142 insertions(+), 84 deletions(-) (limited to 'Master/texmf-dist/doc/latex/mdframed') diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.pdf index ba63fe82ea2..e12c426ee8f 100644 Binary files a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.pdf and b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.pdf differ diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.tex b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.tex index b4467a39c58..1783e4a276a 100644 --- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.tex +++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-default.tex @@ -1,7 +1,7 @@ -%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ +%%$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $ \setcounter{errorcontextlines}{999} \documentclass[parskip=false,english,11pt]{ltxmdf} -\ltxmdfsetifoot $Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ +\ltxmdfsetifoot $Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $ \usepackage{showexpl} \lstset{style=lstltxmdf,explpreset={pos=b,rframe={}},} @@ -12,7 +12,7 @@ \title{The \Pack{mdframed} package} \subtitle{Examples for \Opt{framemethod=\Loadedframemethod}} \author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}} -\date{\mdfdateID$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $} +\date{\mdfdateID$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $} \version{\mdversion} \introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}. Some presented examples are more or less exorbitant.} diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.pdf index dc3f25b0980..e593ef959f8 100644 Binary files a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.pdf and b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.pdf differ diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.tex b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.tex index fc69fcae2f2..76a3e5e93c1 100644 --- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.tex +++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-pstricks.tex @@ -1,7 +1,7 @@ -%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ +%%$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $ \setcounter{errorcontextlines}{999} \documentclass[parskip=false,english,11pt]{ltxmdf} -\ltxmdfsetifoot$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ +\ltxmdfsetifoot$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $ \lstDeleteShortInline{|} \newcommand\Loadedframemethod{PSTricks} @@ -13,7 +13,7 @@ \title{The \Pack{mdframed} package} \subtitle{Examples for \Opt{framemethod=\Loadedframemethod}} \author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}} -\date{\mdfdateID$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $} +\date{\mdfdateID$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $} \version{\mdversion} \introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}. Some presented examples are more or less exorbitant.} diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.pdf index 014cd025604..6fd2b71c07d 100644 Binary files a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.pdf and b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.pdf differ diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.tex b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.tex index bcf3160faed..2d4146bf2a5 100644 --- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.tex +++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-texsx.tex @@ -1,19 +1,20 @@ -%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ +%%$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $ \setcounter{errorcontextlines}{999} \documentclass[parskip=false,english,11pt,ltxlipsum]{ltxmdf} -\ltxmdfsetifoot $Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ +\ltxmdfsetifoot $Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $ \usepackage{showexpl} \lstset{style=lstltxmdf,explpreset={pos=b,rframe={}},} - -\newcommand\Loadedframemethod{default} +\usepackage{tikz} +\usetikzlibrary{calc,arrows} +\newcommand\Loadedframemethod{tikz} \usepackage[framemethod=\Loadedframemethod]{mdframed} \title{The \Pack{mdframed} package} \subtitle{Examples for \Opt{framemethod=\Loadedframemethod}} \author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}} -\date{\mdfdateID$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $} +\date{\mdfdateID$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $} \version{\mdversion} \introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}. Some presented examples are more or less exorbitant.} @@ -130,5 +131,111 @@ Text Text Text Text Text Text Text Text \end{enumerate} Text Text Text Text Text Text \end{LTXexample} +\clearpage +\Examplesec{digression-environement inspired by Tobias Schwan} +\begin{lstlisting} +\usetikzlibrary{calc,arrows} +\tikzset{ + excursus arrow/.style={% + line width=2pt, + draw=gray!40, + rounded corners=2ex, + }, + excursus head/.style={ + fill=white, + font=\bfseries\sffamily, + text=gray!80, + anchor=base west, + }, +} +\mdfdefinestyle{digressionarrows}{% + singleextra={% + \path let \p1=(P), \p2=(O) in (\x2,\y1) coordinate (Q); + \path let \p1=(Q), \p2=(O) in (\x1,{(\y1-\y2)/2}) coordinate (M); + \path [excursus arrow, round cap-to] + ($(O)+(5em,0ex)$) -| (M) |- % + ($(Q)+(12em,0ex)$) .. controls +(0:16em) and +(185:6em) .. % + ++(23em,2ex); + \node [excursus head] at ($(Q)+(2.5em,-0.75pt)$) {Digression};}, + firstextra={% + \path let \p1=(P), \p2=(O) in (\x2,\y1) coordinate (Q); + \path [excursus arrow,-to] + (O) |- % + ($(Q)+(12em,0ex)$) .. controls +(0:16em) and +(185:6em) .. % + ++(23em,2ex); + \node [excursus head] at ($(Q)+(2.5em,-2pt)$) {Digression};}, + secondextra={% + \path let \p1=(P), \p2=(O) in (\x2,\y1) coordinate (Q); + \path [excursus arrow,round cap-] + ($(O)+(5em,0ex)$) -| (Q);}, + middleextra={% + \path let \p1=(P), \p2=(O) in (\x2,\y1) coordinate (Q); + \path [excursus arrow] + (O) -- (Q);}, + middlelinewidth=2.5em,middlelinecolor=white, + hidealllines=true,topline=true, + innertopmargin=0.5ex, + innerbottommargin=2.5ex, + innerrightmargin=2pt, + innerleftmargin=2ex, + skipabove=0.87\baselineskip, + skipbelow=0.62\baselineskip, +} + +\begin{mdframed}[style=digressionarrows] + \ExampleText +\end{mdframed} +\end{lstlisting} + +\tikzset{ + excursus arrow/.style={% + line width=2pt, + draw=gray!40, + rounded corners=2ex, + }, + excursus head/.style={ + fill=white, + font=\bfseries\sffamily, + text=gray!80, + anchor=base west, + }, +} +\mdfdefinestyle{digressionarrows}{% + singleextra={% + \path let \p1=(P), \p2=(O) in (\x2,\y1) coordinate (Q); + \path let \p1=(Q), \p2=(O) in (\x1,{(\y1-\y2)/2}) coordinate (M); + \path [excursus arrow, round cap-to] + ($(O)+(5em,0ex)$) -| (M) |- % + ($(Q)+(12em,0ex)$) .. controls +(0:16em) and +(185:6em) .. % + ++(23em,2ex); + \node [excursus head] at ($(Q)+(2.5em,-0.75pt)$) {Digression};}, + firstextra={% + \path let \p1=(P), \p2=(O) in (\x2,\y1) coordinate (Q); + \path [excursus arrow,-to] + (O) |- % + ($(Q)+(12em,0ex)$) .. controls +(0:16em) and +(185:6em) .. % + ++(23em,2ex); + \node [excursus head] at ($(Q)+(2.5em,-2pt)$) {Digression};}, + secondextra={% + \path let \p1=(P), \p2=(O) in (\x2,\y1) coordinate (Q); + \path [excursus arrow,round cap-] + ($(O)+(5em,0ex)$) -| (Q);}, + middleextra={% + \path let \p1=(P), \p2=(O) in (\x2,\y1) coordinate (Q); + \path [excursus arrow] + (O) -- (Q);}, + middlelinewidth=2.5em,middlelinecolor=white, + hidealllines=true,topline=true, + innertopmargin=0.5ex, + innerbottommargin=2.5ex, + innerrightmargin=2pt, + innerleftmargin=2ex, + skipabove=0.87\baselineskip, + skipbelow=0.62\baselineskip, +} + +\begin{mdframed}[style=digressionarrows] + \ExampleText +\end{mdframed} \end{document} \endinput diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.pdf index 02356cb4c36..7b09f04abda 100644 Binary files a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.pdf and b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.pdf differ diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.tex b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.tex index ac5a5ee9c31..bbf84bdcc62 100644 --- a/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.tex +++ b/Master/texmf-dist/doc/latex/mdframed/mdframed-example-tikz.tex @@ -1,7 +1,7 @@ -%%$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ +%%$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $ \setcounter{errorcontextlines}{999} \documentclass[parskip=false,english,11pt]{ltxmdf} -\ltxmdfsetifoot $Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $ +\ltxmdfsetifoot $Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $ \usepackage{showexpl} \lstset{style=lstltxmdf,explpreset={pos=b,rframe={}},} @@ -12,7 +12,7 @@ \title{The \Pack{mdframed} package} \subtitle{Examples for \Opt{framemethod=\Loadedframemethod}} \author{\href{mailto:marco.daniel@mada-nada.de}{Marco Daniel}} -\date{\mdfdateID$Id: mdframed.dtx 362 2012-03-30 06:55:35Z marco $} +\date{\mdfdateID$Id: mdframed.dtx 375 2012-04-08 10:52:22Z marco $} \version{\mdversion} \introduction{In this document I collect various examples for \Opt{framemethod=\Loadedframemethod}. Some presented examples are more or less exorbitant.} @@ -109,99 +109,50 @@ function of the independent variables alone. \begin{tltxmdfexample} \tikzstyle{titregris} = - [draw=gray, thick, fill=white, shading = exersicetitle, % - text=gray, rectangle, rounded corners, - right,minimum height=.7cm] + [draw=gray, thick, fill=white, shading = exersicetitle, % + text=gray, rectangle, rounded corners, right,minimum height=.7cm] \pgfdeclarehorizontalshading{exersicebackground}{100bp} -{color(0bp)=(green!40); -color(100bp)=(black!5)} + {color(0bp)=(green!40); color(100bp)=(black!5)} \pgfdeclarehorizontalshading{exersicetitle}{100bp} -{color(0bp)=(red!40); -color(100bp)=(black!5)} + {color(0bp)=(red!40);color(100bp)=(black!5)} \newcounter{exercise} -\renewcommand\theexercise{Exercise~n\arabic{exercise}} +\renewcommand*\theexercise{Exercise~n\arabic{exercise}} \makeatletter -\def\mdf@@exercisepoints{} +\def\mdf@@exercisepoints{}%new mdframed key: \define@key{mdf}{exercisepoints}{% \def\mdf@@exercisepoints{#1} } -\renewrobustcmd\mdfcreateextratikz{% - \node[titregris,xshift=1cm] at (P-|O) % - {~\mdf@frametitlefont{\theexercise}~}; - \ifdefempty{\mdf@@exercisepoints}% - {}% - {\node[titregris,left,xshift=-1cm] at (P)% - {~\mdf@frametitlefont{\mdf@@exercisepoints points}~};}% -} \makeatother \mdfdefinestyle{exercisestyle}{% - outerlinewidth=1pt, - innerlinewidth=0pt, - roundcorner=2pt, - linecolor=gray, + outerlinewidth=1pt,innerlinewidth=0pt, + roundcorner=2pt,linecolor=gray, tikzsetting={shading = exersicebackground}, innertopmargin=1.2\baselineskip, skipabove={\dimexpr0.5\baselineskip+\topskip\relax}, needspace=3\baselineskip, frametitlefont=\sffamily\bfseries, settings={\global\stepcounter{exercise}}, - } - -\begin{mdframed}[style=exercisestyle,] -\ExampleText -\end{mdframed} - -\begin{mdframed}[style=exercisestyle,exercisepoints=10] -\ExampleText -\end{mdframed} -\end{tltxmdfexample} - -\tikzstyle{titregris} = - [draw=gray, thick, fill=white, shading = exersicetitle, % - text=gray, rectangle, rounded corners, - right,minimum height=.7cm] - -\pgfdeclarehorizontalshading{exersicebackground}{100bp} -{color(0bp)=(green!40); -color(100bp)=(black!5)} - -\pgfdeclarehorizontalshading{exersicetitle}{100bp} -{color(0bp)=(red!40); -color(100bp)=(black!5)} - -\newcounter{exercise} -\renewcommand\theexercise{Exercise~n\arabic{exercise}} -\makeatletter -\def\mdf@@exercisepoints{} -\define@key{mdf}{exercisepoints}{% - \def\mdf@@exercisepoints{#1} -} -\newrobustcmd\mdfcreateextratikzlocal{% - \node[titregris,xshift=1cm] at (P-|O) {~\textbf{\theexercise}~}; + singleextra={% + \node[titregris,xshift=1cm] at (P-|O) % + {~\mdf@frametitlefont{\theexercise}~}; + \ifdefempty{\mdf@@exercisepoints}% + {}% + {\node[titregris,left,xshift=-1cm] at (P)% + {~\mdf@frametitlefont{\mdf@@exercisepoints points}~};}% + }, + firstextra={% + \node[titregris,xshift=1cm] at (P-|O) % + {~\mdf@frametitlefont{\theexercise}~}; \ifdefempty{\mdf@@exercisepoints}% {}% {\node[titregris,left,xshift=-1cm] at (P)% {~\mdf@frametitlefont{\mdf@@exercisepoints points}~};}% + }, } -\makeatother - -\mdfdefinestyle{exercisestyle}{% - outerlinewidth=1pt, - innerlinewidth=0pt, - roundcorner=2pt, - linecolor=gray, - tikzsetting={shading = exersicebackground}, - innertopmargin=1.2\baselineskip, - skipabove={\dimexpr0.5\baselineskip+\topskip\relax}, - needspace=3\baselineskip, - frametitlefont=\sffamily\bfseries, - settings={\global\stepcounter{exercise}\let\mdfcreateextratikz\mdfcreateextratikzlocal}, - } - \begin{mdframed}[style=exercisestyle,] \ExampleText \end{mdframed} @@ -209,7 +160,7 @@ color(100bp)=(black!5)} \begin{mdframed}[style=exercisestyle,exercisepoints=10] \ExampleText \end{mdframed} - +\end{tltxmdfexample} \clearpage \Examplesec{Theorem environments} \begin{LTXexample} diff --git a/Master/texmf-dist/doc/latex/mdframed/mdframed.pdf b/Master/texmf-dist/doc/latex/mdframed/mdframed.pdf index fbe07f6036a..eb119d6f5fb 100644 Binary files a/Master/texmf-dist/doc/latex/mdframed/mdframed.pdf and b/Master/texmf-dist/doc/latex/mdframed/mdframed.pdf differ -- cgit v1.2.3