pablo/analyseWriter
pablo/analyseWriter
1
1
Fork 0
Code Issues Pull Requests Projects Releases 14 Wiki Activity

MAJ V4.4.3 (correction bug dans l'évaluation de l'attribut evalsautpage)

Browse Source
This commit is contained in:
pablo rodriguez 2023-03-15 08:54:16 +01:00
parent 4c1d8ddc2c
commit d66267e229
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
analyseWriter.exe
View File

Binary file not shown.

BIN
analyseWriter.jar
View File

Binary file not shown.

BIN
bin/evaluer/evaluationAttribut.class
View File

Binary file not shown.

8
src/evaluer/evaluationAttribut.java
View File

@ -774,14 +774,18 @@ public class evaluationAttribut {
styleStudent = styleStudent.retourneFirstEnfantsByName("style:paragraph-properties"); styleStudent = styleStudent.retourneFirstEnfantsByName("style:paragraph-properties");
if(styleStudent!=null) { if(styleStudent!=null) {
if(styleStudent.getAttributs().get("fo:break-before")!=null) { if(styleStudent.getAttributs().get("fo:break-before")!=null) {
if(styleStudent.getAttributs().get("fo:break-before")!="none") {
typeSautStudent = styleStudent.getAttributs().get("fo:break-before"); typeSautStudent = styleStudent.getAttributs().get("fo:break-before");
} }
}
if(styleStudent.getAttributs().get("fo:break-after")!=null) { if(styleStudent.getAttributs().get("fo:break-after")!=null) {
if(styleStudent.getAttributs().get("fo:break-after")!="none") {
typeSautStudent = styleStudent.getAttributs().get("fo:break-after"); typeSautStudent = styleStudent.getAttributs().get("fo:break-after");
} }
} }
} }
} }
}
if(sujet.getAttributs().get("text:style-name")!=null) { if(sujet.getAttributs().get("text:style-name")!=null) {
String styleName = sujet.getAttributs().get("text:style-name"); String styleName = sujet.getAttributs().get("text:style-name");
@ -792,15 +796,19 @@ public class evaluationAttribut {
styleSujet = styleSujet.retourneFirstEnfantsByName("style:paragraph-properties"); styleSujet = styleSujet.retourneFirstEnfantsByName("style:paragraph-properties");
if(styleSujet!=null) { if(styleSujet!=null) {
if(styleSujet.getAttributs().get("fo:break-before")!=null) { if(styleSujet.getAttributs().get("fo:break-before")!=null) {
if(styleSujet.getAttributs().get("fo:break-before")!="none") {
typeSautSujet = styleSujet.getAttributs().get("fo:break-before"); typeSautSujet = styleSujet.getAttributs().get("fo:break-before");
} }
}
if(styleSujet.getAttributs().get("fo:break-after")!=null) { if(styleSujet.getAttributs().get("fo:break-after")!=null) {
if(styleSujet.getAttributs().get("fo:break-after")!="none") {
typeSautSujet = styleSujet.getAttributs().get("fo:break-after"); typeSautSujet = styleSujet.getAttributs().get("fo:break-after");
} }
} }
} }
} }
} }
}
typeSautSujet = evaluation.withoutCodeAndPointPourRechercheContenuExact(typeSautSujet); typeSautSujet = evaluation.withoutCodeAndPointPourRechercheContenuExact(typeSautSujet);
if(typeSautSujet.equals("auto")) typeSautSujet="page"; if(typeSautSujet.equals("auto")) typeSautSujet="page";
if(typeSautStudent.equals("auto")) typeSautStudent="page"; if(typeSautStudent.equals("auto")) typeSautStudent="page";