X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=publishing%2Forg.argeo.publishing.ui%2Fsrc%2Forg%2Fargeo%2Fdocbook%2Fui%2FAbstractDbkViewer.java;h=45737180acd3fc15dab39152efcba9c3844ffaca;hp=b21f502eb43c2efe3f76bf8fa9ad3a3aaa0f1429;hb=7b6b34f956c231ec4dc7aab0acf85c6e7b592e39;hpb=06db6a211a46ba994d007e30f62704165c413177

diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java
index b21f502..4573718 100644
--- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java
+++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java
@@ -238,9 +238,9 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke
 			if (part instanceof EditableText) {
 				EditableText paragraph = (EditableText) part;
 				if (paragraph == getEdited())
-					paragraph.setText(textInterpreter.read(partNode));
-				else
 					paragraph.setText(textInterpreter.raw(partNode));
+				else
+					paragraph.setText(textInterpreter.readSimpleHtml(partNode));
 			} else if (part instanceof EditableImage) {
 				EditableImage editableImage = (EditableImage) part;
 				imageManager.load(partNode, part.getControl(), editableImage.getPreferredImageSize());
@@ -265,7 +265,8 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke
 				return;
 			String text = ((Text) et.getControl()).getText();
 
-			String[] lines = text.split("[\r\n]+");
+			// String[] lines = text.split("[\r\n]+");
+			String[] lines = { text };
 			assert lines.length != 0;
 			saveLine(part, lines[0]);
 			if (lines.length > 1) {
@@ -777,7 +778,8 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke
 //				cancelEdit();
 				saveEdit();
 			} else if (ke.character == '\r') {
-				splitEdit();
+				if (!shiftPressed)
+					splitEdit();
 			} else if (ke.character == 'z') {
 				if (ctrlPressed)
 					cancelEdit();