2 files changed, 50 insertions, 37 deletions
diff --git a/Master/texmf-dist/doc/latex/changelayout/changelayout-guide.pdf b/Master/texmf-dist/doc/latex/changelayout/changelayout-guide.pdf
index abc2060bce1..ad6e57c37fe 100644
--- a/Master/texmf-dist/doc/latex/changelayout/changelayout-guide.pdf
+++ b/Master/texmf-dist/doc/latex/changelayout/changelayout-guide.pdf
diff --git a/Master/texmf-dist/doc/latex/changelayout/changelayout-guide.tex b/Master/texmf-dist/doc/latex/changelayout/changelayout-guide.tex
index f4dd60fa11c..cc031fabdd6 100644
--- a/Master/texmf-dist/doc/latex/changelayout/changelayout-guide.tex
+++ b/Master/texmf-dist/doc/latex/changelayout/changelayout-guide.tex
@@ -1,11 +1,12 @@
+\RequirePackage{xkvltxp}
 \documentclass{article}
-\usepackage{lipsum,comment}
+\usepackage{comment,xspace,lipsum}
 \usepackage[left=3cm,right=3cm]{geometry}
 \usepackage[logdefault,logfinal,strictcheck]{changelayout}
 \usepackage{hyperref}
 \hypersetup{colorlinks=true,linkcolor=red,pdfpagemode=UseThumbs,
-  implicit=true,breaklinks=true,citecolor=purple}
-% Many colors for future use:
+  implicit=true,breaklinks=true,citecolor=purple,pdfview=FitH,
+  pdfstartview=FitH}
 \xglobal\preparecolorset{rgb}{x}{0}{%
   red1,1.00,0.31,0.31;red2,1.00,0.32,0.33;%
   green1,0.00,0.50,0.00;green2,0.00,0.50,0.25;%
@@ -17,11 +18,18 @@
   olive1,0.50,0.50,0.00;orange1,1.00,0.50,0.25;%
   yellow1,1.00,1.00,0.00;yellow2,1.00,1.00,0.70%
 }
-\csdef{temp1}{%
+\new\let\TC\textcolor
+\newrobustcmd*\stya[1]{\TC{xgreen10}{\texttt{#1}}\xspace}
+\newrobustcmd*\styb[1]{\TC{teal}{\texttt{#1}}\xspace}
+\newrobustcmd*\cmda[1]{\begingroup
+  \escapechar=92\endgroup\TC{xgreen10}{\texttt{\string#1}}\xspace}
+\newrobustcmd*\cmdb[1]{\begingroup
+  \escapechar=92\endgroup\TC{teal}{\texttt{\string#1}}\xspace}
+\long\csdef{temp1}{%
  \begin{center}
   \makebox[0pt]{\fboxrule2pt%
    \fcolorbox{xred10}{xyellow20}{%
-    \parbox{\dimexpr(\hsize-3cm)}{%
+    \parbox{\dimexpr\hsize-3cm}{%
     This package is an extension of Peter Wilson's {\tt changepage} package.
     \par\medskip
     This package can be used with the \texttt{geometry} package,
@@ -37,11 +45,15 @@
  \end{center}
  \vspace*{2\baselineskip}
 }
-\csdef{temp2}{\section*{Adjusted layout}\par\lipsum[1-2]}
-\csdef{temp3}{{\flushright\section*{Adjusted layout}}%
-  \par\noindent\lipsum[1-2]}
+\long\csdef{temp2}{\section*{Use of \cmda{\adjusttextwidth}
+  \\--- with text extending into both margins}\par\lipsum[1-2]}
+\long\csdef{temp3}{\section*{Use of \cmda{\adjusttextwidth}
+  with \cmda{switchadjust}}\par\noindent\lipsum[1-2]}
+\long\csdef{temp4}{{\flushright\section*{Use of \cmda{\adjusttextwidth}
+  with \cmda{switchadjust}}}\par\noindent\lipsum[1-2]}
 
 \begin{document}
+
 \title{The {\tt changelayout} Package}
 \author{Ahmed Musa\\[.5ex]University of Central Lancashire\\
   Preston, United Kingdom\\[1ex]\url{a.musa@rocketmail.com}
@@ -53,7 +65,7 @@
 \end{comment}
 \adjusttextwidth{leftmargin=1.5cm,rightmargin=1.5cm,content=\csuse{temp1}}
 
-\section*{Default layout (as set with {\tt geometry} package)}
+\section*{Default layout (as set with \styb{geometry} package)}
 \lipsum[1-2]
 
 \begin{comment}
@@ -71,12 +83,12 @@ content=\csuse{temp2}}
 \begin{comment}
   Make text width wider into right margin by 1.5cm on odd pages.
   'switchadjust' is a boolean for switching left and right margins on
-  odd and even pages. This is useful for twoside printing, where 
+  odd and even pages. This is useful for twoside printing, where
   the user may want the text extended only into outer margins:
 \end{comment}
 
 \adjusttextwidth{switchadjust=true,leftmargin=-0cm,rightmargin=-1.5cm,
-  textcolor=xmagenta20,content=\csuse{temp2}}
+  textcolor=xmagenta20,content=\csuse{temp3}}
 
 \newpage
 \lipsum[1-1]
@@ -89,36 +101,36 @@ content=\csuse{temp2}}
 \end{comment}
 
 \adjusttextwidth{switchadjust,leftmargin=-0cm,rightmargin=-1.5cm,
-  textcolor=red,content=\csuse{temp3}}
+  textcolor=red,content=\csuse{temp4}}
 
 \begin{comment}
   'strictcheck' is a boolean for enforcing strict page number check
-  (the idea is from the 'changepage' package). See the 
-  \usepackage{changelayout} statement above. 
-  Strict page checking is a safeguard against unlikely changes 
-  to the kernel page counter by another macro or package. For a 
-  large document, 'strictcheck' will generate a correspondingly 
-  large number of labels. This is not expected to be a problem 
-  with modern implementations of TeX/LaTeX; so I decided to 
+  (the idea is from the 'changepage' package). See the
+  \usepackage{changelayout} statement above.
+  Strict page checking is a safeguard against unlikely changes
+  to the kernel page counter by another macro or package. For a
+  large document, 'strictcheck' will generate a correspondingly
+  large number of labels. This is not expected to be a problem
+  with modern implementations of TeX/LaTeX; so I decided to
   retain it.
 \end{comment}
 
 \newpage
-\color{xgreen10}
 \begin{comment}
-  The layout of individual pages can be changed by using 
-  \changepagelayout or \changetextlayout (they are synonymous). 
-  
-  Both \changetextlayout and \changepagelayout replace (in the 
-  total sense) the prevailing text/page layout parameters by the 
-  values submitted by the user through these macros. All the page 
-  layout parameters (including \marginpar parameters) can be 
-  changed/replaced by simply submitting (via these macros) 
+  The layout of individual pages can be changed by using
+  \changepagelayout or \changetextlayout (they are synonymous).
+
+  Both \changetextlayout and \changepagelayout replace (in the
+  total sense) the prevailing text/page layout parameters by the
+  values submitted by the user through these macros. All the page
+  layout parameters (including \marginpar parameters) can be
+  changed/replaced by simply submitting (via these macros)
   the new parameter values.
 \end{comment}
+\color{xpurple10}
 \changetextlayout{oddsidemargin=-1cm,evensidemargin=0cm,textheight=550pt,
-  textwidth=515pt}
-\section*{Changed layout}
+  textwidth=530pt}
+\section*{Use of \cmda{\changetextlayout}}
 \lipsum[1-4]
 \normalcolor
 
@@ -140,10 +152,10 @@ content=\csuse{temp2}}
 \end{comment}
 
 \begin{comment}
-  In addition to \changepagelayout and \changetextlayout, there are 
-  also \adjustpagelayout and \adjusttextlayout (again these 
+  In addition to \changepagelayout and \changetextlayout, there are
+  also \adjustpagelayout and \adjusttextlayout (again these
   are synonymous).
-  
+
   Both \adjustpagelayout and \adjusttextlayout adjust (by adding to or
   subtracting from) the prevailing text/page layout parameters the
   values given by the user. All the text and page layout parameters
@@ -153,15 +165,16 @@ content=\csuse{temp2}}
 \color{xorange10}
 \adjusttextlayout{oddsidemargin=1cm, evensidemargin=-0cm, textheight=-50pt,
   textwidth=-50pt,topmargin=25pt}
-\section*{Changed layout}
+\section*{Use of \cmda{\adjusttextlayout}}
 \lipsum[1-4]
 \normalcolor
 
 \newpage
 \resetdefault%
-%\color{xolive10}
-\section*{Default layout (as set with {\tt geometry} package)}
+\section*{Default layout --- obtained by issuing \cmda{\resetdefault}}
+\textbf{\large The default is as set initially using the \styb{geometry} package.}
+\par\medskip
 \lipsum[1-4]
-%\normalcolor
+
 
 \end{document} 
 \ No newline at end of file