diff options
author | Karl Berry <karl@freefriends.org> | 2007-01-03 01:22:49 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2007-01-03 01:22:49 +0000 |
commit | c20c927ab1e34cdf707ffb2c79b83d7015395f8e (patch) | |
tree | 9cf2319fde92f01bf897e0343c35a0c2378a4f17 /Master/texmf-dist/source/latex/blindtext | |
parent | 17e505c4afcf6265da5992c8ccfe341cd10d149f (diff) |
blindtext update (3jan07)
git-svn-id: svn://tug.org/texlive/trunk@3109 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/blindtext')
-rw-r--r-- | Master/texmf-dist/source/latex/blindtext/blindtext.dtx | 301 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/blindtext/blindtext.ins | 82 |
2 files changed, 241 insertions, 142 deletions
diff --git a/Master/texmf-dist/source/latex/blindtext/blindtext.dtx b/Master/texmf-dist/source/latex/blindtext/blindtext.dtx index 20092e955ab..30aefacaf3d 100644 --- a/Master/texmf-dist/source/latex/blindtext/blindtext.dtx +++ b/Master/texmf-dist/source/latex/blindtext/blindtext.dtx @@ -1,11 +1,11 @@ % ^^A CTAN:macros/latex/contrib/supported/minutes -\def\fileversion{V1.5} -\def\filedate{2005/10/20} +\def\fileversion{V1.7} +\def\filedate{2006/11/21} % ^^A For index and changes, run: -% ^^A makeindex -s gglo -o blindtext.gls blindtext.glo -% ^^A makeindex -s gind -o blindtext.ind blindtext.idx +% ^^A makeindex -s gglo.ist -o blindtext.gls blindtext.glo +% ^^A makeindex -s gind.ist -o blindtext.ind blindtext.idx % -% \CheckSum{489} +% \CheckSum{547} %% %% \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 @@ -195,6 +195,26 @@ \providecommand{\flqq}{} % \end{macrocode} % +% \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. +% 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 + }% + \selectlanguage{english}% + }{}% +} +% \end{macrocode} +% \end{macro} + + % First we need some counters for the number of repetitions of the % text and the paragraphs. % \begin{macrocode} @@ -208,14 +228,16 @@ % The default is stored in the counter \verb|blindtext|. This value % can be changed with \verb|\setcounter{blindtext}{1}|. % +% \changes{V1.6}{2006-08-02}{Check for defined language} % \begin{macrocode} \newcount\blind@countxx -\newcommand{\blindtext}[1][\value{blindtext}]{ -\blind@countxx=1 -\loop -\blindtext@text -\ifnum\blind@countxx<#1\advance\blind@countxx by 1 -\repeat +\newcommand{\blindtext}[1][\value{blindtext}]{% + \blind@checklanguage + \blind@countxx=1 % + \loop + \blindtext@text + \ifnum\blind@countxx<#1\advance\blind@countxx by 1 % + \repeat } % \end{macrocode} % \end{macro} @@ -227,11 +249,14 @@ % can be changed with \verb|\setcounter{Blindtext}{5}|. % The counter \verb|blindtext@numBlindtext| stores the first % optional parameter to be used in \verb|\blindtext@Blindtext|. +% \changes{V1.6}{2006-08-02}{Check for defined language} % \begin{macrocode} -\newcount\blindtext@numBlindtext -\newcommand{\Blindtext}[1][\value{Blindtext}]{ -\blindtext@numBlindtext=#1 -\blind@Blindtext} +\newcount\blindtext@numBlindtext% +\newcommand{\Blindtext}[1][\value{Blindtext}]{% +\blind@checklanguage% +\blindtext@numBlindtext=#1% +\blind@Blindtext% +} % \end{macrocode} % \end{macro} %^^ABlindtext % @@ -241,13 +266,13 @@ % Each paragraph starts and end with a text, which can be defined with % \verb|\starttext| or \verb|\endtext|. % \begin{macrocode} -\newcount\blind@countyy -\newcommand{\blind@Blindtext}[1][\value{blindtext}]{ -\blind@countyy=1 -\loop -{\blindtext@parstart\blindtext[#1]\blindtext@parend\par} -\ifnum\blind@countyy<\blindtext@numBlindtext\advance\blind@countyy by 1 -\repeat +\newcount\blind@countyy% +\newcommand{\blind@Blindtext}[1][\value{blindtext}]{% + \blind@countyy=1 % +\loop% +{\blindtext@parstart\blindtext[#1]\blindtext@parend\par}% + \ifnum\blind@countyy<\blindtext@numBlindtext\advance\blind@countyy by 1 % +\repeat% } % \end{macrocode} % \end{macro}%^^A{\blind@Blindtext} @@ -285,9 +310,11 @@ % The default is stored in the counter \verb|blindlist|. This value % can be changed with \verb|\setcounter{blindlist}{1}|. % The type of list is stored in \verb|\blind@listtype|. +% \changes{V1.6}{2006-08-02}{Check for defined language} % \begin{macrocode} %% ^^A----------------------------------------------------------- \newcommand{\blindlist}[1]{ +\blind@checklanguage \def\blind@listtype{#1} \setcounter{blind@levelcount}{1} \blind@list @@ -301,15 +328,15 @@ % optional parameter. After the printout, we reset the flags and the % counter for the list text. % \begin{macrocode} -\newcommand{\blind@list}[1][5]{ -\setcounter{blindlist}{#1} +\newcommand{\blind@list}[1][5]{% +\setcounter{blindlist}{#1}% \addtocounter{blindlist@level}{1}%depth of list -\blind@listitem=1 -\begin{\blind@listtype} -\blind@items -\end{\blind@listtype} -\blind@longfalse -\blind@optionalfalse + \blind@listitem=1 % +\begin{\blind@listtype}% +\blind@items% +\end{\blind@listtype}% +\blind@longfalse% +\blind@optionalfalse% } % \end{macrocode} % \end{macro}%^^A{\blind@list} @@ -317,21 +344,21 @@ % \begin{macro}{\blindlistlist} % \verb|\blindlistlist[num]{env}[x]| writes cascaded lists up to level num. % \begin{macrocode} -\newcommand{\blindlistlist}[2][4]{ -\setcounter{blindlistlevel}{#1} +\newcommand{\blindlistlist}[2][4]{% +\setcounter{blindlistlevel}{#1}% \setcounter{blindlist@level}{0}%deepest reached level \setcounter{blind@levelcount}{1}%actual level for printout -\def\blind@listtype{#2} -\blind@list +\def\blind@listtype{#2}% +\blind@list% } % \end{macrocode} % \end{macro}%^^A{\blindlistlist} % \begin{macro}{\blindlistlistoptional} % Like \verb|\blindlistlist[num]{env}[x]| but for environment with optional parameters. % \begin{macrocode} -\newcommand{\blindlistlistoptional}{ -\blind@optionaltrue -\blindlistlist +\newcommand{\blindlistlistoptional}{% +\blind@optionaltrue% +\blindlistlist% } % \end{macrocode} % \end{macro}%^^A{\blindlistlistoptional} @@ -353,9 +380,9 @@ % % \begin{macro}{\Blindlist} % \begin{macrocode} -\newcommand{\Blindlist}[1]{ -\blind@longtrue -\blindlist{#1} +\newcommand{\Blindlist}[1]{% +\blind@longtrue% +\blindlist{#1}% } % \end{macrocode} % \end{macro}%^^A{\Blindlist} @@ -374,9 +401,9 @@ % Here we start a list with \verb|\item[]|. So we set the flag for optional % parameter and start the normal list. % \begin{macrocode} -\newcommand{\blindlistoptional}[1]{ -\blind@optionaltrue -\blindlist{#1} +\newcommand{\blindlistoptional}[1]{% +\blind@optionaltrue% +\blindlist{#1}% } % \end{macrocode} % \end{macro}%^^A{\blindlistoptional} @@ -384,10 +411,10 @@ % \begin{macro}{\Blindlistoptional} % Now a big list with optional parameter at \verb|\item|. % \begin{macrocode} -\newcommand{\Blindlistoptional}[1]{ -\blind@optionaltrue -\blind@longtrue -\blindlist{#1} +\newcommand{\Blindlistoptional}[1]{% +\blind@optionaltrue% +\blind@longtrue% +\blindlist{#1}% } % \end{macrocode} % \end{macro}%^^A{\blindlistoptional} @@ -395,10 +422,11 @@ % \begin{macro}{\blinddescription} % \begin{macro}{\Blinddescription} % Some default macros for the standard environment description. +%\changes{1.7}{2006-12-01}{Replace counter listcount} % \begin{macrocode} \newcommand{\blinddescription}{\blindlistoptional{description}} \newcommand{\Blinddescription}{\Blindlistoptional{description}} -\newcounter{listcount} +\newcounter{blind@listcount} \newcounter{blind@levelcount} % \end{macrocode} % \end{macro}%^^A{\blinddescription} @@ -410,7 +438,7 @@ % type of \verb|\item| is influenced by the flags. % \begin{macrocode} \newcommand{\blind@items}{ -\setcounter{listcount}{1} +\setcounter{blind@listcount}{1} \loop \ifblind@optional \ifblind@long @@ -418,25 +446,28 @@ \else \item[\blindtext@count] \blindtext@item \fi -\else%\blind@optionalfalse + \else % \blind@optionalfalse \ifblind@long \item \blindtext@text \else \item \blindtext@countitem \fi -\fi%\ifblind@optional + \fi % \ifblind@optional % \end{macrocode} % Loop for cascaded lists. % \changes{V1.3}{2003-05-18}{Cascaded lists} % \begin{macrocode} -{\loop - \ifnum\value{blindlistlevel}>\value{blindlist@level} - \addtocounter{blind@levelcount}{1} - \blind@list[\value{blindlist}]\relax - \addtocounter{blind@levelcount}{-1} - \setcounter{listcount}{1} -\repeat} -\ifnum\value{listcount}<\value{blindlist}\addtocounter{listcount}{1} + {% + \loop + \ifnum\value{blindlistlevel}>\value{blindlist@level} + \addtocounter{blind@levelcount}{1} + \blind@list[\value{blindlist}]\relax + \addtocounter{blind@levelcount}{-1} + \setcounter{blind@listcount}{1} + \repeat + }% +\ifnum\value{blind@listcount}<\value{blindlist} +\addtocounter{blind@listcount}{1} % \end{macrocode} % Correction for nested values. % \begin{macrocode} @@ -463,7 +494,7 @@ \blindtext \subsection{\blindtext@heading 2 (subsection)} \blindtext - \subsubsection{ \blindtext@heading 3 (subsubsection)} + \subsubsection{\blindtext@heading 3 (subsubsection)}% \blindtext \paragraph{\blindtext@heading 4 (paragraph)} \blindtext @@ -524,6 +555,7 @@ % %% ^^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} @@ -543,10 +575,14 @@ Kein babel.sty verwendet -> Zufallssprache}} % define all this macros. % \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 +\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} @@ -556,8 +592,16 @@ Kein babel.sty verwendet -> Zufallssprache}} % \end{macrocode} % % \subsection{English Texts} +% +% \begin{macro}{\blindtext@english} +% Define flag, so we can check, if language is defined. % \begin{macrocode} -\addto\extrasenglish{ +\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 @@ -574,30 +618,40 @@ language.}%\blindtext@text % \end{macrocode} % % \begin{macrocode} -\addto\extrasenglish{ -\def\blindtext@count{\ifcase\value{listcount}\or - First\or Second \or Third \or Fourth\or Fivth\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 +\addto\extrasenglish{% + \def\blindtext@count{% + \ifcase\value{blind@listcount}\or + First\or Second \or Third \or Fourth\or Fivth\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 +\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} % +% \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} -\addto\extrasgerman{ +\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 @@ -617,23 +671,26 @@ falsche Anmutung vermitteln.}%\blindtext@text % \end{macrocode} % % \begin{macrocode} -\addto\extrasgerman{ -\def\blindtext@count{\ifcase\value{listcount}\or +\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 + 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 +\def\blindtext@item{Listenpunkt, Stufe~\arabic{blind@levelcount}}% +}%\addto\extrasgerman % \end{macrocode} % % \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 +\addto\extrasgerman{% + \def\blindtext@heading{{\"U}berschrift auf Ebene\xspace}% + \def\blindtext@list{Listen}% + \def\blindtext@listEx{Beispiel einer Liste\xspace}% +}%\addto\extrasgerman % % If the packet \Lpack{german} is loaded, select the language. % \begin{macrocode} @@ -641,8 +698,15 @@ falsche Anmutung vermitteln.}%\blindtext@text % \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{} +% \end{macrocode} +% \end{macro} +% % \begin{macrocode} -\addto\extrasngerman{ +\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 @@ -662,23 +726,24 @@ falsche Anmutung vermitteln.}%\blindtext@text % \end{macrocode} % % \begin{macrocode} -\addto\extrasngerman{ -\def\blindtext@count{\ifcase\value{listcount}\or +\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 +\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 +\addto\extrasngerman{% + \def\blindtext@heading{{\"U}berschrift auf Ebene\xspace}% + \def\blindtext@list{Listen}% + \def\blindtext@listEx{Beispiel einer Liste\xspace}% +}%\addto\extrasngerman % % If the packet \Lpack{ngerman} is loaded, select the language. % \begin{macrocode} @@ -686,9 +751,16 @@ falsche Anmutung vermitteln.}%\blindtext@text % \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} +% % I don't speak latin, but I think the classic "Lorem ipsum" should be available. % \begin{macrocode} -\addto\extraslatin{ +\addto\extraslatin{% \def\blindtext@text{ Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam lobortis facilisis sem. Nullam nec mi et neque pharetra @@ -706,6 +778,33 @@ turpis accumsan semper.}%\blindtext@text } % \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\extrasgerman +% \end{macrocode} +% +% \begin{macrocode} +\addto\extraslatin{% + \def\blindtext@heading{Sectio\xspace}% + \def\blindtext@list{Caudex}% + \def\blindtext@listEx{Exemplum caudex\xspace}% +}%\addto\extraslatin +% \end{macrocode} +% % \section{Some other macros} % \changes{V1.2b}{2001/05/25}{Add macros vieltext and alotoftext} % \begin{macro}{\alotoftext} diff --git a/Master/texmf-dist/source/latex/blindtext/blindtext.ins b/Master/texmf-dist/source/latex/blindtext/blindtext.ins index 9d26d286aba..1921638325f 100644 --- a/Master/texmf-dist/source/latex/blindtext/blindtext.ins +++ b/Master/texmf-dist/source/latex/blindtext/blindtext.ins @@ -1,41 +1,41 @@ -\def\batchfile{blindtext.ins}
-\input docstrip.tex
-\keepsilent
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\preamble
-----------------------------------------------------------------------
-The original file is loadable from CTAN on:
-tex-archive/latex/contrib/blindtext
-
-Name of contribution: blindtext
-Name and email: Knut Lickert <knut@lickert.net>
-Location on CTAN: tex-archive/macros/latex/contrib/blindtext
-Summary description: Package for writing text
-License type: Free
-
-Announcement text:
-blindtext.sty:
- Style to create text.
- Can be used to create examples with a lot text to become a feeling
- for the look of classes, packages...
-
- There are macros to create dummy text, dummy lists and
- dummy documents with sections, text and lists.
-
-For more information visit
- http://tex.lickert.net/packages/blindtext/index.html
-----------------------------------------------------------------------
-\endpreamble
-
-\generateFile{blindtext.sty}{f}{\from{blindtext.dtx}{package}}
-
-\Msg{***************************************************************}
-\Msg{*}
-\Msg{* To finish the installation you have to copy the files }
-\Msg{*}
-\Msg{*\space\space *.sty into a directory searched by TeX}
-\Msg{*}
-\Msg{***************************************************************}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\endinput
+\def\batchfile{blindtext.ins} +\input docstrip.tex + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\preamble +---------------------------------------------------------------------- +The original file is loadable from CTAN on: +tex-archive/latex/contrib/blindtext + +Name of contribution: blindtext +Name and email: Knut Lickert <knut@lickert.net> +Location on CTAN: tex-archive/macros/latex/contrib/blindtext +Summary description: Package for writing text +License type: Free + +Announcement text: +blindtext.sty: + Style to create text. + Can be used to create examples with a lot text to become a feeling + for the look of classes, packages... + + There are macros to create dummy text, dummy lists and + dummy documents with sections, text and lists. + +For more information visit + http://tex.lickert.net/packages/blindtext/index.html +---------------------------------------------------------------------- +\endpreamble + +\generateFile{blindtext.sty}{f}{\from{blindtext.dtx}{package}} + +\Msg{***************************************************************} +\Msg{*} +\Msg{* To finish the installation you have to copy the files } +\Msg{*} +\Msg{*\space\space *.sty into a directory searched by TeX} +\Msg{*} +\Msg{***************************************************************} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\endinput |