From 859bc459db87e6afbbc677ae496443f71453811c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <asamoukin@asamoukin.local.calculate.ru>
Date: Wed, 4 Aug 2010 09:56:19 +0000
Subject: [PATCH] Added newlines between fields for formats samba, plasma

---
 pym/format/plasma.py | 13 +++++++++++++
 pym/format/samba.py  | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/pym/format/plasma.py b/pym/format/plasma.py
index 927efda..9276208 100644
--- a/pym/format/plasma.py
+++ b/pym/format/plasma.py
@@ -546,6 +546,19 @@ class plasma(samba):
                                                             [],"",[],
                                                             False,False),
                                                             xmlFields[0])
+            # Добавление переводов строк между полями
+            if xmlFields:
+                for node in xmlFields:
+                    # Добавление перевода строк в если его нет между полями
+                    if self.docObj.getTypeField(node) == "var" and\
+                        node.previousSibling and\
+                        not (self.docObj.getTypeField(node.previousSibling) in\
+                             ("br","comment")):
+                        xmlArea.insertBefore(self.docObj.createField("br",
+                                                                     [],"",[],
+                                                                     False,
+                                                                     False),
+                                             node)
             # Если последним полем BR, удаляем его
             if xmlFields and self.docObj.getTypeField(xmlFields[-1]) == "br":
                     if not xmlFields[-1].nextSibling:
diff --git a/pym/format/samba.py b/pym/format/samba.py
index 88ea04a..f5be7d9 100644
--- a/pym/format/samba.py
+++ b/pym/format/samba.py
@@ -61,6 +61,19 @@ class samba(objShare):
                                                             [],"",[],
                                                             False,False),
                                                             nextNode)
+            # Добавление переводов строк между полями
+            if xmlFields:
+                for node in xmlFields:
+                    # Добавление перевода строк в если его нет между полями
+                    if self.docObj.getTypeField(node) == "var" and\
+                        node.previousSibling and\
+                        not (self.docObj.getTypeField(node.previousSibling) in\
+                             ("br","comment")):
+                        xmlArea.insertBefore(self.docObj.createField("br",
+                                                                     [],"",[],
+                                                                     False,
+                                                                     False),
+                                             node)
         # Удаление лишних переводов строк
         childNodes = self.docObj.getFieldsArea(self.docObj.body)
         lenBr = 0