MAJ V4.5.0

This commit is contained in:
pablo rodriguez 2024-04-17 22:15:19 +02:00
parent f6793532e6
commit 93446d9990
257 changed files with 666 additions and 1651 deletions

View File

@ -12,6 +12,6 @@
<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/miglayout15-swing.jar"/>
<classpathentry kind="lib" path="jgoodies-forms-1.8.0.jar" sourcepath="jgoodies-forms-1.8.0-sources.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/Exportation documentation analyseWriter/plugins/documentation.analyseWriter_1.0.0.202212032022.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar" sourcepath="/cXML"/>
<classpathentry kind="output" path="bin"/>
</classpath>

View File

@ -9,7 +9,6 @@ import action.actevalNameCreator;
import cXML.node;
import fenetres.create;
import list.listeDesNodesAllContent;
import list.listeDesNodesAnalyseSpan;
import list.listeDesNodesAnalyseStyle;
import list.listeDesNodesAncrable;
import list.listeDesNodesEvalPlacement;
@ -19,7 +18,6 @@ import list.listeDesNodesPourEvaluerPage;
import list.listeDesNodesPourEvaluerPiedDePage;
import list.listeDesNodesTabStop;
import list.listeEvalNameNode;
import sousmenuEvaluation.mnAnalyseSpan;
import sousmenuEvaluation.mnAnalyseStyle;
import sousmenuEvaluation.mnEvalAncrageNumeroAbsoluPage;
import sousmenuEvaluation.mnEvalEnteteActive;
@ -96,12 +94,6 @@ public class MnGroupeMethodeEvaluer {
mnGroupeMethodeEvaluer.add(mnEvalNameLegacyStyle.menu());
}
// Pour la méthode analyseStyle et evalNameLegacyStyle
if(listeDesNodesAnalyseSpan.isAnalyseSpan(nod)) {
mnGroupeMethodeEvaluer.addSeparator();
mnGroupeMethodeEvaluer.add(mnAnalyseSpan.menu());
}
// Pour la méthode evalPlacement, evalLastChild, evalFirstChild
if(listeDesNodesEvalPlacement.isPlacement(nod)) {
mnGroupeMethodeEvaluer.addSeparator();

View File

@ -1,24 +0,0 @@
package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvaluerStyleFalse;
import action.actEvaluerStyleTrue;
import fenetres.create;
/**
* Menu analyseStyle.</br>
* @author pabr6
*
*/
public class mnAnalyseSpan{
public static JMenu menu() {
JMenu mnAnalyseStyle = new JMenu("Evaluer le formatage direct");
mnAnalyseStyle.setIcon(new ImageIcon(create.class.getResource("/resources/evaluerspanmini.png")));
mnAnalyseStyle.add(new actEvaluerStyleTrue());
mnAnalyseStyle.add( new actEvaluerStyleFalse());
return mnAnalyseStyle;
}
}

View File

@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvaluerStyleFalse;
import action.actEvaluerStyleTrue;
import fenetres.create;
@ -18,7 +17,6 @@ public class mnAnalyseStyle{
JMenu mnAnalyseStyle = new JMenu("Evaluer le style appliqué");
mnAnalyseStyle.setIcon(new ImageIcon(create.class.getResource("/resources/evaluerstylemini.png")));
mnAnalyseStyle.add(new actEvaluerStyleTrue());
mnAnalyseStyle.add( new actEvaluerStyleFalse());
return mnAnalyseStyle;
}
}

View File

@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalAncrageNumeroAbsoluePageNon;
import action.actEvalAncrageNumeroAbsoluePageOui;
import fenetres.create;
@ -18,7 +17,6 @@ public class mnEvalAncrageNumeroAbsoluPage{
JMenu mnEvalAncrageNumeroAbsoluPageAncrage = new JMenu("Numéro absolue de la page");
mnEvalAncrageNumeroAbsoluPageAncrage.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropageancragemini.png")));
mnEvalAncrageNumeroAbsoluPageAncrage.add(new actEvalAncrageNumeroAbsoluePageOui());
mnEvalAncrageNumeroAbsoluPageAncrage.add(new actEvalAncrageNumeroAbsoluePageNon());
return mnEvalAncrageNumeroAbsoluPageAncrage;
}
}

View File

@ -4,7 +4,6 @@ import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalEnteteActive;
import action.actEvalEnteteActiveNon;
import fenetres.create;
/**
@ -18,7 +17,6 @@ public class mnEvalEnteteActive{
JMenu mnEvalEnteteActive = new JMenu("Entête activé");
mnEvalEnteteActive.setIcon(new ImageIcon(create.class.getResource("/resources/enteteouimini.png")));
mnEvalEnteteActive.add(new actEvalEnteteActive());
mnEvalEnteteActive.add(new actEvalEnteteActiveNon());
return mnEvalEnteteActive;
}

View File

@ -4,7 +4,6 @@ import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalEntetePasActive;
import action.actEvalEntetePasActiveNon;
import fenetres.create;
/**
@ -18,7 +17,6 @@ public class mnEvalEntetePasActive{
JMenu mnEvalEntetePasActive = new JMenu("Entête pas activé");
mnEvalEntetePasActive.setIcon(new ImageIcon(create.class.getResource("/resources/entetenonmini.png")));
mnEvalEntetePasActive.add(new actEvalEntetePasActive());
mnEvalEntetePasActive.add(new actEvalEntetePasActiveNon());
return mnEvalEntetePasActive;
}

View File

@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalFormatageDirectNon;
import action.actEvalFormatageDirectOui;
import fenetres.create;
@ -18,9 +17,8 @@ public class mnEvalFormatageDirect{
public static JMenu menu() {
JMenu mnEvalFormatageDirect = new JMenu("Evaluer l'absence ou la présence du formatage direct");
mnEvalFormatageDirect.setIcon( new ImageIcon(create.class.getResource("/resources/evalformatagedirectmini.png")));
mnEvalFormatageDirect.setIcon( new ImageIcon(create.class.getResource("/resources/sautpagecolonnemini.png")));
mnEvalFormatageDirect.add(new actEvalFormatageDirectOui());
mnEvalFormatageDirect.add(new actEvalFormatageDirectNon());
return mnEvalFormatageDirect;
}
}

View File

@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvaluerNomDuStyleHeriteFalse;
import action.actEvaluerNomDuStyleHeriteTrue;
import fenetres.create;
@ -19,7 +18,6 @@ public class mnEvalNameLegacyStyle{
JMenu mnEvalNameLegacyStyle = new JMenu("Evaluer le nom du style hérité");
mnEvalNameLegacyStyle.setIcon( new ImageIcon(create.class.getResource("/resources/heritagestylemini.png")));
mnEvalNameLegacyStyle.add(new actEvaluerNomDuStyleHeriteTrue());
mnEvalNameLegacyStyle.add( new actEvaluerNomDuStyleHeriteFalse());
return mnEvalNameLegacyStyle;
}
}

View File

@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalNameNodeNon;
import action.actEvalNameNodeOui;
import fenetres.create;
@ -20,7 +19,6 @@ public class mnEvalNameNode{
JMenu mnEvalNameNode = new JMenu("Evaluer la présence du node");
mnEvalNameNode.setIcon(new ImageIcon(create.class.getResource("/resources/evalnodemini.png")));
mnEvalNameNode.add(new actEvalNameNodeOui());
mnEvalNameNode.add(new actEvalNameNodeNon());
return mnEvalNameNode;
}
}

View File

@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalNamePageNon;
import action.actEvalNamePageOui;
import fenetres.create;
@ -18,7 +17,6 @@ public class mnEvalNamePage{
JMenu mnEvalNamePage = new JMenu("Evaluer le nom du style de la page");
mnEvalNamePage.setIcon(new ImageIcon(create.class.getResource("/resources/evalnamepagemini.png")));
mnEvalNamePage.add(new actEvalNamePageOui());
mnEvalNamePage.add(new actEvalNamePageNon());
return mnEvalNamePage;
}

View File

@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalNumeroAbsoluePageNon;
import action.actEvalNumeroAbsoluePageOui;
import fenetres.create;
@ -18,7 +17,6 @@ public class mnEvalNumeroAbsoluePage{
JMenu mnEvalNumeroAbsoluePage = new JMenu("Evaluer le numéro absolue de la page");
mnEvalNumeroAbsoluePage.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeroabsoluepagemini.png")));
mnEvalNumeroAbsoluePage.add(new actEvalNumeroAbsoluePageOui());
mnEvalNumeroAbsoluePage.add(new actEvalNumeroAbsoluePageNon());
return mnEvalNumeroAbsoluePage;
}

View File

@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalNumeroPageNon;
import action.actEvalNumeroPageOui;
import fenetres.create;
@ -18,7 +17,6 @@ public class mnEvalNumeroPage{
JMenu mnEvalNumeroPage = new JMenu("Evaluer la pagination (num. de la page)");
mnEvalNumeroPage.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropagemini.png")));
mnEvalNumeroPage.add(new actEvalNumeroPageOui());
mnEvalNumeroPage.add(new actEvalNumeroPageNon());
return mnEvalNumeroPage;
}

View File

@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalPasParagrapheVideNon;
import action.actEvalPasParagrapheVideOui;
import fenetres.create;
@ -19,7 +18,6 @@ public class mnEvalPasParagrapheVide{
JMenu mnEvalPasParagrapheVide = new JMenu("Evaluer l'absence de paragraphe vide dans la page");
mnEvalPasParagrapheVide.setIcon( new ImageIcon(create.class.getResource("/resources/evalpasparagraphevidemini.png")));
mnEvalPasParagrapheVide.add(new actEvalPasParagrapheVideOui());
mnEvalPasParagrapheVide.add(new actEvalPasParagrapheVideNon());
return mnEvalPasParagrapheVide;
}
}

View File

@ -4,7 +4,6 @@ import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalPiedPageActive;
import action.actEvalPiedPageActiveNon;
import fenetres.create;
/**
@ -18,7 +17,6 @@ public class mnEvalPiedPageActive{
JMenu mnEvalPiedPageActive = new JMenu("Pied page activé");
mnEvalPiedPageActive.setIcon(new ImageIcon(create.class.getResource("/resources/piedpageouimini.png")));
mnEvalPiedPageActive.add(new actEvalPiedPageActive());
mnEvalPiedPageActive.add(new actEvalPiedPageActiveNon());
return mnEvalPiedPageActive;
}

View File

@ -4,7 +4,6 @@ import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalPiedPagePasActive;
import action.actEvalPiedPagePasActiveNon;
import fenetres.create;
/**
@ -18,7 +17,6 @@ public class mnEvalPiedPagePasActive{
JMenu mnEvalPiedPagePasActive = new JMenu("Pied page pas activé");
mnEvalPiedPagePasActive.setIcon(new ImageIcon(create.class.getResource("/resources/piedpagenonmini.png")));
mnEvalPiedPagePasActive.add(new actEvalPiedPagePasActive());
mnEvalPiedPagePasActive.add(new actEvalPiedPagePasActiveNon());
return mnEvalPiedPagePasActive;
}

View File

@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalPlacementParagrapheNon;
import action.actEvalPlacementParagrapheOui;
import fenetres.create;
@ -19,7 +18,6 @@ public class mnEvalPlacementParagraphe{
JMenu mnPlacementParagraphe = new JMenu("Placement des paragraphes (evaluation du ¶ avant)");
mnPlacementParagraphe.setIcon(new ImageIcon(create.class.getResource("/resources/ordreparagraphemini.png")));
mnPlacementParagraphe.add(new actEvalPlacementParagrapheOui());
mnPlacementParagraphe.add(new actEvalPlacementParagrapheNon());
return mnPlacementParagraphe;
}
}

View File

@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalSautPageColonneNon;
import action.actEvalSautPageColonneOui;
import fenetres.create;
@ -18,7 +17,6 @@ public class mnEvalSautPageColonne{
JMenu mnEvalSautPageColonne = new JMenu("Evaluer le saut de page ou de colonne");
mnEvalSautPageColonne.setIcon( new ImageIcon(create.class.getResource("/resources/sautpagecolonnemini.png")));
mnEvalSautPageColonne.add(new actEvalSautPageColonneOui());
mnEvalSautPageColonne.add( new actEvalSautPageColonneNon());
return mnEvalSautPageColonne;
}

View File

@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalTabAlignementGaucheNon;
import action.actEvalTabAlignementGaucheOui;
import fenetres.create;
@ -12,7 +11,6 @@ public class mnEvalTabAlignementGauche {
JMenu mnEvalTabAlignementGauche= new JMenu("Evaluer l'agniment à gauche d'une tab.");
mnEvalTabAlignementGauche.setIcon(new ImageIcon(create.class.getResource("/resources/evaltabalgngauchemini.png")));
mnEvalTabAlignementGauche.add(new actEvalTabAlignementGaucheOui());
mnEvalTabAlignementGauche.add(new actEvalTabAlignementGaucheNon());
return mnEvalTabAlignementGauche;
}
}

View File

@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalTabDefautStyleLeaderNon;
import action.actEvalTabDefautStyleLeaderOui;
import fenetres.create;
@ -12,7 +11,6 @@ public class mnEvalTabDefautStyleLeader {
JMenu mnEvalTabAlignementGauche= new JMenu("Evaluer les caractères par défaut de remplissage d'une tab.");
mnEvalTabAlignementGauche.setIcon(new ImageIcon(create.class.getResource("/resources/evaltabstyleleadermini.png")));
mnEvalTabAlignementGauche.add(new actEvalTabDefautStyleLeaderOui());
mnEvalTabAlignementGauche.add(new actEvalTabDefautStyleLeaderNon());
return mnEvalTabAlignementGauche;
}
}

View File

@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvaluerATraversAnalyseStyleFalse;
import action.actEvaluerATraversAnalyseStyleTrue;
import fenetres.create;
@ -18,7 +17,6 @@ public class mnEvaluerATraversAnalyseStyle{
JMenu mnEvaluerATraversAnalyseStyle = new JMenu("Evaluer le style dans la structure");
mnEvaluerATraversAnalyseStyle.setIcon(new ImageIcon(create.class.getResource("/resources/atraversanalysestylemini.png")));
mnEvaluerATraversAnalyseStyle.add(new actEvaluerATraversAnalyseStyleTrue());
mnEvaluerATraversAnalyseStyle.add( new actEvaluerATraversAnalyseStyleFalse());
return mnEvaluerATraversAnalyseStyle;
}

View File

@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalLastChildFalse;
import action.actEvalLastChildTrue;
import fenetres.create;
@ -18,7 +17,6 @@ public class mnEvaluerDernierEnfant{
JMenu mnEvaluerDernierEnfant = new JMenu("Le node est le dernier enfant");
mnEvaluerDernierEnfant.setIcon(new ImageIcon(create.class.getResource("/resources/dernierenfantmini.png")));
mnEvaluerDernierEnfant.add(new actEvalLastChildTrue());
mnEvaluerDernierEnfant.add(new actEvalLastChildFalse());
return mnEvaluerDernierEnfant;
}
}

View File

@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvalFirstChildFalse;
import action.actEvalFirstChildTrue;
import fenetres.create;
@ -18,7 +17,6 @@ public class mnEvaluerPremierEnfant{
JMenu mnEvaluerPremierEnfant = new JMenu("Le node est le premier enfant");
mnEvaluerPremierEnfant.setIcon(new ImageIcon(create.class.getResource("/resources/premierenfantmini.png")));
mnEvaluerPremierEnfant.add(new actEvalFirstChildTrue());
mnEvaluerPremierEnfant.add(new actEvalFirstChildFalse());
return mnEvaluerPremierEnfant;
}

4
bin/.gitignore vendored
View File

@ -536,3 +536,7 @@
/supprimeAttribut.png
/supprimeAttribut.svg
/supprimeAttributmini.png
/atraversanalysestylefalse.png
/atraversanalysestylefalsemini.png
/atraversanalysestyletrue.png
/atraversanalysestyletruemini.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@ -9,9 +9,9 @@
id="svg5"
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
sodipodi:docname="dernierenfant.svg"
inkscape:export-filename="evalLastChildfalse.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
inkscape:export-filename="dernierenfantmini.png"
inkscape:export-xdpi="51.200001"
inkscape:export-ydpi="51.200001"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
@ -27,15 +27,15 @@
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
showgrid="false"
inkscape:zoom="15.822222"
inkscape:cx="22.531601"
inkscape:cy="62.001404"
inkscape:zoom="15.720805"
inkscape:cx="22.486125"
inkscape:cy="22.51793"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="layer1"
inkscape:current-layer="g2"
showguides="true">
<sodipodi:guide
position="11.555083,0.38461201"
@ -103,19 +103,19 @@
inkscape:rounded="0"
inkscape:randomized="0"
d="M 6.1787524,4.7770059 5.3002296,4.5692432 5.2338711,5.4695566 4.5017292,4.9414128 4.095887,5.7477996 3.6215879,4.9796798 2.9380477,5.569375 2.7937992,4.6782184 1.9366239,4.9614462 2.1443865,4.0829234 1.2440731,4.016565 1.7722169,3.2844231 0.9658301,2.8785808 1.7339499,2.4042818 1.1442547,1.7207416 2.0354113,1.5764931 1.7521835,0.71931772 2.6307063,0.92708038 2.6970648,0.026767 3.4292067,0.55491078 3.8350489,-0.25147604 4.3093479,0.51664377 4.9928882,-0.0730514 5.1371366,0.81810515 5.994312,0.53487736 5.7865493,1.4134002 6.6868627,1.4797586 6.1587189,2.2119005 6.9651058,2.6177428 6.196986,3.0920418 6.7866811,3.775582 5.8955246,3.9198305 Z"
transform="matrix(1.7342069,0,0,1.7428036,-0.40462457,1.3463317)" />
transform="matrix(1.7342069,0,0,1.7428036,-0.40462457,1.9761108)" />
<text
xml:space="preserve"
style="font-size:5.84543px;line-height:1.15;font-family:handwriting-draft_free-version;-inkscape-font-specification:handwriting-draft_free-version;fill:#ff0000;stroke-width:0.25"
x="4.0375166"
y="8.3021851"
style="font-size:8.11019px;line-height:1.15;font-family:handwriting-draft_free-version;-inkscape-font-specification:handwriting-draft_free-version;fill:#ff0000;stroke-width:0.34686"
x="2.4835956"
y="8.9485664"
id="text1"
transform="scale(1.023957,0.97660351)"><tspan
sodipodi:role="line"
id="tspan1"
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Arial;-inkscape-font-specification:'Arial Heavy';fill:#ff0000;stroke-width:0.25"
x="4.0375166"
y="8.3021851">Z</tspan></text>
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Arial;-inkscape-font-specification:'Arial Heavy';fill:#ff0000;stroke-width:0.34686"
x="2.4835956"
y="8.9485664">ω</tspan></text>
</g>
<g
id="g919"

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 899 B

After

Width:  |  Height:  |  Size: 972 B

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -2,7 +2,7 @@
<svg
inkscape:export-ydpi="51.200001"
inkscape:export-xdpi="51.200001"
inkscape:export-filename="evalnode."
inkscape:export-filename="evalnodemini.png"
sodipodi:docname="evalnode.svg"
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
id="svg8"
@ -37,8 +37,8 @@
inkscape:snap-global="false"
inkscape:window-maximized="1"
inkscape:window-y="-8"
inkscape:window-x="1912"
inkscape:window-height="1057"
inkscape:window-x="-8"
inkscape:window-height="1009"
inkscape:window-width="1920"
inkscape:object-nodes="true"
inkscape:bbox-nodes="true"
@ -48,10 +48,10 @@
units="px"
showgrid="false"
inkscape:document-rotation="0"
inkscape:current-layer="g1030"
inkscape:current-layer="g1918"
inkscape:document-units="mm"
inkscape:cy="60.099364"
inkscape:cx="33.960257"
inkscape:cy="23.600664"
inkscape:cx="33.925955"
inkscape:zoom="14.575861"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
@ -115,16 +115,16 @@
d="m 12.94386,117.63912 c 0.771547,0.15268 1.602284,0.65238 2.350842,1.41404 1.147069,1.16711 1.965697,2.9665 2.41449,5.30714 0.551551,2.8766 0.890054,4.05403 1.389378,4.83272 0.135955,0.2119 0.606103,0.78156 1.044938,1.26591 0.438837,0.48435 1.689669,1.99517 2.779596,3.35741 2.425575,3.03152 3.666996,4.47167 4.305872,4.99519 l 0.486503,0.39865 4.879991,0.001 c 5.150454,10e-4 5.454573,0.0263 6.435402,0.52783 0.683469,0.34945 1.466998,1.19843 1.848003,2.00236 l 0.339234,0.71584 v 11.94355 11.94351 l -0.295018,0.62943 c -0.623001,1.32923 -1.937271,2.29969 -3.400903,2.51123 -0.388974,0.0562 -2.98585,0.1034 -5.770842,0.10474 l -5.06361,0.002 -1.210864,0.37231 c -0.665982,0.20476 -2.523565,0.79635 -4.12796,1.31465 -6.833891,2.20765 -9.117237,2.6074 -14.860615,2.60165 -4.0272092,-0.003 -5.4188274,-0.20392 -7.22200735,-1.03697 -3.33211025,-1.53951 -5.08172465,-4.20688 -5.38247415,-8.20585 -0.063166,-0.84022 -0.1139919,-1.00305 -0.4971708,-1.59614 -0.5229809,-0.8093 -0.9165554,-1.68658 -1.2250228,-2.73051 -0.1855237,-0.62767 -0.2404077,-1.14606 -0.2647957,-2.49823 -0.0297,-1.64301 -0.0433,-1.73273 -0.367596,-2.42173 -0.740046,-1.57209 -1.04659,-3.81163 -0.745798,-5.44888 l 0.161889,-0.88064 -0.414971,-0.77055 c -0.8979412,-1.66738 -1.2814752,-3.38289 -1.1879602,-5.31363 0.105207,-2.17342 0.8576142,-3.79109 2.5506092,-5.48407 1.1305039,-1.1305 2.1516176,-1.78998 3.446855,-2.2261 0.8473447,-0.28529 0.895786,-0.28868 4.68143645,-0.32714 2.10386765,-0.0213 3.82522425,-0.0698 3.82522425,-0.10775 0,-0.0378 -0.1947274,-0.56688 -0.4326036,-1.1757 -1.0424694,-2.6675 -1.328034,-5.03972 -0.9491839,-7.8852 0.2182779,-1.6395 0.4401953,-2.43156 1.0000303,-3.56914 1.0290408,-2.091 2.5232934,-3.34998 4.894988,-4.12428 1.360787,-0.44429 3.5163173,-0.651 4.5842193,-0.43964 z m -2.24214,4.33643 c -2.5299873,0.21563 -3.6641093,1.61891 -3.9910454,4.9383 -0.2184884,2.21831 0.1018613,3.6698 1.5081601,6.83195 0.981646,2.2074 1.432112,3.59522 1.620752,4.99316 l 0.06274,0.46449 -6.4678834,0.031 -6.4678849,0.031 -0.7155114,0.3417 c -1.424686,0.68036 -2.4688073,2.11651 -2.6005563,3.57698 -0.1238225,1.37187 0.6262008,3.45388 1.5196021,4.21859 0.2530614,0.2166 0.5419935,0.39384 0.6420971,0.39384 0.3141985,0 0.3244891,0.12128 0.046014,0.54208 -0.6316181,0.95443 -0.980788,2.60127 -0.8089012,3.81509 0.1326067,0.93658 0.4634544,1.6925 1.1208199,2.56117 l 0.528901,0.69888 -0.2457835,0.62206 c -0.3690818,0.93408 -0.3464507,2.54727 0.049989,3.56778 0.3526841,0.90771 0.8288348,1.61796 1.3836699,2.06382 l 0.4173559,0.33541 -0.049355,1.45547 c -0.074253,2.1878 0.2869867,3.37047 1.35721075,4.44398 0.6706891,0.67274 1.41795115,1.07334 2.56612975,1.37572 0.692525,0.18238 1.3227833,0.23251 3.5394918,0.28141 5.5710938,0.12291 8.2332478,-0.35411 15.4414078,-2.76692 3.790776,-1.26891 4.501142,-1.45161 6.073912,-1.56216 l 1.050794,-0.0738 v -10.8265 -10.8265 h -0.754123 c -0.414762,0 -0.922515,-0.0568 -1.128308,-0.12593 -0.699699,-0.23531 -1.802425,-1.06707 -2.924334,-2.20576 -1.333597,-1.35354 -1.677015,-1.75251 -3.141463,-3.64954 -1.377834,-1.78485 -2.792479,-3.52047 -3.645241,-4.47225 -1.682831,-1.87828 -2.069251,-2.78374 -3.149201,-7.37934 -0.505308,-2.15029 -0.766254,-2.88438 -1.221426,-3.43623 -0.269857,-0.32716 -0.397025,-0.39985 -0.635195,-0.36308 -0.163771,0.0253 -0.606059,0.0722 -0.982859,0.10441 z m 23.275182,39.07213 c -0.431683,0.18531 -1.014609,0.78333 -1.173068,1.20362 -0.493614,1.30931 0.388576,2.78132 1.745034,2.91165 1.86965,0.17968 3.081538,-1.80121 2.029072,-3.31652 -0.569185,-0.81946 -1.725332,-1.17451 -2.601038,-0.79875 z"
id="path1684" />
<path
style="fill:#008080;stroke-width:0.110078"
style="fill:#cc00ff;stroke-width:0.110078"
d="m 10.821617,119.18257 c 0.771547,0.15268 1.602284,0.65238 2.350842,1.41404 1.147069,1.16711 1.965697,2.9665 2.41449,5.30714 0.551551,2.8766 0.890054,4.05403 1.389378,4.83272 0.135955,0.2119 0.606103,0.78156 1.044938,1.26591 0.438837,0.48435 1.689669,1.99517 2.779596,3.35741 2.425575,3.03152 3.666996,4.47167 4.305872,4.99519 l 0.486503,0.39865 4.879991,0.001 c 5.150454,0.001 5.454573,0.0263 6.435402,0.52783 0.683469,0.34945 1.466998,1.19843 1.848003,2.00236 l 0.339234,0.71584 v 11.94355 11.94351 l -0.295018,0.62943 c -0.623001,1.32923 -1.937271,2.29969 -3.400903,2.51123 -0.388974,0.0562 -2.98585,0.1034 -5.770842,0.10474 l -5.06361,0.002 -1.210864,0.37231 c -0.665982,0.20476 -2.523565,0.79635 -4.12796,1.31465 -6.833891,2.20765 -9.117237,2.6074 -14.8606152,2.60165 -4.02720916,-0.003 -5.4188274,-0.20392 -7.2220073,-1.03697 -3.3321103,-1.53951 -5.0817247,-4.20688 -5.3824742,-8.20585 -0.063166,-0.84022 -0.1139919,-1.00305 -0.4971708,-1.59614 -0.5229809,-0.8093 -0.9165554,-1.68658 -1.2250228,-2.73051 -0.1855237,-0.62767 -0.2404077,-1.14606 -0.2647957,-2.49823 -0.0297,-1.64301 -0.0433,-1.73273 -0.367596,-2.42173 -0.740046,-1.57209 -1.04659,-3.81163 -0.745798,-5.44888 l 0.161889,-0.88064 -0.414971,-0.77055 c -0.897941,-1.66738 -1.281475,-3.38289 -1.18796,-5.31363 0.105207,-2.17342 0.857614,-3.79109 2.550609,-5.48407 1.1305039,-1.1305 2.1516176,-1.78998 3.446855,-2.2261 0.8473447,-0.28529 0.895786,-0.28868 4.6814365,-0.32714 2.10386764,-0.0213 3.8252242,-0.0698 3.8252242,-0.10775 0,-0.0378 -0.1947274,-0.56688 -0.4326036,-1.1757 -1.04246936,-2.6675 -1.32803396,-5.03972 -0.94918386,-7.8852 0.2182779,-1.6395 0.4401953,-2.43156 1.00003026,-3.56914 1.0290408,-2.091 2.5232934,-3.34998 4.894988,-4.12428 1.360787,-0.44429 3.516317,-0.651 4.5842195,-0.43964 z M 8.5794765,123.519 c -2.529987,0.21563 -3.664109,1.61891 -3.9910451,4.9383 -0.2184884,2.21831 0.1018613,3.6698 1.5081601,6.83195 0.981646,2.2074 1.432112,3.59522 1.620752,4.99316 l 0.06274,0.46449 -6.4678834,0.031 -6.4678849,0.031 -0.7155114,0.3417 c -1.424686,0.68036 -2.4688073,2.11651 -2.6005563,3.57698 -0.1238225,1.37187 0.6262008,3.45388 1.5196021,4.21859 0.2530614,0.2166 0.5419935,0.39384 0.6420971,0.39384 0.3141985,0 0.3244891,0.12128 0.046014,0.54208 -0.6316181,0.95443 -0.980788,2.60127 -0.8089012,3.81509 0.1326067,0.93658 0.4634544,1.6925 1.1208199,2.56117 l 0.528901,0.69888 -0.2457835,0.62206 c -0.3690818,0.93408 -0.3464507,2.54727 0.049989,3.56778 0.3526841,0.90771 0.8288348,1.61796 1.3836699,2.06382 l 0.4173559,0.33541 -0.049355,1.45547 c -0.074253,2.1878 0.2869867,3.37047 1.3572108,4.44398 0.6706891,0.67274 1.4179511,1.07334 2.56612974,1.37572 0.692525,0.18238 1.32278326,0.23251 3.53949176,0.28141 5.5710943,0.12291 8.233248,-0.35411 15.441408,-2.76692 3.790776,-1.26891 4.501142,-1.45161 6.073912,-1.56216 L 26.161603,166.7 V 155.8735 145.047 H 25.40748 c -0.414762,0 -0.922515,-0.0568 -1.128308,-0.12593 -0.699699,-0.23531 -1.802425,-1.06707 -2.924334,-2.20576 -1.333597,-1.35354 -1.677015,-1.75251 -3.141463,-3.64954 -1.377834,-1.78485 -2.792479,-3.52047 -3.645241,-4.47225 -1.682831,-1.87828 -2.069251,-2.78374 -3.149201,-7.37934 -0.505308,-2.15029 -0.766254,-2.88438 -1.221426,-3.43623 -0.2698575,-0.32716 -0.3970255,-0.39985 -0.6351955,-0.36308 -0.163771,0.0253 -0.606059,0.0722 -0.982859,0.10441 z m 23.2751825,39.07213 c -0.431683,0.18531 -1.014609,0.78333 -1.173068,1.20362 -0.493614,1.30931 0.388576,2.78132 1.745034,2.91165 1.86965,0.17968 3.081538,-1.80121 2.029072,-3.31652 -0.569185,-0.81946 -1.725332,-1.17451 -2.601038,-0.79875 z"
id="path1050" />
<path
style="fill:none;stroke:#000000;stroke-width:7.02493;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
style="fill:none;stroke:#000000;stroke-width:8.12130567;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m -7.1166038,113.29556 -16.0132882,39.74382 16.0132885,36.464"
id="path1349"
sodipodi:nodetypes="ccc" />
<path
style="fill:none;stroke:#000000;stroke-width:7.02493;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
style="fill:none;stroke:#000000;stroke-width:8.12130567;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 38.695934,113.29556 16.013289,39.74382 -16.013289,36.464"
id="path1682"
sodipodi:nodetypes="ccc" />

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 890 B

After

Width:  |  Height:  |  Size: 919 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 678 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 645 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 964 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 932 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 899 B

After

Width:  |  Height:  |  Size: 972 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 712 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 687 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 867 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 829 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 890 B

After

Width:  |  Height:  |  Size: 919 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 927 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 930 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 986 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 954 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 878 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 854 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 942 B

After

Width:  |  Height:  |  Size: 1003 B

Some files were not shown because too many files have changed in this diff Show More