summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-06-04 16:38:12 +0000
committerKarl Berry <karl@freefriends.org>2008-06-04 16:38:12 +0000
commit0c1d6aeb7161b63c8c5d178288c2df12ea713dd9 (patch)
tree7ee89be78708a8c0f0d44dccb8a4c4ad95408b1d
parent5ef57beafc2325d43527f56b57905eee2e5a864b (diff)
moreverb update (3jun08)
git-svn-id: svn://tug.org/texlive/trunk@8554 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/moreverb/README25
-rw-r--r--Master/texmf-dist/doc/latex/moreverb/moreverb.pdfbin106122 -> 105958 bytes
-rw-r--r--Master/texmf-dist/source/latex/moreverb/moreverb.dtx61
-rw-r--r--Master/texmf-dist/tex/latex/moreverb/moreverb.sty13
4 files changed, 53 insertions, 46 deletions
diff --git a/Master/texmf-dist/doc/latex/moreverb/README b/Master/texmf-dist/doc/latex/moreverb/README
index eb8a133faec..70552b70f02 100644
--- a/Master/texmf-dist/doc/latex/moreverb/README
+++ b/Master/texmf-dist/doc/latex/moreverb/README
@@ -1,20 +1,15 @@
-The _supported_ moreverb package... supported in the sense that I'll
-try and get things mended.
+The moreverb package is a miscellany of verbatim facilities,
+originally provided as a LaTeX 2.09 package.
-This is a further iteration of moreverb, following my original port to
-2e and a bug mend (or two?) by David Carlisle.
+The present instance has been ported to current LaTeX (2e), tidied and
+mended in various ways by David Carlisle and Morten H\o gholm.
-This version has been pruned somewhat, from its 2.09 original, to take
-account of changes to the facilities offered by the LaTeX team members
-themselves.
+Some of the facilities of the original package are no longer provided
+in this package, since they duplicated those of the LaTeX required
+verbatim package (which this package loads) or the alltt package
+(which is now part of the LaTeX distribution).
-Major changes from the original 2e port are:
-
- - the package no longer (re-)implements \verbatiminput (since it's
- in the verbatim package, which the package loads anyway)
- - the package no longer implements the verbatimcmd environment, and
- points you to alltt instead
- - the source is `documented'
+The package is distributed under the LPPL.
Robin Fairbairns
-rf@cl.cam.ac.uk
+rf10@cam.ac.uk
diff --git a/Master/texmf-dist/doc/latex/moreverb/moreverb.pdf b/Master/texmf-dist/doc/latex/moreverb/moreverb.pdf
index 187a20f30ca..be5162195af 100644
--- a/Master/texmf-dist/doc/latex/moreverb/moreverb.pdf
+++ b/Master/texmf-dist/doc/latex/moreverb/moreverb.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/moreverb/moreverb.dtx b/Master/texmf-dist/source/latex/moreverb/moreverb.dtx
index d4ee6d5f0d5..01ec3c91bfd 100644
--- a/Master/texmf-dist/source/latex/moreverb/moreverb.dtx
+++ b/Master/texmf-dist/source/latex/moreverb/moreverb.dtx
@@ -1,9 +1,28 @@
%
% \iffalse
%
+% Copyright (C) 1997 2002 2008 by
+% Robin Fairbairns <rf10@cam.ac.uk>
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any later
+% version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3c 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 Robin Fairbairns.
+%
+% This work consists of the source files moreverb.dtx,
+% moreverb.ins
+% and the derived file moreverb.sty,
+%
% RCS information:
%
-% $Id: moreverb.dtx,v 1.10 2002/03/20 10:39:07 rf Exp $
+% $Id: moreverb.dtx,v 1.11 2008/06/03 11:54:01 rf10 Exp rf10 $
%
% \section{Initially: identify the package}
%
@@ -16,7 +35,7 @@
\ProvidesFile{moreverb.dtx}
%</dtx>
%<moreverb>\ProvidesPackage{moreverb}
- [1997/12/07 v2.2d.2
+ [2008/06/03 v2.3
%<moreverb> `more' verbatim facilities%
%<*dtx>
moreverb source file%
@@ -44,11 +63,11 @@
\title{The \textsf{moreverb} package\thanks{This file
has version number \fileversion, last
revised \filedate}}
- \author{Robin Fairbairns (\small\texttt{rf@cl.cam.ac.uk})\\
+ \author{Robin Fairbairns (\small\texttt{rf10@cam.ac.uk})\\
after\\
Angus Duggan, Rainer Sch\"opf and Victor Eijkhout}
- \date{\the\year/\ifnum\month<10 0\fi\the\month
- /\ifnum\day <10 0\fi\the\day}
+ \date{\the\year-\ifnum\month<10 0\fi\the\month
+ -\ifnum\day <10 0\fi\the\day}
\maketitle
\tableofcontents
\DocInput{moreverb.dtx}
@@ -57,7 +76,7 @@
%
% \fi
%
-% \CheckSum{399}
+% \CheckSum{401}
%
% \section{This package}
%
@@ -75,16 +94,6 @@
% later re-input), and `boxed' verbatim.
% \end{itemize}
%
-% \subsection*{Copyright statement}
-%
-% \noindent Program: \texttt{moreverb.dtx}\par
-% \noindent Copyright 1997 2002 Robin Fairbairns
-%
-% This program may redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in file \texttt{macros/latex/base/lppl.txt}; either
-% version 1.2 of the License, or (at your option) any later version.
-%
% \subsection{Tab expansion}
%
% The package enables you to specify the expected width of the
@@ -458,7 +467,7 @@
% \begin{macrocode}
\def\verbatimcmd{%
\PackageError{moreverb}{The verbatimcmd environment is obsolete}%
- {Use alltt (from the LaTeX base package
+ {Use alltt (from the LaTeX required package
alltt) in place of verbatimcmd}%
}
\let\endverbatimcmd\relax
@@ -471,8 +480,11 @@
%
% (Written by Victor Eijkhout.)
%
-% Bug fix (supplied by David Carlisle) 1995/12/28, marked
-% \verb+%%%DPC%%%+
+% \noindent Bug fixes:
+% \begin{itemize}
+% \item David Carlisle 1995-12-28, dealing with spacing issues (iirc)
+% \item Moretn H\o gholm 2008-06-01, positioning of frame in lists
+% \end{itemize}
%
% First, redefine `processline' to produce only a line as wide
% as the natural width of the line
@@ -487,8 +499,9 @@
% Now save the verbatim code in a box
%
% \begin{macrocode}
- \@minipagetrue%%%DPC%%%
- \@tempswatrue%%%DPC%%%
+ \@minipagetrue % DPC
+ \@tempswatrue % DPC
+ \@totalleftmargin\z@ % MH
\setbox0=\vbox\bgroup \verbatim
}
% \end{macrocode}
@@ -499,20 +512,18 @@
% \begin{macrocode}
\def\endboxedverbatim{%
\endverbatim
- \unskip\setbox0=\lastbox %%%DPC%%%
+ \unskip\setbox0=\lastbox % DPC
% \end{macrocode}
%
% Now everything's in the box, so we can close it\dots
-%
% \begin{macrocode}
\egroup
% \end{macrocode}
%
% To change the code for centring, the next line needs a spot of
% hacking.
-%
% \begin{macrocode}
- \fbox{\box0}% <<<=== change here for centering,...
+ \fbox{\box0}%
}
% \end{macrocode}
% \end{environment}
diff --git a/Master/texmf-dist/tex/latex/moreverb/moreverb.sty b/Master/texmf-dist/tex/latex/moreverb/moreverb.sty
index 1b45c22405d..4fbbb33f599 100644
--- a/Master/texmf-dist/tex/latex/moreverb/moreverb.sty
+++ b/Master/texmf-dist/tex/latex/moreverb/moreverb.sty
@@ -14,7 +14,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{moreverb}
- [1997/12/07 v2.2d.2
+ [2008/06/03 v2.3
`more' verbatim facilities%
]
\@ifundefined{verbatim@processline}{\RequirePackage{verbatim}}{}
@@ -130,7 +130,7 @@
}
\def\verbatimcmd{%
\PackageError{moreverb}{The verbatimcmd environment is obsolete}%
- {Use alltt (from the LaTeX base package
+ {Use alltt (from the LaTeX required package
alltt) in place of verbatimcmd}%
}
\let\endverbatimcmd\relax
@@ -138,15 +138,16 @@
\def\verbatim@processline{%
{\setbox0=\hbox{\the\verbatim@line}%
\hsize=\wd0 \the\verbatim@line\par}}%
- \@minipagetrue%%%DPC%%%
- \@tempswatrue%%%DPC%%%
+ \@minipagetrue % DPC
+ \@tempswatrue % DPC
+ \@totalleftmargin\z@ % MH
\setbox0=\vbox\bgroup \verbatim
}
\def\endboxedverbatim{%
\endverbatim
- \unskip\setbox0=\lastbox %%%DPC%%%
+ \unskip\setbox0=\lastbox % DPC
\egroup
- \fbox{\box0}% <<<=== change here for centering,...
+ \fbox{\box0}%
}
\newenvironment{verbatimtab}{\obeylines\@verbatimtab}{\endtrivlist}
\newcommand\@verbatimtab[1][\verbatimtabsize]{%