From e95f87b640f8511a65edd45ae1cafddb00fb15b9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 5 Aug 2009 13:29:59 +0000 Subject: blindtext 1.9b (2aug09) git-svn-id: svn://tug.org/texlive/trunk@14537 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/blindtext/README | 11 +- .../texmf-dist/doc/latex/blindtext/blindtext.pdf | Bin 118739 -> 165992 bytes .../source/latex/blindtext/blindtext.dtx | 626 +++++++++++---------- .../source/latex/blindtext/blindtext.ins | 7 +- .../source/latex/blindtext/blindtext_texts.dtx | 331 +++++++++++ .../texmf-dist/tex/latex/blindtext/blindtext.sty | 298 +++++++--- 6 files changed, 913 insertions(+), 360 deletions(-) create mode 100644 Master/texmf-dist/source/latex/blindtext/blindtext_texts.dtx (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/blindtext/README b/Master/texmf-dist/doc/latex/blindtext/README index 227a9e6f419..1e352fe5c64 100644 --- a/Master/texmf-dist/doc/latex/blindtext/README +++ b/Master/texmf-dist/doc/latex/blindtext/README @@ -19,14 +19,15 @@ Supported languages: - (n)german - english - latin (short Lorem ipsum) +- french (interim solution) ==================================== Provided Files: *blindtext.dtx *blindtext.ins *blindtext.pdf -*readme - +*Readme + For more information visit http://tex.lickert.net/packages/blindtext/index.html (German) @@ -42,6 +43,8 @@ Similarities: -The length can be defined by optional parameters. Differences between blindtext and lipsum: --lipsum contains a larger 'Lorem Ipsum' +-lipsum contains a larger 'Lorem Ipsum'. +-blindtext supports different languages -blindtext contains macros for dummy lists (itemize, enumerate, description) --blindtext contains macros for documents (sections, text and lists) +-blindtext contains macros for documents (including sections, text and lists) +-blindtext contains macros for math formulas if requested diff --git a/Master/texmf-dist/doc/latex/blindtext/blindtext.pdf b/Master/texmf-dist/doc/latex/blindtext/blindtext.pdf index cca1a54bc30..6d4440c6c99 100644 Binary files a/Master/texmf-dist/doc/latex/blindtext/blindtext.pdf and b/Master/texmf-dist/doc/latex/blindtext/blindtext.pdf differ diff --git a/Master/texmf-dist/source/latex/blindtext/blindtext.dtx b/Master/texmf-dist/source/latex/blindtext/blindtext.dtx index 18b0a6bae13..7c32d8ef681 100644 --- a/Master/texmf-dist/source/latex/blindtext/blindtext.dtx +++ b/Master/texmf-dist/source/latex/blindtext/blindtext.dtx @@ -1,11 +1,14 @@ % ^^A CTAN:macros/latex/contrib/supported/minutes -\def\fileversion{V1.8} -\def\filedate{2009/01/27} +%\iffalse +%<*package> +%\fi +\def\blindfileversion{V1.9b} +\def\blindfiledate{2009/06/14} % ^^A For index and changes, run: % ^^A makeindex -s gglo.ist -o blindtext.gls blindtext.glo % ^^A makeindex -s gind.ist -o blindtext.ind blindtext.idx % -% \CheckSum{545} +% \CheckSum{872} %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -25,7 +28,7 @@ %% % \DoNotIndex{\" , \-, \flqq,\frqq, \ ,\def, \begin, \end} % \DoNotIndex{\csname,\endcsname, \expandafter, \global, \newcommand} -% \DoNotIndex{\advance, \filedate, \fileversion, \MessageBreak} +% \DoNotIndex{\advance, \blindfiledate, \blindfileversion, \MessageBreak} % \DoNotIndex{\newcount, \newcounter, \newif, \or} % \DoNotIndex{\if, \else, \fi, \ifcase, \ifdefined, \ifnum, \ifx, \loop, \repeat} % \DoNotIndex{\heartsuit} @@ -35,11 +38,10 @@ % \DoNotIndex{\value, \typeout, \long, \renewcommand} % % \iffalse +% %<*driver> \documentclass{ltxdoc} -%\documentclass{refart} -%\usepackage{doc} -\usepackage[german,english]{babel} +\usepackage[ngerman,english]{babel} \usepackage{blindtext} \usepackage{makeidx} \IfFileExists{hyperref.sty}{\usepackage{hyperref}}{} @@ -47,6 +49,7 @@ \makeindex %\OnlyDescription \begin{document} + \RecordChanges \DocInput{blindtext.dtx} \end{document} % @@ -58,8 +61,8 @@ % \newcommand*{\Lenv}[1]{\texttt {#1}} ^^A typeset a package % % \title{Blindtext.sty:\\ -% Creating text for testing/ -% Texterzeugung zum testen} +% Creating dummy text\\ +% Blindtext erzeugen} % % \author{Knut Lickert\\ % \url{http://tex.lickert.net/packages/blindtext/} @@ -68,29 +71,32 @@ % %\begin{abstract} %\selectlanguage{english} -%This packet create text with the commands \verb|\blindtext| and -%\verb|\Blindtext|. -%With this created text you can get an impression of the look -%of new classes and packages. +%With this package you can create dummy text. +%Use \cmd{\blindtext} to get some text and +%\cmd{\Blindtext} to get a long text. +%With \cmd{\blinddocument} (or \cmd{\Blinddocument}) +%you get complete dummy documents. % -%\selectlanguage{german} +%\selectlanguage{ngerman} %Mit diesem Paket kann man lange Texte erzeugen, ohne lange %Texte einzugeben. %Sinn ist die Erzeugung langer Beispieltexte, ohne den %Quelltext lang zu machen. %\end{abstract} % +% \tableofcontents +% %\selectlanguage{english} %\section{Overview/{\"U}bersicht} -%\subsection{The commands/Die Kommandos} +% %\begin{figure} %\renewcommand{\arraystretch}{1.1} %\begin{tabular}{p{0.3\textwidth}*{2}{p{0.3\textwidth}}}\hline -%Command/Makro & englisch & german \\\hline -%\verb|\blinddocument| & creates a document & erzeugt ein Dokument\\ -%\verb|\Blinddocument| & creates a big document & erzeugt ein gro{\ss}es Dokument\\ -%\verb|\blindtext| & creates text & erzeugt Text\\ -%\verb|\Blindtext| & creates more text & erzeugt mehr Text\\ +%Command/Makro & englisch & German \\\hline +%\cmd{\blinddocument} & creates a document & erzeugt ein Dokument\\ +%\cmd{\Blinddocument} & creates a big document & erzeugt ein gro{\ss}es Dokument\\ +%\cmd{\blindtext} & creates text & erzeugt Text\\ +%\cmd{\Blindtext} & creates more text & erzeugt mehr Text\\ %\verb|\blindlist{env}| & creates a list & erzeugt eine Liste\\ %\verb|\blindlistoptional|\newline\hspace*{2em}\verb|{env}| & creates a list with \verb|\item[]| & erzeugt eine Liste mit \verb|\item[]|\\ %\verb|\blindlistlist|\newline\hspace*{2em}\verb|[level]{env}| & creates cascaded lists & erzeugt geschachtelte Listen\\ @@ -102,15 +108,17 @@ %$\sim$[x] & repetition & Wiederholungsfaktor\\ % ^^A%\verb|\lovetext| & I love you in different languages & mehrsprachig: Ich liebe dich\\ %\end{tabular} -%\caption{Command Overview} +%\caption{Command Overview/Kommando\"ubersicht} %\end{figure} % +% \subsection{Create Documents} % \DescribeMacro{\blinddocument} -% {\verb|\blinddocument|} create a document with sections, +% \cmd{\blinddocument} create a document with sections, % subsections\ldots and lists (\Lenv{itemize}, % \Lenv{enumerate} and \Lenv{description}). +% % \DescribeMacro{\Blinddocument} -% {\verb|\Blinddocument|} create a +% \cmd{\Blinddocument} create a % document with bigger sections, subsections\ldots and longer % lists.\par % @@ -125,58 +133,96 @@ % \end{verbatim} % \end{quote} % +% If you want to have a table of contents you have two ways: +% \begin{enumerate} +% \item use the package option 'toc' +% \item Just add the |\tableofcontents|-command in your testdocument. +% \end{enumerate} +% +% \subsection{Get some text} % \DescribeMacro{\blindtext} -% \verb|\blindtext[x]| create a text. The optional parameter defines a +% \cmd{\blindtext}\oarg{x} create a text. The optional parameter defines a % repetition. Default for the repetition is one and can be modified -% with \verb|\setcounter{blindtext}{1}|. +% with \cmd{\setcounter}\marg{blindtext}\marg{1}. % % \DescribeMacro{\Blindtext} -% {\verb|\Blindtext[x][y]|} create $x$ paragraphs with the text of -% {\verb|\blindtext|}. The first optional parameter defines a +% \cmd{\Blindtext}\oarg{x}\oarg{y} create $x$ paragraphs with the text of +% \cmd{\blindtext}. The first optional parameter defines a % repetition of the paragraphs. Default for the repetition is five -% and can be modified with \verb|\setcounter{Blindtext}{5}|. The -% second optional parameter is given to \verb|\blindtext|. +% and can be modified with \cmd{\setcounter}\marg{Blindtext}\marg{5}. The +% second optional parameter is given to \cmd{\blindtext}. % % It is possible to add a start and end sequence for each paragraph. % % \DescribeMacro{\parstart} % \DescribeMacro{\parend} -% The two macros \verb|\parstart| and \verb|\parend| define a +% The two macros \cmd{\parstart} and \cmd{\parend} define a % starting and ending sequence for each paragraph in -% \verb|\Blindtext|. +% \cmd{\Blindtext}. % +% \subsection{Get some lists} % \DescribeMacro{\blindlist} -% {\verb|\blindlist{env}[x]|} create a list, the type is defined by the +% \cmd{\blindlist}\marg{env}\oarg{x} create a list, the type is defined by the % obligatory parameter. The optional parameter defines a repetition. % Default for the repetition is five and can be modified with -% \verb|\setcounter{blindlist}{x}|. +% \cmd{\setcounter}\marg{blindlist}\marg{x}. % % \DescribeMacro{\blindlistlist} -% {\verb|\blindlistlist[level]{env}[x]|} creates cascaded lists up to +% \cmd{\blindlistlist}\oarg{level}\marg{env}\oarg{x} creates cascaded lists up to % level \verb|level|, the type is defined by the second obligatory % parameter. The optional parameter defines a repetition. Default is the -% same like in \verb|\blindlist|. +% same like in \cmd{\blindlist}. % % \DescribeMacro{\Blindlist} -% \verb|\Blindlist{env}[x]| create a list with long texts. The optional parameter defines a +% \cmd{\Blindlist}\marg{env}\oarg{x} create a list with long texts. +% The optional parameter defines a % repetition. Default for the repetition is five and can be modified -% with \verb|\setcounter{blindlist}{x}|. +% with \cmd{\setcounter}\marg{blindlist}\marg{x}. % % \DescribeMacro{\blindlistoptional} -% {\verb|\blindlistoptional{env}[x]|} create a list with \verb|\item[]|. The +% \cmd{\blindlistoptional}\marg{env}\oarg{x} create a list with \cmd{\item}\oarg{}. The % list is defined by the obligatory parameter. The optional % parameter defines a repetition. Default for the repetition is five -% and can be modified with \verb|\setcounter{blindlist}{x}|. +% and can be modified with \cmd{\setcounter}\marg{blindlist}\marg{x}. % % \DescribeMacro{\Blindlistoptional} -% \verb|\Blindlistoptional| create a list like -% \verb|\blindlistoptional| with long texts. +% \cmd{\Blindlistoptional} create a list like +% \cmd{\blindlistoptional} with long texts. +% +% \DescribeMacro{\blinditemize} +% \DescribeMacro{\blindenumerate} +% \DescribeMacro{\blinddescription} +% The commands \cmd{\blinditemize}, \cmd{\blindenumerate} and \cmd{\blinddescription} +% are abbreviations for \cmd{\blindlist}\marg{itemize}, \cmd{\blindlist}\marg{enumerate} +% and \cmd{\blindlist}\marg{description}. +% +% \DescribeMacro{\Blinditemize} +% \DescribeMacro{\Blindenumerate} +% \DescribeMacro{\Blinddescription} +% The commands \cmd{\Blinditemize}, \cmd{\Blindenumerate} and \cmd{\Blinddescription} +% are abbreviations for \cmd{\Blindlist}\marg{itemize}, \cmd{\Blindlist}\marg{enumerate} +% and \cmd{\Blindlist}\marg{description}. +% +% \subsection{Get some math in the text} +% \marginpar{\hfill math} +% If you need a dummy text with math formula, you can add +% some math with the package option 'math'. +% +%\DescribeMacro{\blindmathpaper} +% |\blindmathpaper| build some text with formulas in between. +% This macro is used in |\blinddocument| if |\blindmathtrue| is set. +% +% If you need dummy text with and without math, you can (de)activate +% the math option with the following commands: +% +%\DescribeMacro{\blindmathtrue} +% With |\blindmathtrue| you set a flag, so the following blind text contains +% inline math. +% +%\DescribeMacro{\blindmathfalse} +% With |\blindmathfalse| you reset the flag for inline math +% inside the blind text. % -% \DescribeMacro{\blinditemize} \DescribeMacro{\Blinditemize} -% \DescribeMacro{\blindenumerate} \DescribeMacro{\Blindenumerate} -% \DescribeMacro{\blinddescription} \DescribeMacro{\Blinddescription} -% This commands are a abbreviation for \verb|\blindlist{itemize}|, \verb|\blindlist{enumerate}| -% and \verb|\blindlist{description}|. % % \StopEventually % @@ -187,36 +233,41 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{blindtext}[\filedate\space\fileversion\space% +\ProvidesPackage{blindtext}[\blindfiledate\space\blindfileversion\space% blindtext-Package] \RequirePackage{xspace} % \end{macrocode} -% Just in case the french quote are not defined +% \begin{macro}{frqq} +% \begin{macro}{flqq} +% Just in case the French quote are not defined % \begin{macrocode} \providecommand{\frqq}{} \providecommand{\flqq}{} % \end{macrocode} +% \end{macro} +% \end{macro} % % \begin{macro}{\blind@checklanguage} % \changes{V1.6}{2006-08-02}{Check for defined language} % It is possible, that you use blindtext.sty with % undefined languages. -% This macro checks, if blindtext support the language. +% This macro checks, if blindtext supports the language. % If it is not available, an error is reported and % English is used. % \begin{macrocode} \newcommand{\blind@checklanguage}{% \@ifundefined{blindtext@\languagename}{% \PackageWarning{blindtext}{\languagename\space not - defined, using english instead.\MessageBreak + defined, using English instead.\MessageBreak }% \selectlanguage{english}% }{}% } % \end{macrocode} % \end{macro} - - +% +% +% \subsection{Counter and supporting macros} % First we need some counters for the number of repetitions of the % text and the paragraphs. % \begin{macrocode} @@ -226,7 +277,7 @@ % % \begin{macro}{\blindtext} % -% \verb|\blindtext[x]| write $x\times$ a sentence. +% \verb|\blindtext[x]| write x times a sentence. % The default is stored in the counter \verb|blindtext|. This value % can be changed with \verb|\setcounter{blindtext}{1}|. % @@ -244,6 +295,7 @@ % \end{macrocode} % \end{macro} % +% \subsection{Creating Text} % \begin{macro}{\Blindtext} % \verb|\Blindtext[x][y]| execute $x\times$\verb|\blindtext[y]|. Each % \verb|\blindtext[y]| built a paragraph. @@ -263,7 +315,7 @@ % \end{macro} %^^A Blindtext % % \begin{macro}{\blind@Blindtext} -% This macro continue \verb|\Blindtext| with a second optional parameter. +% This macro continue \cmd{\Blindtext} with a second optional parameter. % % Each paragraph starts and end with a text, which can be defined with % \verb|\starttext| or \verb|\endtext|. @@ -290,7 +342,7 @@ % \end{macro}%^^A{\parstart} % \end{macro}%^^A{\parend} % -% \section{Lists} +% \subsection{Lists} % Here I define some flags to decide in the lists, if we have to % create big items and if we need the optional parameter at % \verb|\item|. This flags are reset in \verb|\blind@list|.\par @@ -481,13 +533,123 @@ % \end{macrocode} % \end{macro}%^^A{\blind@item} %% ^^A----------------------------------------------------------- -% \section{A sample document} +% \subsection{Blind Text with Math} +% \changes{V1.9}{2009-05-06}{Adding math} +% \subsubsection{Inline Math} +% \begin{macro}{\blindtext@endsentence} + %Finish a sentence with a dot. + %This macro is redefined for blind text with inline math/formulas. +% \begin{macrocode} + \def\blindtext@endsentence{.\xspace}% +% \end{macrocode} +% +% Counter to make some alternation of inline formulas. +% \begin{macrocode} + \newcount{\blind@mathformula}\blind@mathformula=0% +% \end{macrocode} +% +% A flag to sign, if math formulas should be used in blind text. +% \begin{macrocode} +\newif\ifblindmath +% \end{macrocode} +% +% \begin{macro}{\blindmathtrue} +% Make the following blind text with inline math. +% This redefine the logical variable |\ifblindmath|, +% to keep the flag we have to store and call the old definition. +% \begin{macrocode} +\let\oldblindmathtrue\blindmathtrue +\renewcommand{\blindmathtrue}{ + \oldblindmathtrue +% \end{macrocode} +% Make a formula each x sentence. +% \begin{macrocode} + \def\blindtext@endsentence{% + \advance\blind@mathformula by 1% + \ifcase\blind@mathformula% + \or. \(\sin^2(\alpha) + \cos^2(\beta) = 1\)% + \or\xspace\(E = mc^2\)% + \or. \(\sqrt[n]{a} \cdot \sqrt[n]{b} = \sqrt[n]{ab}\)% + \or. \(\frac{\sqrt[n]{a}}{\sqrt[n]{b}} = \sqrt[n]{\frac{a}{b}}\)% + \or. \(a\sqrt[n]{b} = \sqrt[n]{a^n b}\)% + \or. \(\mathrm{d}\Omega = \sin \vartheta \mathrm{d} \vartheta \mathrm{d}\varphi\)% + \else\global\blind@mathformula=0% + \fi% + .\xspace}% +% \end{macrocode} +% \begin{macrocode} + }%\blindmathtrue +% \end{macrocode} +% \end{macro} %^^A \blindmathtrue +% +% \begin{macro}{\blindmathfalse} +% Make the following blind text without inline math. +% \begin{macrocode} +\let\oldblindmathfalse\blindmathfalse +\renewcommand{\blindmathfalse}{ + \oldblindmathfalse +% \end{macrocode} +% Rebuild the normal sentence end. +% \begin{macrocode} + \def\blindtext@endsentence{.\xspace}% +% \end{macrocode} +% \begin{macrocode} +}%\includemath +% \end{macrocode} +% \end{macro} %^^A \blindmathfalse +% \end{macro} %^^A\blindtext@endsentence +% +% +% \subsubsection{'Big' Formulas} +% Counter to make some alternation of 'big' formulas. +% \begin{macrocode} + \newcount{\blind@Mathformula} + \blind@Mathformula=0% +% \end{macrocode} +% \begin{macro}{\blindtext@formula} +% Make a formula each x sentence. +% \begin{macrocode} + \def\blindtext@formula{% + \advance\blind@Mathformula by 1% + \ifcase\blind@Mathformula% + \[\bar x = \frac{1}{n}\sum_{i=1}^{i=n} x_i = \frac{x_1 + x_2 + \dots{} + x_n}{n}\] + \or \[ \int_0^\infty e^{-\alpha x^2} \mathrm{d}x = + \frac12\sqrt{\int_{-\infty}^\infty e^{-\alpha x^2}} + \mathrm{d}x\int_{-\infty}^\infty e^{-\alpha y^2}\mathrm{d}y = + \frac12\sqrt{\frac{\pi}{\alpha}} \] + \or \[ \sum_{k=0}^\infty a_0q^k = \lim_{n\to\infty}\sum_{k=0}^n a_0q^k = + \lim_{n\to\infty} a_0\frac{1-q^{n+1}}{1-q} = \frac{a_0}{1-q} + \] + \or \[x_{1,2}=\frac{-b \pm \sqrt{b^2-4ac}}{2a} = \frac{-p \pm \sqrt{p^2-4q}}{2}\] + \or \[ \frac{\partial^2 \Phi}{\partial x^2} + \frac{\partial^2 \Phi}{\partial y^2} + + \frac{\partial^2 \Phi}{\partial z^2} = + \frac{1}{c^2}\frac{\partial^2\Phi}{\partial t^2} + \] + \or \[\sqrt[n]{a} \cdot \sqrt[n]{b} = \sqrt[n]{ab}\] + \or \[\frac{\sqrt[n]{a}}{\sqrt[n]{b}} = \sqrt[n]{\frac{a}{b}}\] + \or \[a\sqrt[n]{b} = \sqrt[n]{a^n b}\] + \global\blind@Mathformula=0% + \fi% +}% +% \end{macrocode} %^^A \blindtext@formula +% \end{macro} %^^A \blindtext@formula +% +%% ^^A----------------------------------------------------------- +% \subsection{Create complete documents} +% A flag to sign, if the dummy documents should include a +% table of contents. +% \begin{macrocode} +\newif\ifblindtoc +\blindtocfalse +% \end{macrocode} +% % \begin{macro}{\blinddocument} -% \verb|\blinddocument| adds a document with \verb|\chapter|, +% \cmd{\blinddocument} adds a document with \verb|\chapter|, % \verb|\section|\ldots, texts and lists (itemize, enumerate, % description). % \begin{macrocode} \newcommand{\blinddocument}{% + \ifblindtoc\tableofcontents\fi \@ifundefined{chapter}{}{% \chapter{\blindtext@heading 0 (chapter)}% \blindtext @@ -518,11 +680,12 @@ % \end{macro}%^^A{\blinddocument} % % \begin{macro}{\Blinddocument} -% \verb|\blinddocument| adds a document with \verb|\chapter|, +% \cmd{\blinddocument} adds a document with \verb|\chapter|, % \verb|\section|\ldots, texts and lists (itemize, enumerate, % description). % \begin{macrocode} \newcommand{\Blinddocument}{% + \ifblindtoc\tableofcontents\fi \@ifundefined{chapter}{}{% \chapter{\blindtext@heading 0 (chapter)}% \blindtext @@ -551,225 +714,92 @@ \subsubsection{\blindtext@listEx (4*description)}% \blind@longtrue \blindlistlistoptional{description}[2]% + % + \ifblindmath + \section{\blindtext@blindmath}% + \blindmathpaper% + \fi% } % \end{macrocode} % \end{macro}%^^A{\Blinddocument} % -%% ^^A----------------------------------------------------------- -% \section{The texts} -% \changes{V1.7}{2006-11-21}{Delete trailing spaces in language definitions.} -% \begin{macro}{\addto} -% If babel is not loaded, we need the command \verb|\addto|. -% \begin{macrocode} -%\providecommand{\addto}[2]{#2} -\@ifundefined{addto}{% - \@ifpackageloaded{babel}{}{% - \PackageWarning{blindtext}{% - You are not using babel.sty -> Language by random\MessageBreak - Kein babel.sty verwendet -> Zufallssprache}% - }% - \newcommand{\addto}[2]{#2}% -}{} -% \end{macrocode} -% \end{macro}%^^A\addto -% -% \subsection{Default without language} -% First all texts without any language. If you make a new translation, please -% define all this macros. +% \begin{macro}{\blindmathpaper} +% \changes{V1.9}{2009-05-06}{Adding math} +% Build some text with formulas in between. % \begin{macrocode} -\def\blindtext@text{Text} -\def\blindtext@count{% - \ifcase\blind@listitem\or - First\or Second%... - \else - Last% - \blind@listitem=0 % - \fi - \global\advance\blind@listitem by 1 % -}% \blindtext@count -\def\blindtext@item{itemtext} -\def\blindtext@countitem{\blindtext@count\ \blindtext@item} -\def\blindtext@heading{Heading on level\xspace} -\def\blindtext@list{Lists} -\def\blindtext@listEx{Example for list\xspace} +\newcommand{\blindmathpaper}{ +\blindtext +\blindtext@formula +\blindtext +\blindtext@formula +\blindtext +\blindtext@formula +\blindtext +\blindtext@formula +\blindtext +\blindtext@formula +\blindtext +}%\blindmathpaper % \end{macrocode} +% \end{macro} %^^A \blindmathpaper % -% \subsection{English Texts} % -% \begin{macro}{\blindtext@english} -% Define flag, so we can check, if language is defined. -% \begin{macrocode} -\def\blindtext@english{} -% \end{macrocode} -% \end{macro} -% -% \begin{macrocode} -\addto\extrasenglish{% - \def\blindtext@text{% - Hello, here is some text without a meaning. This text should show, - how a printed text will look like at this place. If you read this - text, you will get no information. Really? Is there no - information? Is there a difference between this text and some - nonsense like \frqq Huardest gefburn\flqq? Kjift -- Never mind! A - blind text like this gives you information about the selected - font, how the letters are written and the impression of the look. - This text should contain all letters of the alphabet and it should - be written in of the original language. There is no need for a - special contents, but the length of words should match to the - language.% - }% \blindtext@text -} -% \end{macrocode} -% -% \begin{macrocode} -\addto\extrasenglish{% - \def\blindtext@count{% - \ifcase\value{blind@listcount}\or - First\or Second\or Third\or Fourth\or Fifth\or - Sixth\or Seventh\or Eighth\or Ninth\or Tenth\or - Eleventh\or Twelfth% - \else Another% - \fi - }% \blindtext@count - \def\blindtext@item{item in a list}%, level~\arabic{blindlist@level}} -}% \addto\extrasenglish -% \end{macrocode} -% -% \begin{macrocode} -\addto\extrasenglish{% - \def\blindtext@heading{Heading on level\xspace}% - \def\blindtext@list{Lists}% - \def\blindtext@listEx{Example for list\xspace}% -}%\addto\extrasenglish -% -% \end{macrocode} -% -% -% \subsection{German Texts} +%% ^^A----------------------------------------------------------- +% \section{The texts} % -% \begin{macro}{\blindtext@german} -% Define flag, so we can check, if language is defined. -% \begin{macrocode} -\def\blindtext@german{} -% \end{macrocode} -% \end{macro} +% \changes{V1.7}{2006-11-21}{Delete trailing spaces in language definitions.} % +% \begin{macro}{\blind@addtext} +% This macro adds the texts to the language definitions. +% Actual four language packages are supported: +%\begin{itemize} +% \item babel +% \item polyglossia (see \url{http://tug.ctan.org/tex-archive/macros/xetex/latex/polyglossia/}) +% \item (n)german +%\end{itemize} +%Parameters: +%\begin{enumerate} +% \item Language +% \item The text definitions +%\end{enumerate} % \begin{macrocode} -\addto\extrasgerman{% - \def\blindtext@text{% - Dies hier ist ein Blindtext zum Testen von Textausgaben. Wer - diesen Text liest, ist selbst schuld. Der Text gibt lediglich den - Grauwert der Schrift an. Ist das wirklich so? Ist es - gleich\-g\"ul\-tig ob ich schreibe: \frqq Dies ist ein - Blindtext\flqq\ oder \frqq Huardest gefburn\flqq? Kjift -- - mitnichten! Ein Blindtext bietet mir wichtige Informationen. An - ihm messe ich die Lesbarkeit einer Schrift, ihre Anmutung, wie - harmonisch die Figuren zueinander stehen und pr\"u\-fe, wie breit - oder schmal sie l\"auft. Ein Blindtext sollte m\"og\-lichst viele - verschiedene Buchstaben enthalten und in der Originalsprache - gesetzt sein. Er mu\ss\ keinen Sinn ergeben, sollte aber lesbar - sein. Fremdsprachige Texte wie \frqq Lorem ipsum\flqq\ dienen - nicht dem eigentlichen Zweck, da sie eine - falsche Anmutung vermitteln.% - }% \blindtext@text -} +\newcommand{\blind@addtext}[2]{% % \end{macrocode} -% +% First we take care for the babel-package. % \begin{macrocode} -\addto\extrasgerman{% - \def\blindtext@count{% - \ifcase\value{blind@listcount}\or - Erster\or Zweiter\or Dritter\or Vierter\or F{\"u}nfter\or - Sechster\or Siebter\or Achter\or Neunter\or Zehnter\or - Elfter\or Zw{\"o}lfter\or Dreizehnter\or Vierzehnter% - \else - Noch ein% - \fi - }% \blindtext@count - \def\blindtext@item{Listenpunkt, Stufe~\arabic{blind@levelcount}}% -}%\addto\extrasgerman + \@ifpackageloaded{babel}{ + \expandafter\addto\csname extras#1\endcsname{#2} + }{}% % \end{macrocode} -% +% \changes{V1.9}{2009-06-03}{Support polyglossia} +% Polyglossia provides a complete Babel replacement for users of Xe\LaTeX. % \begin{macrocode} -\addto\extrasgerman{% - \def\blindtext@heading{{\"U}berschrift auf Ebene\xspace}% - \def\blindtext@list{Listen}% - \def\blindtext@listEx{Beispiel einer Liste\xspace}% -}% \addto\extrasgerman + \@ifpackageloaded{polyglossia}{ + \expandafter\gappto\csname captions#1\endcsname {#2} + }{}% % \end{macrocode} -% -% If the packet \Lpack{german} is loaded, select the language. +% \changes{V1.9}{2009-06-04}{Support (n)german} +% Now some special support for the (n)german-package. % \begin{macrocode} -\@ifpackageloaded{german}{\selectlanguage{german}}{} + \@ifpackageloaded{ngerman}{ + \expandafter\g@addto@macro\csname captions#1\endcsname {#2} + }{}% + \@ifpackageloaded{german}{ + \expandafter\g@addto@macro\csname captions#1\endcsname {#2} + }{}% % \end{macrocode} % -% \subsection{German - New typesetting} -% \begin{macro}{\blindtext@ngerman} -% Define flag, so we can check, if language is defined. % \begin{macrocode} -\def\blindtext@ngerman{} +}%\blind@addtext % \end{macrocode} -% \end{macro} +% \end{macro}%^^A\blind@addtext % -% \begin{macrocode} -\addto\extrasngerman{% - \def\blindtext@text{% - Dies hier ist ein Blindtext zum Testen von Textausgaben. Wer - diesen Text liest, ist selbst schuld. Der Text gibt lediglich den - Grauwert der Schrift an. Ist das wirklich so? Ist es - gleich\-g\"ul\-tig ob ich schreibe: \frqq Dies ist ein - Blindtext\flqq\ oder \frqq Huardest gefburn\flqq? Kjift -- - mitnichten! Ein Blindtext bietet mir wichtige Informationen. An - ihm messe ich die Lesbarkeit einer Schrift, ihre Anmutung, wie - harmonisch die Figuren zueinander stehen und pr\"u\-fe, wie breit - oder schmal sie l\"auft. Ein Blindtext sollte m\"og\-lichst viele - verschiedene Buchstaben enthalten und in der Originalsprache - gesetzt sein. Er mu\ss\ keinen Sinn ergeben, sollte aber lesbar - sein. Fremdsprachige Texte wie \frqq Lorem ipsum\flqq\ dienen - nicht dem eigentlichen Zweck, da sie eine - falsche Anmutung vermitteln.% - }% \blindtext@text -} -% \end{macrocode} % -% \begin{macrocode} -\addto\extrasngerman{% - \def\blindtext@count{% - \ifcase\value{blind@listcount}\or - Erster\or Zweiter\or Dritter\or Vierter\or F{\"u}nfter\or - Sechster \or Siebter\or Achter\or Neunter\or Zehnter\or - Elfter \or Zw{\"o}lfter\or Dreizehnter\or Vierzehnter\else - Noch ein\fi - }% \blindtext@count - \def\blindtext@item{Listenpunkt, Stufe~\arabic{blind@levelcount}}% -}%\addto\extrasgerman -% \end{macrocode} -% -% \begin{macrocode} -\addto\extrasngerman{% - \def\blindtext@heading{{\"U}berschrift auf Ebene\xspace}% - \def\blindtext@list{Listen}% - \def\blindtext@listEx{Beispiel einer Liste\xspace}% -}%\addto\extrasngerman -% \end{macrocode} -% -% If the packet \Lpack{ngerman} is loaded, select the language. -% \begin{macrocode} -\@ifpackageloaded{ngerman}{\selectlanguage{ngerman}}{} -% \end{macrocode} -% -% \subsection{Latin Texts} -% \begin{macro}{\blindtext@latin} -% Define flag, so we can check, if language is defined. -% \begin{macrocode} -\def\blindtext@latin{} -% \end{macrocode} -% \end{macro} +% \subsection{Default without language} +% First all texts without any language. % -% I don't speak latin, but I think the classic "Lorem ipsum" should be available. % \begin{macrocode} -\addto\extraslatin{% - \def\blindtext@text{% +\def\blindtext@text{% Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam lobortis facilisis sem. Nullam nec mi et neque pharetra sollicitudin. Praesent imperdiet mi nec ante. Donec ullamcorper, @@ -783,50 +813,82 @@ Praesent lectus tellus, aliquet aliquam, luctus a, egestas a, turpis. Mauris lacinia lorem sit amet ipsum. Nunc quis urna dictum turpis accumsan semper.% - }%\blindtext@text } +\def\blindtext@count{% + \ifcase\blind@listitem\or + First\or Second%... + \else + Last% + \blind@listitem=0 % + \fi + \global\advance\blind@listitem by 1 % +}% \blindtext@count +\def\blindtext@item{itemtext} +\def\blindtext@countitem{\blindtext@count\ \blindtext@item} +\def\blindtext@heading{Heading on level\xspace} +\def\blindtext@list{Lists} +\def\blindtext@listEx{Example for list\xspace} +\def\blindtext@blindmath{Some blind text with math formulas} % \end{macrocode} % -% The following "Latin" texts are not really correct latin. -% (I never learned Latin) -% If you want correct texts, please provide them to me. -% -% \begin{macrocode} -\addto\extraslatin{% - \def\blindtext@count{% - \ifcase\value{blind@listcount}\or - Primus\or Duo\or Tres\or Quattuor\or Quinque\or - Sex\or Septem\or Octo\or Novem\or Decem\or - Undecim\or Duodecim% - \else - Nova% - \fi - }% \blindtext@count - \def\blindtext@item{, altum~\arabic{blind@levelcount}}% -}%\addto\extraslatin +% +%<*packageend> +% %^^A Load the texts for documentation +% \input{blindtext_texts.dtx} +% +% \subsection{More Languages} +%If you want to have blindtext in another language, please provide me some texts. +% +%I need: +%\begin{itemize} +% \item The language name (used in babel) +% \item Some text for the paragraphs +% \item The numbers as used in "first, second\ldots" +% \item The following texts: +% \begin{itemize} +% \item item: "item in a list" +% \item heading: "Heading on level" +% \item lists: "Lists" +% \item listsEx: "Example for list" +% \item blindmath: "Some blind text with math formulas" +% \end{itemize} +%\end{itemize} +% +% +% \section{Option Processing} +% \subsection{Option Math} +% \changes{V1.9}{2009-06-06}{Option math} +% Activate the math formulas in the text. +% \begin{macrocode} +\DeclareOption{math}{ + \blindmathtrue +} % \end{macrocode} % +% \subsection{Option toc} +% \changes{V1.9}{2009-06-14}{Option toc} +% Activate the table of contents for |\blinddoccument|. % \begin{macrocode} -\addto\extraslatin{% - \def\blindtext@heading{Sectio\xspace}% - \def\blindtext@list{Caudex}% - \def\blindtext@listEx{Exemplum caudex\xspace}% -}%\addto\extraslatin +\DeclareOption{toc}{ + \blindtoctrue +} % \end{macrocode} -% -% \section{Some other macros} -% \changes{V1.2b}{2001/05/25}{Add macros vieltext and alotoftext} -% \begin{macro}{\alotoftext} +% \section{Closing actions} +% Activate the options % \begin{macrocode} -\let\alotoftext=\blindtext +\ProcessOptions\relax % \end{macrocode} -% \end{macro}%^^A\alotoftext % % % \section{Thanks} % Thanks to Heiko Oberdiek and Arno Trautmann for corrections (Version 1.8) % +% Thanks to Andrea Bergschneider for her idea with math formulas inside the text +% (and Arno Trautmann for his cooperation in realizing it). +% Thanks to Dennis Heidsieck for his hint with polygloss. +% (Version 1.9) % \Finale % \PrintIndex +% \PrintChanges % \end{document} -% +% diff --git a/Master/texmf-dist/source/latex/blindtext/blindtext.ins b/Master/texmf-dist/source/latex/blindtext/blindtext.ins index c84505e6b70..875c6ad4c59 100644 --- a/Master/texmf-dist/source/latex/blindtext/blindtext.ins +++ b/Master/texmf-dist/source/latex/blindtext/blindtext.ins @@ -27,7 +27,12 @@ For more information visit ---------------------------------------------------------------------- \endpreamble -\generateFile{blindtext.sty}{f}{\from{blindtext.dtx}{package}} +\generateFile{blindtext.sty}{f}{ + \from{blindtext.dtx}{package} + \from{blindtext_texts.dtx}{package} + \from{blindtext.dtx}{packageend} +} +%\generateFile{blind_texts.sty}{f}{\from{generator_text/blind_texts.dtx}{package}} \Msg{***************************************************************} \Msg{*} diff --git a/Master/texmf-dist/source/latex/blindtext/blindtext_texts.dtx b/Master/texmf-dist/source/latex/blindtext/blindtext_texts.dtx new file mode 100644 index 00000000000..3f49abac4db --- /dev/null +++ b/Master/texmf-dist/source/latex/blindtext/blindtext_texts.dtx @@ -0,0 +1,331 @@ +% +% +% ^^A This part of blindtext is generated by mk_blindtext_texts.rb +% +% +% \subsection{English Texts} +% +% \begin{macro}{\blindtext@english} +% Define flag, so we can check, if language is defined. +% \begin{macrocode} +\def\blindtext@english{} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\blind@addtext{english}{% + \def\blindtext@text{% + Hello, here is some text without a meaning\blindtext@endsentence + This text should show, how a printed text will look like + at this place\blindtext@endsentence If you read this + text, you will get no information\blindtext@endsentence Really? Is there no + information? Is there a difference between this text and some + nonsense like \frqq Huardest gefburn\flqq\blindtext@endsentence + Kjift -- Never mind! A blind text like this gives you information about the selected + font, how the letters are written and the impression of the look\blindtext@endsentence + This text should contain all letters of the alphabet and it should + be written in of the original language\blindtext@endsentence There is no need for a + special contents, but the length of words should match to the + language\blindtext@endsentence% + }% \blindtext@text +} +% \end{macrocode} +% +% \begin{macrocode} +\blind@addtext{english}{% + \def\blindtext@count{% + \ifcase\value{blind@listcount}\or + First\or Second\or Third\or Fourth\or Fifth\or + Sixth\or Seventh\or Eighth\or Ninth\or Tenth\or + Eleventh\or Twelfth% + \else + Another% + \fi + }% \blindtext@count + \def\blindtext@item{item in a list}% +}%\addto\extrasenglish +% \end{macrocode} +% +% \begin{macrocode} +\blind@addtext{english}{% + \def\blindtext@heading{Heading on level\xspace}% + \def\blindtext@list{Lists}% + \def\blindtext@listEx{Example for list\xspace}% +}%\addto\extrasenglish +% \end{macrocode} +% +% Add the title for |\blindmathpaper|. +% \begin{macrocode} +\blind@addtext{english}{% + \def\blindtext@blindmath{Some blind text with math formulas}% +}%\addto\extrasenglish +% \end{macrocode} +% +% +% +% ^^A %%%%%%%%%% End English Texts %%%%%%%%%%%%%%%% +% +% \subsection{German Texts} +% +% \begin{macro}{\blindtext@german} +% Define flag, so we can check, if language is defined. +% \begin{macrocode} +\def\blindtext@german{} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\blind@addtext{german}{% + \def\blindtext@text{% + Dies hier ist ein Blindtext zum Testen von Textausgaben\blindtext@endsentence + Wer diesen Text liest, ist selbst schuld\blindtext@endsentence + Der Text gibt lediglich den Grauwert der Schrift + an\blindtext@endsentence Ist das wirklich so? Ist es + gleich\-g\"ul\-tig ob ich schreibe: \frqq Dies ist ein + Blindtext\flqq\ oder \frqq Huardest gefburn\flqq?\blindtext@endsentence + Kjift -- mitnichten! Ein Blindtext bietet mir wichtige + Informationen\blindtext@endsentence An ihm messe ich die + Lesbarkeit einer Schrift, ihre Anmutung, wie harmonisch die + Figuren zueinander stehen und pr\"u\-fe, wie breit oder + schmal sie l\"auft\blindtext@endsentence Ein Blindtext + sollte m\"og\-lichst viele verschiedene Buchstaben + enthalten und in der Originalsprache gesetzt + sein\blindtext@endsentence Er mu\ss\ keinen Sinn ergeben, + sollte aber lesbar sein\blindtext@endsentence + Fremdsprachige Texte wie \frqq Lorem ipsum\flqq\ dienen + nicht dem eigentlichen Zweck, da sie eine falsche Anmutung + vermitteln\blindtext@endsentence% + }% \blindtext@text +} +% \end{macrocode} +% +% \begin{macrocode} +\blind@addtext{german}{% + \def\blindtext@count{% + \ifcase\value{blind@listcount}\or + Erster\or Zweiter\or Dritter\or Vierter\or F{\"u}nfter\or + Sechster\or Siebter\or Achter\or Neunter\or Zehnter\or + Elfter\or Zw{\"o}lfter\or Dreizehnter\or Vierzehnter% + \else + Noch ein% + \fi + }% \blindtext@count + \def\blindtext@item{Listenpunkt, Stufe~\arabic{blind@levelcount}}% +}%\addto\extrasgerman +% \end{macrocode} +% +% \begin{macrocode} +\blind@addtext{german}{% + \def\blindtext@heading{{\"U}berschrift auf Ebene\xspace}% + \def\blindtext@list{Listen}% + \def\blindtext@listEx{Beispiel einer Liste\xspace}% +}%\addto\extrasgerman +% \end{macrocode} +% +% Add the title for |\blindmathpaper|. +% \begin{macrocode} +\blind@addtext{german}{% + \def\blindtext@blindmath{Blindtext mit mathematischen Formeln}% +}%\addto\extrasgerman +% \end{macrocode} +% +% If the packet \Lpack{german} is loaded, select the language. +% \begin{macrocode} +\@ifpackageloaded{german}{\selectlanguage{german}}{} +% \end{macrocode} +% +% ^^A %%%%%%%%%% End German Texts %%%%%%%%%%%%%%%% +% +% \subsection{German - New typesetting} +% +% \begin{macro}{\blindtext@ngerman} +% Define flag, so we can check, if language is defined. +% \begin{macrocode} +\def\blindtext@ngerman{} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\blind@addtext{ngerman}{% + \def\blindtext@text{% + Dies hier ist ein Blindtext zum Testen von Textausgaben\blindtext@endsentence + Wer diesen Text liest, ist selbst schuld\blindtext@endsentence + Der Text gibt lediglich den Grauwert der Schrift + an\blindtext@endsentence Ist das wirklich so? Ist es + gleich\-g\"ul\-tig ob ich schreibe: \frqq Dies ist ein + Blindtext\flqq\ oder \frqq Huardest gefburn\flqq?\blindtext@endsentence + Kjift -- mitnichten! Ein Blindtext bietet mir wichtige + Informationen\blindtext@endsentence An ihm messe ich die + Lesbarkeit einer Schrift, ihre Anmutung, wie harmonisch die + Figuren zueinander stehen und pr\"u\-fe, wie breit oder + schmal sie l\"auft\blindtext@endsentence Ein Blindtext + sollte m\"og\-lichst viele verschiedene Buchstaben + enthalten und in der Originalsprache gesetzt + sein\blindtext@endsentence Er mu\ss\ keinen Sinn ergeben, + sollte aber lesbar sein\blindtext@endsentence + Fremdsprachige Texte wie \frqq Lorem ipsum\flqq\ dienen + nicht dem eigentlichen Zweck, da sie eine falsche Anmutung + vermitteln\blindtext@endsentence% + }% \blindtext@text +} +% \end{macrocode} +% +% \begin{macrocode} +\blind@addtext{ngerman}{% + \def\blindtext@count{% + \ifcase\value{blind@listcount}\or + Erster\or Zweiter\or Dritter\or Vierter\or F{\"u}nfter\or + Sechster\or Siebter\or Achter\or Neunter\or Zehnter\or + Elfter\or Zw{\"o}lfter\or Dreizehnter\or Vierzehnter% + \else + Noch ein% + \fi + }% \blindtext@count + \def\blindtext@item{Listenpunkt, Stufe~\arabic{blind@levelcount}}% +}%\addto\extrasngerman +% \end{macrocode} +% +% \begin{macrocode} +\blind@addtext{ngerman}{% + \def\blindtext@heading{{\"U}berschrift auf Ebene\xspace}% + \def\blindtext@list{Listen}% + \def\blindtext@listEx{Beispiel einer Liste\xspace}% +}%\addto\extrasngerman +% \end{macrocode} +% +% Add the title for |\blindmathpaper|. +% \begin{macrocode} +\blind@addtext{ngerman}{% + \def\blindtext@blindmath{Blindtext mit mathematischen Formeln}% +}%\addto\extrasngerman +% \end{macrocode} +% +% +% If the packet \Lpack{ngerman} is loaded, select the language. +% \begin{macrocode} +\@ifpackageloaded{ngerman}{\selectlanguage{ngerman}}{} +% \end{macrocode} +% +% ^^A %%%%%%%%%% End German - New typesetting %%%%%%%%%%%%%%%% +% +% \subsection{Latin Texts} +% +% I don't speak Latin, but I think the classic "Lorem ipsum" should be available. +% There is no inline math supported for this "Lorem ipsum". +% +% The following "Latin" texts are not really correct Latin. +% If you want correct texts, please provide them to me. +% \begin{macro}{\blindtext@latin} +% Define flag, so we can check, if language is defined. +% \begin{macrocode} +\def\blindtext@latin{} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\blind@addtext{latin}{% + \def\blindtext@text{% + Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam + lobortis facilisis sem. Nullam nec mi et neque pharetra + sollicitudin. Praesent imperdiet mi nec ante. Donec ullamcorper, + felis non sodales commodo, lectus velit ultrices augue, a + dignissim nibh lectus placerat pede. Vivamus nunc nunc, molestie + ut, ultricies vel, semper in, velit. Ut porttitor. Praesent in + sapien. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. + Duis fringilla tristique neque. Sed interdum libero ut metus. + Pellentesque placerat. Nam rutrum augue a leo. Morbi sed elit sit + amet ante lobortis sollicitudin. Praesent blandit blandit mauris. + Praesent lectus tellus, aliquet aliquam, luctus a, egestas a, + turpis. Mauris lacinia lorem sit amet ipsum. Nunc quis urna dictum + turpis accumsan semper.% + }% \blindtext@text +} +% \end{macrocode} +% +% \begin{macrocode} +\blind@addtext{latin}{% + \def\blindtext@count{% + \ifcase\value{blind@listcount}\or + Primus\or Duo\or Tres\or Quattuor\or Quinque\or + Sex\or Septem\or Octo\or Novem\or Decem\\or + Undecim\or Duodecim% + \else + Nova% + \fi + }% \blindtext@count + \def\blindtext@item{, altum~\arabic{blind@levelcount}}% +}%\addto\extraslatin +% \end{macrocode} +% +% \begin{macrocode} +\blind@addtext{latin}{% + \def\blindtext@heading{Sectio\xspace}% + \def\blindtext@list{Caudex}% + \def\blindtext@listEx{Exemplum caudex\xspace}% +}%\addto\extraslatin +% \end{macrocode} +% +% Add the title for |\blindmathpaper|. +% \begin{macrocode} +\blind@addtext{latin}{% + \def\blindtext@blindmath{Mathematica}% +}%\addto\extraslatin +% \end{macrocode} +% +% +% +% ^^A %%%%%%%%%% End Latin Texts %%%%%%%%%%%%%%%% +% +% \subsection{FrenchTexts} +% \changes{V1.9b}{2009-06-05}{Support French - interim version} +% This text is just an interim solution until I get a correct text. +% \begin{macro}{\blindtext@french} +% Define flag, so we can check, if language is defined. +% \begin{macrocode} +\def\blindtext@french{} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\blind@addtext{french}{% + \def\blindtext@text{% + Qu'est que c'est?\blindtext@endsentence + C'est mon premi\`{e}re phrase fran\c{c}ais depuis quince ans\blindtext@endsentence %% + }% \blindtext@text +} +% \end{macrocode} +% +% \begin{macrocode} +\blind@addtext{french}{% + \def\blindtext@count{% + \ifcase\value{blind@listcount}\or + Premier\or Deuxi\`eme\or Troisi\`eme\or Quatri\`eme\or Cinqui\`eme\or + Sixi\`eme\or Septi\`eme\or Huiti\`eme\or Neuvi\`eme\or Dixi\`eme\or + Onzi\`eme\or Douzi\`eme% + \else + L'autres% + \fi + }% \blindtext@count + \def\blindtext@item{point dans une list}% +}%\addto\extrasfrench +% \end{macrocode} +% +% \begin{macrocode} +\blind@addtext{french}{% + \def\blindtext@heading{Titres de niveau\xspace}% + \def\blindtext@list{Lists}% + \def\blindtext@listEx{Example pour une list\xspace}% +}%\addto\extrasfrench +% \end{macrocode} +% +% Add the title for |\blindmathpaper|. +% \begin{macrocode} +\blind@addtext{french}{% + \def\blindtext@blindmath{Quelque text avec des formulas math\´ematique.}% +}%\addto\extrasfrench +% \end{macrocode} +% +% +% +% ^^A %%%%%%%%%% End FrenchTexts %%%%%%%%%%%%%%%% +% diff --git a/Master/texmf-dist/tex/latex/blindtext/blindtext.sty b/Master/texmf-dist/tex/latex/blindtext/blindtext.sty index fb45acc484f..992c4b8605f 100644 --- a/Master/texmf-dist/tex/latex/blindtext/blindtext.sty +++ b/Master/texmf-dist/tex/latex/blindtext/blindtext.sty @@ -5,6 +5,8 @@ %% The original source files were: %% %% blindtext.dtx (with options: `package') +%% blindtext_texts.dtx (with options: `package') +%% blindtext.dtx (with options: `packageend') %% ---------------------------------------------------------------------- %% The original file is loadable from CTAN on: %% tex-archive/latex/contrib/blindtext @@ -27,8 +29,8 @@ %% For more information visit %% http://tex.lickert.net/packages/blindtext/index.html %% ---------------------------------------------------------------------- -\def\fileversion{V1.8} -\def\filedate{2009/01/27} +\def\blindfileversion{V1.9b} +\def\blindfiledate{2009/06/14} %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -47,7 +49,7 @@ %% Right brace \} Tilde \~} %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{blindtext}[\filedate\space\fileversion\space% +\ProvidesPackage{blindtext}[\blindfiledate\space\blindfileversion\space% blindtext-Package] \RequirePackage{xspace} \providecommand{\frqq}{} @@ -55,12 +57,11 @@ \newcommand{\blind@checklanguage}{% \@ifundefined{blindtext@\languagename}{% \PackageWarning{blindtext}{\languagename\space not - defined, using english instead.\MessageBreak + defined, using English instead.\MessageBreak }% \selectlanguage{english}% }{}% } - \newcounter{blindtext}\setcounter{blindtext}{1} \newcounter{Blindtext}\setcounter{Blindtext}{5} \newcount\blind@countxx @@ -175,7 +176,61 @@ \repeat } %% ^^A----------------------------------------------------------- + %Finish a sentence with a dot. + %This macro is redefined for blind text with inline math/formulas. + \def\blindtext@endsentence{.\xspace}% + \newcount{\blind@mathformula}\blind@mathformula=0% +\newif\ifblindmath +\let\oldblindmathtrue\blindmathtrue +\renewcommand{\blindmathtrue}{ + \oldblindmathtrue + \def\blindtext@endsentence{% + \advance\blind@mathformula by 1% + \ifcase\blind@mathformula% + \or. \(\sin^2(\alpha) + \cos^2(\beta) = 1\)% + \or\xspace\(E = mc^2\)% + \or. \(\sqrt[n]{a} \cdot \sqrt[n]{b} = \sqrt[n]{ab}\)% + \or. \(\frac{\sqrt[n]{a}}{\sqrt[n]{b}} = \sqrt[n]{\frac{a}{b}}\)% + \or. \(a\sqrt[n]{b} = \sqrt[n]{a^n b}\)% + \or. \(\mathrm{d}\Omega = \sin \vartheta \mathrm{d} \vartheta \mathrm{d}\varphi\)% + \else\global\blind@mathformula=0% + \fi% + .\xspace}% + }%\blindmathtrue +\let\oldblindmathfalse\blindmathfalse +\renewcommand{\blindmathfalse}{ + \oldblindmathfalse + \def\blindtext@endsentence{.\xspace}% +}%\includemath + \newcount{\blind@Mathformula} + \blind@Mathformula=0% + \def\blindtext@formula{% + \advance\blind@Mathformula by 1% + \ifcase\blind@Mathformula% + \[\bar x = \frac{1}{n}\sum_{i=1}^{i=n} x_i = \frac{x_1 + x_2 + \dots{} + x_n}{n}\] + \or \[ \int_0^\infty e^{-\alpha x^2} \mathrm{d}x = + \frac12\sqrt{\int_{-\infty}^\infty e^{-\alpha x^2}} + \mathrm{d}x\int_{-\infty}^\infty e^{-\alpha y^2}\mathrm{d}y = + \frac12\sqrt{\frac{\pi}{\alpha}} \] + \or \[ \sum_{k=0}^\infty a_0q^k = \lim_{n\to\infty}\sum_{k=0}^n a_0q^k = + \lim_{n\to\infty} a_0\frac{1-q^{n+1}}{1-q} = \frac{a_0}{1-q} + \] + \or \[x_{1,2}=\frac{-b \pm \sqrt{b^2-4ac}}{2a} = \frac{-p \pm \sqrt{p^2-4q}}{2}\] + \or \[ \frac{\partial^2 \Phi}{\partial x^2} + \frac{\partial^2 \Phi}{\partial y^2} + + \frac{\partial^2 \Phi}{\partial z^2} = + \frac{1}{c^2}\frac{\partial^2\Phi}{\partial t^2} + \] + \or \[\sqrt[n]{a} \cdot \sqrt[n]{b} = \sqrt[n]{ab}\] + \or \[\frac{\sqrt[n]{a}}{\sqrt[n]{b}} = \sqrt[n]{\frac{a}{b}}\] + \or \[a\sqrt[n]{b} = \sqrt[n]{a^n b}\] + \global\blind@Mathformula=0% + \fi% +}% +%% ^^A----------------------------------------------------------- +\newif\ifblindtoc +\blindtocfalse \newcommand{\blinddocument}{% + \ifblindtoc\tableofcontents\fi \@ifundefined{chapter}{}{% \chapter{\blindtext@heading 0 (chapter)}% \blindtext @@ -203,6 +258,7 @@ \blindlistlistoptional{description}[2]% } \newcommand{\Blinddocument}{% + \ifblindtoc\tableofcontents\fi \@ifundefined{chapter}{}{% \chapter{\blindtext@heading 0 (chapter)}% \blindtext @@ -231,17 +287,55 @@ \subsubsection{\blindtext@listEx (4*description)}% \blind@longtrue \blindlistlistoptional{description}[2]% + % + \ifblindmath + \section{\blindtext@blindmath}% + \blindmathpaper% + \fi% } +\newcommand{\blindmathpaper}{ +\blindtext +\blindtext@formula +\blindtext +\blindtext@formula +\blindtext +\blindtext@formula +\blindtext +\blindtext@formula +\blindtext +\blindtext@formula +\blindtext +}%\blindmathpaper %% ^^A----------------------------------------------------------- -\@ifundefined{addto}{% - \@ifpackageloaded{babel}{}{% - \PackageWarning{blindtext}{% - You are not using babel.sty -> Language by random\MessageBreak - Kein babel.sty verwendet -> Zufallssprache}% - }% - \newcommand{\addto}[2]{#2}% -}{} -\def\blindtext@text{Text} +\newcommand{\blind@addtext}[2]{% + \@ifpackageloaded{babel}{ + \expandafter\addto\csname extras#1\endcsname{#2} + }{}% + \@ifpackageloaded{polyglossia}{ + \expandafter\gappto\csname captions#1\endcsname {#2} + }{}% + \@ifpackageloaded{ngerman}{ + \expandafter\g@addto@macro\csname captions#1\endcsname {#2} + }{}% + \@ifpackageloaded{german}{ + \expandafter\g@addto@macro\csname captions#1\endcsname {#2} + }{}% +}%\blind@addtext +\def\blindtext@text{% + Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam + lobortis facilisis sem. Nullam nec mi et neque pharetra + sollicitudin. Praesent imperdiet mi nec ante. Donec ullamcorper, + felis non sodales commodo, lectus velit ultrices augue, a + dignissim nibh lectus placerat pede. Vivamus nunc nunc, molestie + ut, ultricies vel, semper in, velit. Ut porttitor. Praesent in + sapien. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. + Duis fringilla tristique neque. Sed interdum libero ut metus. + Pellentesque placerat. Nam rutrum augue a leo. Morbi sed elit sit + amet ante lobortis sollicitudin. Praesent blandit blandit mauris. + Praesent lectus tellus, aliquet aliquam, luctus a, egestas a, + turpis. Mauris lacinia lorem sit amet ipsum. Nunc quis urna dictum + turpis accumsan semper.% +} \def\blindtext@count{% \ifcase\blind@listitem\or First\or Second%... @@ -256,112 +350,134 @@ \def\blindtext@heading{Heading on level\xspace} \def\blindtext@list{Lists} \def\blindtext@listEx{Example for list\xspace} +\def\blindtext@blindmath{Some blind text with math formulas} \def\blindtext@english{} -\addto\extrasenglish{% +\blind@addtext{english}{% \def\blindtext@text{% - Hello, here is some text without a meaning. This text should show, - how a printed text will look like at this place. If you read this - text, you will get no information. Really? Is there no + Hello, here is some text without a meaning\blindtext@endsentence + This text should show, how a printed text will look like + at this place\blindtext@endsentence If you read this + text, you will get no information\blindtext@endsentence Really? Is there no information? Is there a difference between this text and some - nonsense like \frqq Huardest gefburn\flqq? Kjift -- Never mind! A - blind text like this gives you information about the selected - font, how the letters are written and the impression of the look. + nonsense like \frqq Huardest gefburn\flqq\blindtext@endsentence + Kjift -- Never mind! A blind text like this gives you information about the selected + font, how the letters are written and the impression of the look\blindtext@endsentence This text should contain all letters of the alphabet and it should - be written in of the original language. There is no need for a + be written in of the original language\blindtext@endsentence There is no need for a special contents, but the length of words should match to the - language.% + language\blindtext@endsentence% }% \blindtext@text } -\addto\extrasenglish{% +\blind@addtext{english}{% \def\blindtext@count{% \ifcase\value{blind@listcount}\or First\or Second\or Third\or Fourth\or Fifth\or Sixth\or Seventh\or Eighth\or Ninth\or Tenth\or Eleventh\or Twelfth% - \else Another% + \else + Another% \fi }% \blindtext@count - \def\blindtext@item{item in a list}%, level~\arabic{blindlist@level}} -}% \addto\extrasenglish -\addto\extrasenglish{% + \def\blindtext@item{item in a list}% +}%\addto\extrasenglish +\blind@addtext{english}{% \def\blindtext@heading{Heading on level\xspace}% \def\blindtext@list{Lists}% \def\blindtext@listEx{Example for list\xspace}% }%\addto\extrasenglish +\blind@addtext{english}{% + \def\blindtext@blindmath{Some blind text with math formulas}% +}%\addto\extrasenglish \def\blindtext@german{} -\addto\extrasgerman{% +\blind@addtext{german}{% \def\blindtext@text{% - Dies hier ist ein Blindtext zum Testen von Textausgaben. Wer - diesen Text liest, ist selbst schuld. Der Text gibt lediglich den - Grauwert der Schrift an. Ist das wirklich so? Ist es + Dies hier ist ein Blindtext zum Testen von Textausgaben\blindtext@endsentence + Wer diesen Text liest, ist selbst schuld\blindtext@endsentence + Der Text gibt lediglich den Grauwert der Schrift + an\blindtext@endsentence Ist das wirklich so? Ist es gleich\-g\"ul\-tig ob ich schreibe: \frqq Dies ist ein - Blindtext\flqq\ oder \frqq Huardest gefburn\flqq? Kjift -- - mitnichten! Ein Blindtext bietet mir wichtige Informationen. An - ihm messe ich die Lesbarkeit einer Schrift, ihre Anmutung, wie - harmonisch die Figuren zueinander stehen und pr\"u\-fe, wie breit - oder schmal sie l\"auft. Ein Blindtext sollte m\"og\-lichst viele - verschiedene Buchstaben enthalten und in der Originalsprache - gesetzt sein. Er mu\ss\ keinen Sinn ergeben, sollte aber lesbar - sein. Fremdsprachige Texte wie \frqq Lorem ipsum\flqq\ dienen - nicht dem eigentlichen Zweck, da sie eine - falsche Anmutung vermitteln.% + Blindtext\flqq\ oder \frqq Huardest gefburn\flqq?\blindtext@endsentence + Kjift -- mitnichten! Ein Blindtext bietet mir wichtige + Informationen\blindtext@endsentence An ihm messe ich die + Lesbarkeit einer Schrift, ihre Anmutung, wie harmonisch die + Figuren zueinander stehen und pr\"u\-fe, wie breit oder + schmal sie l\"auft\blindtext@endsentence Ein Blindtext + sollte m\"og\-lichst viele verschiedene Buchstaben + enthalten und in der Originalsprache gesetzt + sein\blindtext@endsentence Er mu\ss\ keinen Sinn ergeben, + sollte aber lesbar sein\blindtext@endsentence + Fremdsprachige Texte wie \frqq Lorem ipsum\flqq\ dienen + nicht dem eigentlichen Zweck, da sie eine falsche Anmutung + vermitteln\blindtext@endsentence% }% \blindtext@text } -\addto\extrasgerman{% +\blind@addtext{german}{% \def\blindtext@count{% \ifcase\value{blind@listcount}\or Erster\or Zweiter\or Dritter\or Vierter\or F{\"u}nfter\or Sechster\or Siebter\or Achter\or Neunter\or Zehnter\or Elfter\or Zw{\"o}lfter\or Dreizehnter\or Vierzehnter% - \else + \else Noch ein% \fi }% \blindtext@count \def\blindtext@item{Listenpunkt, Stufe~\arabic{blind@levelcount}}% }%\addto\extrasgerman -\addto\extrasgerman{% +\blind@addtext{german}{% \def\blindtext@heading{{\"U}berschrift auf Ebene\xspace}% \def\blindtext@list{Listen}% \def\blindtext@listEx{Beispiel einer Liste\xspace}% -}% \addto\extrasgerman +}%\addto\extrasgerman +\blind@addtext{german}{% + \def\blindtext@blindmath{Blindtext mit mathematischen Formeln}% +}%\addto\extrasgerman \@ifpackageloaded{german}{\selectlanguage{german}}{} \def\blindtext@ngerman{} -\addto\extrasngerman{% +\blind@addtext{ngerman}{% \def\blindtext@text{% - Dies hier ist ein Blindtext zum Testen von Textausgaben. Wer - diesen Text liest, ist selbst schuld. Der Text gibt lediglich den - Grauwert der Schrift an. Ist das wirklich so? Ist es + Dies hier ist ein Blindtext zum Testen von Textausgaben\blindtext@endsentence + Wer diesen Text liest, ist selbst schuld\blindtext@endsentence + Der Text gibt lediglich den Grauwert der Schrift + an\blindtext@endsentence Ist das wirklich so? Ist es gleich\-g\"ul\-tig ob ich schreibe: \frqq Dies ist ein - Blindtext\flqq\ oder \frqq Huardest gefburn\flqq? Kjift -- - mitnichten! Ein Blindtext bietet mir wichtige Informationen. An - ihm messe ich die Lesbarkeit einer Schrift, ihre Anmutung, wie - harmonisch die Figuren zueinander stehen und pr\"u\-fe, wie breit - oder schmal sie l\"auft. Ein Blindtext sollte m\"og\-lichst viele - verschiedene Buchstaben enthalten und in der Originalsprache - gesetzt sein. Er mu\ss\ keinen Sinn ergeben, sollte aber lesbar - sein. Fremdsprachige Texte wie \frqq Lorem ipsum\flqq\ dienen - nicht dem eigentlichen Zweck, da sie eine - falsche Anmutung vermitteln.% + Blindtext\flqq\ oder \frqq Huardest gefburn\flqq?\blindtext@endsentence + Kjift -- mitnichten! Ein Blindtext bietet mir wichtige + Informationen\blindtext@endsentence An ihm messe ich die + Lesbarkeit einer Schrift, ihre Anmutung, wie harmonisch die + Figuren zueinander stehen und pr\"u\-fe, wie breit oder + schmal sie l\"auft\blindtext@endsentence Ein Blindtext + sollte m\"og\-lichst viele verschiedene Buchstaben + enthalten und in der Originalsprache gesetzt + sein\blindtext@endsentence Er mu\ss\ keinen Sinn ergeben, + sollte aber lesbar sein\blindtext@endsentence + Fremdsprachige Texte wie \frqq Lorem ipsum\flqq\ dienen + nicht dem eigentlichen Zweck, da sie eine falsche Anmutung + vermitteln\blindtext@endsentence% }% \blindtext@text } -\addto\extrasngerman{% +\blind@addtext{ngerman}{% \def\blindtext@count{% \ifcase\value{blind@listcount}\or - Erster\or Zweiter\or Dritter\or Vierter\or F{\"u}nfter\or - Sechster \or Siebter\or Achter\or Neunter\or Zehnter\or - Elfter \or Zw{\"o}lfter\or Dreizehnter\or Vierzehnter\else - Noch ein\fi + Erster\or Zweiter\or Dritter\or Vierter\or F{\"u}nfter\or + Sechster\or Siebter\or Achter\or Neunter\or Zehnter\or + Elfter\or Zw{\"o}lfter\or Dreizehnter\or Vierzehnter% + \else + Noch ein% + \fi }% \blindtext@count \def\blindtext@item{Listenpunkt, Stufe~\arabic{blind@levelcount}}% -}%\addto\extrasgerman -\addto\extrasngerman{% +}%\addto\extrasngerman +\blind@addtext{ngerman}{% \def\blindtext@heading{{\"U}berschrift auf Ebene\xspace}% \def\blindtext@list{Listen}% \def\blindtext@listEx{Beispiel einer Liste\xspace}% }%\addto\extrasngerman +\blind@addtext{ngerman}{% + \def\blindtext@blindmath{Blindtext mit mathematischen Formeln}% +}%\addto\extrasngerman \@ifpackageloaded{ngerman}{\selectlanguage{ngerman}}{} \def\blindtext@latin{} -\addto\extraslatin{% +\blind@addtext{latin}{% \def\blindtext@text{% Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam lobortis facilisis sem. Nullam nec mi et neque pharetra @@ -376,13 +492,13 @@ Praesent lectus tellus, aliquet aliquam, luctus a, egestas a, turpis. Mauris lacinia lorem sit amet ipsum. Nunc quis urna dictum turpis accumsan semper.% - }%\blindtext@text + }% \blindtext@text } -\addto\extraslatin{% +\blind@addtext{latin}{% \def\blindtext@count{% \ifcase\value{blind@listcount}\or Primus\or Duo\or Tres\or Quattuor\or Quinque\or - Sex\or Septem\or Octo\or Novem\or Decem\or + Sex\or Septem\or Octo\or Novem\or Decem\\or Undecim\or Duodecim% \else Nova% @@ -390,12 +506,48 @@ }% \blindtext@count \def\blindtext@item{, altum~\arabic{blind@levelcount}}% }%\addto\extraslatin -\addto\extraslatin{% +\blind@addtext{latin}{% \def\blindtext@heading{Sectio\xspace}% \def\blindtext@list{Caudex}% \def\blindtext@listEx{Exemplum caudex\xspace}% }%\addto\extraslatin -\let\alotoftext=\blindtext +\blind@addtext{latin}{% + \def\blindtext@blindmath{Mathematica}% +}%\addto\extraslatin +\def\blindtext@french{} +\blind@addtext{french}{% + \def\blindtext@text{% + Qu'est que c'est?\blindtext@endsentence + C'est mon premi\`{e}re phrase fran\c{c}ais depuis quince ans\blindtext@endsentence %% + }% \blindtext@text +} +\blind@addtext{french}{% + \def\blindtext@count{% + \ifcase\value{blind@listcount}\or + Premier\or Deuxi\`eme\or Troisi\`eme\or Quatri\`eme\or Cinqui\`eme\or + Sixi\`eme\or Septi\`eme\or Huiti\`eme\or Neuvi\`eme\or Dixi\`eme\or + Onzi\`eme\or Douzi\`eme% + \else + L'autres% + \fi + }% \blindtext@count + \def\blindtext@item{point dans une list}% +}%\addto\extrasfrench +\blind@addtext{french}{% + \def\blindtext@heading{Titres de niveau\xspace}% + \def\blindtext@list{Lists}% + \def\blindtext@listEx{Example pour une list\xspace}% +}%\addto\extrasfrench +\blind@addtext{french}{% + \def\blindtext@blindmath{Quelque text avec des formulas math\´ematique.}% +}%\addto\extrasfrench +\DeclareOption{math}{ + \blindmathtrue +} +\DeclareOption{toc}{ + \blindtoctrue +} +\ProcessOptions\relax \endinput %% %% End of file `blindtext.sty'. -- cgit v1.2.3