diff --git a/.classpath b/.classpath index 7242b9c..ea03344 100644 --- a/.classpath +++ b/.classpath @@ -14,6 +14,6 @@ - + diff --git a/analyseWriter.exe b/analyseWriter.exe index c8a086d..c80b6ce 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index b574881..0c18ede 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index 75cdcb7..0000000 --- a/bin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/fenetres/ diff --git a/bin/fenetres/afficheText.class b/bin/fenetres/afficheText.class index b37bc36..20bd666 100644 Binary files a/bin/fenetres/afficheText.class and b/bin/fenetres/afficheText.class differ diff --git a/bin/fenetres/baliseStyle.class b/bin/fenetres/baliseStyle.class index e3beee0..915e9e1 100644 Binary files a/bin/fenetres/baliseStyle.class and b/bin/fenetres/baliseStyle.class differ diff --git a/bin/fenetres/create_act/actOu.class b/bin/fenetres/create_act/actOu.class new file mode 100644 index 0000000..2d4d55d Binary files /dev/null and b/bin/fenetres/create_act/actOu.class differ diff --git a/bin/fenetres/create_act/ou.png b/bin/fenetres/create_act/ou.png new file mode 100644 index 0000000..a81162e Binary files /dev/null and b/bin/fenetres/create_act/ou.png differ diff --git a/bin/fenetres/create_act/oumini.png b/bin/fenetres/create_act/oumini.png new file mode 100644 index 0000000..5d659bf Binary files /dev/null and b/bin/fenetres/create_act/oumini.png differ diff --git a/bin/fenetres/evaluate$30.class b/bin/fenetres/evaluate$30.class new file mode 100644 index 0000000..bdeafd6 Binary files /dev/null and b/bin/fenetres/evaluate$30.class differ diff --git a/bin/fenetres/evaluate$31.class b/bin/fenetres/evaluate$31.class new file mode 100644 index 0000000..19e471d Binary files /dev/null and b/bin/fenetres/evaluate$31.class differ diff --git a/src/fenetres/afficheText.java b/src/fenetres/afficheText.java index 3f7778a..f624abe 100644 --- a/src/fenetres/afficheText.java +++ b/src/fenetres/afficheText.java @@ -270,10 +270,13 @@ public class afficheText extends JEditorPane { } } - + //********************************** + //** Affiche le contenu d'un node ** + //********************************** if(!nod.getNomElt().equals("fichier")&&!nod.getNomElt().equals("setting")&&!nod.getNomElt().equals("structurepage")) { if(!nod.retourneLesContenusEnfants("").isEmpty()) { - sb.append("

Contenu


" + nod.retourneLesContenusEnfants("") ); + sb.append("

Contenu

" + nod.retourneLesContenusEnfants2("").replace("'", "’") + "
" ); //+ nod.retourneLesContenusEnfants("") + System.out.println(nod.retourneLesContenusEnfants2("").replace("'", "’")); } } diff --git a/src/fenetres/baliseStyle.java b/src/fenetres/baliseStyle.java index a2e4edb..35fb8e6 100644 --- a/src/fenetres/baliseStyle.java +++ b/src/fenetres/baliseStyle.java @@ -27,6 +27,7 @@ public class baliseStyle { + "p.p4{margin-left: 0px; margin-bottom: 0cm; margin-top: 4px; line-height: 115%}" + "p.p5 {color: navy;text-indent: 30px;}" + ".center { display: block;margin-left: auto;margin-right: auto;width: 50%}" + + ".tabulation { display: inline-block; margin-left: 40px;} " + ""; }