4 files changed, 66 insertions, 83 deletions
diff --git a/Master/texmf-dist/doc/context/third/fixme/fixme.pdf b/Master/texmf-dist/doc/context/third/fixme/fixme.pdf
deleted file mode 100644
index 8d0494fc33e..00000000000
--- a/Master/texmf-dist/doc/context/third/fixme/fixme.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/source/context/third/fixme/doc/fixme.tex b/Master/texmf-dist/source/context/third/fixme/doc/fixme.tex
deleted file mode 100644
index 25c68367d75..00000000000
--- a/Master/texmf-dist/source/context/third/fixme/doc/fixme.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\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.mkii b/Master/texmf-dist/tex/context/third/fixme/t-fixme.mkii
index 0ef107a854a..4a3b8988319 100644
--- a/Master/texmf-dist/tex/context/third/fixme/t-fixme.mkii
+++ b/Master/texmf-dist/tex/context/third/fixme/t-fixme.mkii
@@ -1,13 +1,13 @@
 %D \module
-%D   [      file=t-fixme,
-%D        version=2013.03.03,
-%D          title=\CONTEXT\ User Module,
-%D       subtitle=FiXme,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster,
-%D          email=schuster.wolfgang@googlemail.com,
-%D        license=Public Domain]
+%D   [     file=t-fixme,
+%D      version=2013.03.03,
+%D        title=\CONTEXT\ User Module,
+%D     subtitle=FiXme,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D        email=schuster.wolfgang@gmail.com,
+%D      license=Public Domain]
 
 \writestatus{loading}{Context User Module / FiXme}
 
diff --git a/Master/texmf-dist/tex/context/third/fixme/t-fixme.mkiv b/Master/texmf-dist/tex/context/third/fixme/t-fixme.mkiv
index cbb4aa9c149..f770846ab64 100644
--- a/Master/texmf-dist/tex/context/third/fixme/t-fixme.mkiv
+++ b/Master/texmf-dist/tex/context/third/fixme/t-fixme.mkiv
@@ -1,13 +1,13 @@
 %D \module
-%D   [      file=t-fixme,
-%D        version=2013.03.03,
-%D          title=\CONTEXT\ User Module,
-%D       subtitle=FiXme,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster,
-%D          email=schuster.wolfgang@googlemail.com,
-%D        license=Public Domain]
+%D   [     file=t-fixme,
+%D      version=2013.03.03,
+%D        title=\CONTEXT\ User Module,
+%D     subtitle=FiXme,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D        email=schuster.wolfgang@gmail.com,
+%D      license=Public Domain]
 
 \writestatus{loading}{Context User Module / FiXme}
 
@@ -84,6 +84,12 @@
 %D
 %D Commands
 
+\appendtoks
+  \setuevalue        {\currentfixme}{\fixme_direct{\currentfixme}}%
+  \setuevalue{\e!start\currentfixme}{\fixme_start {\currentfixme}}%
+  \setuevalue{\e!stop \currentfixme}{\fixme_stop                 }%
+\to \everydefinefixme
+
 \definecounter[\????fixmecounter\v!note   ]
 \definecounter[\????fixmecounter\v!warning]
 \definecounter[\????fixmecounter\v!error  ]
@@ -121,6 +127,33 @@
    \edef\p_fixme_renderingsetup{\fixmelocationparameter\c!renderingsetup}%
    \texsetup\p_fixme_renderingsetup}
 
+\unexpanded\def\fixme_start#1%
+  {\begingroup
+   \edef\currentfixme{#1}%
+   \dosingleempty\fixme_start_indeed}
+
+\def\fixme_start_indeed[#1]%
+  {\iffirstargument
+     \setupcurrentfixme[#1]%
+   \fi
+   \grabbufferdatadirect\v!fixme{\e!start\currentfixme}{\e!stop\currentfixme}}
+
+\unexpanded\def\fixme_stop
+  {\edef\p_fixme_version{\fixmeparameter\c!version}%
+   \edef\p_fixme_list   {\fixmeparameter\c!list   }%
+   \edef\p_fixme_type   {\fixmeparameter\c!type   }%
+   \ifx\p_fixme_version\v!draft
+     \ifx\p_fixme_list\empty \else
+       \normalexpanded{\writetolist[\v!fixme]{}{\fixmetext\p_fixme_type\p_fixme_list}}%
+     \fi
+     \incrementcounter[\????fixmecounter\v!total     ]%
+     \incrementcounter[\????fixmecounter\p_fixme_type]%
+     \fixmeparameter\c!before
+     \getbufferdata[\v!fixme]%
+     \fixmeparameter\c!after
+   \fi
+   \endgroup}
+
 \definefixmelocation [\v!text] [\c!renderingsetup=\????fixmerenderings:\v!text]
 
 \startsetups[\????fixmerenderings:\v!text]
@@ -148,37 +181,6 @@
   % EMPTY
 \stopsetups
 
-\unexpanded\def\fixme_start#1%
-  {\begingroup
-   \edef\currentfixme{#1}%
-   \dosingleempty\fixme_start_indeed}
-
-\def\fixme_start_indeed[#1]%
-  {\iffirstargument
-     \setupcurrentfixme[#1]%
-   \fi
-   \edef\p_fixme_version{\fixmeparameter\c!version}%
-   \edef\p_fixme_list   {\fixmeparameter\c!list   }%
-   \edef\p_fixme_type   {\fixmeparameter\c!type   }%
-   \ifx\p_fixme_version\v!draft
-     \ifx\p_fixme_list\empty \else
-       \normalexpanded{\writetolist[\v!fixme]{}{\fixmetext\p_fixme_type\p_fixme_list}}%
-     \fi
-     \incrementcounter[\????fixmecounter\v!total     ]%
-     \incrementcounter[\????fixmecounter\p_fixme_type]%
-     \fixmeparameter\c!before
-   \else
-     \expandafter\fixme_gobble
-   \fi}
-
-\unexpanded\def\fixme_gobble
-  {\expandafter\endgroup\expandafter\gobbleuntil\csname\e!stop\currentfixme\endcsname}
-
-\unexpanded\def\fixme_stop
-  {\fixmeparameter\c!after
-   \endgroup}
-
-
 %D \starttyping
 %D \def\definefixme
 %D   {\dodoubleargument\dodefinefixme}
@@ -190,17 +192,6 @@
 %D \stoptyping
 
 \appendtoks
-  \setuevalue        {\currentfixme}{\fixme_direct{\currentfixme}}%
-  \setuevalue{\e!start\currentfixme}{\fixme_start {\currentfixme}}%
-  \setuevalue{\e!stop \currentfixme}{\fixme_stop                 }%
-\to \everydefinefixme
-
-\definefixme [\v!fixme    ] [\c!type=\v!fatal  ]
-\definefixme [\v!fxnote   ] [\c!type=\v!note   ]
-\definefixme [\v!fxwarning] [\c!type=\v!warning]
-\definefixme [\v!fxerror  ] [\c!type=\v!error  ]
-
-\appendtoks
     \showmessage\m!fixme{1}{\rawcountervalue[\????fixmecounter\v!note   ]}%
     \showmessage\m!fixme{2}{\rawcountervalue[\????fixmecounter\v!warning]}%
     \showmessage\m!fixme{3}{\rawcountervalue[\????fixmecounter\v!error  ]}%
@@ -208,14 +199,7 @@
     \showmessage\m!fixme{5}{\rawcountervalue[\????fixmecounter\v!total  ]}%
 \to \everynotabene
 
-\setupfixme
-  [  \c!before=\startquotation,
-      \c!after=\stopquotation,
-   \c!location=\v!margin,
-    \c!version=\v!draft,
-       \c!type=\v!fatal]
-
-%D Labels
+% Labels
 
 \definelabelclass[fixme]
 
@@ -262,4 +246,18 @@
 \setupfixmetext [\s!hr]   [\v!error=\fixmelogo~Gre\scaron ska: ]
 \setupfixmetext [\s!hr]   [\v!fatal=\fixmelogo: ]
 
+% Default commands and settings
+
+\definefixme [\v!fixme    ] [\c!type=\v!fatal  ]
+\definefixme [\v!fxnote   ] [\c!type=\v!note   ]
+\definefixme [\v!fxwarning] [\c!type=\v!warning]
+\definefixme [\v!fxerror  ] [\c!type=\v!error  ]
+
+\setupfixme
+  [  \c!before=\startquotation,
+      \c!after=\stopquotation,
+   \c!location=\v!margin,
+    \c!version=\v!draft,
+       \c!type=\v!fatal]
+
 \protect \endinput