summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/ms
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-05-22 23:38:09 +0000
committerKarl Berry <karl@freefriends.org>2009-05-22 23:38:09 +0000
commitdff4dbf8de3762428b08cd3164f27a2e6bd7ab4c (patch)
treea541fd06c2539fd23d271abbea9f4d6f103036ba /Master/texmf-dist/source/latex/ms
parentc07a3149dc5d6d0206762e514429d9c1105d907f (diff)
ragged2e 2.1, part of ms (21may09)
git-svn-id: svn://tug.org/texlive/trunk@13392 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/ms')
-rw-r--r--Master/texmf-dist/source/latex/ms/ragged2e.drv38
-rw-r--r--Master/texmf-dist/source/latex/ms/ragged2e.dtx134
-rw-r--r--Master/texmf-dist/source/latex/ms/ragged2e.ins52
3 files changed, 152 insertions, 72 deletions
diff --git a/Master/texmf-dist/source/latex/ms/ragged2e.drv b/Master/texmf-dist/source/latex/ms/ragged2e.drv
index efea813b431..e4501c5d71c 100644
--- a/Master/texmf-dist/source/latex/ms/ragged2e.drv
+++ b/Master/texmf-dist/source/latex/ms/ragged2e.drv
@@ -6,7 +6,7 @@
%%
%% ragged2e.dtx (with options: `driver')
%%
-%% Copyright (C) [1996..2003] Martin Schroeder. All rights reserved.
+%% Copyright 1996..2009 Martin Schroeder.
%%
%% This file is part of the Ragged2e package
%% -----------------------------------------
@@ -16,12 +16,17 @@
%%
\NeedsTeXFormat{LaTeX2e}[1996/10/24]
\ProvidesFile{ragged2e.drv}
- [2003/03/25 v1.06 Driver for ragged2e Package (MS)]
-\documentclass{ltxdoc}
+ [2006/07/26 v1.08 Driver for ragged2e Package (MS)]
+\documentclass[a4paper]{ltxdoc}
\usepackage[T1]{fontenc}
+\usepackage{lmodern}
+\usepackage{microtype}
\usepackage{url} % in latex/contrib/other/misc
\usepackage{array}
\usepackage{tabularx}
+\usepackage{svn}
+\usepackage{hypdoc}
+\usepackage{geometry}
\IfFileExists{booktabs.sty}{%
\usepackage{booktabs}%
}{%
@@ -33,16 +38,28 @@
\let\midrule\hline
\let\bottomrule\hline
}
-\usepackage[document]{ragged2e}[2003/01/26]
+\IfFileExists{footmisc.sty}{%
+ \usepackage[document]{ragged2e}[2003/01/26]
+ }{%
+ \PackageWarning{ragged2e}%
+ {footmisc.sty is missing.\MessageBreak
+ You should install it for better results}%
+ \usepackage[raggedrightboxes]{ragged2e}[2003/01/26]
+ }
\setlength{\RaggedRightRightskip}{0pt plus 4em}%
\GetFileInfo{ragged2e.sty}
\EnableCrossrefs
\RecordChanges % Gather update information
%%\DisableCrossrefs% Say \DisableCrossrefs if index is ready
\CodelineIndex % Index code by line number
-\OnlyDescription % comment out for implementation details
%%\OldMakeIndex % use if your MakeIndex is pre-v2.9
\setcounter{IndexColumns}{2}
+\makeatletter
+ \renewenvironment{theglossary}{%
+ \glossary@prologue
+ \setlength\emergencystretch{5em}
+ \GlossaryParms \let\item\@idxitem \ignorespaces}{}
+ \makeatother
\setlength{\IndexMin}{40ex}
\setlength{\columnseprule}{.4pt}
\addtolength{\oddsidemargin}{1cm}
@@ -55,6 +72,7 @@
\let\PrintChanges\relax
\let\PrintIndex\relax
\end{document}
+%% Copyright 1996..2009 by Martin Schr\"oder.
%% \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
%% Lower-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
@@ -75,14 +93,14 @@
%% ===================================================================
%% @LaTeX-style-file{
%% author = {Martin Schr\"oder},
-%% version = "2.04",
-%% date = "25 March 2003",
+%% version = "2.1",
+%% date = "21 May 2009",
%% filename = "ragged2e.sty",
%% address = {Martin Schr\"oder
-%% Cr\"usemannallee 3
-%% 28213 Bremen
+%% Barmer Stra\"se 14
+%% 44137 Dortmund
%% Germany}
-%% telephone = "+49-421-2239425",
+%% telephone = "+49-231-1206574",
%% email = "martin@oneiros.de",
%% docstring = "LaTeX package which defines new commands
%% \Centering, \RaggedLeft, \RaggedRight and
diff --git a/Master/texmf-dist/source/latex/ms/ragged2e.dtx b/Master/texmf-dist/source/latex/ms/ragged2e.dtx
index 48dab7821c0..51b77280077 100644
--- a/Master/texmf-dist/source/latex/ms/ragged2e.dtx
+++ b/Master/texmf-dist/source/latex/ms/ragged2e.dtx
@@ -1,16 +1,21 @@
% \iffalse
\NeedsTeXFormat{LaTeX2e}[1996/10/24]
%<package>\ProvidesPackage{ragged2e}
-%<package> [2003/03/25 v2.04 ragged2e Package (MS)]
+%<package> [2009/05/21 v2.1 ragged2e Package (MS)]
%
%<*driver>
\ProvidesFile{ragged2e.drv}
- [2003/03/25 v1.06 Driver for ragged2e Package (MS)]
-\documentclass{ltxdoc}
+ [2006/07/26 v1.08 Driver for ragged2e Package (MS)]
+\documentclass[a4paper]{ltxdoc}
\usepackage[T1]{fontenc}
+\usepackage{lmodern}
+\usepackage{microtype}
\usepackage{url} % in latex/contrib/other/misc
\usepackage{array}
\usepackage{tabularx}
+\usepackage{svn}
+\usepackage{hypdoc}
+\usepackage{geometry}
% booktabs.sty is in latex/contrib/supported/booktab
\IfFileExists{booktabs.sty}{%
\usepackage{booktabs}%
@@ -23,16 +28,30 @@
\let\midrule\hline
\let\bottomrule\hline
}
-\usepackage[document]{ragged2e}[2003/01/26]
+\IfFileExists{footmisc.sty}{%
+ \usepackage[document]{ragged2e}[2003/01/26]
+ }{%
+ \PackageWarning{ragged2e}%
+ {footmisc.sty is missing.\MessageBreak
+ You should install it for better results}%
+ \usepackage[raggedrightboxes]{ragged2e}[2003/01/26]
+ }
\setlength{\RaggedRightRightskip}{0pt plus 4em}%
\GetFileInfo{ragged2e.sty}
\EnableCrossrefs
\RecordChanges % Gather update information
%%\DisableCrossrefs% Say \DisableCrossrefs if index is ready
\CodelineIndex % Index code by line number
-\OnlyDescription % comment out for implementation details
+%\OnlyDescription % comment out for implementation details
%%\OldMakeIndex % use if your MakeIndex is pre-v2.9
\setcounter{IndexColumns}{2}
+% onecolumn glossary
+\makeatletter
+ \renewenvironment{theglossary}{%
+ \glossary@prologue
+ \setlength\emergencystretch{5em}
+ \GlossaryParms \let\item\@idxitem \ignorespaces}{}
+ \makeatother
\setlength{\IndexMin}{40ex}
\setlength{\columnseprule}{.4pt}
\addtolength{\oddsidemargin}{1cm}
@@ -47,20 +66,27 @@
\end{document}
%</driver>
%
-% Copyright 1996, 1998, 1999, 2003 by Martin Schr"oder. All rights reserved.
+%% Copyright 1996..2009 by Martin Schr\"oder.
%
-% This program may be redistributed and/or modified under the terms
-% of the LaTeX Project Public License, either version 1.2 of this
-% license, or (at your option) any later version.
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
% The latest version of this license is in
-% CTAN:macros/latex/base/lppl.txt.
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
%
-% For error reports in case of UNCHANGED versions see ragged2e.ins
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Martin Schr\"oder.
+%
+% This work consists of the files ragged2e.dtx and ragged2e.ins
+% and the derived file ragged2e.sty.
%
% \fi
%
-% \CheckSum{466}
-% ^^A$Id: ragged2e.dtx,v 1.22 2003/03/25 20:10:06 ms Exp $
+% \CheckSum{474}
+% ^^A$Id: ragged2e.dtx 1364 2009-05-21 14:58:40Z oneiros $
%
%% \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
@@ -82,14 +108,14 @@
%% ===================================================================
%% @LaTeX-style-file{
%% author = {Martin Schr\"oder},
-%% version = "2.04",
-%% date = "25 March 2003",
+%% version = "2.1",
+%% date = "21 May 2009",
%% filename = "ragged2e.sty",
%% address = {Martin Schr\"oder
-%% Cr\"usemannallee 3
-%% 28213 Bremen
+%% Barmer Stra\"se 14
+%% 44137 Dortmund
%% Germany}
-%% telephone = "+49-421-2239425",
+%% telephone = "+49-231-1206574",
%% email = "martin@oneiros.de",
% codetable = "ISO/ASCII",
% keywords = "raggedright",
@@ -109,6 +135,9 @@
%
% \pagestyle{headings}
%
+% \SVN $Rev: 1364 $
+% \SVN $Date: 2009-05-21 16:58:40 +0200 (Do, 21. Mai 2009) $
+%
% \newcommand*{\file}[1] {\texttt{#1}}
% \newcommand{\plain} {\texttt{plain}}
% \newcommand{\bs} {\texttt{\symbol{'134}}}
@@ -144,12 +173,12 @@
% \title{\unskip
% The \textsf{ragged2e}-package^^A
% \thanks{^^A
-% The version number of this file is \fileversion,
-% last revised \filedate.}^^A
+% The version number of this file is \fileversion, subversion
+% revision~\#\SVNRev, last revised \protect\SVNDate.}^^A
% }
% \author{Martin Schr\"oder\\[0.5ex]
-% \normalsize Cr\"usemannallee 3\\
-% \normalsize 28213 Bremen\\
+% \normalsize Barmer Stra\ss{}e 14\\
+% \normalsize 44137 Dortmund\\
% \normalsize Germany\\
% \normalsize martin@oneiros.de}
% \date{\filedate}
@@ -161,7 +190,7 @@
% This package provides new commands and environments for setting
% ragged text which are easy to configure to allow hyphenation.
% An earlier attempt to do this was the style
-% \package{raggedright}\cite{raggedri} by the same author.
+% \package{raggedright}\,\cite{raggedri} by the same author.
% \end{abstract}
%
%
@@ -305,9 +334,10 @@
% For example, we switched on \cs{RaggedRight} on the top of this
% text, and consequently this text was set
% ragged-right.\footnote{^^A
-% Actually we also set \cs{RaggedRightRightskip} higher than usual
-% (|0pt plus 4em|) because of all the long command names which
-% make linebreaking difficult.}
+% For this documentation we also set \cs{RaggedRightRightskip}
+% higher than usual (|0pt plus 4em| instead of |0pt plus 2em|)
+% because of all the long command names which make linebreaking
+% difficult.}
%
% \DescribeMacro{\justifying}
% \NEWfeature{2003/01/04}%
@@ -427,7 +457,7 @@
% \begin{center}
% \begin{tabularx}{\linewidth}{l>{\ttfamily}X>{\ttfamily}X}\toprule
% Parameter & \normalfont\LaTeX{} setting
-% & \normalfont\package{ragged2e} setting\\
+% & \normalfont\package{ragged2e} setting\footnotemark\\
% \midrule
% \cs{CenteringLeftskip} & 0pt plus 1fil
% & 0pt plus 2em\\
@@ -535,7 +565,7 @@
% \changes{v2.00}{2003/01/18}{New option \option{footnotes}}
% \NEWfeature{2003/01/18}
% This options sets all footnotes ragged-right by loading the
-% \package{footmisc}\cite{footmisc} package with the
+% \package{footmisc}\,\cite{footmisc} package with the
% \option{ragged} option.
% \item[\normalfont\option{document}]
% \changes{v2.00}{2003/01/18}{New option \option{document}}
@@ -553,14 +583,17 @@
%
% \section{Required packages}
% ^^A
-% This package requires the following package:
+% \changes{v2.1}{2003/10/08}{document that \option{document} needs
+% \package{footmisc}}
+% This package requires the following packages:
% \begin{description}
-% \item[\normalfont\package{everysel}\cite{everysel}]
+% \item[\normalfont\package{everysel}\,\cite{everysel}]
% It is used to distinguish between monospaced and proportional
% fonts.
-% \item[\normalfont\package{footmisc}\cite{footmisc}]
-% It is used by the \option{footnotes} option; at least
-% version~5.00 (2002/08/28) is needed.
+% \item[\normalfont\package{footmisc}\,\cite{footmisc}]
+% It is used by the \option{footnotes} and the
+% \option{document} options; at least version~5.00 (2002/08/28)
+% is needed.
% \end{description}
%
%
@@ -574,13 +607,13 @@
% \section{Acknowledgements}
% ^^A
% A first version of this package for \LaTeX2.09 was named
-% \package{raggedri}\cite{raggedri}.
+% \package{raggedri}\,\cite{raggedri}.
% Laurent Siebenmann (\url{lcs@topo.math.u-psud.fr}) with his
-% style \package{ragged.sty}\cite{ragged} provided the final impulse
+% style \package{ragged.sty}\,\cite{ragged} provided the final impulse
% for this new implementation.\newline
% The code for \cs{justifying}, \env{justify} and the overloading of
% \cs{@arrayparboxrestore} is incorporated from the
-% \package{raggedr}\cite{raggedr} package by James Kilfinger
+% \package{raggedr}\,\cite{raggedr} package by James Kilfinger
% (\url{mapdn@csv.warwick.ac.uk}).\newline
% Without the constant nagging of Rainer Sieger
% (\url{rsieger@awi-bremerhaven.de}) this package might not
@@ -589,7 +622,7 @@
% \cs{@gnewline}.\newline
% Frank Mittelbach (\url{frank.mittelbach@latex-project.org})
% provided the impetus for version~2.00.\newline
-% Rolf Niepraschk (\url{Rolf.Niepraschk@ptb.de}) and Hubert G\"a\ss{}lein
+% Rolf Niepraschk (\url{Rolf.Niepraschk@gmx.de}) and Hubert G\"a\ss{}lein
% found many bugs and provided fixes for them and code for new
% features.
%
@@ -841,11 +874,13 @@
% \changes{v2.00}{2003/01/18}{New macro}%
% \changes{v2.04}{2003/03/02}{Set \cs{@tocrmarg} and use
% \cs{PackageInfo}}%
+% \changes{v2.1}{2006/07/23}{bugfix: Use \cs{@tocrmarg} only if it's
+% defined}%
% \begin{macrocode}
\newcommand{\@raggedtwoe@abdhook}{%
\PackageInfo{ragged2e}{ABD: executing \string\RaggedRight}%
\RaggedRight
- \edef\@tocrmarg{\@tocrmarg plus 2em}%
+ \@ifundefined{@tocrmarg}{}{\edef\@tocrmarg{\@tocrmarg plus 2em}}%
\let\@raggedtwoe@abdhook\relax
}
% \end{macrocode}
@@ -916,9 +951,12 @@
% \package{footmisc} package after we are finished (\package{footmisc}
% detects our presence by looking for the definition of
% \cs{RaggedRight}, so we can not load it just now).
+% \changes{v2.1}{2003/10/08}{bugfix: Load \package{footmisc}
+% directly and not via \cs{AtEndOfPackage} (bug found by Axel
+% Sommerfeldt)}
% \begin{macrocode}
\if@raggedtwoe@footmisc
- \AtEndOfPackage{\RequirePackage{footmisc}[2002/08/28]}
+ \RequirePackage{footmisc}[2002/08/28]
\fi
% \end{macrocode}
%
@@ -1038,7 +1076,7 @@
% words, if nonzero) and \cs{xspaceskip} (space at the end of
% sentences, if nonzero).
%
-% We do the setting with the help of \package{everysel}\cite{everysel},
+% We do the setting with the help of \package{everysel}\,\cite{everysel},
% which allows us to define code which is (hopefully) executed after
% every fontchange in a \LaTeX{} document.\footnote{^^A
% It \emph{is} executed after every \cs{selectfont}, so if you stay
@@ -1126,13 +1164,21 @@
% \changes{v2.00}{2003/01/04}{New macro}
% \changes{v2.02}{2003/02/24}{Bugfix: \cs{@nolerr}
% \ensuremath{\rightarrow} \cs{@nolnerr}}%
+% \changes{v2.1}{2009/05/17}{Bugfix: handle math}
% \begin{macrocode}
\newcommand*{\@raggedtwoe@gnewline}[1]{%
\ifvmode
\@nolnerr
\else
\unskip
- \reserved@e {\reserved@f #1}{\parskip\z@\par}%
+ \ifmmode
+% \end{macrocode}
+% In formulas we use the original code of \cs{@gnewline}.
+% \begin{macrocode}
+ \reserved@e {\reserved@f #1}\nobreak \hfil \break
+ \else
+ \reserved@e {\reserved@f #1}{\parskip\z@\par}%
+ \fi
\fi
}
% \end{macrocode}
@@ -1299,6 +1345,8 @@
% If the option \option{newcommands} is used, we save the original
% \LaTeX-commands and environments for ragged text and overload them.
% \changes{v2.04}{2003/03/02}{Save more commands}
+% \changes{v2.1}{2003/10/08}{bugfix: \cs{Flushleft} instead of
+% \cs{FlushLeft} (found by Berend Hasselman)}
% \begin{macrocode}
\if@raggedtwoe@originalcommands
\else
@@ -1316,8 +1364,8 @@
\let\endLaTeXflushright\endflushright
\let\center\Center
\let\endcenter\endCenter
- \let\flushleft\Flushleft
- \let\endflushleft\endFlushleft
+ \let\flushleft\FlushLeft
+ \let\endflushleft\endFlushLeft
\let\flushright\FlushRight
\let\endflushright\endFlushRight
\fi
diff --git a/Master/texmf-dist/source/latex/ms/ragged2e.ins b/Master/texmf-dist/source/latex/ms/ragged2e.ins
index 69e9183103c..c70e911b280 100644
--- a/Master/texmf-dist/source/latex/ms/ragged2e.ins
+++ b/Master/texmf-dist/source/latex/ms/ragged2e.ins
@@ -1,16 +1,25 @@
%\NeedsTeXFormat{LaTeX2e}
%\ProvidesFile{ragged2e.ins}
-% [2003/02/20 v1.20 Installation script for Ragged2e Package (MS)]
+% [2009/05/17 v1.3 Installation script for Ragged2e Package (MS)]
%%
-%% Copyright 1996, 1998, 1999, 2003 by Martin Schr"oder. All rights reserved.
-%%
-%% This program may be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License, either version 1.0 of this
-%% license, or (at your option) any later version.
+%% Copyright 1996..2009 by Martin Schr\"oder.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
%% The latest version of this license is in
-%% CTAN:macros/latex/base/lppl.txt.
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
%%
-%% $Id: ragged2e.ins,v 1.7 2003/02/20 22:12:18 ms Exp $
+%% The Current Maintainer of this work is Martin Schr\"oder.
+%%
+%% This work consists of the files ragged2e.dtx and ragged2e.ins
+%% and the derived file ragged2e.sty.
+%%
+%% $Id: ragged2e.ins 1356 2009-05-17 16:51:10Z oneiros $
%%
%% --------------- start of docstrip commands ------------------
\input docstrip.tex
@@ -42,31 +51,36 @@
\preamble
-Copyright (C) [1996..2003] by Martin Schroeder. All rights reserved.
+Copyright 1996..2009 Martin Schroeder.
This file is part of the Ragged2e package
-----------------------------------------
-This program may be redistributed and/or modified under the terms
-of the LaTeX Project Public License, either version 1.0 of this
-license, or (at your option) any later version.
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version.
The latest version of this license is in
- CTAN:macros/latex/base/lppl.txt.
+ http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is Martin Schroeder.
-The Ragged2e package contains these files:
- ragged2e.dtx
- ragged2e.ins
+This work consists of the files ragged2e.dtx and ragged2e.ins
+and the derived file ragged2e.sty.
Martin Schroeder
- Cruesemannallee 3
- 28213 Bremen
+ Barmer Strasse 14
+ 44137 Dortmund
Germany
martin@oneiros.de
\endpreamble
\declarepreamble\driverpreamble
-Copyright (C) [1996..2003] Martin Schroeder. All rights reserved.
+Copyright 1996..2009 Martin Schroeder.
This file is part of the Ragged2e package
-----------------------------------------