pullup from trunk
authorTom Yu <tlyu@mit.edu>
Wed, 7 Sep 2005 21:39:10 +0000 (21:39 +0000)
committerTom Yu <tlyu@mit.edu>
Wed, 7 Sep 2005 21:39:10 +0000 (21:39 +0000)
ticket: 3169
version_fixed: 1.4.3

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17373 dc483132-0cff-0310-8789-dd5450dbe970

12 files changed:
doc/ChangeLog
doc/api/ChangeLog
doc/api/Makefile
doc/api/changebar.sty [deleted file]
doc/api/library.tex
doc/implement/ChangeLog
doc/implement/Makefile
doc/implement/changebar.sty [deleted file]
doc/implement/implement.tex
doc/kadm5/api-funcspec.tex
doc/kadm5/api-server-design.tex
doc/kadm5/changebar.sty [deleted file]

index ed586d5c4a13a948bc229b67e44d8f684b010a61..2a77ca76cde4f857ebcd6cf48a9c2035799dc739 100644 (file)
@@ -1,3 +1,7 @@
+2005-08-29  Sam Hartman  <hartmans@mit.edu>
+
+       * kadm5/api-server-design.tex kadm5/api-funcspec.tex:  Avoid using  changebar.sty
+
 2005-02-11  Tom Yu  <tlyu@mit.edu>
 
        * kadm5/api-unit-test.tex (ovsec_kadm_init): Update to reflect
index 4446ccf26bffce139d2673d997362503b83e64c7..25a0d4185406a6b685bae9461740242b89e4bda3 100644 (file)
@@ -1,3 +1,7 @@
+2005-08-29  Sam Hartman  <hartmans@mit.edu>
+
+       * library.tex: Don't use changebar.sty
+
 2003-05-09  Tom Yu  <tlyu@mit.edu>
 
        * krb5.tex: Update subkey-related information to match code.
index 72ad368e5718ed86de9c0b0302028b1df19b3604..2d5d6b784f697c4b9db646547397569e14ffcac2 100644 (file)
@@ -2,7 +2,7 @@
 
 SHELL=/bin/sh
 
-STYLES=changebar.sty fixunder.sty functions.sty krb5idx.sty
+STYLES= fixunder.sty functions.sty krb5idx.sty
 LIBTEX= library.tex intro.tex tables.tex errors.tex krb5.tex ccache.tex \
        rcache.tex keytab.tex libos.tex free.tex
 
diff --git a/doc/api/changebar.sty b/doc/api/changebar.sty
deleted file mode 100644 (file)
index 61b7383..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-% Change bar document-style option for LaTeX.
-%
-% Copyright (C) 1990 by David B. Johnson.
-
-% These macros draw a solid bar down the right margin of the output,
-% covering a range of the input file that has been declared to be changed.
-%
-% The beginning and end of a change bar in the text are marked with
-% \chgbarbegin and \chgbarend, respectively.  For example,
-%
-%     Here is some sample text \chgbarbegin that was
-%     changed\chgbarend{} and some that wasn't changed.
-%
-% The change bar is drawn continuously between the line of output
-% containing the \chgbarbegin and the line of output containing the
-% \chgbarend.  These lines can end up on separate pages, and the
-% division at page boundaries is handled automatically.
-
-% Two dimensions control the size and placement of the change bars:
-%     \chgbarwidth      The width of a change bar
-%     \chgbarsep        The distance between the text and the change bar
-
-% Warning: it does not appear to be possible to do this completely
-% correctly, due to the time at which the verticle glue on a page is
-% finally set, and the way that page breaks are decided.  With
-% \raggedbottom, this normally works fine.  It hasn't been tested with
-% \flushbottom, but will probably behave worse.  In strange rare 
-% situations, a change bar might be drawn from the first line of a page
-% up off the top of a page; this can usually be fixed by slightly moving
-% the \chngbarend around, or by breaking a single change bar range
-% into two ranges.
-
-\newdimen\chgbarwidth \newdimen\chgbarsep
-\chgbarwidth 4pt
-\chgbarsep .25in
-
-\def\chgbarbegin{\ifhmode\@chgbar{-2}\else\@chgbar{-3}\fi}
-\def\chgbarend{\@chgbar{-4}\relax}
-
-\marginparpush 0pt
-
-% The remainder of this is hacked up based on the LaTeX 2.09 latex.tex.
-
-% copied from \marginpar
-\def\@chgbar#1{\ifhmode \@bsphack\@floatpenalty -\@Mii\else
-   \@floatpenalty-\@Miii\fi\ifinner
-      \@parmoderr\@floatpenalty\z@
-    \else\@next\@currbox\@freelist{\global
-      \count\@currbox#1}{\@floatpenalty\z@ \@fltovf
-      \def\@currbox{\@tempboxa}}\fi
-     \setbox\@tempboxa\vbox
-     \bgroup\end@float\@esphack}
-
-\newdimen\@chgbarbegin
-\newif\if@inchgbar \@inchgbarfalse
-
-\def\@addmarginpar{%
-\ifnum\count\@currbox = -2     % change bar begin from hmode
-    \global\@chgbarbegin\@pageht \global\advance\@chgbarbegin -\baselineskip
-    \global\@inchgbartrue
-    \@cons\@freelist\@currbox
-\else
-\ifnum\count\@currbox = -3     % change bar begin not from hmode
-    \global\@chgbarbegin\@pageht
-    \global\@inchgbartrue
-    \@cons\@freelist\@currbox
-\else
-\ifnum\count\@currbox = -4     % change bar end
-    \if@inchgbar\else\@latexbug\fi
-    \@tempdima\@pageht \advance\@tempdima -\@chgbarbegin
-    \nointerlineskip
-    \@tempcnta\@ne
-    \if@twocolumn 
-        \if@firstcolumn \@tempcnta\m@ne \fi
-    \else 
-      \if@mparswitch
-         \ifodd\c@page \else\@tempcnta\m@ne \fi
-      \fi
-      \if@reversemargin \@tempcnta -\@tempcnta \fi
-    \fi
-    \hbox to\columnwidth
-      {\ifnum \@tempcnta >\z@
-          \hskip\columnwidth \hskip\chgbarsep
-        \else \hskip -\chgbarsep \fi
-\hbox{\vbox to 0pt{\vss
-       \hrule \@height\@tempdima \@width\chgbarwidth \@depth\z@
-}}
-\hss}
-    \nointerlineskip
-    \global\@inchgbarfalse
-    \@cons\@freelist\@currbox
-\else
-    \@next\@marbox\@currlist{\@cons\@freelist\@marbox
-    \@cons\@freelist\@currbox}\@latexbug\@tempcnta\@ne
-    \if@twocolumn 
-        \if@firstcolumn \@tempcnta\m@ne \fi
-    \else 
-      \if@mparswitch
-         \ifodd\c@page \else\@tempcnta\m@ne \fi
-      \fi
-      \if@reversemargin \@tempcnta -\@tempcnta \fi
-    \fi
-    \ifnum\@tempcnta <\z@  \global\setbox\@marbox\box\@currbox \fi
-    \@tempdima\@mparbottom \advance\@tempdima -\@pageht 
-       \advance\@tempdima\ht\@marbox \ifdim\@tempdima >\z@
-       \@warning{Marginpar on page \thepage\space moved}\else\@tempdima\z@ \fi
-    \global\@mparbottom\@pageht \global\advance\@mparbottom\@tempdima
-       \global\advance\@mparbottom\dp\@marbox
-       \global\advance\@mparbottom\marginparpush
-    \advance\@tempdima -\ht\@marbox
-    \global\ht\@marbox\z@ \global\dp\@marbox\z@ 
-    \vskip -\@pagedp \vskip\@tempdima\nointerlineskip 
-    \hbox to\columnwidth
-      {\ifnum \@tempcnta >\z@
-          \hskip\columnwidth \hskip\marginparsep
-        \else \hskip -\marginparsep \hskip -\marginparwidth \fi
-       \box\@marbox \hss}
-    \vskip -\@tempdima
-    \nointerlineskip
-    \hbox{\vrule \@height\z@ \@width\z@ \@depth\@pagedp}
-\fi\fi\fi}
-
-\def\@makecol{\setbox\@outputbox\box\@cclv
-   \if@inchgbar
-    \@tempcnta\@ne
-    \if@twocolumn 
-        \if@firstcolumn \@tempcnta\m@ne \fi
-    \else 
-      \if@mparswitch
-         \ifodd\c@page \else\@tempcnta\m@ne \fi
-      \fi
-      \if@reversemargin \@tempcnta -\@tempcnta \fi
-    \fi
-    \@tempdima\ht\@outputbox \advance\@tempdima -\@chgbarbegin
-    \advance\@tempdima -\baselineskip
-    \setbox\@outputbox
-     \vbox{\boxmaxdepth \maxdepth
-     \unvbox\@outputbox \nointerlineskip \hbox to\columnwidth
-      {\ifnum \@tempcnta >\z@
-          \hskip\columnwidth \hskip\chgbarsep
-        \else \hskip -\chgbarsep \fi
-       \hbox{\vbox to 0pt{\vss
-         \hrule \@height\@tempdima \@width\chgbarwidth \@depth\z@}}\hss}}
-    \global\@chgbarbegin 0pt
-\fi
-   \ifvoid\footins\else\setbox\@outputbox
-     \vbox{\boxmaxdepth \maxdepth
-     \unvbox\@outputbox\vskip\skip\footins\footnoterule\unvbox\footins}\fi
-     \xdef\@freelist{\@freelist\@midlist}\gdef\@midlist{}\@combinefloats
-     \setbox\@outputbox\vbox to\@colht{\boxmaxdepth\maxdepth
-        \@texttop\dimen128=\dp\@outputbox\unvbox\@outputbox
-        \vskip-\dimen128\@textbottom}
-     \global\maxdepth\@maxdepth}
-
-\newenvironment{changebar}{\chgbarbegin}{\chgbarend}
index cdfceb42c81f59bde8c4104c946150161322960f..713ce482f27b592fd6770cf1ed61ffe728b0b437 100644 (file)
@@ -1,5 +1,5 @@
 \documentclass[twoside]{article}
-\usepackage{fixunder,functions,changebar,fancyheadings}
+\usepackage{fixunder,functions,fancyheadings}
 \usepackage{krb5idx}
 %\usepackage{hyperref}
 
index f20a0b8aed4ea7dc67ae6b25d66782d6cfd28e3f..3bd06aae7751d4e186a4165db05748154d270a04 100644 (file)
@@ -1,3 +1,7 @@
+2005-08-29  Sam Hartman  <hartmans@mit.edu>
+
+       * implement.tex: Avoid use of changebar.sty
+
 2001-11-06  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile (clean): Delete *.ilg.
index 58fbc4b168d3052105de7ea910c22dd5858bb21e..4c51161328aee1858e2462ec0ec445e12394f5e8 100644 (file)
@@ -1,6 +1,6 @@
 .SUFFIXES: .tex .dvi .ps
 
-STYLES=changebar.sty fixunder.sty functions.sty
+STYLES= fixunder.sty functions.sty
 LIBTEX= implement.tex ccache-i.tex rcache-i.tex keytab-i.tex libos-i.tex \
        kdb-i.tex encrypt-i.tex cksum-i.tex crc-32-i.tex implement.ind
 
diff --git a/doc/implement/changebar.sty b/doc/implement/changebar.sty
deleted file mode 100644 (file)
index 61b7383..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-% Change bar document-style option for LaTeX.
-%
-% Copyright (C) 1990 by David B. Johnson.
-
-% These macros draw a solid bar down the right margin of the output,
-% covering a range of the input file that has been declared to be changed.
-%
-% The beginning and end of a change bar in the text are marked with
-% \chgbarbegin and \chgbarend, respectively.  For example,
-%
-%     Here is some sample text \chgbarbegin that was
-%     changed\chgbarend{} and some that wasn't changed.
-%
-% The change bar is drawn continuously between the line of output
-% containing the \chgbarbegin and the line of output containing the
-% \chgbarend.  These lines can end up on separate pages, and the
-% division at page boundaries is handled automatically.
-
-% Two dimensions control the size and placement of the change bars:
-%     \chgbarwidth      The width of a change bar
-%     \chgbarsep        The distance between the text and the change bar
-
-% Warning: it does not appear to be possible to do this completely
-% correctly, due to the time at which the verticle glue on a page is
-% finally set, and the way that page breaks are decided.  With
-% \raggedbottom, this normally works fine.  It hasn't been tested with
-% \flushbottom, but will probably behave worse.  In strange rare 
-% situations, a change bar might be drawn from the first line of a page
-% up off the top of a page; this can usually be fixed by slightly moving
-% the \chngbarend around, or by breaking a single change bar range
-% into two ranges.
-
-\newdimen\chgbarwidth \newdimen\chgbarsep
-\chgbarwidth 4pt
-\chgbarsep .25in
-
-\def\chgbarbegin{\ifhmode\@chgbar{-2}\else\@chgbar{-3}\fi}
-\def\chgbarend{\@chgbar{-4}\relax}
-
-\marginparpush 0pt
-
-% The remainder of this is hacked up based on the LaTeX 2.09 latex.tex.
-
-% copied from \marginpar
-\def\@chgbar#1{\ifhmode \@bsphack\@floatpenalty -\@Mii\else
-   \@floatpenalty-\@Miii\fi\ifinner
-      \@parmoderr\@floatpenalty\z@
-    \else\@next\@currbox\@freelist{\global
-      \count\@currbox#1}{\@floatpenalty\z@ \@fltovf
-      \def\@currbox{\@tempboxa}}\fi
-     \setbox\@tempboxa\vbox
-     \bgroup\end@float\@esphack}
-
-\newdimen\@chgbarbegin
-\newif\if@inchgbar \@inchgbarfalse
-
-\def\@addmarginpar{%
-\ifnum\count\@currbox = -2     % change bar begin from hmode
-    \global\@chgbarbegin\@pageht \global\advance\@chgbarbegin -\baselineskip
-    \global\@inchgbartrue
-    \@cons\@freelist\@currbox
-\else
-\ifnum\count\@currbox = -3     % change bar begin not from hmode
-    \global\@chgbarbegin\@pageht
-    \global\@inchgbartrue
-    \@cons\@freelist\@currbox
-\else
-\ifnum\count\@currbox = -4     % change bar end
-    \if@inchgbar\else\@latexbug\fi
-    \@tempdima\@pageht \advance\@tempdima -\@chgbarbegin
-    \nointerlineskip
-    \@tempcnta\@ne
-    \if@twocolumn 
-        \if@firstcolumn \@tempcnta\m@ne \fi
-    \else 
-      \if@mparswitch
-         \ifodd\c@page \else\@tempcnta\m@ne \fi
-      \fi
-      \if@reversemargin \@tempcnta -\@tempcnta \fi
-    \fi
-    \hbox to\columnwidth
-      {\ifnum \@tempcnta >\z@
-          \hskip\columnwidth \hskip\chgbarsep
-        \else \hskip -\chgbarsep \fi
-\hbox{\vbox to 0pt{\vss
-       \hrule \@height\@tempdima \@width\chgbarwidth \@depth\z@
-}}
-\hss}
-    \nointerlineskip
-    \global\@inchgbarfalse
-    \@cons\@freelist\@currbox
-\else
-    \@next\@marbox\@currlist{\@cons\@freelist\@marbox
-    \@cons\@freelist\@currbox}\@latexbug\@tempcnta\@ne
-    \if@twocolumn 
-        \if@firstcolumn \@tempcnta\m@ne \fi
-    \else 
-      \if@mparswitch
-         \ifodd\c@page \else\@tempcnta\m@ne \fi
-      \fi
-      \if@reversemargin \@tempcnta -\@tempcnta \fi
-    \fi
-    \ifnum\@tempcnta <\z@  \global\setbox\@marbox\box\@currbox \fi
-    \@tempdima\@mparbottom \advance\@tempdima -\@pageht 
-       \advance\@tempdima\ht\@marbox \ifdim\@tempdima >\z@
-       \@warning{Marginpar on page \thepage\space moved}\else\@tempdima\z@ \fi
-    \global\@mparbottom\@pageht \global\advance\@mparbottom\@tempdima
-       \global\advance\@mparbottom\dp\@marbox
-       \global\advance\@mparbottom\marginparpush
-    \advance\@tempdima -\ht\@marbox
-    \global\ht\@marbox\z@ \global\dp\@marbox\z@ 
-    \vskip -\@pagedp \vskip\@tempdima\nointerlineskip 
-    \hbox to\columnwidth
-      {\ifnum \@tempcnta >\z@
-          \hskip\columnwidth \hskip\marginparsep
-        \else \hskip -\marginparsep \hskip -\marginparwidth \fi
-       \box\@marbox \hss}
-    \vskip -\@tempdima
-    \nointerlineskip
-    \hbox{\vrule \@height\z@ \@width\z@ \@depth\@pagedp}
-\fi\fi\fi}
-
-\def\@makecol{\setbox\@outputbox\box\@cclv
-   \if@inchgbar
-    \@tempcnta\@ne
-    \if@twocolumn 
-        \if@firstcolumn \@tempcnta\m@ne \fi
-    \else 
-      \if@mparswitch
-         \ifodd\c@page \else\@tempcnta\m@ne \fi
-      \fi
-      \if@reversemargin \@tempcnta -\@tempcnta \fi
-    \fi
-    \@tempdima\ht\@outputbox \advance\@tempdima -\@chgbarbegin
-    \advance\@tempdima -\baselineskip
-    \setbox\@outputbox
-     \vbox{\boxmaxdepth \maxdepth
-     \unvbox\@outputbox \nointerlineskip \hbox to\columnwidth
-      {\ifnum \@tempcnta >\z@
-          \hskip\columnwidth \hskip\chgbarsep
-        \else \hskip -\chgbarsep \fi
-       \hbox{\vbox to 0pt{\vss
-         \hrule \@height\@tempdima \@width\chgbarwidth \@depth\z@}}\hss}}
-    \global\@chgbarbegin 0pt
-\fi
-   \ifvoid\footins\else\setbox\@outputbox
-     \vbox{\boxmaxdepth \maxdepth
-     \unvbox\@outputbox\vskip\skip\footins\footnoterule\unvbox\footins}\fi
-     \xdef\@freelist{\@freelist\@midlist}\gdef\@midlist{}\@combinefloats
-     \setbox\@outputbox\vbox to\@colht{\boxmaxdepth\maxdepth
-        \@texttop\dimen128=\dp\@outputbox\unvbox\@outputbox
-        \vskip-\dimen128\@textbottom}
-     \global\maxdepth\@maxdepth}
-
-\newenvironment{changebar}{\chgbarbegin}{\chgbarend}
index 9aa62579ac3b159111f7dbf0fd3242faf0e45a82..7b709f56f745f20a9b136a5efb01c5d882f7d516 100644 (file)
@@ -1,4 +1,4 @@
-\documentstyle[fixunder,functions,changebar,twoside,fancyheadings]{article}
+\documentstyle[fixunder,functions,twoside,fancyheadings]{article}
 \setlength{\oddsidemargin}{0in}
 \setlength{\evensidemargin}{2.00in}
 \setlength{\marginparsep}{0.05in}
index 62605225153500fe42f8ef68656fad155faa2373..bf885b464fb44e766f900ed70c7c09a7fe5b636a 100644 (file)
@@ -1,4 +1,4 @@
-\documentstyle[12pt,fullpage,changebar,rcsid]{article}
+\documentstyle[12pt,fullpage,rcsid]{article}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Make _ actually generate an _, and allow line-breaking after it.
index cecdae1cbdbe77e8e471f9a86456cbdf03666535..61fc868fe6f95f2dfcb04ef8f772e4cc3e97e129 100644 (file)
@@ -1,4 +1,4 @@
-\documentstyle[12pt,fullpage,changebar,rcsid]{article}
+\documentstyle[12pt,fullpage,rcsid]{article}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Make _ actually generate an _, and allow line-breaking after it.
diff --git a/doc/kadm5/changebar.sty b/doc/kadm5/changebar.sty
deleted file mode 100644 (file)
index c49e8be..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-% Change bar document-style option for LaTeX.
-%
-% Copyright (C) 1990 by David B. Johnson.
-%
-% dbj@titan.rice.edu (Dave Johnson)
-
-% These macros draw a solid bar down the right margin of the output,
-% covering a range of the input file that has been declared to be changed.
-%
-% The beginning and end of a change bar in the text are marked with
-% \chgbarbegin and \chgbarend, respectively.  For example,
-%
-%     Here is some sample text \chgbarbegin that was
-%     changed\chgbarend{} and some that wasn't changed.
-%
-% The change bar is drawn continuously between the line of output
-% containing the \chgbarbegin and the line of output containing the
-% \chgbarend.  These lines can end up on separate pages, and the
-% division at page boundaries is handled automatically.
-
-% Two dimensions control the size and placement of the change bars:
-%     \chgbarwidth      The width of a change bar
-%     \chgbarsep        The distance between the text and the change bar
-
-% Warning: it does not appear to be possible to do this completely
-% correctly, due to the time at which the verticle glue on a page is
-% finally set, and the way that page breaks are decided.  With
-% \raggedbottom, this normally works fine.  It hasn't been tested with
-% \flushbottom, but will probably behave worse.  In strange rare 
-% situations, a change bar might be drawn from the first line of a page
-% up off the top of a page; this can usually be fixed by slightly moving
-% the \chngbarend around, or by breaking a single change bar range
-% into two ranges.
-
-\newdimen\chgbarwidth \newdimen\chgbarsep
-\chgbarwidth 4pt
-\chgbarsep .25in
-
-\def\chgbarbegin{\ifhmode\@chgbar{-2}\else\@chgbar{-3}\fi}
-\def\chgbarend{\@chgbar{-4}\relax}
-
-\marginparpush 0pt
-
-% The remainder of this is hacked up based on the LaTeX 2.09 latex.tex.
-
-% copied from \marginpar
-\def\@chgbar#1{\ifhmode \@bsphack\@floatpenalty -\@Mii\else
-   \@floatpenalty-\@Miii\fi\ifinner
-      \@parmoderr\@floatpenalty\z@
-    \else\@next\@currbox\@freelist{\global
-      \count\@currbox#1}{\@floatpenalty\z@ \@fltovf
-      \def\@currbox{\@tempboxa}}\fi
-     \setbox\@tempboxa\vbox
-     \bgroup\end@float\@esphack}
-
-\newdimen\@chgbarbegin
-\newif\if@inchgbar \@inchgbarfalse
-
-\def\@addmarginpar{%
-\ifnum\count\@currbox = -2     % change bar begin from hmode
-    \global\@chgbarbegin\@pageht \global\advance\@chgbarbegin -\baselineskip
-    \global\@inchgbartrue
-    \@cons\@freelist\@currbox
-\else
-\ifnum\count\@currbox = -3     % change bar begin not from hmode
-    \global\@chgbarbegin\@pageht
-    \global\@inchgbartrue
-    \@cons\@freelist\@currbox
-\else
-\ifnum\count\@currbox = -4     % change bar end
-    \if@inchgbar\else\@latexbug\fi
-    \@tempdima\@pageht \advance\@tempdima -\@chgbarbegin
-    \nointerlineskip
-    \@tempcnta\@ne
-    \if@twocolumn 
-        \if@firstcolumn \@tempcnta\m@ne \fi
-    \else 
-      \if@mparswitch
-         \ifodd\c@page \else\@tempcnta\m@ne \fi
-      \fi
-      \if@reversemargin \@tempcnta -\@tempcnta \fi
-    \fi
-    \hbox to\columnwidth
-      {\ifnum \@tempcnta >\z@
-          \hskip\columnwidth \hskip\chgbarsep
-        \else \hskip -\chgbarsep \fi
-\hbox{\vbox to 0pt{\vss
-       \hrule \@height\@tempdima \@width\chgbarwidth \@depth\z@
-}}
-\hss}
-    \nointerlineskip
-    \global\@inchgbarfalse
-    \@cons\@freelist\@currbox
-\else
-    \@next\@marbox\@currlist{\@cons\@freelist\@marbox
-    \@cons\@freelist\@currbox}\@latexbug\@tempcnta\@ne
-    \if@twocolumn 
-        \if@firstcolumn \@tempcnta\m@ne \fi
-    \else 
-      \if@mparswitch
-         \ifodd\c@page \else\@tempcnta\m@ne \fi
-      \fi
-      \if@reversemargin \@tempcnta -\@tempcnta \fi
-    \fi
-    \ifnum\@tempcnta <\z@  \global\setbox\@marbox\box\@currbox \fi
-    \@tempdima\@mparbottom \advance\@tempdima -\@pageht 
-       \advance\@tempdima\ht\@marbox \ifdim\@tempdima >\z@
-       \@warning{Marginpar on page \thepage\space moved}\else\@tempdima\z@ \fi
-    \global\@mparbottom\@pageht \global\advance\@mparbottom\@tempdima
-       \global\advance\@mparbottom\dp\@marbox
-       \global\advance\@mparbottom\marginparpush
-    \advance\@tempdima -\ht\@marbox
-    \global\ht\@marbox\z@ \global\dp\@marbox\z@ 
-    \vskip -\@pagedp \vskip\@tempdima\nointerlineskip 
-    \hbox to\columnwidth
-      {\ifnum \@tempcnta >\z@
-          \hskip\columnwidth \hskip\marginparsep
-        \else \hskip -\marginparsep \hskip -\marginparwidth \fi
-       \box\@marbox \hss}
-    \vskip -\@tempdima
-    \nointerlineskip
-    \hbox{\vrule \@height\z@ \@width\z@ \@depth\@pagedp}
-\fi\fi\fi}
-
-\def\@makecol{\setbox\@outputbox\box\@cclv
-   \if@inchgbar
-    \@tempcnta\@ne
-    \if@twocolumn 
-        \if@firstcolumn \@tempcnta\m@ne \fi
-    \else 
-      \if@mparswitch
-         \ifodd\c@page \else\@tempcnta\m@ne \fi
-      \fi
-      \if@reversemargin \@tempcnta -\@tempcnta \fi
-    \fi
-    \@tempdima\ht\@outputbox \advance\@tempdima -\@chgbarbegin
-    \advance\@tempdima -\baselineskip
-    \setbox\@outputbox
-     \vbox{\boxmaxdepth \maxdepth
-     \unvbox\@outputbox \nointerlineskip \hbox to\columnwidth
-      {\ifnum \@tempcnta >\z@
-          \hskip\columnwidth \hskip\chgbarsep
-        \else \hskip -\chgbarsep \fi
-       \hbox{\vbox to 0pt{\vss
-         \hrule \@height\@tempdima \@width\chgbarwidth \@depth\z@}}\hss}}
-    \global\@chgbarbegin 0pt
-\fi
-   \ifvoid\footins\else\setbox\@outputbox
-     \vbox{\boxmaxdepth \maxdepth
-     \unvbox\@outputbox\vskip\skip\footins\footnoterule\unvbox\footins}\fi
-     \xdef\@freelist{\@freelist\@midlist}\gdef\@midlist{}\@combinefloats
-     \setbox\@outputbox\vbox to\@colht{\boxmaxdepth\maxdepth
-        \@texttop\dimen128=\dp\@outputbox\unvbox\@outputbox
-        \vskip-\dimen128\@textbottom}
-     \global\maxdepth\@maxdepth}
-
-\newenvironment{changebar}{\chgbarbegin}{\chgbarend}