From c6419eed96f2832b1de2b94d711552efaa9b172d Mon Sep 17 00:00:00 2001 From: Aleksey Veresov Date: Wed, 6 Nov 2019 20:09:07 +0300 Subject: [texo] Prettier print (+ fixes). --- src/html.cpp | 58 +++++++++++++++++++--------------------------------------- 1 file changed, 19 insertions(+), 39 deletions(-) (limited to 'src/html.cpp') diff --git a/src/html.cpp b/src/html.cpp index 4cf8174..f40b8bd 100644 --- a/src/html.cpp +++ b/src/html.cpp @@ -25,22 +25,22 @@ void TexoProducerHTML::Put(const TexoHeader &piece) { Close(); if (piece.level <= 1) { - exporter.Put("
"); + exporter.Put("\n
\n"); opened_block = header_6; } else if (piece.level == 2) { - exporter.Put("
"); + exporter.Put("\n
\n"); opened_block = header_5; } else if (piece.level == 3) { - exporter.Put("

"); + exporter.Put("\n

\n"); opened_block = header_4; } else if (piece.level == 4) { - exporter.Put("

"); + exporter.Put("\n

\n"); opened_block = header_3; } else if (piece.level == 5) { - exporter.Put("

"); + exporter.Put("\n

\n"); opened_block = header_2; } else { - exporter.Put("

"); + exporter.Put("\n

\n"); opened_block = header_1; } } @@ -49,21 +49,21 @@ void TexoProducerHTML::Put(const TexoParagraph &piece) { Close(); opened_block = paragraph; - exporter.Put("

"); + exporter.Put("\n

\n"); } void TexoProducerHTML::Put(const TexoCode &piece) { Close(); opened_block = code; - exporter.Put("

");
+    exporter.Put("\n
\n");
 }
 
 void TexoProducerHTML::Put(const TexoQuote &piece)
 {
     Close();
     opened_block = quote;
-    exporter.Put("

"); + exporter.Put("\n

\n"); } void TexoProducerHTML::Put(const TexoMono &piece) @@ -169,41 +169,21 @@ void TexoProducerHTML::Put(const TexoLink &piece) void TexoProducerHTML::Put(const TexoHorizontalRule &piece) { - exporter.Put("


"); + exporter.Put("\n
\n"); } void TexoProducerHTML::Close() { switch (opened_block) { case none: break; - case header_1: exporter.Put("

"); break; - case header_2: exporter.Put(""); break; - case header_3: exporter.Put(""); break; - case header_4: exporter.Put(""); break; - case header_5: exporter.Put(""); break; - case header_6: exporter.Put(""); break; - case paragraph: exporter.Put("

"); break; - case quote: exporter.Put("

"); break; - case code: exporter.Put(""); break; + case header_1: exporter.Put("\n\n"); break; + case header_2: exporter.Put("\n\n"); break; + case header_3: exporter.Put("\n\n"); break; + case header_4: exporter.Put("\n\n"); break; + case header_5: exporter.Put("\n\n"); break; + case header_6: exporter.Put("\n\n"); break; + case paragraph: exporter.Put("\n

\n"); break; + case quote: exporter.Put("\n

\n"); break; + case code: exporter.Put("\n\n"); break; } } - - -TexoImporterHTML::TexoImporterHTML(TexoProducer &producer): - TexoImporter(producer) -{} - -void TexoImporterHTML::Put(char c) -{ // TODO - producer.Put(Texo(c)); -} - -void TexoImporterHTML::Put(const ScriptVariable &str) -{ - TexoImporter::Put(str); -} - -void TexoImporterHTML::Put(FILE *file) -{ - TexoImporter::Put(file); -} -- cgit v1.2.3