MAJ V4.4.2 - prend en compte les sauts de page et de colonne après le

paragraphe dans la méthode evalSautPageColonne
This commit is contained in:
pablo rodriguez 2022-12-26 12:04:34 +01:00
parent 6bccbd6014
commit 75845d2903
5 changed files with 10 additions and 0 deletions

Binary file not shown.

Binary file not shown.

3
bin/.gitignore vendored
View File

@ -129,3 +129,6 @@
/sautpagecolonne.png /sautpagecolonne.png
/sautpagecolonnemini.png /sautpagecolonnemini.png
/resources/ /resources/
/evalpasparagraphevide.png
/evalpasparagraphevide.svg
/evalpasparagraphevidemini.png

Binary file not shown.

View File

@ -685,6 +685,9 @@ public class evaluationAttribut {
if(styleStudent.getAttributs().get("fo:break-before")!=null) { if(styleStudent.getAttributs().get("fo:break-before")!=null) {
typeSautStudent = styleStudent.getAttributs().get("fo:break-before"); 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 = styleSujet.getAttributs().get("fo:break-before");
typeSautSujet = evaluation.withoutCodeAndPointPourRechercheContenuExact(typeSautSujet); 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");
}
} }
} }
} }