context-filter (1apr13)

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

2 files changed, 26 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/context/third/filter/t-filter.mkii b/Master/texmf-dist/tex/context/third/filter/t-filter.mkii
index 0f002b1e5ce..ee5234e0223 100644
--- a/Master/texmf-dist/tex/context/third/filter/t-filter.mkii
+++ b/Master/texmf-dist/tex/context/third/filter/t-filter.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [     file=t-filter,
-%D      version=2013.01.13,
+%D      version=2013.03.31,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Filter,
 %D       author=Aditya Mahajan,
@@ -9,7 +9,7 @@
 %D        email=adityam <at> ieee <dot> org,
 %D      license=Simplified BSD License]
 
-\writestatus{loading}{Filter (ver: 2013.01.13)}
+\writestatus{loading}{Filter (ver: 2013.03.31)}
 
 \ifx\undefined\normalexpanded \let\normalexpanded\expanded \fi
 
@@ -348,6 +348,7 @@
 %D well as the value of \type{name} key.
 
 \starttexdefinition externalfilter@set_filenames
+   \processcommacommand[\externalfilterparameter{\c!filter\c!setups}]\directsetup
    \externalfilter@set_directory
 
    % Set the name of temp file for the filter
@@ -405,7 +406,6 @@
 %D \subsubject {Execute Filter}
 
 \starttexdefinition externalfilter@execute_filter
-   \processcommacommand[\externalfilterparameter{\c!filter\c!setups}]\directsetup
    \iftraceexternalfilters \externalfilter@show_filtercommand \fi
 
    \doifelse{\externalfilterparameter\c!cache}\v!yes
@@ -443,11 +443,12 @@
 \stoptexdefinition
 
 \starttexdefinition externalfilter@read_processed_file_indeed
-   \doif{\externalfilterparameter\c!location}\v!paragraph
+   \doifelse{\externalfilterparameter\c!location}\v!paragraph
      {\blank[\externalfilterparameter\c!spacebefore]
       \doifsomething{\externalfilterparameter\c!align}
-          {\setupalign[\externalfilterparameter\c!align]}}
-   \externalfilterparameter\c!before
+          {\setupalign[\externalfilterparameter\c!align]}
+      \externalfilterparameter\c!before}
+     {\externalfilterparameter\c!left}
 
    \begingroup
    \externalfilter@attributes_start \externalfilter@id \c!style \c!color
@@ -456,9 +457,10 @@
    \externalfilter@attributes_stop
    \endgroup
 
-   \externalfilterparameter\c!after
-   \doif{\externalfilterparameter\c!location}\v!paragraph
-     {\par\blank[\externalfilterparameter\c!spaceafter]}%
+   \doifelse{\externalfilterparameter\c!location}\v!paragraph
+     {\externalfilterparameter\c!after
+      \par\blank[\externalfilterparameter\c!spaceafter]}%
+     {\externalfilterparameter\c!right}
 \stoptexdefinition
 
 %D \section {Default Values}
@@ -468,6 +470,8 @@
    \c!location=\v!paragraph,
    \c!before=,
    \c!after=,
+   \c!left=\externalfilterparameter\c!before,
+   \c!right=\externalfilterparameter\c!after,
    \c!spacebefore=,
    \c!spaceafter=,
    \c!style=,
diff --git a/Master/texmf-dist/tex/context/third/filter/t-filter.mkiv b/Master/texmf-dist/tex/context/third/filter/t-filter.mkiv
index 50b7f1ecc0c..694387fbea5 100644
--- a/Master/texmf-dist/tex/context/third/filter/t-filter.mkiv
+++ b/Master/texmf-dist/tex/context/third/filter/t-filter.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [     file=t-filter,
-%D      version=2013.01.13,
+%D      version=2013.03.31,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Filter,
 %D       author=Aditya Mahajan,
@@ -9,7 +9,7 @@
 %D        email=adityam <at> ieee <dot> org,
 %D      license=Simplified BSD License]
 
-\writestatus{loading}{Filter (ver: 2013.01.13)}
+\writestatus{loading}{Filter (ver: 2013.03.31)}
 
 \startmodule [filter]
 \usemodule   [module-catcodes]
@@ -349,6 +349,7 @@
 %D well as the value of \type{name} key.
 
 \starttexdefinition externalfilter@set_filenames
+   \processcommacommand[\externalfilterparameter{\c!filter\c!setups}]\directsetup
    \externalfilter@set_directory
 
    % Set the name of temp file for the filter
@@ -435,7 +436,6 @@
 \starttexdefinition externalfilter@execute_filter
 
    \externalfilter@check_writable \externalfilter@output_file
-   \processcommacommand[\externalfilterparameter{\c!filter\c!setups}]\directsetup
    \iftraceexternalfilters \externalfilter@show_filtercommand \fi
 
    \doifelsenothing{\externalfilter@input_file}
@@ -471,10 +471,11 @@
 \stoptexdefinition
 
 \starttexdefinition externalfilter@read_processed_file_indeed
-   \doif{\externalfilterparameter\c!location}\v!paragraph
+   \doifelse{\externalfilterparameter\c!location}\v!paragraph
      {\blank[\externalfilterparameter\c!spacebefore]
-      \usealignparameter\externalfilterparameter}
-   \externalfilterparameter\c!before
+      \usealignparameter\externalfilterparameter
+      \externalfilterparameter\c!before}
+     {\externalfilterparameter\c!left}
 
    \begingroup
    \dostarttagged{\externalfilterparameter\c!taglabel}\currentexternalfilter
@@ -484,9 +485,10 @@
    \dostoptagged
    \endgroup
 
-   \externalfilterparameter\c!after
-   \doif{\externalfilterparameter\c!location}\v!paragraph
-     {\par\blank[\externalfilterparameter\c!spaceafter]}%
+   \doifelse{\externalfilterparameter\c!location}\v!paragraph
+     {\externalfilterparameter\c!after
+      \par\blank[\externalfilterparameter\c!spaceafter]}
+     {\externalfilterparameter\c!right}
 \stoptexdefinition
 
 %D \section {Default Values}
@@ -496,6 +498,8 @@
    \c!location=\v!paragraph,
    \c!before=,
    \c!after=,
+   \c!left=\externalfilterparameter\c!before,
+   \c!right=\externalfilterparameter\c!after,
    \c!spacebefore=,
    \c!spaceafter=,
    \c!style=,