diff --git a/.classpath b/.classpath
index 148593c..4b5675b 100644
--- a/.classpath
+++ b/.classpath
@@ -12,6 +12,6 @@
-
+
diff --git a/analyseWriter.exe b/analyseWriter.exe
index d78ad2e..e8311c2 100644
Binary files a/analyseWriter.exe and b/analyseWriter.exe differ
diff --git a/analyseWriter.jar b/analyseWriter.jar
index ab09d75..cd753b5 100644
Binary files a/analyseWriter.jar and b/analyseWriter.jar differ
diff --git a/bin/.gitignore b/bin/.gitignore
index c47d7ed..b19e473 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -3,52 +3,6 @@
/evaluer/
/fenetres/
/list/
-/piedpagenonmini.png
-/piedpageoui.png
-/piedpageoui.svg
-/piedpageouimini.png
-/poids.svg
-/poidsmini.png
-/premierenfant.png
-/premierenfant.svg
-/premierenfantmini.png
-/property.png
-/property.svg
-/recherche.png
-/recherche.svg
-/rechercheDoublon.png
-/rechercheDoublon.svg
-/rechercheDoublonmini.png
-/rechercheancragepage.png
-/rechercheancragepage.svg
-/rechercheancragepagemini.png
-/recherchecontenu.png
-/recherchecontenu.svg
-/recherchecontenumini.png
-/recherchecontenuplusprochevoisin.png
-/recherchecontenuplusprochevoisin.svg
-/recherchecontenuplusprochevoisinmini.png
-/rechercheindex.png
-/rechercheindex.svg
-/rechercheindexmini.png
-/recherchemini.png
-/redo.png
-/saut.svg
-/sautmini.png
-/sautmultiple.png
-/sautmultiple.svg
-/sautmultiplemini.png
-/save.png
-/save.svg
-/save_as.png
-/saveas.svg
-/saveasmini.png
-/savemini.png
-/savepreference.png
-/savepreference.svg
-/savepreferencemini.png
-/section.png
-/section.svg
/sequence.png
/sequence.svg
/setting.png
@@ -125,10 +79,3 @@
/zipstudent.png
/zipstudent.svg
/zipstudentmini.png
-/sautpageColonne.svg
-/sautpagecolonne.png
-/sautpagecolonnemini.png
-/resources/
-/evalpasparagraphevide.png
-/evalpasparagraphevide.svg
-/evalpasparagraphevidemini.png
diff --git a/bin/evalpasparagraphevide.png b/bin/evalpasparagraphevide.png
new file mode 100644
index 0000000..5fe4d45
Binary files /dev/null and b/bin/evalpasparagraphevide.png differ
diff --git a/bin/evalpasparagraphevide.svg b/bin/evalpasparagraphevide.svg
new file mode 100644
index 0000000..3cd0a5c
--- /dev/null
+++ b/bin/evalpasparagraphevide.svg
@@ -0,0 +1,68 @@
+
+
+
+
diff --git a/bin/evalpasparagraphevidemini.png b/bin/evalpasparagraphevidemini.png
new file mode 100644
index 0000000..601a35e
Binary files /dev/null and b/bin/evalpasparagraphevidemini.png differ
diff --git a/bin/evaluer/evaluationAttribut.class b/bin/evaluer/evaluationAttribut.class
index f69ba90..30fc4ae 100644
Binary files a/bin/evaluer/evaluationAttribut.class and b/bin/evaluer/evaluationAttribut.class differ
diff --git a/bin/fenetres/createPopupMenu.class b/bin/fenetres/createPopupMenu.class
index dbab855..33f2665 100644
Binary files a/bin/fenetres/createPopupMenu.class and b/bin/fenetres/createPopupMenu.class differ
diff --git a/bin/list/listeDesNodesAllContent.class b/bin/list/listeDesNodesAllContent.class
index 0c0db73..6ac0fa1 100644
Binary files a/bin/list/listeDesNodesAllContent.class and b/bin/list/listeDesNodesAllContent.class differ
diff --git a/bin/resources/evalpasparagraphevide.png b/bin/resources/evalpasparagraphevide.png
new file mode 100644
index 0000000..5fe4d45
Binary files /dev/null and b/bin/resources/evalpasparagraphevide.png differ
diff --git a/bin/resources/evalpasparagraphevidemini.png b/bin/resources/evalpasparagraphevidemini.png
new file mode 100644
index 0000000..601a35e
Binary files /dev/null and b/bin/resources/evalpasparagraphevidemini.png differ
diff --git a/bin/sautpageColonne.svg b/bin/sautpageColonne.svg
new file mode 100644
index 0000000..b6183a6
--- /dev/null
+++ b/bin/sautpageColonne.svg
@@ -0,0 +1,101 @@
+
+
+
+
diff --git a/bin/sautpagecolonne.png b/bin/sautpagecolonne.png
new file mode 100644
index 0000000..d2718e5
Binary files /dev/null and b/bin/sautpagecolonne.png differ
diff --git a/bin/sautpagecolonnemini.png b/bin/sautpagecolonnemini.png
new file mode 100644
index 0000000..810447e
Binary files /dev/null and b/bin/sautpagecolonnemini.png differ
diff --git a/src/evaluer/evaluationAttribut.java b/src/evaluer/evaluationAttribut.java
index 25b3dec..05e3786 100644
--- a/src/evaluer/evaluationAttribut.java
+++ b/src/evaluer/evaluationAttribut.java
@@ -694,19 +694,22 @@ public class evaluationAttribut {
if(sujet.getAttributs().get("text:style-name")!=null) {
String styleName = sujet.getAttributs().get("text:style-name");
- node styleSujet = sujet.racineDuNode().retourneFirstEnfantsByName("style:paragraph").retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", styleName);
+ node styleSujet = sujet.racineDuNode().retourneFirstEnfantsByName("style:paragraph");
if(styleSujet!=null) {
- styleSujet = styleSujet.retourneFirstEnfantsByName("style:paragraph-properties");
- if(styleSujet!=null) {
- if(styleSujet.getAttributs().get("fo:break-before")!=null) {
- typeSautSujet = styleSujet.getAttributs().get("fo:break-before");
- typeSautSujet = evaluation.withoutCodeAndPointPourRechercheContenuExact(typeSautSujet);
- }
- if(styleSujet.getAttributs().get("fo:break-after")!=null) {
- typeSautSujet = styleSujet.getAttributs().get("fo:break-after");
- typeSautStudent = styleSujet.getAttributs().get("fo:break-after");
- }
- }
+ styleSujet = styleSujet.retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", styleName);
+ if(styleSujet!=null) {
+ styleSujet = styleSujet.retourneFirstEnfantsByName("style:paragraph-properties");
+ if(styleSujet!=null) {
+ if(styleSujet.getAttributs().get("fo:break-before")!=null) {
+ typeSautSujet = styleSujet.getAttributs().get("fo:break-before");
+ typeSautSujet = evaluation.withoutCodeAndPointPourRechercheContenuExact(typeSautSujet);
+ }
+ if(styleSujet.getAttributs().get("fo:break-after")!=null) {
+ typeSautSujet = styleSujet.getAttributs().get("fo:break-after");
+ typeSautStudent = styleSujet.getAttributs().get("fo:break-after");
+ }
+ }
+ }
}
}
@@ -720,17 +723,24 @@ public class evaluationAttribut {
String typeSautStudent = "pas de saut";
String typeSautSujet = "pas de saut";
- if(sujet.getAttributs().get("text:style-name")!=null) {
+ if(sujet.getAttributs().get("text:style-name")!=null) {
String styleName = sujet.getAttributs().get("text:style-name");
- node styleSujet = sujet.racineDuNode().retourneFirstEnfantsByName("style:paragraph").retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", styleName);
+ node styleSujet = sujet.racineDuNode().retourneFirstEnfantsByName("style:paragraph");
if(styleSujet!=null) {
- styleSujet = styleSujet.retourneFirstEnfantsByName("style:paragraph-properties");
- if(styleSujet!=null) {
- if(styleSujet.getAttributs().get("fo:break-before")!=null) {
- typeSautSujet = styleSujet.getAttributs().get("fo:break-before");
- typeSautSujet = evaluation.withoutCodeAndPointPourRechercheContenuExact(typeSautSujet);
- }
- }
+ styleSujet = styleSujet.retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", styleName);
+ if(styleSujet!=null) {
+ styleSujet = styleSujet.retourneFirstEnfantsByName("style:paragraph-properties");
+ if(styleSujet!=null) {
+ if(styleSujet.getAttributs().get("fo:break-before")!=null) {
+ typeSautSujet = styleSujet.getAttributs().get("fo:break-before");
+ typeSautSujet = evaluation.withoutCodeAndPointPourRechercheContenuExact(typeSautSujet);
+ }
+ if(styleSujet.getAttributs().get("fo:break-after")!=null) {
+ typeSautSujet = styleSujet.getAttributs().get("fo:break-after");
+ typeSautStudent = styleSujet.getAttributs().get("fo:break-after");
+ }
+ }
+ }
}
}
diff --git a/src/fenetres/createPopupMenu.java b/src/fenetres/createPopupMenu.java
index 4ba8ca5..a45ad53 100644
--- a/src/fenetres/createPopupMenu.java
+++ b/src/fenetres/createPopupMenu.java
@@ -331,7 +331,7 @@ public class createPopupMenu extends JPopupMenu {
* Evaluation de l'ancrage du node dans la page par son numéro absolue.
* @return
*/
- private JMenu mnEvalAncrageNumeroAbsoluPageAncrage() {
+ private JMenu 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());
@@ -774,7 +774,7 @@ public class createPopupMenu extends JPopupMenu {
if(listeDesNodesAncrable.isAncrable(nod)) {
mnGroupeMethodeEvaluer.addSeparator();
- mnGroupeMethodeEvaluer.add(mnEvalAncrageNumeroAbsoluPageAncrage());
+ mnGroupeMethodeEvaluer.add(mnEvalAncrageNumeroAbsoluPage());
}
if(listeDesNodesFormatageDirect.isFormatageDirect(nod)) {
diff --git a/src/list/listeDesNodesAllContent.java b/src/list/listeDesNodesAllContent.java
index fa21acd..e1ed353 100644
--- a/src/list/listeDesNodesAllContent.java
+++ b/src/list/listeDesNodesAllContent.java
@@ -10,13 +10,19 @@ public class listeDesNodesAllContent {
* @return
*/
public static boolean isAllContent(node nod) {
- if(nod.retourneLesContenusEnfants("").length()<=0) return false;
+ if(nod.getNomElt().equals("text:title")) return true;
+ if(nod.getNomElt().equals("text:subject")) return true;
+ if(nod.getNomElt().equals("page")) return true;
+
+ if(nod.getNomElt().equals("text:page-number")) return false;
+ if(nod.getNomElt().equals("text:page-count")) return false;
if(nod.getNomElt().equals("OU")) return false;
if(nod.getNomElt().equals("text:conditional-text")) return false;
if(nod.getNomElt().contains("text:bookmark")) return false;
- if(nod.getNomElt().equals("page")) return true;
+ if(nod.retourneLesContenusEnfants("").length()<=0) return false;
if(nod.getNomElt().contains("text:")) return true;
+
return true;
}
diff --git a/src/list/listeDesNodesAncrable.java b/src/list/listeDesNodesAncrable.java
index 8925581..6d18822 100644
--- a/src/list/listeDesNodesAncrable.java
+++ b/src/list/listeDesNodesAncrable.java
@@ -4,9 +4,17 @@ import cXML.node;
public class listeDesNodesAncrable {
-
+ /**
+ * Retourne True si le node est un enfant du node structurepage.
+ * Et s'il peut être contenu dans le node page.
+ * @param nod
+ * @return
+ */
public static Boolean isAncrable(node nod) {
+ if(nod.retourneNodeStructurePage()==null) return false;
+
+
String nameNode = nod.getNomElt();
switch (nameNode) {