From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Wed, 6 Dec 2006 10:49:55 +0000 (+0000)
Subject: PN
X-Git-Tag: V1_11b4~18
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c24184af0dda3c51ee74633cb8fc7fa1f8ca5f07;p=tools%2Feficas.git

PN
---

diff --git a/generator/Formatage.py b/generator/Formatage.py
index c573d652..46b2bbfc 100644
--- a/generator/Formatage.py
+++ b/generator/Formatage.py
@@ -186,12 +186,13 @@ class Formatage :
       longueur = self.longueur(self.texte_etape)
       increment = len(('\n'+self.indent_courant*' ')*ind + string.strip(s_mcsimp))
       #self.jdc_fini = self.jdc_fini + ('\n'+self.indent_courant*' ')*ind + string.strip(s_mcsimp)
-      if ((1-ind)*longueur+increment)  <= self.l_max :
+      if (bool_fonction == 1 ) :
+          self.texte_etape = self.texte_etape +s_mcsimp
+      elif ( ((1-ind)*longueur+increment) <= self.l_max ) :
           self.texte_etape = self.texte_etape + ('\n'+self.indent_courant*' ')*ind + string.strip(s_mcsimp)
       else :
           # il faut couper ...
-          if bool_fonction == 0 :
-             nom,valeur = string.split(s_mcsimp,self.sep,1)
+          nom,valeur = string.split(s_mcsimp,self.sep,1)
           chaine = self.creer_chaine(nom,valeur,'\n'+self.indent_courant*' ',ind)
           #self.jdc_fini = self.jdc_fini + ('\n'+self.indent_courant*' ')*ind + string.strip(s_mcsimp)
           self.texte_etape = self.texte_etape + chaine