stex update once more

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

2 files changed, 722 insertions, 0 deletions

diff --git a/Master/texmf-dist/tex/latex/stex/modules/modules.sty b/Master/texmf-dist/tex/latex/stex/modules/modules.sty
new file mode 100644
index 00000000000..2e11bb955ad
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/stex/modules/modules.sty
@@ -0,0 +1,224 @@
+%%
+%% This is file `modules.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% modules.dtx  (with options: `package')
+%% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{modules}[2010/06/25 v1.0 Semantic Markup]
+\newif\ifmod@show\mod@showfalse
+\DeclareOption{show}{\mod@showtrue}
+\newif\ifmod@qualified\mod@qualifiedfalse
+\DeclareOption{qualifiedimports}{\mod@qualifiedtrue}
+\ProcessOptions
+\RequirePackage{sref}
+\RequirePackage{xspace}
+\RequirePackage{xcomment}
+\define@key{module}{cd}{}
+\define@key{module}{id}{%
+\edef\this@module{\expandafter\noexpand\csname module@defs@#1\endcsname}%
+\global\@namedef{module@defs@#1}{}%
+\ifmod@qualified
+\edef\this@qualified@module{\expandafter\noexpand\csname module@defs@qualified@#1\endcsname}%
+\global\@namedef{module@defs@qualified@#1}{}%
+\fi
+\def\mod@id{#1}%
+\expandafter\edef\csname #1@cd@file@base\endcsname{\mod@path}%
+\expandafter\g@addto@macro\csname module@defs@#1\expandafter\endcsname\expandafter%
+{\expandafter\def\csname #1@cd@file@base\expandafter\endcsname\expandafter{\mod@path}}}
+\newenvironment{module}[1][]{\setkeys{module}{#1}}{}
+\def\activate@defs#1{\csname module@defs@#1\endcsname}
+\def\export@defs#1{\@ifundefined{mod@id}{}%
+{\expandafter\expandafter\expandafter\g@addto@macro\expandafter%
+\this@module\expandafter{\csname module@defs@#1\endcsname}}}
+\def\coolurion{}
+\def\coolurioff{}
+\newcommand{\importmodule}[2][]{{\def\mod@path{#1}%
+\ifx\mod@path\@empty\else\requiremodules{#1}\fi}%
+\activate@defs{#2}\export@defs{#2}}
+\newcommand{\importOMDocmodule}[3][]{\importmodule[#1]{#3}}
+\let\metalanguage=\importmodule
+\def\mod@newcommand{\@star@or@long\mod@new@command}
+\def\mod@new@command#1{\@testopt{\@mod@newcommand#1}0}
+\def\@mod@newcommand#1[#2]{\kernel@ifnextchar [{\mod@xargdef#1[#2]}{\mod@argdef#1[#2]}}
+\long\def\mod@argdef#1[#2]#3{\@yargdef#1\@ne{#2}{#3}}
+\long\def\mod@xargdef#1[#2][#3]#4{\expandafter\def\expandafter#1\expandafter{%
+\expandafter\@protected@testopt\expandafter #1\csname\string#1\endcsname{#3}}%
+\expandafter\@yargdef\csname\string#1\endcsname\tw@{#2}{#4}}
+\define@key{symdef}{local}[true]{\@symdeflocaltrue}
+\define@key{symdef}{name}{}
+\define@key{symdef}{assocarg}{}
+\define@key{symdef}{bvars}{}
+\define@key{symdef}{bvar}{}
+\newif\if@symdeflocal
+\def\symdef{\@ifnextchar[{\@symdef}{\@symdef[]}}
+\def\@symdef[#1]#2{\@ifnextchar[{\@@symdef[#1]{#2}}{\@@symdef[#1]{#2}[0]}}
+\def\@mod@nc#1{\mod@newcommand{#1}[1]}
+\def\@@symdef[#1]#2[#3]#4{%
+\@symdeflocalfalse\setkeys{symdef}{#1}%
+\expandafter\mod@newcommand\csname modules@#2@pres\endcsname[#3]{#4}%
+\expandafter\def\csname#2\endcsname{\csname modules@#2@pres\endcsname}%
+\expandafter\@mod@nc\csname mod@symref@#2\expandafter\endcsname\expandafter%
+{\expandafter\mod@termref\expandafter{\mod@id}{#2}{##1}}%
+\if@symdeflocal\else%
+\@ifundefined{mod@id}{}{%
+\expandafter\g@addto@macro\this@module%
+{\expandafter\mod@newcommand\csname modules@#2@pres\endcsname[#3]{#4}}%
+\expandafter\g@addto@macro\this@module%
+{\expandafter\def\csname#2\endcsname{\csname modules@#2@pres\endcsname}}%
+\expandafter\g@addto@macro\csname  module@defs@\mod@id\expandafter\endcsname\expandafter%
+{\expandafter\@mod@nc\csname mod@symref@#2\expandafter\endcsname\expandafter%
+{\expandafter\mod@termref\expandafter{\mod@id}{#2}{##1}}}%
+\ifmod@qualified%
+\expandafter\g@addto@macro\this@qualified@module%
+{\expandafter\mod@newcommand\csname modules@#2@pres@qualified\endcsname[#3]{#4}}%
+\expandafter\g@addto@macro\this@qualified@module%
+{\expandafter\def\csname#2atqualified\endcsname{\csname modules@#2@pres@qualified\endcsname}}%
+\fi%
+}\fi}
+\def\resymdef{\@ifnextchar[{\@resymdef}{\@resymdef[]}}
+\def\@resymdef[#1]#2{\@ifnextchar[{\@@resymdef[#1]{#2}}{\@@resymdef[#1]{#2}[0]}}
+\def\@@resymdef[#1]#2[#3]#4{\expandafter\renewcommand\csname modules@#2@pres\endcsname[#3]{#4}}
+\let\abbrdef\symdef
+\def\mod@path{}
+\def\mod@true{true}
+\omdaddkey[false]{termdef}{local}
+\omdaddkey{termdef}{name}
+\newcommand{\termdef}[3][]{\omdsetkeys{termdef}{#1}%
+\expandafter\mod@newcommand\csname#2\endcsname[0]{#3\xspace}
+\ifx\termdef@local\mod@true\else%
+\@ifundefined{mod@id}{}{\expandafter\g@addto@macro\this@module%
+{\expandafter\mod@newcommand\csname#2\endcsname[0]{#3\xspace}}}
+\fi}
+\def\@captitalize#1{\uppercase{#1}}
+\newcommand\capitalize[1]{\expandafter\@captitalize #1}
+\def\mod@termref#1#2#3{\def\@test{#3}
+\@ifundefined{#1@cd@file@base}
+    {\protect\G@refundefinedtrue
+      \@latex@warning{\protect\termref with unidentified cd "#1": the cd key must
+        reference an active module}
+      \def\@label{sref@#2 @target}}
+  {\def\@label{sref@#2@#1@target}}%
+\expandafter\ifx\csname #1@cd@file@base\endcsname\@empty% local reference
+\sref@hlink@ifh{\@label}{\ifx\@test\@empty #2\else #3\fi}\else%
+\def\@uri{\csname #1@cd@file@base\endcsname.pdf\#\@label}%
+\sref@href@ifh{\@uri}{\ifx\@test\@empty #2\else #3\fi}\fi}
+\def\mod@simplify#1{\expandafter\mod@simpl#1/\relax}
+\def\mod@simpl#1/#2\relax{\def\@second{#2}%
+\ifx\mod@blaaaa\@empty\edef\mod@savedprefix{}\def\mod@blaaaa{aaa}\else\fi%
+\ifx\@second\@empty\edef\mod@savedprefix{\mod@savedprefix#1}%
+\else\mod@simplhelp#1/#2\relax\fi}
+\def\mod@updir{..}
+\def\mod@simplhelp#1/#2/#3\relax{\def\@first{#1}\def\@second{#2}\def\@third{#3}%
+\ifx\@third\@empty% base case
+\ifx\@second\mod@updir\else%
+\ifx\mod@second\@empty\edef\mod@savedprefix{\mod@savedprefix#1}%
+\else\edef\mod@savedprefix{\mod@savedprefix#1/#2}%
+\fi%
+\fi%
+\else%
+\ifx\@first\mod@updir%
+\edef\mod@savedprefix{\mod@savedprefix#1/}\mod@simplhelp#2/#3\relax%
+\else%
+\ifx\@second\mod@updir\mod@simpl#3\relax%
+\else\edef\mod@savedprefix{\mod@savedprefix#1/}\mod@simplhelp#2/#3\relax%
+\fi%
+\fi%
+\fi}%
+\newcommand{\defpath}[2]{\expandafter\newcommand\csname #1\endcsname[1]{#2/##1}}
+\newif\ifmodules
+\gdef\mod@reg{}
+\def\mod@update#1{\ifx\mod@reg\@empty\xdef\mod@reg{#1}\else\xdef\mod@reg{#1@\mod@reg}\fi}
+\def\mod@check#1@#2///#3\relax{%
+\def\mod@one{#1}\def\mod@two{#2}\def\mod@three{#3}%
+\expandafter%
+\ifx\mod@three\mod@one\modulestrue%
+\else%
+\ifx\mod@two\@empty\modulesfalse\else\mod@check#2///#3\relax\fi%
+\fi}
+\def\mod@search#1{%
+\modulesfalse\expandafter\mod@check\mod@reg @///#1\relax%
+\ifmodules\else\mod@update{#1}\fi}
+\def\mod@reguse#1{\modulesfalse\expandafter\mod@check\mod@reg @///#1\relax}
+\def\mod@prefix{}
+\def\mod@updatedpre#1{%
+\edef\mod@prefix{\mod@prefix\mod@pathprefix@check#1/\relax}}
+\def\mod@pathprefix@check#1/#2\relax{%
+\ifx\\#2\\% no slash in string
+\else\mod@ReturnAfterFi{#1/\mod@pathprefix@help#2\relax}%
+\fi}
+\def\mod@pathprefix@help#1/#2\relax{%
+\ifx\\#2\\% end of recursion
+\else\mod@ReturnAfterFi{#1/\mod@pathprefix@help#2\relax}%
+\fi}
+\long\def\mod@ReturnAfterFi#1\fi{\fi#1}
+\def\mod@pathpostfix@check#1/#2\relax{% slash
+\ifx\\#2\\%no slash in string
+#1\else\mod@ReturnAfterFi{\mod@pathpostfix@help#2\relax}%
+\fi}
+\def\mod@pathpostfix@help#1/#2\relax{%
+\ifx\\#2\\%
+#1\else\mod@ReturnAfterFi{\mod@pathpostfix@help#2\relax}%
+\fi}
+\def\mod@updatedpost#1{%
+\edef\mod@savedprefix{\mod@savedprefix\mod@pathpostfix@check#1/\relax}}
+\def\mod@updatesms{\edef\mod@savedprefix{\mod@savedprefix.sms}}
+\newcommand{\requiremodules}[1]{%
+{\mod@updatedpre{#1}% add the new file to the already existing path
+\let\mod@savedprefix\mod@prefix% add the path to the new file to the prefix
+\mod@updatedpost{#1}%
+\def\mod@blaaaa{}% macro used in the simplify function (remove .. from the prefix)
+\mod@simplify{\mod@savedprefix}% remove |xxx/..| from the path (in case it exists)
+\mod@reguse{\mod@savedprefix}%
+\ifmodules\else%
+\mod@updatesms% update the file to contain the .sms extension
+\let\newreg\mod@reg% use to compare, in case the .sms file was loaded before
+\mod@search{\mod@savedprefix}% update registry
+\ifx\newreg\mod@reg\else\input{\mod@savedprefix}\fi% check if the registry was updated and load if necessary
+\fi}}
+\def\sinput#1{
+{\mod@updatedpre{#1}% add the new file to the already existing path
+\let\mod@savedprefix\mod@prefix% add the path to the new file to the prefix
+\mod@updatedpost{#1}%
+\def\mod@blaaaa{}% macro used in the simplify function (remove .. from the prefix)
+\mod@simplify{\mod@savedprefix}% remove |xxx/..| from the path (in case it exists)
+\mod@reguse{\mod@savedprefix}%
+\let\newreg\mod@reg% use to compare, in case the .sms file was loaded before
+\mod@search{\mod@savedprefix}% update registry
+\ifx\newreg\mod@reg%\message{This file has been previously introduced}
+\else\input{\mod@savedprefix}%
+\fi}}
+\let\sinputref=\sinput
+\def\requirepackage#1#2{\makeatletter\input{#1.sty}\makeatother}
+\srefaddidkey{view}
+\omdaddkey{view}{from}
+\omdaddkey{view}{to}
+\omdaddkey{view}{title}
+\ifmod@show
+\newsavebox{\viewbox}
+\newcounter{view}[section]
+\def\view@heading{{\textbf{View} \thesection.\theview}
+  \sref@label@id{View \thesection.\theproblem}
+  \@ifundefined{view@title}{:\quad}{\quad(\view@title)\hfill\\}}
+\newenvironment{view}[1][]{\omdsetkeys{view}{#1}\sref@target\stepcounter{view}
+\begin{lrbox}{\viewbox}\begin{minipage}{.9\textwidth}\importmodule{\view@to}}
+{\end{minipage}\end{lrbox}
+\setbox0=\hbox{\begin{minipage}{.9\textwidth}%
+\noindent\view@heading\rm%
+\end{minipage}}
+\smallskip\noindent\fbox{\vbox{\box0\vspace*{.2em}\usebox\viewbox}}\smallskip}
+\else\newxcomment[]{view}\fi
+\def\vassign#1#2{#1\ensuremath{\mapsto #2}}
+\define@key{module}{uses}{%
+\@for\module@tmp:=#1\do{\activate@defs\module@tmp\export@defs\module@tmp}}
+\define@key{module}{usesqualified}{%
+\@for\module@tmp:=#1\do{\activate@defs{qualified@\module@tmp}\export@defs\module@tmp}}
+\def\csymdef{\@ifnextchar[{\@csymdef}{\@csymdef[]}}
+\def\@csymdef[#1]#2{\@ifnextchar[{\@@csymdef[#1]{#2}}{\@@csymdef[#1]{#2}[0]}}
+\def\@@csymdef[#1]#2[#3]#4#5{\@@symdef[#1]{#2}[#3]{#4}}
+\def\notationdef[#1]#2#3{}
+\endinput
+%%
+%% End of file `modules.sty'.
diff --git a/Master/texmf-dist/tex/latex/stex/modules/modules.sty.ltxml b/Master/texmf-dist/tex/latex/stex/modules/modules.sty.ltxml
new file mode 100644
index 00000000000..39d1584c14b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/stex/modules/modules.sty.ltxml
@@ -0,0 +1,498 @@
+# -*- CPERL -*-
+package LaTeXML::Package::Pool;
+use strict;
+use LaTeXML::Global;
+use LaTeXML::Package;
+DefEnvironment('{module} OptionalKeyVals:Module',
+       "?#excluded()(<omdoc:theory "
+             . "?&defined(&KeyVal(#1,'id'))(xml:id='&KeyVal(#1,'id')')(xml:id='#id')>#body</omdoc:theory>)",
+#     beforeDigest=>\&useTheoryItemizations,
+       afterDigestBegin=>sub {
+       my($stomach, $whatsit)=@_;
+       $whatsit->setProperty(excluded=>LookupValue('excluding_modules'));
+
+       my $keys = $whatsit->getArg(1);
+       my($id, $cd)=$keys
+  && map(ToString($keys->getValue($_)),qw(id cd));
+        #make sure we have an id or give a stub one otherwise:
+if (not $id) {
+#do magic to get a unique id for this theory
+$whatsit->setProperties(beginItemize('theory'));
+$id = ToString($whatsit->getProperty('id'));
+}
+       $cd = $id unless $cd;
+       # update the catalog with paths for modules
+       my $module_paths = LookupValue('module_paths') || {};
+       $module_paths->{$id} = LookupValue('last_module_path');
+       AssignValue('module_paths', $module_paths, 'global');
+
+       #Update the current module position
+       AssignValue(current_module => $id);
+       AssignValue(module_cd => $cd) if $cd;
+
+       #activate the module in our current scope
+       $STATE->activateScope("module:".$id);
+
+       #Activate parent scope, if present
+       my $parentmod = LookupValue('parent_module');
+       use_module($parentmod) if $parentmod;
+       #Update the current parent module
+       AssignValue("parent_of_$id"=>$parentmod,'global');
+       AssignValue("parent_module" => $id);
+       return; },
+     afterDigest => sub {
+       #Move a step up on the module ancestry
+       AssignValue("parent_module" => LookupValue("parent_of_".LookupValue("parent_module")));
+       return;
+     });
+sub use_module {
+  my($module,%ancestors)=@_;
+  $module = ToString($module);
+  if (defined $ancestors{$module})  {
+    Fatal(":module \"$module\" leads to import cycle!");
+  }
+  $ancestors{$module}=1;
+  # Depth-first load definitions from used modules, disregarding cycles
+  foreach my $used_module (@{ LookupValue("module_${module}_uses") || []}){
+    use_module($used_module,%ancestors);
+  }
+  # then load definitions for this module
+  $STATE->activateScope("module:$module"); }#$
+DefMacro('\coolurion',sub {AssignValue('cooluri'=>1);});
+DefMacro('\coolurioff',sub {AssignValue('cooluri'=>0);});
+sub omext {
+  my ($mod)=@_; my $dest='';
+  if (ToString($mod)) {
+    #We need a constellation of abs_path invocations
+    # to make sure that all symbolic links get resolved
+    my ($d,$f,$t) = pathname_split(abs_path(ToString($mod)));
+    $d = pathname_relative(abs_path($d),abs_path(cwd()));
+    $dest=$d."/".$f;
+  }
+  $dest.=".omdoc" if (ToString($mod) && !LookupValue('cooluri'));
+  return Tokenize($dest);}
+sub importmoduleI {
+   my($stomach,$whatsit)=@_;
+   my $file = $whatsit->getArg(1);
+   my $omdocmod = $file.".omdoc" if $file;
+   my $module = $whatsit->getArg(2);
+   $module = ToString($module);
+   my $containing_module = LookupValue('current_module');
+   #set the relation between the current module and the one to be imported
+   PushValue("module_".$containing_module."_uses"=>$module) if $containing_module;
+  #check if we've already loaded this module file or no file path given
+  if((!$file) || (LookupValue('file_'.$module.'_loaded'))) {use_module($module);} #if so activate it!
+  else {
+    #if not:
+    my $gullet = $stomach->getGullet;
+    #1) mark as loaded
+    AssignValue('file_'.$module.'_loaded' => 1, 'global');
+    #open a group for its definitions so that they are localized
+    $stomach->bgroup;
+    #update the last module path
+    AssignValue('last_module_path', $file);
+    #queue the closing tag for this module in the gullet where it will be executed
+    #after all other definitions of the imported module have been taken care of
+    $gullet->unread(Invocation(T_CS('\end@requiredmodule'), T_OTHER($module))->unlist);
+    #we only need to load the sms definitions without generating any xml output, so we set the flag to 1
+    AssignValue('excluding_modules' => 1);
+    #queue this module's sms file in the gullet so that its definitions are imported
+    $gullet->input($file,['sms']);
+   }
+   return;}
+DefConstructor('\importmodule OptionalSemiverbatim {}',
+   "<omdoc:imports from='?#1(&omext(#1))\##2'/>",
+   afterDigest=>sub{ importmoduleI(@_)});
+DefConstructor('\importOMDocmodule OptionalSemiverbatim {}{}',"<omdoc:imports from='#3\##2'/>",
+afterDigest=>sub{
+  #Same as \importmodule, just switch second and third argument.
+  my ($stomach,$whatsit) = @_;
+  my $path = $whatsit->getArg(1);
+  my $ouri = $whatsit->getArg(2);
+  my $module = $whatsit->getArg(3);
+  $whatsit->setArgs(($path, $module,$ouri));
+  importmoduleI($stomach,$whatsit);
+  return;
+});
+DefConstructor('\metalanguage OptionalSemiverbatim {}',
+   "<omdoc:imports type='metalanguage' from='?#1(&omext(#1))\##2'/>",
+   afterDigest=>sub{ importmoduleI(@_)});
+DefMacro('\DefMathOp OptionalKeyVals:symdef {}',
+ sub {
+   my($self,$keyval,$pres)=@_;
+   my $name = KeyVal($keyval,'name') if $keyval;
+   #Rewrite this token
+   my $scopes = $STATE->getActiveScopes;
+   DefMathRewrite(active=>$scopes,xpath=>'descendant-or-self::ltx:XMath',match=>ToString($pres),replace=>"\\".ToString($name));
+   #Invoke symdef
+   (Invocation(T_CS('\symdef'),$keyval,$name,undef,undef,$pres)->unlist);
+ });
+DefMacro('\symdef OptionalKeyVals:symdef {}[][]{}',
+      sub {
+  my($self,@args)=@_;
+  ((Invocation(T_CS('\@symdef'),@args)->unlist),
+   (LookupValue('excluding_modules') ? ()
+     : (Invocation(T_CS('\@symdef@pres'), @args)->unlist))); });
+
+#Current list of recognized formatter command sequences:
+our @PresFormatters = qw (infix prefix postfix assoc mixfixi mixfixa mixfixii mixfixia mixfixai mixfixaii mixfixiii);
+DefPrimitive('\@symdef OptionalKeyVals:symdef {}[][]{}', sub {
+  my($stomach,$keys,$cs,$nargs,$opt,$presentation)=@_;
+  my($name,$cd,$role,$bvars,$bvar)=$keys
+    && map($_ && $_->toString,map($keys->getValue($_), qw(name cd role
+    bvars bvar)));
+  $cd = LookupValue('module_cd') unless $cd;
+  $name = $cs unless $name;
+  #Store for later lookup
+  AssignValue("symdef.".ToString($cs).".cd"=>ToString($cd),'global');
+  AssignValue("symdef.".ToString($cs).".name"=>ToString($name),'global');
+  $nargs = (ref $nargs ? $nargs->toString : $nargs || 0);
+  my $module = LookupValue('current_module');
+  my $scope = (($keys && ($keys->getValue('local') || '' eq 'true')) ? 'module_local' : 'module').":".$module;
+
+ #The DefConstructorI Factory is responsible for creating the \symbol command sequences as dictated by the \symdef
+ DefConstructorI("\\".$cs->toString,convertLaTeXArgs($nargs,$opt), sub {
+    my ($document,@args) = @_;
+    my @props = @args;
+    my $localpres = $presentation;
+    @args = splice(@props,0,$nargs);
+    my %prs = @props;
+    $prs{isbound} = "BINDER" if ($bvars || $bvar);
+    my $wrapped;
+    my $parent=$document->getNode;
+    if(! defined $parent->lookupNamespacePrefix("http://omdoc.org/ns")){ # namespace not already declared?
+      $document->getDocument->documentElement->setNamespace("http://omdoc.org/ns","omdoc",0); }
+    my $symdef_scope=$parent->exists('ancestor::omdoc:rendering'); #Are we in a \symdef rendering?
+    if (($localpres =~/^LaTeXML::Token/) && $symdef_scope) {
+      #Note: We should probably ask Bruce whether this maneuver makes sense
+      # We jump back to digestion, at a processing stage where it has been already completed
+      # Hence need to reinitialize all scopes and make a new group. This is probably expensive to do.
+
+      my @toks = $localpres->unlist;
+      while(@toks && $toks[0]->equals(T_SPACE)){ shift(@toks); }  # Remove leading space
+      my $formatters = join("|",@PresFormatters);
+      $formatters = qr/$formatters/;
+      $wrapped = (@toks && ($toks[0]->toString =~ /^\\($formatters)$/));
+      $localpres = Invocation(T_CS('\@use'),$localpres) unless $wrapped;
+      # Plug in the provided arguments, doing a nasty reversion:
+      my @sargs = map (Tokens($_->revert),  @args);
+      $localpres = Tokens(LaTeXML::Expandable::substituteTokens($localpres,@sargs)) if $nargs>0;
+      #Digest:
+      my $stomach = $STATE->getStomach;
+      $stomach->beginMode('inline-math');
+      $STATE->activateScope($scope);
+      use_module($module);
+      use_module(LookupValue("parent_of_".$module)) if LookupValue("parent_of_".$module);
+      $localpres=$stomach->digest($localpres);
+      $stomach->endMode('inline-math');
+    }
+    else { #Some are already digested to Whatsit, usually when dropped from a wrapping constructor
+    }
+    if ($nargs == 0) {
+      if (!$symdef_scope) { #Simple case - discourse flow, only a single XMTok
+        #Referencing XMTok when not in \symdefs:
+        $document->insertElement('ltx:XMTok',undef,(name=>$cs->toString, meaning=>$name,omcd=>$cd,role => $role,scriptpos=>$prs{'scriptpos'}));
+      }
+      else {
+        if ($symdef_scope && ($localpres =~/^LaTeXML::Whatsit/) && (!$wrapped)) {#1. Simple case: converts to a single token
+          $localpres->setProperties((name=>$cs->toString, meaning=>$name,omcd=>$cd,role => $role,scriptpos=>$prs{'scriptpos'}));
+        }
+        else {
+          #Experimental treatment - COMPLEXTOKEN
+          #$role=$role||'COMPLEXTOKEN';
+          #$document->openElement('ltx:XMApp',role=>'COMPLEXTOKEN');
+          #$document->insertElement('ltx:XMTok',undef,(name=>$cs->toString, meaning=>$name, omcd=>$cd, role=>$role, scriptpos=>$prs{'scriptpos'}));
+          #$document->openElement('ltx:XMWrap');
+          #$document->absorb($localpres);
+          #$document->closeElement('ltx:XMWrap');
+          #$document->closeElement('ltx:XMApp');
+        }
+        #We need expanded presentation when invoked in \symdef scope:
+
+        #Suppress errors from rendering attributes when absorbing.
+        #This is bad style, but we have no way around it due to the digestion acrobatics.
+        my $verbosity = $LaTeXML::Global::STATE->lookupValue('VERBOSITY');
+        my $errors = $LaTeXML::Global::STATE->getStatus('error');
+        $LaTeXML::Global::STATE->assignValue('VERBOSITY',-5);
+
+        #Absorb presentation:
+        $document->absorb($localpres);
+
+        #Return to original verbosity and error state:
+        $LaTeXML::Global::STATE->assignValue('VERBOSITY',$verbosity);
+        $LaTeXML::Global::STATE->setStatus('error',$errors);
+
+        #Strip all/any <rendering><Math><XMath> wrappers:
+        #TODO: Ugly LibXML work, possibly do something smarter
+        my $parent = $document->getNode;
+        my @renderings=$parent->findnodes(".//omdoc:rendering");
+        foreach my $render(@renderings) {
+          my $content=$render;
+          while ($content && $content->localname =~/^rendering|[X]?Math/) {
+            $content = $content->firstChild;
+          }
+          my $sibling = $content->parentNode->lastChild;
+          my $localp = $render->parentNode;
+          while ((defined $sibling) && (!$sibling->isSameNode($content))) {
+            my $clone = $sibling->cloneNode(1);
+            $localp->insertAfter($clone,$render);
+            $sibling = $sibling->previousSibling;
+          }
+          $render->replaceNode($content);
+        }
+      }
+    }
+    else {#2. Constructors with arguments
+      if (!$symdef_scope) { #2.1 Simple case, outside of \symdef declarations:
+        #Referencing XMTok when not in \symdefs:
+        $document->openElement('ltx:XMApp',scriptpos=>$prs{'scriptpos'},role=>$prs{'isbound'});
+        $document->insertElement('ltx:XMTok',undef,(name=>$cs->toString, meaning=>$name, omcd=>$cd, role=>$role, scriptpos=>$prs{'operator_scriptpos'}));
+        foreach my $carg (@args) {
+          if ($carg =~/^LaTeXML::Token/) {
+            my $stomach = $STATE->getStomach;
+            $stomach->beginMode('inline-math');
+            $carg=$stomach->digest($carg);
+            $stomach->endMode('inline-math');
+          }
+          $document->openElement('ltx:XMArg');
+          $document->absorb($carg);
+          $document->closeElement('ltx:XMArg');
+        }
+        $document->closeElement('ltx:XMApp');
+      }
+      else { #2.2 Complex case, inside a \symdef declaration
+        #We need expanded presentation when invoked in \symdef scope:
+
+        #Suppress errors from rendering attributes when absorbing.
+        #This is bad style, but we have no way around it due to the digestion acrobatics.
+        my $verbosity = $LaTeXML::Global::STATE->lookupValue('VERBOSITY');
+        my $errors = $LaTeXML::Global::STATE->getStatus('error');
+        $LaTeXML::Global::STATE->assignValue('VERBOSITY',-5);
+
+        #Absorb presentation:
+        $document->absorb($localpres);
+
+        #Return to original verbosity and error state:
+        $LaTeXML::Global::STATE->assignValue('VERBOSITY',$verbosity);
+        $LaTeXML::Global::STATE->setStatus('error',$errors);
+
+        #Strip all/any <rendering><Math><XMath> wrappers:
+        #TODO: Ugly LibXML work, possibly do something smarter?
+        my $parent = $document->getNode;
+        if(! defined $parent->lookupNamespacePrefix("http://omdoc.org/ns")){ # namespace not already declared?
+          $document->getDocument->documentElement->setNamespace("http://omdoc.org/ns","omdoc",0); }
+        my @renderings=$parent->findnodes(".//omdoc:rendering");
+        foreach my $render(@renderings) {
+          my $content=$render;
+          while ($content && $content->localname =~/^rendering|[X]?Math/) {
+            $content = $content->firstChild;
+          }
+          my $sibling = $content->parentNode->lastChild;
+          my $localp = $render->parentNode;
+          while ((defined $sibling) && (!$sibling->isSameNode($content))) {
+            my $clone = $sibling->cloneNode(1);
+            $localp->insertAfter($clone,$render);
+            $sibling = $sibling->previousSibling;
+          }
+          $render->replaceNode($content);
+        }
+      }
+    }},
+  properties => {name=>$cs->toString, meaning=>$name,omcd=>$cd,role => $role},
+  scope=>$scope);
+  return; });
+DefPrimitive('\abbrdef OptionalKeyVals:symdef {}[][]{}', sub {
+  my($stomach,$keys,$cs,$nargs,$opt,$presentation)=@_;
+  my $module = LookupValue('current_module');
+  my $scope = (($keys && ($keys->getValue('local') || '' eq 'true')) ? 'module_local' : 'module').":$module";
+  DefMacroI("\\".$cs->toString,convertLaTeXArgs($nargs,$opt),$presentation,
+   scope=>$scope);
+  return; });
+DefMacro('\defpath{}{}', sub {
+   my ($gullet,$arg1,$arg2)=@_;
+   $arg1 = ToString($arg1);
+   $arg2 = ToString($arg2);
+   my $paths = LookupValue('defpath')||{};
+   $$paths{"$arg1"}=$arg2;
+   AssignValue('defpath'=>$paths,'global');
+   DefMacro('\\'.$arg1.' {}',$arg2."/#1");
+ });#$
+DefPrimitive('\requiremodules{}', sub {
+  my($stomach,$module)=@_;
+  my $GULLET = $stomach->getGullet;
+  $module = Digest($module)->toString;
+  if(LookupValue('file_'.$module.'_loaded')) {}
+  else {
+    AssignValue('file_'.$module.'_loaded' => 1, 'global');
+    $stomach->bgroup;
+    AssignValue('last_module_path', $module);
+    $GULLET->unread(T_CS('\end@requiredmodule'));
+    AssignValue('excluding_modules' => 1);
+    $GULLET->input($module,['sms']);
+       }
+  return;});
+
+DefPrimitive('\end@requiredmodule{}',sub {
+ #close the group
+ $_[0]->egroup;
+ #print STDERR "END: ".ToString(Digest($_[1])->toString);
+ #Take care of any imported elements in this current module by activating it and all its dependencies
+ #print STDERR "Important: ".ToString(Digest($_[1])->toString)."\n";
+ use_module(ToString(Digest($_[1])->toString));
+ return; });#$
+DefPrimitive('\sinput Semiverbatim', sub {
+  my($stomach,$module)=@_;
+  my $GULLET = $stomach->getGullet;
+  $module = Digest($module)->toString;
+  AssignValue('file_'.$module.'_loaded' => 1, 'global');
+  $stomach->bgroup;
+  AssignValue('last_module_path', $module);
+  $GULLET->unread(Invocation(T_CS('\end@requiredmodule'),T_OTHER($module))->unlist);
+  $GULLET->input($module,['tex']);
+  return;});#$
+DefConstructor('\sinputref{}',"<omdoc:ref xref='#1.omdoc' type='include'/>");
+DefMacro('\@symdef@pres  OptionalKeyVals:symdef {}[][]{}', sub {
+  my($self,$keys, $cs,$nargs,$opt,$presentation)=@_;
+
+  my($name,$cd,$role)=$keys
+   && map($_ && $_->toString,map($keys->getValue($_), qw(name cd role)));
+  $cd = LookupValue('module_cd') unless $cd;
+  $name = $cs unless $name;
+  AssignValue('module_name'=>$name) if $name;
+  $nargs = 0 unless ($nargs);
+  my $nargkey = ToString($name).'_args';
+  AssignValue($nargkey=>ToString($nargs)) if $nargs;
+  $name=ToString($name);
+
+  Invocation(T_CS('\@symdef@pres@aux'),
+     $cs,
+     ($nargs || Tokens(T_OTHER(0))),
+     symdef_presentation_pmml($cs,ToString($nargs)||0,$presentation),
+#     symdef_presentation_TeX($presentation),
+     (Tokens(T_OTHER($name))),
+     (Tokens(T_OTHER($cd))),
+     $keys)->unlist; });#$
+sub symdef_presentation_pmml {
+  my($cs,$nargs,$presentation)=@_;
+  my @toks = $presentation->unlist;
+  while(@toks && $toks[0]->equals(T_SPACE)){ shift(@toks); }  # Remove leading space
+  $presentation = Tokens(@toks);
+  # Wrap with \@use, unless already has a recognized formatter.
+  my $formatters = join("|",@PresFormatters);
+  $formatters = qr/$formatters/;
+  $presentation = Invocation(T_CS('\@use'),$presentation)
+    unless (@toks && ($toks[0]->toString =~ /^\\($formatters)$/));
+  # Low level substitution.
+  my @args = map(Invocation(T_CS('\@SYMBOL'),T_OTHER("arg:".($_))),1..$nargs);
+  $presentation = Tokens(LaTeXML::Expandable::substituteTokens($presentation,@args));
+  $presentation; }#$
+sub  getSymmdefProperties {
+  my $cd = LookupValue('module_cd');
+  my $name = LookupValue('module_name');
+  my $nargkey = ToString($name).'_args';
+  my $nargs = LookupValue($nargkey);
+  $nargs = 0 unless ($nargs);
+  my %props = ('cd'=>$cd,'name'=>$name,'nargs'=>$nargs);
+  return %props;}
+DefConstructor('\@use{}', sub{
+  my ($document,$args,%properties) = @_;
+  #Notation created at \@symdef@pres@aux
+  #Create the rendering:
+  $document->openElement('omdoc:rendering');
+  $document->openElement('ltx:Math');
+  $document->openElement('ltx:XMath');
+  if ($args->isMath) {$document->absorb($args);}
+  else {  $document->insertElement('ltx:XMText',$args);}
+  $document->closeElement('ltx:XMath');
+  $document->closeElement('ltx:Math');
+  $document->closeElement('omdoc:rendering');
+},
+properties=>sub { getSymmdefProperties($_[1]);},
+               mode=>'inline_math');
+sub get_cd {
+   my($name,$cd,$role)=@_;
+   return $cd;}
+DefConstructor('\@symdef@pres@aux{}{}{}{}{} OptionalKeyVals:symdef', sub {
+   my ($document,$cs,$nargs,$pmml,$name,$cd,$keys)=@_;
+   my $assocarg = ToString($keys->getValue('assocarg')) if $keys;
+   $assocarg = $assocarg||"0";
+   my $bvars = ToString($keys->getValue('bvars')) if $keys;
+   $bvars = $bvars||"0";
+   my $bvar = ToString($keys->getValue('bvar')) if $keys;
+   $bvar = $bvar||"0";
+   my $appElement = 'om:OMA'; $appElement = 'om:OMBIND' if ($bvars || $bvar);
+
+   $document->insertElement("omdoc:symbol",undef,(name=>$cs,"xml:id"=>ToString($cs).".sym"));
+   $document->openElement("omdoc:notation",(name=>$name,cd=>$cd));
+   #First, generate prototype:
+   $nargs = ToString($nargs)||0;
+   $document->openElement('omdoc:prototype');
+   $document->openElement($appElement) if $nargs;
+   my $cr="fun" if $nargs;
+   $document->insertElement('om:OMS',undef,
+    (cd=>$cd,
+     name=>$name,
+     "cr"=>$cr));
+   if ($bvar || $bvars) {
+     $document->openElement('om:OMBVAR');
+     if ($bvar) {
+       $document->insertElement('omdoc:expr',undef,(name=>"arg$bvar"));
+     } else {
+       $document->openElement('omdoc:exprlist',(name=>"args"));
+       $document->insertElement('omdoc:expr',undef,(name=>"arg"));
+       $document->closeElement('omdoc:exprlist');
+     }
+     $document->closeElement('om:OMBVAR');
+   }
+   for my $id(1..$nargs) {
+     next if ($id==$bvars || $id==$bvar);
+     if ($id!=$assocarg) {
+       my $argname="arg$id";
+       $document->insertElement('omdoc:expr',undef,(name=>"$argname"));
+     }
+     else {
+       $document->openElement('omdoc:exprlist',(name=>"args"));
+       $document->insertElement('omdoc:expr',undef,(name=>"arg"));
+       $document->closeElement('omdoc:exprlist');
+     }
+   }
+   $document->closeElement($appElement) if $nargs;
+   $document->closeElement('omdoc:prototype');
+   #Next, absorb rendering:
+   $document->absorb($pmml);
+   $document->closeElement("omdoc:notation");
+ }, afterDigest=>sub { my ($stomach, $whatsit) = @_;
+  my $keys = $whatsit->getArg(6);
+  my $module = LookupValue('current_module');
+  $whatsit->setProperties(for=>ToString($whatsit->getArg(1)));
+  $whatsit->setProperty(role=>($keys ? $keys->getValue('role')
+       : (ToString($whatsit->getArg(2)) ? 'applied'
+  : undef))); });
+sub symdef_presentation_TeX {
+  my($presentation)=@_;
+  my @tokens = $presentation->unlist;
+  my(@frag,@frags) = ();
+  while(my $tok = shift(@tokens)){
+    if($tok->equals(T_PARAM)){
+      push(@frags,Invocation(T_CS('\@symdef@pres@text'),Tokens(@frag))) if @frag;
+      @frag=();
+      my $n = shift(@tokens)->getString;
+      push(@frags,Invocation(T_CS('\@symdef@pres@arg'),T_OTHER($n+1))); }
+    else {
+      push(@frag,T_OTHER($tok->getString)); }} # IMPORTANT! Neutralize the tokens!
+  push(@frags,Invocation(T_CS('\@symdef@pres@text'),Tokens(@frag))) if @frag;
+  Tokens(map($_->unlist,@frags)); }
+DefConstructor('\@symdef@pres@arg{}', "<omdoc:recurse select='#select'/>",
+       afterDigest=>sub { my ($stomach, $whatsit) = @_;
+  my $select = $whatsit->getArg(1);
+  $select = ref $select ? $select->toString : '';
+  $whatsit->setProperty(select=>"*[".$select."]"); });
+DefConstructor('\@symdef@pres@text{}', "<omdoc:text>#1</omdoc:text>");
+DefConstructor('\requirepackage{} Semiverbatim',"<omdoc:imports from='#2'/>",
+       afterDigest=>sub { my ($stomach, $whatsit) = @_;
+  my $select = $whatsit->getArg(1);
+  RequirePackage($select->toString); });#$
+Tag('omdoc:recurse',afterOpen=>\&numberIt,afterClose=>\&locateIt);
+Tag('omdoc:imports',afterOpen=>\&numberIt,afterClose=>\&locateIt);
+Tag('omdoc:theory',afterOpen=>\&numberIt,afterClose=>\&locateIt);
+1;