summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/stex/omdoc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-11-12 00:31:31 +0000
committerKarl Berry <karl@freefriends.org>2010-11-12 00:31:31 +0000
commit70e387eb63ce4723858c48592208e193dec294f3 (patch)
tree61ec42df871a70687151ed4a6d1bc6a5c81dc53c /Master/texmf-dist/tex/latex/stex/omdoc
parent2cee8f6dcf8e9596b5cfe9d1f3e55c61b261a320 (diff)
stex 0.9.3 (11nov10)
git-svn-id: svn://tug.org/texlive/trunk@20410 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/stex/omdoc')
-rw-r--r--Master/texmf-dist/tex/latex/stex/omdoc/omdoc.cls4
-rw-r--r--Master/texmf-dist/tex/latex/stex/omdoc/omdoc.sty22
-rw-r--r--Master/texmf-dist/tex/latex/stex/omdoc/omdoc.sty.ltxml5
3 files changed, 19 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/stex/omdoc/omdoc.cls b/Master/texmf-dist/tex/latex/stex/omdoc/omdoc.cls
index de669642d66..2d239c41ac8 100644
--- a/Master/texmf-dist/tex/latex/stex/omdoc/omdoc.cls
+++ b/Master/texmf-dist/tex/latex/stex/omdoc/omdoc.cls
@@ -8,6 +8,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{omdoc}[2010/06/25 v1.0 OMDoc Documents]
+\DeclareOption{showmeta}{\PassOptionsToPackage{\CurrentOption}{metakeys}}
\def\omdoc@class{article}
\DeclareOption{report}{\def\omdoc@class{report}\PassOptionsToPackage{\CurrentOption}{omdoc}}
\DeclareOption{book}{\def\omdoc@class{book}\PassOptionsToPackage{\CurrentOption}{omdoc}}
@@ -20,7 +21,8 @@
\LoadClass{\omdoc@class}
\RequirePackage{omdoc}
\let\orig@document=\document
-\renewcommand{\document}[1][]{\orig@document}
+\srefaddidkey{document}
+\renewcommand{\document}[1][]{\metasetkeys{document}{#1}\orig@document}
\endinput
%%
%% End of file `omdoc.cls'.
diff --git a/Master/texmf-dist/tex/latex/stex/omdoc/omdoc.sty b/Master/texmf-dist/tex/latex/stex/omdoc/omdoc.sty
index f0ead1392bd..625c4ef0751 100644
--- a/Master/texmf-dist/tex/latex/stex/omdoc/omdoc.sty
+++ b/Master/texmf-dist/tex/latex/stex/omdoc/omdoc.sty
@@ -8,6 +8,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{omdoc}[2010/06/25 v1.0 OMDoc document Structure]
+\DeclareOption{showmeta}{\PassOptionsToPackage{\CurrentOption}{metakeys}}
\newif\if@chapter\@chapterfalse
\newif\if@part\@partfalse
\newcount\section@level\section@level=3
@@ -23,13 +24,13 @@
\RequirePackage{sref}
\RequirePackage{comment}
\srefaddidkey{omgroup}
-\omdaddkey{omgroup}{creators}
-\omdaddkey{omgroup}{contributors}
-\omdaddkey{omgroup}{type}
-\omdaddkey{omgroup}{short}
-\omdaddkey{omgroup}{display}
+\addmetakey{omgroup}{creators}
+\addmetakey{omgroup}{contributors}
+\addmetakey{omgroup}{type}
+\addmetakey*{omgroup}{short}
+\addmetakey*{omgroup}{display}
\newenvironment{omgroup}[2][]% title
-{\bgroup\omdsetkeys{omgroup}{#1}\sref@target
+{\bgroup\metasetkeys{omgroup}{#1}\sref@target
\ifx\omgroup@display\st@flow\noindent{\Large\textbf{#2}\\[.3ex]\noindent\ignorespaces}
\else
\if@part\ifnum\section@level=1\part{#2}\sref@label@id{Part \thepart}\fi\fi
@@ -41,11 +42,12 @@
\ifnum\section@level=7\subparagraph{#2}\sref@label@id{this subparagraph}\fi
\advance\section@level by 1
\fi}{\egroup}
+\providecommand\printindex{\IfFileExists{\jobname.ind}{\input{\jobname.ind}}{}}
\ifshow@ignores
-\omdaddkey{ignore}{type}
-\omdaddkey{ignore}{comment}
+\addmetakey{ignore}{type}
+\addmetakey{ignore}{comment}
\newenvironment{ignore}[1][]
-{\omdsetkeys{ignore}{#1}\textless\ignore@type\textgreater\bgroup\itshape}
+{\metasetkeys{ignore}{#1}\textless\ignore@type\textgreater\bgroup\itshape}
{\egroup\textless/\ignore@type\textgreater}
\renewenvironment{ignore}{}{}\else\excludecomment{ignore}\fi
\long\def\STRlabel#1#2{\STRlabeldef{#1}{#2}{#2}}
@@ -55,6 +57,7 @@
\newcommand{\STRsemantics}[3][]{#2\def\@test{#1}\ifx\@test\@empty\STRlabeldef{#1}{#2}\fi}
\def\STRlabeldef#1{\expandafter\gdef\csname STR@#1\endcsname}
\def\black#1{\textcolor{black}{#1}}
+\def\gray#1{\textcolor{gray}{#1}}
\def\blue#1{\textcolor{blue}{#1}}
\def\red#1{\textcolor{red}{#1}}
\def\green#1{\textcolor{green}{#1}}
@@ -62,7 +65,6 @@
\def\magenta#1{\textcolor{magenta}{#1}}
\def\brown#1{\textcolor{brown}{#1}}
\def\yellow#1{\textcolor{yellow}{#1}}
-\def\yellow#1{\textcolor{yellow}{#1}}
\def\orange#1{\textcolor{orange}{#1}}
\newcommand{\baseURI}[2][]{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/stex/omdoc/omdoc.sty.ltxml b/Master/texmf-dist/tex/latex/stex/omdoc/omdoc.sty.ltxml
index 181b90aa0d9..13fa706247e 100644
--- a/Master/texmf-dist/tex/latex/stex/omdoc/omdoc.sty.ltxml
+++ b/Master/texmf-dist/tex/latex/stex/omdoc/omdoc.sty.ltxml
@@ -73,6 +73,9 @@ DefEnvironment('{description}',
."</omdoc:omgroup>",
properties=>sub { beginItemize('description'); },
beforeDigestEnd=>sub { Digest(T_CS('\group@item@maybe@unwrap')); });
+DefConstructor('\printindex','<omdoc:index/>');
+DefConstructor('\tableofcontents',"<omdoc:tableofcontents level='2'/>");
+DefConstructor('\bibliography{}',"<omdoc:bibliography files='#1'/>");
DefKeyVal('ignore','type','Semiverbatim');
DefKeyVal('ignore','comment','Semiverbatim');
DefEnvironment('{ignore} OptionalKeyVals:ignore',
@@ -96,7 +99,7 @@ sub omdocColorMacro {
DefMacro('\@omdoc@color{}', sub { MergeFont(color=>$_[1]->toString); return; });#$
DefConstructor('\@omdoc@color@content[]{}',
"?#isMath(#2)(<omdoc:phrase ?#1(style='color:#1')()>#2</omdoc:phrase>)");
-foreach my $color(qw(blue red green magenta cyan brown yellow)) {
+foreach my $color(qw(black gray blue red green cyan magenta brown yellow orange)) {
DefMacro("\\".$color.'{}', sub { omdocColorMacro($color, @_); }); }#$
DefConstructor('\newpage','');
Tag('omdoc:ignore',afterOpen=>\&numberIt,afterClose=>\&locateIt);