gmdoc (2feb11)

git-svn-id: svn://tug.org/texlive/trunk@21292 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 78 insertions, 48 deletions

diff --git a/Master/texmf-dist/tex/latex/gmdoc/gmdoc.sty b/Master/texmf-dist/tex/latex/gmdoc/gmdoc.sty
index 90e416a0fa7..a5bc9763984 100644
--- a/Master/texmf-dist/tex/latex/gmdoc/gmdoc.sty
+++ b/Master/texmf-dist/tex/latex/gmdoc/gmdoc.sty
@@ -2,7 +2,7 @@
 %% \iffalse ^^A we skip the debug setting
 \IfFileExists{\string~/bin/gen_and_xela}{\errorcontextlines=1000 }{}
 %% \fi
-%% ^^A $Id: TheUltimateMaster.gmd,v 0.250 2010/10/24 14:42:35 natror Exp natror $
+%% ^^A $Id: TheUltimateMaster.gmd,v 0.298 2011/02/02 18:35:58 natror Exp natror $
 %% This is file “gmdoc.sty” generated with the DocStrip utility.
 %% 
 %%
@@ -13,7 +13,7 @@
 %% 
 %% Copyright ©  2006, 2007, 2008, 2009, 2010
 %% by Grzegorz ‘Natror’ Murzynowski
-%% natror (at) o2 (dot) pl
+%% natror (at) gmail (dot) com
 %% 
 %% This program is subject to the LaTeX Project Public License.
 %% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
@@ -1058,6 +1058,7 @@ pagella, trebuchet, cursor, fontspec=quiet]{gmdocc}
   \fi}
 \catcode`\^^B=\active% note we re|\catcode| \<char2> globally, for the
 \catcode`\^^V=\active % the same for |^^V|.
+\catcode`\^^U=\active % and  for |^^U|.
 \foone{\obeylines}%% \Define*{^^B}
 {\pdef\QueerCharTwo{%
     \protected\def^^B##1^^M{%
@@ -1066,47 +1067,79 @@ pagella, trebuchet, cursor, fontspec=quiet]{gmdocc}
   % drive \TeX\ into hmode.
   %
   % \Define*{^^V}
-  \pdef\QueerV{%
-    \unless\ifdefined\gmd@QueerV%
+  % \Define*{^^U}
+  % The |^^V| char is intended to mark parts of code commented out
+  % which are to be typeset verbatim. Lines are begun with narration
+  % marks (\%'s by default) and the narration-verbatim-typewriter font
+  % is used.
+  %
+  % The |^^U| char is intended for the lines commented out which are
+  % to be typeset as almost-invisible (second-class). They are marked
+  % with the narration mark as with |^^V| and a special font setting
+  % is used, which is a gray colour by default (in addition to the narration-verbatim-typewriter).
+  %
+  \pdef\gmd@UVdefs {%
+    \def\gmd@UV@percent{\global\let\verb@balance@group\@empty  %
+      % ^^V         \hyphenchar\font=\gmv@storedhyphenchar  % it works back
+      % for the current paragraph so destroys our special hyphenchar.
+      \egroup\endgroup %
+    }% of |\gmd@UV@percent|
+    %
+    \@xa\def\@xa\verb@egroup@UV\@xa{%
+      \gmd@UV@percent ^^M%
+    }% of |\verb@egroup@UV|.
+    %
+    \addtomacro\gmd@UV@percent{\narrationmark}%
+    %
+    \pdef\gmd@QueerUV ##1{%
+      \scantokens\@xa{\code@delim %
+        \fooatletter{\@ifQueerEOL\@gobble}{}%
+      }% of |\scantokens|
       %
-      \def\gmd@V@percent{\global\let\verb@balance@group\@empty  %
-        \egroup\endgroup %
-      }% of |\gmd@V@percent|
+      \par%
+      {\codett\verbhyphen}\narrationmark %
+      \begingroup %
+      \catcode`\^^M=\active %
       %
-      \@xa\def\@xa\verb@egroup@V\@xa{%
-        \gmd@V@percent ^^M%
-      }% of |\verb@egroup@V|.
+      \let\verb@egroup=\verb@egroup@UV %
+      \verb^^M%
       %
-      \addtomacro\gmd@V@percent{\narrationmark}%
+      ##1% nothing in |^^V| case and a gray setting in the |^^U| case.
       %
-      \pdef\gmd@QueerV{%
-        \scantokens\@xa{\code@delim %
-          \fooatletter{\@ifQueerEOL\@gobble}{}%
-        }% of |\scantokens|
-        %
-        \par%
-        {\codett\verbhyphen}\narrationmark %
-        \begingroup %
-        \catcode`\^^M=\active %
-        %
-        \let\verb@egroup=\verb@egroup@V %
-        \verb^^M%%
-        %
-        \begingroup %
-        \@xa\lccode\@xa`\@xa~\@xa`\code@delim%
-        \lowercase{\endgroup\let~\gmd@V@percent }%
-        \@xa\catcode\@xa`\code@delim\active %
-      }%
+      \begingroup %
+      \@xa\lccode\@xa`\@xa~\@xa`\code@delim%
+      \lowercase{\endgroup\let~\gmd@UV@percent }%
+      \@xa\catcode\@xa`\code@delim\active %
+    }% of |\gmd@QueerUV|
+  }% of |\gmd@UVdefs|
+  %
+  %
+  \pdef\QueerU {%
+    \unless\ifdefined\gmd@QueerU%
       %
+      \gmd@UVdefs %
+      \pdef\gmd@QueerU {\gmd@QueerUV {\QueerUFont }}%
+      \let^^U\gmd@QueerU%
+      \catcode`\^^U=\active%
+    \fi %
+  }% of |\QueerU|
+  %
+  \pdef\QueerV {%
+    \unless\ifdefined\gmd@QueerV %
       %
-    \fi% of unless  |\gmd@QueerV| defined
-    \let^^V\gmd@QueerV%
-    \catcode`\^^V=\active%
+      \gmd@UVdefs %
+      \pdef\gmd@QueerV {\gmd@QueerUV {}}%
+      \let^^V\gmd@QueerV%
+      \catcode`\^^V=\active%
+    \fi %
   }% of |\QueerV|
+  %
 }% of |\foone|
 
 \QueerCharTwo
 \QueerV
+\QueerU
+\def\QueerUFont{\color{black!35}}
 
 \AtBegInput{\@ifEOLactive{\catcode`\^^B\active}{}\QueerCharTwo}% \label{QCh2}
 \catcode`\^^A=\active% note we re|\catcode| \<char1> globally, for the
@@ -4274,11 +4307,6 @@ pagella, trebuchet, cursor, fontspec=quiet]{gmdocc}
 
 \def\NoEOF{\QueerEOL\@NoEOF}
 \def\EOF{\QueerEOL\@EOF}
-%%% (For my GNU Emacs:)
-%%% Local Variables:
-%%% mode: doctex
-%%% coding: utf-8
-%%% End:
 \endinput
 %%
 %% End of file `gmdoc.sty'.
diff --git a/Master/texmf-dist/tex/latex/gmdoc/gmdocc.cls b/Master/texmf-dist/tex/latex/gmdoc/gmdocc.cls
index 36344bf900c..befb51f5317 100644
--- a/Master/texmf-dist/tex/latex/gmdoc/gmdocc.cls
+++ b/Master/texmf-dist/tex/latex/gmdoc/gmdocc.cls
@@ -2,7 +2,7 @@
 %% \iffalse ^^A we skip the debug setting
 \IfFileExists{\string~/bin/gen_and_xela}{\errorcontextlines=1000 }{}
 %% \fi
-%% ^^A $Id: TheUltimateMaster.gmd,v 0.250 2010/10/24 14:42:35 natror Exp natror $
+%% ^^A $Id: TheUltimateMaster.gmd,v 0.298 2011/02/02 18:35:58 natror Exp natror $
 %% This is file “gmdocc.cls” generated with the DocStrip utility.
 %% 
 %%
@@ -13,7 +13,7 @@
 %% 
 %% Copyright ©  
 %% by Grzegorz ‘Natror’ Murzynowski
-%% natror (at) o2 (dot) pl
+%% natror (at) gmail (dot) com
 %% 
 %% This program is subject to the LaTeX Project Public License.
 %% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
@@ -278,10 +278,15 @@
 
 \renewcommand*\thesection{\arabic{section}}% isn't it redundant at the
 
-\@ifnotmw{}{%
-  \@ifclassloaded{mwart}{% We set the indentation of Contents:
-    \SetTOCIndents{{}{\quad}{\quad}{\quad}{\quad}{\quad}{\quad}}}{% for \pk{mwart} …\ilrr
-    \SetTOCIndents{{}{\bf9.\enspace}{\quad}{\quad}{\quad}{\quad}{\quad}}}% and for the two other \pk{mwcls}s. \ilrr
+\@ifnotmw{}
+{% if MW class
+  \@ifclassloaded{mwart}
+  {% We set the indentation of Contents:
+    \SetTOCIndents{{}{\quad}{\quad}{\quad}{\quad}{\quad}{\quad}}%
+  }
+  {% for \pk{mwart} …\ilrr
+    \SetTOCIndents{{}{\bf9.\enspace}{\quad}{\quad}{\quad}{\quad}{\quad}}%
+  }% and for the two other \pk{mwcls}s. \ilrr
   \pagestyle{outer}}% We set the page numbers to be printed in the
 
 \def\titlesetup{\bfseries\sffamily}% We set the title(s) to be
@@ -327,12 +332,9 @@
 
 \def\OK{\acro{OK}\spifletter}
 
+\pdef\oczko{;-)\spifletter}
+
 
-%%% (For my GNU Emacs:)
-%%% Local Variables:
-%%% mode: doctex
-%%% coding: utf-8
-%%% End:
 \endinput
 %%
 %% End of file `gmdocc.cls'.