diff --git a/analyseWriter.exe b/analyseWriter.exe index abf3e94..d78ad2e 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index 3beadc8..ab09d75 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index 0952eba..c47d7ed 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -129,3 +129,6 @@ /sautpagecolonne.png /sautpagecolonnemini.png /resources/ +/evalpasparagraphevide.png +/evalpasparagraphevide.svg +/evalpasparagraphevidemini.png diff --git a/bin/evaluer/evaluationAttribut.class b/bin/evaluer/evaluationAttribut.class index a8e7be4..f69ba90 100644 Binary files a/bin/evaluer/evaluationAttribut.class and b/bin/evaluer/evaluationAttribut.class differ diff --git a/src/evaluer/evaluationAttribut.java b/src/evaluer/evaluationAttribut.java index 6a7c057..25b3dec 100644 --- a/src/evaluer/evaluationAttribut.java +++ b/src/evaluer/evaluationAttribut.java @@ -685,6 +685,9 @@ public class evaluationAttribut { if(styleStudent.getAttributs().get("fo:break-before")!=null) { typeSautStudent = styleStudent.getAttributs().get("fo:break-before"); } + if(styleStudent.getAttributs().get("fo:break-after")!=null) { + typeSautStudent = styleStudent.getAttributs().get("fo:break-after"); + } } } } @@ -699,6 +702,10 @@ 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"); + } } } }