diff --git a/doc/macroprocessor/old-design.pdf b/doc/macroprocessor/old-design.pdf
index 7e73eccb5e2fce47aeb86b08bffb8c7bfccf1314..4ccc05c321a1aba52d4b03b0cf095f1e250c038b 100644
Binary files a/doc/macroprocessor/old-design.pdf and b/doc/macroprocessor/old-design.pdf differ
diff --git a/doc/macroprocessor/old-design.svg b/doc/macroprocessor/old-design.svg
index 719ca05dec3bbe9fcbfe01e4eab3aefda86c7874..1816925c4e48a948a369f4cba572cd660601f1e9 100644
--- a/doc/macroprocessor/old-design.svg
+++ b/doc/macroprocessor/old-design.svg
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
@@ -12,12 +13,11 @@
height="312"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.48.1 r9760"
version="1.0"
- sodipodi:docbase="K:\Commun\Villemot\Macroprocessor"
- sodipodi:docname="old-design.svg"
+ sodipodi:docname="old-design.pdf"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:export-filename="K:\Commun\Villemot\Macroprocessor\old-design.png"
+ inkscape:export-filename="/home/sebastien/dynare/unstable/doc/macroprocessor/old-design.pdf.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
@@ -52,8 +52,10 @@
height="744.09448px"
inkscape:window-width="1024"
inkscape:window-height="712"
- inkscape:window-x="-4"
- inkscape:window-y="-4" />
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ showgrid="false"
+ inkscape:window-maximized="0" />
<metadata
id="metadata7">
<rdf:RDF>
@@ -62,6 +64,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -80,7 +83,7 @@
sodipodi:role="line"
id="tspan2162"
x="60"
- y="72.362183"></tspan></text>
+ y="72.362183" /></text>
<g
id="g6679"
transform="translate(-52.857143,-31.428572)">
@@ -101,7 +104,7 @@
sodipodi:role="line">File</tspan></text>
<path
transform="matrix(1.0924144,0,0,1.1873521,180.35562,37.324342)"
- d="M 102.85714 79.094482 A 37.142857 33.57143 0 1 1 28.57143,79.094482 A 37.142857 33.57143 0 1 1 102.85714 79.094482 z"
+ d="m 102.85714,79.094482 c 0,18.540989 -16.62942,33.571428 -37.142853,33.571428 -20.513433,0 -37.142857,-15.030439 -37.142857,-33.571428 0,-18.540989 16.629424,-33.57143 37.142857,-33.57143 20.513433,0 37.142853,15.030441 37.142853,33.57143 z"
sodipodi:ry="33.57143"
sodipodi:rx="37.142857"
sodipodi:cy="79.094482"
@@ -134,7 +137,7 @@
sodipodi:role="line">the model</tspan></text>
<path
transform="matrix(1.0528522,0,0,1.0682674,-22.862484,-9.0197689)"
- d="M 431.42857 79.808769 A 66.428574 51.42857 0 1 1 298.57143,79.808769 A 66.428574 51.42857 0 1 1 431.42857 79.808769 z"
+ d="m 431.42857,79.808769 c 0,28.403211 -29.74108,51.428571 -66.42857,51.428571 -36.68749,0 -66.42857,-23.02536 -66.42857,-51.428571 0,-28.403215 29.74108,-51.42857 66.42857,-51.42857 36.68749,0 66.42857,23.025355 66.42857,51.42857 z"
sodipodi:ry="51.42857"
sodipodi:rx="66.428574"
sodipodi:cy="79.808769"
@@ -166,7 +169,7 @@
x="691.42859"
sodipodi:role="line">Graphics</tspan></text>
<path
- d="M 747.14283 85.523056 A 54.285713 51.42857 0 1 1 638.5714,85.523056 A 54.285713 51.42857 0 1 1 747.14283 85.523056 z"
+ d="m 747.14283,85.523056 c 0,28.403214 -24.30454,51.428574 -54.28571,51.428574 -29.98117,0 -54.28572,-23.02536 -54.28572,-51.428574 0,-28.403215 24.30455,-51.42857 54.28572,-51.42857 29.98117,0 54.28571,23.025355 54.28571,51.42857 z"
sodipodi:ry="51.42857"
sodipodi:rx="54.285713"
sodipodi:cy="85.523056"
@@ -181,26 +184,18 @@
<text
sodipodi:linespacing="125%"
id="text2170"
- y="132.36218"
- x="218.57144"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
+ y="152.36218"
+ x="220.00002"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial"
xml:space="preserve"><tspan
id="tspan2174"
- y="132.36218"
- x="218.57144"
+ y="152.36218"
+ x="220.00002"
sodipodi:role="line">Dynare</tspan><tspan
- id="tspan2192"
- y="157.36218"
- x="218.57144"
- sodipodi:role="line">Preprocessor:</tspan><tspan
- y="182.36218"
- x="218.57144"
- sodipodi:role="line"
- id="tspan5483">parser, analytical</tspan><tspan
- y="207.36218"
- x="218.57144"
+ y="177.36218"
+ x="220.00002"
sodipodi:role="line"
- id="tspan5487">derivator</tspan></text>
+ id="tspan3023">Preprocessor</tspan></text>
<rect
y="101.57445"
x="137.47997"
@@ -236,32 +231,36 @@
style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
<path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Lend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- d="M 241,99.916281 L 393.28571,100.30877"
+ style="fill:none;stroke:#000000;stroke-width:1.49009621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend);display:inline"
+ d="m 236.63007,99.899587 157.99275,0.412633"
id="path2258"
inkscape:connector-type="polyline"
- inkscape:connection-end="#g5495"
- inkscape:connection-start="#g6679" />
+ inkscape:connector-curvature="0" />
<path
- style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow1Lend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="M 559.57142,101.0107 L 649,101.53521"
+ style="color:#000000;fill:none;stroke:#000000;stroke-width:1.37411284;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Lend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 556.05574,101.00285 93.00406,0.65001"
id="path2260"
inkscape:connector-type="polyline"
- inkscape:connection-end="#g2239"
- inkscape:connection-start="#g5495" />
+ inkscape:connector-curvature="0" />
<path
- style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow1Lend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="M 719.79412,157.95162 L 719.42858,257.3802"
+ style="color:#000000;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Lend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 719.79923,156.5612 -0.37433,101.819"
id="path2262"
inkscape:connector-type="polyline"
inkscape:connection-start="#g2239"
- inkscape:connection-end="#g2233" />
+ inkscape:connection-end="#g2233"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
<path
- style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:url(#Arrow1Lend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="M 641.85715,296.13199 L 249.57141,295.59827"
+ style="color:#000000;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Lend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 642.85715,296.13336 248.57136,295.59691"
id="path2264"
inkscape:connector-type="polyline"
inkscape:connection-start="#g2233"
- inkscape:connection-end="#g2226" />
+ inkscape:connection-end="#g2226"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
</g>
</svg>