From 73345c7dc06a6488f34d4a76906a62171a519278 Mon Sep 17 00:00:00 2001
From: Aleksey Veresov <aleksey@veresov.pro>
Date: Tue, 5 Nov 2019 19:46:50 +0300
Subject: [texo] Medium has been changed.

---
 src/lines.cpp | 54 +++++++++++++-----------------------------------------
 1 file changed, 13 insertions(+), 41 deletions(-)

(limited to 'src/lines.cpp')

diff --git a/src/lines.cpp b/src/lines.cpp
index f77ae40..3d93598 100644
--- a/src/lines.cpp
+++ b/src/lines.cpp
@@ -10,6 +10,7 @@ void TexoProducerLines::Put(const Texo &piece)
     if (piece.c == '\n') {
         if (!newline) {
             exporter.Put(' ');
+            newline = true;
         }
     } else {
         exporter.Put(piece.c);
@@ -19,65 +20,36 @@ void TexoProducerLines::Put(const Texo &piece)
 
 void TexoProducerLines::Put(const TexoParagraph &piece)
 {
-    if (piece.closing) {
-        exporter.Put('\n');
-        newline = true;
-    }
+    exporter.Put('\n');
+    newline = true;
 }
 
 void TexoProducerLines::Put(const TexoQuote &piece)
 {
-    if (piece.closing) {
-        exporter.Put('\n');
-        newline = true;
-    } else {
-        exporter.Put('>');
-    }
-}
-
-void TexoProducerLines::Put(const TexoLineBreak &piece)
-{
-    exporter.Put('\n');
-    newline = true;
+    exporter.Put("\n>");
+    newline = false;
 }
 
 
 TexoImporterLines::TexoImporterLines(TexoProducer &producer):
-    TexoImporter(producer), quoted(false), newline(true)
+    TexoImporter(producer), newline(true)
 {}
 
-TexoImporterLines::~TexoImporterLines()
-{
-    if (!newline) {
-        if (quoted) {
-            producer.Put(TexoQuote(true));
-        } else {
-            producer.Put(TexoParagraph(true));
-        }
-    }
-}
-
 void TexoImporterLines::Put(char c)
 {
     if (c == '\n') {
         if (!newline) {
-            if (quoted) {
-                producer.Put(TexoQuote(true));
-                quoted = false;
-            } else {
-                producer.Put(TexoParagraph(true));
-            }
             newline = true;
         }
-    } else if (newline && c == '>') {
-        producer.Put(TexoQuote());
-        newline = false;
-        quoted  = true;
-    } else {
-        if (newline) {
+    } else if (newline) {
+        if (c == '>') {
+            producer.Put(TexoQuote());
+        } else {
             producer.Put(TexoParagraph());
-            newline = false;
+            producer.Put(c);
         }
+        newline = false;
+    } else {
         producer.Put(c);
     }
 }
-- 
cgit v1.2.3