MAJ V4.4.2 - mise à jour des listes

.classpath

@@ -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" sourcepath="/cXML"/>
+	<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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

bin/evalpasparagraphevide.svg

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="45"
+   height="45"
+   viewBox="0 0 11.90625 11.90625"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   sodipodi:docname="evalpasparagraphevide.svg"
+   inkscape:export-filename="evalpasparagraphevidemini.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"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="14.50748"
+     inkscape:cx="17.542674"
+     inkscape:cy="20.368803"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <text
+       xml:space="preserve"
+       style="font-size:11.7061px;line-height:1.2;font-family:Symbol;-inkscape-font-specification:Symbol;stroke-width:0.264583;fill:#0000ff"
+       x="0.95308274"
+       y="8.9726267"
+       id="text265"
+       transform="scale(0.9988156,1.0011858)"><tspan
+         sodipodi:role="line"
+         id="tspan263"
+         style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:11.7061px;font-family:Arial;-inkscape-font-specification:'Arial Heavy';stroke-width:0.264583;fill:#0000ff"
+         x="0.95308274"
+         y="8.9726267">¶</tspan></text>
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.8;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1.0395499,0.83893503 10.924393,11.252672"
+       id="path479"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.8;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10.924393,0.83893503 1.0395499,11.252672"
+       id="path1131"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>

bin/sautpageColonne.svg

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="45"
+   height="45"
+   viewBox="0 0 11.90625 11.90625"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   sodipodi:docname="sautpageColonne.svg"
+   inkscape:export-filename="sautpagecolonnemini.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"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     showguides="true"
+     inkscape:zoom="16.511111"
+     inkscape:cx="22.5"
+     inkscape:cy="22.076043"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <sodipodi:guide
+       position="2.7722493,6.922611"
+       orientation="1,0"
+       id="guide1265"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="9.0378533,10.544162"
+       orientation="1,0"
+       id="guide1267"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="2.7722493,10.576211"
+       orientation="0,-1"
+       id="guide1269"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2">
+    <marker
+       style="overflow:visible"
+       id="Arrow4"
+       refX="0"
+       refY="0"
+       orient="auto-start-reverse"
+       inkscape:stockid="Arrow4"
+       markerWidth="5"
+       markerHeight="6"
+       viewBox="0 0 5 6"
+       inkscape:isstock="true"
+       inkscape:collect="always"
+       preserveAspectRatio="xMidYMid">
+      <path
+         style="fill:context-stroke;fill-rule:evenodd;stroke:none"
+         d="m 1,0 -3,3 h -2 l 3,-3 -3,-3 h 2 z"
+         id="path1741" />
+    </marker>
+  </defs>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#ffcc00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000"
+       id="rect234"
+       width="5.3041301"
+       height="7.7238393"
+       x="0.49676141"
+       y="3.0767162" />
+    <rect
+       style="fill:#ffcc00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000"
+       id="rect344"
+       width="5.3041301"
+       height="7.7238393"
+       x="6.3136778"
+       y="3.0286424" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.873125;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow4)"
+       d="m 2.7722493,5.6887196 0,-4.3586809 6.265604,3e-7 0,4.3907297"
+       id="path400"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>

src/evaluer/evaluationAttribut.java

@@ -694,7 +694,9 @@ 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.retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", styleName);
   	  				if(styleSujet!=null) {
   	  					styleSujet = styleSujet.retourneFirstEnfantsByName("style:paragraph-properties");
   	  					if(styleSujet!=null) {
@@ -709,6 +711,7 @@ public class evaluationAttribut {
   	  					}
   	  				}
   				}
+  			}
   			
 
 			retour = evaluationSautPageColonne(retour,typeSautStudent, typeSautSujet, sujet.getAttributs().get("evalSautPageColonne"),"Saut");
@@ -722,7 +725,9 @@ 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.retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", styleName);
   	  				if(styleSujet!=null) {
   	  					styleSujet = styleSujet.retourneFirstEnfantsByName("style:paragraph-properties");
   	  					if(styleSujet!=null) {
@@ -730,6 +735,11 @@ public class evaluationAttribut {
   	  	  	  					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");
+  	  						}
+  	  					}
   	  				}
   				}
   			}

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.</br>
 	 * @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)) {

src/list/listeDesNodesAllContent.java

@@ -10,14 +10,20 @@ 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;
 	}
 	

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.</br>
+	 * Et s'il peut être contenu dans le node page.</br>
+	 * @param nod
+	 * @return
+	 */
 	public static Boolean isAncrable(node nod) {
 		
+		if(nod.retourneNodeStructurePage()==null) return false;
+		
+		
 		String nameNode = nod.getNomElt();
 		
 		switch (nameNode) {