Experiment with support for multiple lines within a paragraph.

[gpl/argeo-suite.git] / publishing / org.argeo.publishing.ui / src / org / argeo / docbook / ui / AbstractDbkViewer.java

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 b21f502eb43c2efe3f76bf8fa9ad3a3aaa0f1429..45737180acd3fc15dab39152efcba9c3844ffaca 100644 (file)
--- 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();