# HG changeset patch
# User galaxyp
# Date 1613990770 0
# Node ID abffdfee3021ed6f529c841bb64601e458bf7ac4
# Parent 01dbaf6a57e00892ab82c4921e3dfec75ecf0b1c
"planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms"
diff -r 01dbaf6a57e0 -r abffdfee3021 404-urls.patch
--- a/404-urls.patch Fri Nov 06 19:49:28 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff -ruN FeatureFinderSuperHirn.xml FeatureFinderSuperHirn.xml
---- FeatureFinderSuperHirn.xml 2020-10-02 12:06:56.398572301 +0200
-+++ FeatureFinderSuperHirn.xml 2020-10-02 12:07:31.511153834 +0200
-@@ -105,6 +105,6 @@
-
-+For more information, visit https://abibuilder.informatik.uni-tuebingen.de/archive/openms/Documentation/release/2.6.0/html/UTILS_FeatureFinderSuperHirn.html]]>
-
-
diff -r 01dbaf6a57e0 -r abffdfee3021 ConsensusID.xml
--- a/ConsensusID.xml Fri Nov 06 19:49:28 2020 +0000
+++ b/ConsensusID.xml Mon Feb 22 10:46:10 2021 +0000
@@ -1,7 +1,7 @@
-
+
Computes a consensus of peptide identifications of several identification engines.
ConsensusID
@@ -17,7 +17,8 @@
## Preprocessing
mkdir in &&
-${ ' '.join(["ln -s '%s' 'in/%s.%s' &&" % (_, re.sub('[^\w\-_]', '_', _.element_identifier), $gxy2omsext(_.ext)) for _ in $in if _]) }
+mkdir ${' '.join(["'in/%s'" % (i) for i, f in enumerate($in) if f])} &&
+${' '.join(["ln -s '%s' 'in/%s/%s.%s' && " % (f, i, re.sub('[^\w\-_]', '_', f.element_identifier), $gxy2omsext(f.ext)) for i, f in enumerate($in) if f])}
mkdir out &&
## Main program call
@@ -27,7 +28,7 @@
python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hardcoded_json' &&
@EXECUTABLE@ -ini @EXECUTABLE@.ctd
-in
-${' '.join(["'in/%s.%s'"%(re.sub('[^\w\-_]', '_', _.element_identifier), $gxy2omsext(_.ext)) for _ in $in if _])}
+${' '.join(["'in/%s/%s.%s'"%(i, re.sub('[^\w\-_]', '_', f.element_identifier), $gxy2omsext(f.ext)) for i, f in enumerate($in) if f])}
-out
'out/output.${in[0].ext}'
@@ -42,8 +43,8 @@
-
-
+
+
@@ -52,30 +53,30 @@
-
+
-
+
-
+
-
+
-
-
+
+
diff -r 01dbaf6a57e0 -r abffdfee3021 OMSSAAdapter.patch
--- a/OMSSAAdapter.patch Fri Nov 06 19:49:28 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- OMSSAAdapter.xml 2020-06-16 15:51:40.315400730 +0200
-+++ /tmp/OMSSAAdapter.xml 2020-06-16 15:50:23.536086074 +0200
-@@ -22,6 +22,7 @@
- mkdir database &&
- ln -s '$database' 'database/${re.sub("[^\w\-_]", "_", $database.element_identifier)}.$gxy2omsext($database.ext)' &&
-
-+makeblastdb -dbtype prot -in 'database/${re.sub("[^\w\-_]", "_", $database.element_identifier)}.$gxy2omsext($database.ext)' &&
- ## Main program call
-
- set -o pipefail &&
diff -r 01dbaf6a57e0 -r abffdfee3021 PepNovoAdapter.patch
--- a/PepNovoAdapter.patch Fri Nov 06 19:49:28 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
---- PepNovoAdapter.xml 2020-05-12 15:55:24.712831518 +0200
-+++ /tmp/PepNovoAdapter.xml 2020-05-12 15:36:31.267276757 +0200
-@@ -42,8 +42,13 @@
-
-
-
--
--
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -51,8 +56,14 @@
-
-
-
--
--
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
diff -r 01dbaf6a57e0 -r abffdfee3021 filetypes.txt
--- a/filetypes.txt Fri Nov 06 19:49:28 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-# CTD type # Galaxy type
-# the following lines need to be at the top in order to ensure
-# correct translation Galaxy->CTD type for the ambiguous cases
-# (should only be relevant for the autogenerated tests [which
-# do not set the ftype of the inputs])
-txt txt
-tsv tabular
-
-##analysisXML
-# XTandemAdapter output is named xml in OMS (which is to unspecific) and bioml in Galaxy .. so this is renamed via hardcoded parameters
-bioml xml
-consensusXML consensusxml
-# TODO csv is problematic, since csv often actually means tsv .. but not always
-csv csv
-##dat
-dta dta
-dta2d dta2d
-edta edta
-fa fasta
-fas fasta
-fasta fasta
-FASTA fasta
-featureXML featurexml
-featurexml featurexml
-# fid
-html html
-HTML html
-idXML idxml
-##ini txt
-json json
-kroenik kroenik
-mascotXML mascotxml
-mgf mgf
-mrm mrm
-ms sirius.ms
-ms2 ms2
-msp msp
-mzData mzdata
-mzid mzid
-# important to have mzML first, since LuciphorAdapter is case sensitive https://github.com/OpenMS/OpenMS/issues/4444
-mzML mzml
-mzml mzml
-mzq mzq
-mzTab mztab
-mzXML mzxml
-novor txt
-obo obo
-# I guess this is the idXML output of omssa
-omssaXML idxml
-osw osw
-OSW osw
-params txt
-paramXML paramxml
-fasta peff
-peplist peplist
-# TODO pep.xml should be removed with OMS 2.6 https://github.com/OpenMS/OpenMS/pull/4541 .. but still in the tests
-pep.xml pepxml
-pepXML pepxml
-png png
-PNG png
-protXML protxml
-psms psms
-# TODO implement or use
-# psq
-pqp pqp
-qcML qcml
-spec.xml spec.xml
-splib splib
-sqMass sqmass
-tandem.xml tandem
-trafoXML trafoxml
-traML traml
-TraML traml
-tab tabular
-## MOVED TO TOP txt txt
-raw thermo.raw
-## xls: SpectraSTSearchAdapter https://github.com/OpenMS/OpenMS/pull/4419
-xls tsv
-XML xml
-xml xml
-xquest.xml xquest.xml
-xsd xml
-
-# TODO needs to be implemented, needs to be below xml in order that Galaxy->OMS mapping gives xml
-# cachedMzML xml
diff -r 01dbaf6a57e0 -r abffdfee3021 fill_ctd_clargs.py
--- a/fill_ctd_clargs.py Fri Nov 06 19:49:28 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-from argparse import ArgumentParser
-from io import StringIO
-
-from CTDopts.CTDopts import (
- CTDModel,
- ModelTypeError,
- Parameters
-)
-
-if __name__ == "__main__":
- # note add_help=False since otherwise arguments starting with -h will
- # trigger an error (despite allow_abbreviate)
- parser = ArgumentParser(prog="fill_ctd_clargs",
- description="fill command line arguments"
- "into a CTD file and write the CTD file to",
- add_help=False, allow_abbrev=False)
- parser.add_argument("--ctd", dest="ctd", help="input ctd file",
- metavar='CTD', default=None, required=True)
- args, cliargs = parser.parse_known_args()
- # load CTDModel
- model = None
- try:
- model = CTDModel(from_file=args.ctd)
- except ModelTypeError:
- pass
- try:
- model = Parameters(from_file=args.ctd)
- except ModelTypeError:
- pass
- assert model is not None, "Could not parse %s, seems to be no CTD/PARAMS" % (args.ctd)
-
- # get a dictionary of the ctd arguments where the values of the parameters
- # given on the command line are overwritten
- margs = model.parse_cl_args(cl_args=cliargs, ignore_required=True)
-
- # write the ctd with the values taken from the dictionary
- out = StringIO()
- ctd_tree = model.write_ctd(out, margs)
- print(out.getvalue())
diff -r 01dbaf6a57e0 -r abffdfee3021 generate-foo.sh
--- a/generate-foo.sh Fri Nov 06 19:49:28 2020 +0000
+++ b/generate-foo.sh Mon Feb 22 10:46:10 2021 +0000
@@ -83,7 +83,7 @@
#echo python3 fill_ctd_clargs.py --ctd $ini $cli
# using eval: otherwise for some reason quoted values are not used properly ('A B' -> ["'A", "B'"])
# >&2 echo "python3 fill_ctd_clargs.py --ctd $ini $cli"
- eval "python3 fill_ctd_clargs.py --ctd $ini $cli" > "$ctdtmp"
+ eval "python3 fill_ctd_clargs.py --ini_file $ini --ctd_file ctd/$tool_id.ctd $cli" > "$ctdtmp"
# echo $ctdtmp
# >&2 cat $ctdtmp
testtmp=$(mktemp)
diff -r 01dbaf6a57e0 -r abffdfee3021 generate.sh
--- a/generate.sh Fri Nov 06 19:49:28 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-#!/usr/bin/env bash
-
-VERSION=2.6
-FILETYPES="filetypes.txt"
-PROFILE="20.05"
-## FILETYPES_RE=$(grep -v "^#" $FILETYPES | grep -v "^$" | cut -f 1 -d" " | tr '\n' '|' | sed 's/|$//'| sed 's/|/\\|/g')
-
-export tmp=$(mktemp -d)
-export CTDCONVERTER="$tmp/CTDConverter"
-
-###############################################################################
-## reset old data
-###############################################################################
-# rm $(ls *xml |grep -v macros)
-# rm -rf ctd
-# mkdir -p ctd
-# echo "" > prepare_test_data.sh
-
-###############################################################################
-## generate tests
-## also creates
-## - conda environment (for executing the binaries) and
-## - the git clone of OpenMS (for generating the tests)
-## - ctd files
-###############################################################################
-bash ./test-data.sh ./macros_autotest.xml
-
-###############################################################################
-## get the
-## - conda package (for easy access and listing of the OpenMS binaries),
-###############################################################################
-# if [ ! -d $OPENMSPKG ]; then
-# mkdir $OPENMSPKG/
-# wget -P $OPENMSPKG/ "$CONDAPKG"
-# tar -xf $OPENMSPKG/"$(basename $CONDAPKG)" -C OpenMS$VERSION-pkg/
-# rm $OPENMSPKG/"$(basename $CONDAPKG)"
-# fi
-
-###############################################################################
-## Get python libaries for CTD -> Galaxy conversion
-## TODO fix to main repo OR conda packkage if PRs are merged
-###############################################################################
-# if [ ! -d CTDopts ]; then
-# # git clone https://github.com/genericworkflownodes/CTDopts CTDopts
-# git clone -b topic/no-1-2x https://github.com/bernt-matthias/CTDopts CTDopts
-# fi
-if [ ! -d $CTDCONVERTER ]; then
- #git clone https://github.com/WorkflowConversion/CTDConverter.git CTDConverter
- git clone -b topic/cdata https://github.com/bernt-matthias/CTDConverter.git $CTDCONVERTER
-fi
-# export PYTHONPATH=$(pwd)/CTDopts
-###############################################################################
-## conversion ctd->xml
-###############################################################################
-
-find . -maxdepth 0 -name "[A-Z]*xml" -delete
-source $(dirname $(which conda))/../etc/profile.d/conda.sh
-conda activate $tmp/OpenMS$VERSION-env
-python $CTDCONVERTER/convert.py galaxy -i ctd/*ctd -o ./ -s tools_blacklist.txt -f "$FILETYPES" -m macros.xml -t tool.conf -p hardcoded_params.json --test-macros macros_autotest.xml --test-macros-prefix autotest_ --test-macros macros_test.xml --test-macros-prefix manutest_ --tool-version $VERSION --tool-profile $PROFILE > convert.out 2> convert.err
-if [[ "$?" -ne "0" ]]; then >&2 echo 'CTD -> XML conversion failed'; >&2 echo -e "stderr:\n$(cat convert.err)"; fi
-conda deactivate
-
-patch PepNovoAdapter.xml < PepNovoAdapter.patch
-patch OMSSAAdapter.xml < OMSSAAdapter.patch
-
-# https://github.com/OpenMS/OpenMS/pull/4984
-sed -i -e 's@http://www.openms.de/documentation/@http://www.openms.de/doxygen/release/2.6.0/html/@' ./*xml
-# https://github.com/OpenMS/OpenMS/pull/4984#issuecomment-702641976
-patch -p0 <404-urls.patch
-
-# #-b version log debug test in_type executable pepnovo_executable param_model_directory rt_concat_trafo_out param_id_pool
-
-# for i in A-E F-H I-L M-N O-P Q-Z
-# do
-# planemo t [$i]*xml --galaxy_branch release_20.05 --galaxy_python_version 3.7 --test_output $i.html --test_output_json $i.json &
-# done
diff -r 01dbaf6a57e0 -r abffdfee3021 hardcoded_params.json
--- a/hardcoded_params.json Fri Nov 06 19:49:28 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,236 +0,0 @@
-{
- "#": "blacklist parameters",
-
- "version": [{"value": "@"}],
- "debug": [{"value": "@"}],
- "algorithm:debug": [{"value": "@"}],
- "java_memory": [{"value": "@"}],
- "java_permgen": [{"value": "@"}],
- "#": "type of input is always determined from the file extension ",
- "in_type": [{"value": "@"}],
-
- "#": "tool specific blacklist parameters",
-
- "convert_back": [{"value": "@", "tools": ["OpenSwathMzMLFileCacher"]}],
- "NET_executable": [{
- "value": "@",
- "tools": ["FileConverter"]
- }],
-
-
- "params_file": [{"value": "@", "tools": ["SpectraSTSearchAdapter"]}],
-
- "#": "TODO not usable in 2.5 https://github.com/OpenMS/OpenMS/issues/4456, corresponding test currently disabled",
- "consensus_out": [{"value": "@", "tools": ["MaRaClusterAdapter"]}],
- "#": "TODO would need treatment as prefix-output",
- "output_directory": [{"value": "@", "tools": ["MaRaClusterAdapter"]}],
-
- "#": "hardcode parameter values",
-
- "comet_version": [{
- "value":"2016.01 rev. 3"
- }],
- "comet_executable": [{
- "value":"comet"
- }],
- "crux_executable": [{
- "value": "crux"
- }],
- "fido_executable": [{
- "value":"Fido"
- }],
- "fidocp_executable": [{
- "value":"FidoChooseParameters"
- }],
- "maracluster_executable": [{
- "value":"/home/berntm/projects/tools-galaxyp/tools/openms/OpenMS2.5.0-git/THIRDPARTY/Linux/64bit/MaRaCluster/maracluster"
- }],
- "mascot_directory": [{
- "value":"TODO"
- }],
- "myrimatch_executable": [{
- "value":"myrimatch"
- }],
- "omssa_executable": [{
- "value":"$(dirname $(realpath $(which omssacl)))/omssacl"
- }],
- "ThermoRaw_executable": [{
- "value": "ThermoRawFileParser.exe",
- "tools": ["FileConverter"]
- }],
- "pepnovo_executable": [{
- "value":"pepnovo"
- }],
- "percolator_executable": [{
- "value":"percolator"
- }],
- "xtandem_executable": [{
- "value":"xtandem"
- }],
- "executable": [
- {
- "value":"$(dirname $(realpath $(which luciphor2)))/luciphor2.jar",
- "tools": ["LuciphorAdapter"]
- }, {
- "value":"/home/berntm/Downloads/MSFragger-20171106/MSFragger-20171106.jar",
- "tools": ["MSFraggerAdapter"]
- }, {
- "value":"$(msgf_plus -get_jar_path)",
- "tools": ["MSGFPlusAdapter"]
- }, {
- "value": "/home/berntm/Downloads/novor/lib/novor.jar",
- "tools": ["NovorAdapter"]
- }, {
- "value":"$(which sirius)",
- "tools": ["SiriusAdapter", "AssayGeneratorMetabo"]
- }, {
- "value":"spectrast",
- "tools": ["SpectraSTSearchAdapter"]
- }
- ],
- "r_executable": [{
- "value":"R"
- }],
- "rscript_executable": [{
- "value":"Rscript"
- }],
- "java_executable": [{
- "value":"java"
- }],
- "log": [{
- "value":"log.txt"
- }],
- "tempDirectory": [{
- "value":"$TMP_DIR"
- }],
- "temp_data_directory": [{
- "value":"$TMP_DIR"
- }],
- "algorithm:Preprocessing:tmp_dir": [{
- "value":"$TMP_DIR"
- }],
- "no_progress": [{
- "value": true
- }],
- "#": "only used in LuciphorAdapter at the moment, inconsistency will be fixed",
- "num_threads": [{
- "value":"${GALAXY_SLOTS:-1}"
- }],
- "threads": [{
- "value": "${GALAXY_SLOTS:-1}"
- }],
- "sirius:cores": [{
- "value": "${GALAXY_SLOTS:-1}"
- }],
-
- "#": "hardcode the outer loop threads for OpenSwathWorkflow",
- "outer_loop_threads": [{
- "value": "1",
- "tools": ["OpenSwathWorkflow"]
- }],
- "separator": [{
- "value": ",",
- "tools": ["IDMassAccuracy"]
- }],
-
- "#": "don't alow to copy data internally to save computation time for reloading",
- "copy_data": [{
- "value": "false",
- "tools": ["MapAlignerTreeGuided"]
- }],
-
- "#": "overwrite/add Galaxy xml attributes of some parameters (names need to start with param_)",
-
- "#": "test is not a hardcoded value since we need to set it in the tool tests",
- "test": [{
- "CTD:type": "text",
- "XML:type": "hidden"
- }],
-
- "#": "overwrite CTD attributes of some parameters (some are not possible, e.g. type)",
-
- "#": "for some tools the user needs to select the desired output type since detection by extension makes no sense for galaxy tools",
- "out_type": [{
- "CTD:required": true,
- "CTD:advanced": false
- }],
-
- "#": "SeedListGenerator with consensusXML input needs a dynamic number of outputs that depends on the content of the input, so we remove this options at the moment because its hard or impossible to implement in Galaxy, https://github.com/OpenMS/OpenMS/issues/4404 .. see also in parameter",
- "#": "FileInfo, MapStatistics, SequenceCoverageCalculator wo -out just writes to stdout. not wanted here",
- "#": "MzMLSplitter output prefix https://github.com/OpenMS/OpenMS/issues/4404",
- "#": "IDRipper: blacklist out (is doing the same as the output-prefix out-path)",
- "out": [{
- "CTD:is_list": false,
- "tools": ["SeedListGenerator"]
- }, {
- "CTD:required": true,
- "tools": ["FileInfo", "MapStatistics", "SequenceCoverageCalculator"]
- }, {
- "CTD:type": "output-prefix",
- "CTD:required": true,
- "CTD:restrictions": "mzml",
- "tools": ["MzMLSplitter"]
- }, {
- "value": "@",
- "tools": ["IDRipper"]
- }],
-
- "#": "Try to remove xml data type whereever possible",
- "#": "XTandem Adapter output is called .xml in OMS which is to unspecific -> use Galaxy's bioml",
- "xml_out": [{
- "CTD:restrictions": "bioml",
- "tools": ["XTandemAdapter"]
- }],
-
- "#": "IDFileConverter remove xml",
- "#": "OpenSwathWorkflow make in single file input and all outputs non-optional",
- "#": "XFDR does not need xml .. redundant with xquest.xml TODO check if list is up to date with each new release",
- "#": "SeedListGenerator: remove consensusXML https://github.com/OpenMS/OpenMS/issues/4404 .. see also out parameter",
- "in": [{
- "CTD:restrictions": "pepXML,protXML,mascotXML,omssaXML,bioml,psms,tsv,idXML,mzid,xquest.xml",
- "tools": ["IDFileConverter"]
- }, {
- "CTD:is_list": false,
- "tools": ["OpenSwathWorkflow"]
- }, {
- "CTD:restrictions": "idXML,mzid,xquest.xml",
- "tools": ["XFDR"]
- }, {
- "CTD:restrictions": "mzML,idXML,featureXML",
- "tools": ["SeedListGenerator"]
- }],
-
- "#": "IDMapper has in and spectra:in params, in is used in out as format_source",
- "#": "which does not work in Galaxy: https://github.com/galaxyproject/galaxy/pull/9493",
- "spectra:in": [{
- "CTD:name": "_in",
- "tools": ["IDMapper"]
- }],
-
- "#": "hardcoding prefix parameters which are not yet available in OMS but in CTDOpts https://github.com/OpenMS/OpenMS/pull/4527",
- "#": "output-prefix",
- "out_path": [{
- "CTD:type": "output-prefix",
- "CTD:required": true,
- "CTD:restrictions": "idXML",
- "tools": ["IDRipper"]
- }],
- "outputDirectory": [{
- "CTD:type": "output-prefix",
- "CTD:advanced": false,
- "CTD:required": true,
- "CTD:restrictions": "mzml",
- "tools": ["OpenSwathFileSplitter"]
- }],
-
- "#": "OpenSwathDIAPreScoring: https://github.com/OpenMS/OpenMS/pull/4443",
- "#": "SpectraSTSearchAdapter does not need xml .. redundant with pep.xml TODO check if list is up to date with each new release",
- "output_files": [{
- "CTD:required": true,
- "tools": ["OpenSwathDIAPreScoring"]
- }, {
- "CTD:restrictions": "txt,tsv,pep.xml,pepXML,html",
- "tools": ["SpectraSTSearchAdapter"]
-
- }]
-}
diff -r 01dbaf6a57e0 -r abffdfee3021 macros.xml
--- a/macros.xml Fri Nov 06 19:49:28 2020 +0000
+++ b/macros.xml Mon Feb 22 10:46:10 2021 +0000
@@ -21,6 +21,7 @@
+
@@ -45,10 +46,10 @@
-
- ^[^$]
+
+ ^[^$]
- ^ *((?:\"[^\"]*\" +)|(?:[^ \"]+ +))*((?:\"[^\"]*\")|(?:[^ \"]+)) *$
+ ^ *((?:\"[^\"]*\" +)|(?:[^ \"]+ +))*((?:\"[^\"]*\")|(?:[^ \"]+)) *$
@@ -64,8 +65,8 @@
-
- ^ *[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?( *[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?)* *$
+
+ ^ *[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?( *[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?)* *$
@@ -78,8 +79,8 @@
-
- ^ *[+-]?[0-9]+( *[+-]?[0-9]+)* *$
+
+ ^ *[+-]?[0-9]+( *[+-]?[0-9]+)* *$
diff -r 01dbaf6a57e0 -r abffdfee3021 macros_autotest.xml
--- a/macros_autotest.xml Fri Nov 06 19:49:28 2020 +0000
+++ b/macros_autotest.xml Mon Feb 22 10:46:10 2021 +0000
@@ -126,7 +126,6 @@
-
@@ -195,7 +194,6 @@
-
@@ -264,7 +262,6 @@
-
@@ -333,7 +330,6 @@
-
@@ -402,7 +398,6 @@
-
@@ -471,7 +466,6 @@
-
@@ -540,7 +534,6 @@
-
@@ -609,7 +602,6 @@
-
@@ -678,7 +670,6 @@
-
@@ -758,7 +749,6 @@
-
@@ -796,8 +786,8 @@
-
-
+
+
@@ -1046,8 +1031,6 @@
-
-
@@ -4185,7 +4168,6 @@
-
@@ -4214,7 +4196,6 @@
-
@@ -4243,7 +4224,6 @@
-
@@ -4272,7 +4252,6 @@
-
@@ -4301,7 +4280,6 @@
-
@@ -4330,7 +4308,6 @@
-
@@ -5347,16 +5324,11 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -6196,15 +6133,11 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
@@ -9377,13 +9168,9 @@
-
-
-
-
-
-
-
+
+
+
@@ -9483,16 +9270,11 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -10333,16 +10080,11 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -12230,12 +11972,10 @@
-
@@ -12297,13 +12037,11 @@
@@ -12365,12 +12103,10 @@
@@ -12432,12 +12168,10 @@
@@ -12499,12 +12233,10 @@
@@ -12566,12 +12298,10 @@
@@ -12633,12 +12363,10 @@
@@ -12700,12 +12428,10 @@
@@ -12767,12 +12493,10 @@
@@ -12834,12 +12558,10 @@
@@ -12901,12 +12623,10 @@
@@ -12968,12 +12688,10 @@
@@ -13035,12 +12753,10 @@
@@ -13102,12 +12818,10 @@
@@ -13170,12 +12884,10 @@
@@ -13238,12 +12950,10 @@
@@ -13306,12 +13016,10 @@
@@ -13374,12 +13082,10 @@
@@ -13442,12 +13148,10 @@
@@ -13509,12 +13213,10 @@
@@ -13576,12 +13278,10 @@
@@ -13643,12 +13343,10 @@
@@ -13710,12 +13408,10 @@
@@ -13777,12 +13473,10 @@
@@ -13844,12 +13538,10 @@
@@ -13911,12 +13603,10 @@
@@ -14648,7 +14338,7 @@
-
+
@@ -15139,8 +14829,6 @@
-
-
@@ -15195,8 +14883,6 @@
-
-
@@ -15250,8 +14936,6 @@
-
-
@@ -15305,8 +14989,6 @@
-
-
@@ -15360,8 +15042,6 @@
-
-
@@ -15416,8 +15096,6 @@
-
-
@@ -15473,8 +15151,6 @@
-
-
@@ -15748,8 +15424,6 @@
-
-
@@ -15796,8 +15470,6 @@
-
-
@@ -15851,8 +15523,6 @@
-
-
@@ -15906,8 +15576,6 @@
-
-
@@ -15981,8 +15649,6 @@
-
-
@@ -16028,8 +15694,6 @@
-
-
@@ -16074,8 +15738,6 @@
-
-
@@ -16121,8 +15783,6 @@
-
-
@@ -16168,8 +15828,6 @@
-
-
@@ -16215,8 +15873,6 @@
-
-
@@ -16273,8 +15929,6 @@
-
-
@@ -16286,7 +15940,7 @@
-
+
@@ -16818,7 +16472,7 @@
-
+
@@ -17486,7 +17138,7 @@
-
+
@@ -17528,8 +17180,6 @@
@@ -17603,7 +17253,7 @@
-
+
@@ -19779,7 +19427,6 @@
-
@@ -19937,7 +19584,6 @@
-
@@ -20094,7 +19740,6 @@
-
@@ -20251,7 +19896,6 @@
-
@@ -20408,7 +20052,6 @@
-
@@ -20565,7 +20208,6 @@
-
@@ -20722,7 +20364,6 @@
-
@@ -20880,7 +20521,6 @@
-
@@ -21037,7 +20677,6 @@
-
@@ -21509,7 +21148,6 @@
-
@@ -21666,7 +21304,6 @@
-
@@ -21822,7 +21459,6 @@
-
@@ -21978,7 +21614,6 @@
-
@@ -22290,7 +21925,6 @@
-
@@ -22445,7 +22079,6 @@
-
@@ -22600,7 +22233,6 @@
-
@@ -22755,7 +22387,6 @@
-
@@ -22913,7 +22544,6 @@
-
@@ -24957,7 +24587,6 @@
@@ -25016,7 +24645,6 @@
@@ -25076,8 +24704,6 @@
@@ -25437,13 +25061,11 @@
-
+
@@ -25472,7 +25094,6 @@
-
@@ -25515,7 +25136,6 @@
-
@@ -25558,7 +25178,6 @@
-
@@ -25601,7 +25220,6 @@
-
@@ -25644,7 +25262,6 @@
-
@@ -25687,7 +25304,6 @@
-
@@ -25731,7 +25347,6 @@
-
@@ -27122,7 +26735,7 @@
-
+
@@ -27154,7 +26767,7 @@
-
+
@@ -27186,7 +26799,7 @@
-
+
@@ -27202,4 +26815,4 @@
-
+
diff -r 01dbaf6a57e0 -r abffdfee3021 macros_test.xml
--- a/macros_test.xml Fri Nov 06 19:49:28 2020 +0000
+++ b/macros_test.xml Mon Feb 22 10:46:10 2021 +0000
@@ -127,8 +127,8 @@
-
-
+
+