context-fixme update (9nov09)

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

3 files changed, 43 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/context/third/fixme/fixme.pdf b/Master/texmf-dist/doc/context/third/fixme/fixme.pdf
new file mode 100644
index 00000000000..8d0494fc33e
--- /dev/null
+++ b/Master/texmf-dist/doc/context/third/fixme/fixme.pdf
diff --git a/Master/texmf-dist/source/context/third/fixme/doc/fixme.tex b/Master/texmf-dist/source/context/third/fixme/doc/fixme.tex
new file mode 100644
index 00000000000..25c68367d75
--- /dev/null
+++ b/Master/texmf-dist/source/context/third/fixme/doc/fixme.tex
@@ -0,0 +1,15 @@
+\usemodule[fixme]
+
+\starttext
+
+\startprocesscommalist[text,margin,footnote,left,right,inner,outer]
+
+\section{Fixme test with location \quotation{#1}}
+
+\input knuth
+\fixme[#1]{This is a short note.}
+\input knuth
+
+\stopprocesscommalist
+
+\stoptext
diff --git a/Master/texmf-dist/tex/context/third/fixme/t-fixme.tex b/Master/texmf-dist/tex/context/third/fixme/t-fixme.tex
index 6fac8eb9a17..d372374ebc2 100644
--- a/Master/texmf-dist/tex/context/third/fixme/t-fixme.tex
+++ b/Master/texmf-dist/tex/context/third/fixme/t-fixme.tex
@@ -1,15 +1,15 @@
 %D \module
 %D   [      file=t-fixme,
-%D        version=2009.05.03,
+%D        version=2009.11.08,
 %D          title=\CONTEXT\ User Module,
-%D       subtitle=Fixme,
+%D       subtitle=FiXme,
 %D         author=Wolfgang Schuster,
 %D           date=\currentdate,
 %D      copyright=Wolfgang Schuster,
 %D          email=schuster.wolfgang@googlemail.com,
 %D        license=Public Domain]
 
-\writestatus{loading}{Context User Module / Fixme}
+\writestatus{loading}{Context User Module / FiXme}
 
 \unprotect
 
@@ -48,6 +48,9 @@
   \setinterfacemessage{fixme}{5}    {Total: --}
 \stopinterface
 
+%D \macros
+%D   {setupfixme}
+%D
 %D Namespace and setup command
 
 \def\????fx{@@@@fx} % FiXme
@@ -67,6 +70,10 @@
 \setvalue{\e!place   \e!listof\v!fixmes}{\dodoubleempty\doplacelist     [\v!fixme]}
 \setvalue{\e!complete\e!listof\v!fixmes}{\dotripleempty\dodocompletelist[\v!fixme][\v!fixmes]}
 
+%D \macros
+%D   {fixme,fxnote,fxwarning,fxerror,
+%D    definefixme,definefixmelocation}
+%D
 %D Commands
 
 \makecounter{\????fx\v!note   } % \pluscounter is not so
@@ -89,9 +96,19 @@
 
 \def\dofixmelocation#1#2#3{\executeifdefined{@@fixme@@#3}\gobbleoneargument{\labeltext{fixme#1}#2}}
 
-\setvalue{@@fixme@@\v!text    }#1{\ifhmode\normalspace\fi#1}
-\setvalue{@@fixme@@\v!margin  }#1{\inright {#1}}
-\setvalue{@@fixme@@\v!footnote}#1{\footnote{#1}}
+\def\definefixmelocation
+  {\dodoubleargument\dodefinefixmelocation}
+
+\def\dodefinefixmelocation[#1][#2]%
+  {\setvalue{@@fixme@@#1}{#2}}
+
+\definefixmelocation [\v!text    ] [\ifhmode\normalspace\fi]
+\definefixmelocation [\v!margin  ] [\inright               ]
+\definefixmelocation [\v!footnote] [\footnote              ]
+\definefixmelocation [\v!left    ] [\inleft                ]
+\definefixmelocation [\v!right   ] [\inright               ]
+\definefixmelocation [\v!inner   ] [\ininner               ]
+\definefixmelocation [\v!outer   ] [\inouter               ]
 
 \def\dostartfixme[#1][#2]%
   {\bgroup
@@ -113,10 +130,10 @@
    \setvalue{\e!start#1}{\dodoubleempty\dostartfixme[#2]}%
    \setvalue{\e!stop #1}{\dostopfixme}}
 
-\definefixme[\v!fixme    ][\v!fatal  ]
-\definefixme[\v!fxnote   ][\v!note   ]
-\definefixme[\v!fxwarning][\v!warning]
-\definefixme[\v!fxerror  ][\v!error  ]
+\definefixme [\v!fixme    ] [\v!fatal  ]
+\definefixme [\v!fxnote   ] [\v!note   ]
+\definefixme [\v!fxwarning] [\v!warning]
+\definefixme [\v!fxerror  ] [\v!error  ]
 
 \appendtoks
     \showmessage\m!fixme{1}{\countervalue{\????fx\v!note   }}%
@@ -124,7 +141,7 @@
     \showmessage\m!fixme{3}{\countervalue{\????fx\v!error  }}%
     \showmessage\m!fixme{4}{\countervalue{\????fx\v!fatal  }}%
     \showmessage\m!fixme{5}{\countervalue{\????fx\v!total  }}%
-\to\everynotabene
+\to \everynotabene
 
 %D Labels