From fa367f4e88a5506f3680d988fb0e0991f36b162e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 1 Apr 2013 22:50:36 +0000 Subject: context-filter (1apr13) git-svn-id: svn://tug.org/texlive/trunk@29599 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/context/third/filter/filter.txt | 22 ++++++++++++++-------- .../tex/context/third/filter/t-filter.mkii | 22 +++++++++++++--------- .../tex/context/third/filter/t-filter.mkiv | 22 +++++++++++++--------- 3 files changed, 40 insertions(+), 26 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/context/third/filter/filter.txt b/Master/texmf-dist/doc/context/third/filter/filter.txt index 68deb3e2a34..7720c0226f8 100644 --- a/Master/texmf-dist/doc/context/third/filter/filter.txt +++ b/Master/texmf-dist/doc/context/third/filter/filter.txt @@ -388,7 +388,10 @@ Standard options - `spacebefore` and `spaceafter` to specify the blank space to be used before and after the environment. -- `before` and `after`: to enclose the output in a frame, etc. +- `before` and `after`: to enclose the output in a frame, etc. (only if + `location` is `paragraph`) +- `left` and `right`: same as `before` and `after` but used when `location` is + not `paragraph`. - `style` and `color`: to set the color and style of the output. - `align`: to set the alignment of the output (only if `location` is `paragraph`). @@ -400,13 +403,14 @@ Standard options The order in which these options are executed are: 1. `\blank[spacebefore]` -2. `before` -3. `style` and `color` -4. `setups` -5. `readcommand` -6. `after` -7. `\blank[afterspace]` -8. check `indentnext` +2. `before/left +3. `align` (if `location=paragraph`) +4. `style` and `color` +5. `setups` +6. `readcommand` +7. `after/right +8. `\blank[afterspace]` +9. check `indentnext` Options to a specific environment --------------------------------- @@ -956,3 +960,5 @@ Version History - Support for `\usepath` - **2012.01.13** - Support for `write=no` and `cacheoption=...`. +- **2013.03.31** + - Support for `left` and `right` 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 ieee 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 ieee 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=, -- cgit v1.2.3