diff --git a/.classpath b/.classpath
index 4b5675b..148593c 100644
--- a/.classpath
+++ b/.classpath
@@ -12,6 +12,6 @@
-
+
diff --git a/analyseWriter.exe b/analyseWriter.exe
index 0ae2b10..1bb69d4 100644
Binary files a/analyseWriter.exe and b/analyseWriter.exe differ
diff --git a/analyseWriter.jar b/analyseWriter.jar
index 4c5d29c..f895659 100644
Binary files a/analyseWriter.jar and b/analyseWriter.jar differ
diff --git a/bin/.gitignore b/bin/.gitignore
new file mode 100644
index 0000000..08f04d9
--- /dev/null
+++ b/bin/.gitignore
@@ -0,0 +1,2 @@
+/MEPTL/
+/fenetres/
diff --git a/bin/MEPTL/meptl.class b/bin/MEPTL/meptl.class
index 005e565..9b3b826 100644
Binary files a/bin/MEPTL/meptl.class and b/bin/MEPTL/meptl.class differ
diff --git a/bin/fenetres/createPopupMenu.class b/bin/fenetres/createPopupMenu.class
index 5ae00cb..ab3acc3 100644
Binary files a/bin/fenetres/createPopupMenu.class and b/bin/fenetres/createPopupMenu.class differ
diff --git a/src/MEPTL/meptl.java b/src/MEPTL/meptl.java
index cb07f7f..6e4ccbc 100644
--- a/src/MEPTL/meptl.java
+++ b/src/MEPTL/meptl.java
@@ -1047,6 +1047,23 @@ public class meptl {
}
}
}
+ if(usage1=="1") {
+ if(nodpage.get(j).getNodes().get(0)!=null) {
+ if(nodpage.get(j).getNodes().get(0).getAttributs().get("text:style-name")!=null) {
+ String styleParagraphe = nodpage.get(j).getNodes().get(0).getAttributs().get("text:style-name");
+ node nod6 = a.retourneFirstNodeByNameAttributValue(nodstyleparagraphe, "style:style", "style:name", styleParagraphe);
+ if(nod6!=null) {
+ node nod7 = nod6.retourneFirstEnfantsByName("style:paragraph-properties");
+ if(nod7.getAttributs().get("style:page-number")!=null) {
+ if(!nod7.getAttributs().get("style:page-number").equals("auto")) {
+ int numeroPage = Integer.valueOf(nod7.getAttributs().get("style:page-number"));
+ if(numeroPage%2==0) {usage1="left";}else{usage1="right";}
+ }
+ }
+ }
+ }
+ }
+ }
if(nodpage.get(j-1).getAttributs().get("style:master-page-name")!=null) {
@@ -1058,6 +1075,24 @@ public class meptl {
}
}
}
+ if(usage2=="2") {
+ if(nodpage.get(j-1).getNodes().get(0)!=null) {
+ if(nodpage.get(j).getNodes().get(0).getAttributs().get("text:style-name")!=null) {
+ String styleParagraphe = nodpage.get(j).getNodes().get(0).getAttributs().get("text:style-name");
+ node nod6 = a.retourneFirstNodeByNameAttributValue(nodstyleparagraphe, "style:style", "style:name", styleParagraphe);
+ if(nod6!=null) {
+ node nod7 = nod6.retourneFirstEnfantsByName("style:paragraph-properties");
+ if(nod7.getAttributs().get("style:page-number")!=null) {
+ if(!nod7.getAttributs().get("style:page-number").equals("auto")) {
+ int numeroPage = Integer.valueOf(nod7.getAttributs().get("style:page-number"));
+ if(numeroPage%2==0) {usage2="left";}else{usage2="right";}
+ }
+ }
+ }
+ }
+ }
+ }
+
if(j-1==0) usage2="right"; //la première page est toujours à droite.
@@ -1117,8 +1152,10 @@ public class meptl {
if(noddraw.get(j).getAttributs().get("text:anchor-type").equals("page")) {
if(noddraw.get(j).getAttributs().get("text:anchor-page-number")!=null) {
node page1 = null;
- if(pagezerosupprimer) page1 = a.retourneFirstNodeByNameAttributValue(nodpage, "page", "numeroabsolue", String.valueOf(Integer.valueOf(noddraw.get(j).getAttributs().get("text:anchor-page-number"))-1));
- if(!pagezerosupprimer) page1 = a.retourneFirstNodeByNameAttributValue(nodpage, "page", "numeroabsolue", noddraw.get(j).getAttributs().get("text:anchor-page-number"));
+ // à vérifier sur plusierus fichiers la ligne ci-dessous
+ int numpageAncrer = Integer.valueOf(noddraw.get(j).getAttributs().get("text:anchor-page-number"));
+ page1 = a.retourneFirstNodeByNameAttributValue(nodpage, "page", "numeroabsolue", String.valueOf(Integer.valueOf(numpageAncrer)));
+
if(page1!=null) {
if(pagezerosupprimer) {
page1.getNodes().add(noddraw.get(j));
@@ -1130,6 +1167,7 @@ public class meptl {
}
}
}
+
}
}
}
diff --git a/src/fenetres/createPopupMenu.java b/src/fenetres/createPopupMenu.java
index 9a8bedb..0a5c282 100644
--- a/src/fenetres/createPopupMenu.java
+++ b/src/fenetres/createPopupMenu.java
@@ -421,7 +421,7 @@ public class createPopupMenu extends JPopupMenu {
*/
private JMenu mnEvalPiedPagePasActive() {
JMenu mnEvalPiedPagePasActive = new JMenu("Pied page pas activé");
- mnEvalPiedPagePasActive.setIcon(new ImageIcon(create.class.getResource("/resources/evalnombredepagemaximini.png")));
+ mnEvalPiedPagePasActive.setIcon(new ImageIcon(create.class.getResource("/resources/piedpagenonmini.png")));
mnEvalPiedPagePasActive.add(new actEvalPiedPagePasActive());
mnEvalPiedPagePasActive.add(new actEvalPiedPagePasActiveNon());
return mnEvalPiedPagePasActive;