write(string) methods removed from writers

content.cpp

@@ -15,7 +15,8 @@
 namespace {
 
 void writeRemainingSpaces(ContentContext &context) {
-	context.w.writeVisibleText_escaped(std::string(context.remainingSpacesCount, ' '));
+	for (uint32_t i = 0; i < context.remainingSpacesCount; ++i)
+		context.w.writeVisibleText_escaped(' ');
 
 	if (context.remainingSpacesCount > 0) {
 		context.lastWasStyleEnd = false;
@@ -51,18 +52,20 @@ void writeStyleDiff(ContentContext &context, const Style &oldStyle, const Style
 
 	if (disablingItalic) {
 		if ((context.outerIsItalic) && (inBold || disablingBold)) {
-			context.w.writeMarkup("**");
+			context.w.writeMarkup('*');
+			context.w.writeMarkup('*');
 			disablingBold = false;
 		}
 
-		context.w.writeMarkup("_");
+		context.w.writeMarkup('_');
 		context.lastWasStyleEnd = true;
 
 		if ((context.outerIsItalic) && (inBold)) {
 			::writeRemainingSpaces(context);
 			::writeSpaceBeforeStyleIfNeeded(context);
 
-			context.w.writeMarkup("**");
+			context.w.writeMarkup('*');
+			context.w.writeMarkup('*');
 			context.lastWasStyleEnd = false;
 
 			context.outerIsItalic = false;
@@ -71,17 +74,18 @@ void writeStyleDiff(ContentContext &context, const Style &oldStyle, const Style
 
 	if (disablingBold) {
 		if ((! context.outerIsItalic) && (inItalic)) {
-			context.w.writeMarkup("_");
+			context.w.writeMarkup('_');
 		}
 
-		context.w.writeMarkup("**");
+		context.w.writeMarkup('*');
+		context.w.writeMarkup('*');
 		context.lastWasStyleEnd = true;
 
 		if ((! context.outerIsItalic) && (inItalic)) {
 			::writeRemainingSpaces(context);
 			::writeSpaceBeforeStyleIfNeeded(context);
 
-			context.w.writeMarkup("_");
+			context.w.writeMarkup('_');
 			context.lastWasStyleEnd = false;
 
 			context.outerIsItalic = true;
@@ -95,7 +99,8 @@ void writeStyleDiff(ContentContext &context, const Style &oldStyle, const Style
 		::writeRemainingSpaces(context);
 		::writeSpaceBeforeStyleIfNeeded(context);
 
-		context.w.writeMarkup("**");
+		context.w.writeMarkup('*');
+		context.w.writeMarkup('*');
 		context.lastWasStyleEnd = false;
 	}
 
@@ -106,7 +111,7 @@ void writeStyleDiff(ContentContext &context, const Style &oldStyle, const Style
 		::writeRemainingSpaces(context);
 		::writeSpaceBeforeStyleIfNeeded(context);
 
-		context.w.writeMarkup("_");
+		context.w.writeMarkup('_');
 		context.lastWasStyleEnd = false;
 	}
 }

writer.h

@@ -1,20 +1,14 @@
 #pragma once
 
 #include <cstdint>
-#include <string>
 
 class Writer {
 
 public:
 	virtual ~Writer() {}
 
 	virtual void writeMarkup(const char c) = 0;
-	virtual void writeMarkup(const std::string &str) = 0;
-
 	virtual void writeVisibleText(const char c) = 0;
-	virtual void writeVisibleText(const std::string &str) = 0;
-
 	virtual void writeVisibleText_escaped(const char c) = 0;
-	virtual void writeVisibleText_escaped(const std::string &str) = 0;
 
 };

writer_collecting.cpp

@@ -17,36 +17,16 @@ void Writer_Collecting::writeMarkup(const char)
 {
 }
 
-void Writer_Collecting::writeMarkup(const std::string &)
-{
-}
-
 void Writer_Collecting::writeVisibleText(const char c)
 {
 	write(c);
 }
 
-void Writer_Collecting::writeVisibleText(const std::string &str)
-{
-	write(str);
-}
-
 void Writer_Collecting::writeVisibleText_escaped(const char c)
 {
 	write(c);
 }
 
-void Writer_Collecting::writeVisibleText_escaped(const std::string &str)
-{
-	write(str);
-}
-
 void Writer_Collecting::write(const char c) {
 	collectedVisibleText << c;
 }
-
-void Writer_Collecting::write(const std::string &str) {
-	for (const char c : str) {
-		write(c);
-	}
-}

writer_collecting.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <sstream>
+#include <string>
 #include "writer.h"
 
 class Writer_Collecting : public Writer {
@@ -11,17 +12,11 @@ class Writer_Collecting : public Writer {
 
 public:
 	virtual void writeMarkup(const char c) override;
-	virtual void writeMarkup(const std::string &str) override;
-
 	virtual void writeVisibleText(const char c) override;
-	virtual void writeVisibleText(const std::string &str) override;
-
 	virtual void writeVisibleText_escaped(const char c) override;
-	virtual void writeVisibleText_escaped(const std::string &str) override;
 
 private:
 	void write(const char c);
-	void write(const std::string &str);
 
 private:
 	std::ostringstream collectedVisibleText;

writer_output.cpp

@@ -21,21 +21,11 @@ void Writer_Output::writeMarkup(const char c)
 	write(c);
 }
 
-void Writer_Output::writeMarkup(const std::string &str)
-{
-	write(str);
-}
-
 void Writer_Output::writeVisibleText(const char c)
 {
 	write(c);
 }
 
-void Writer_Output::writeVisibleText(const std::string &str)
-{
-	write(str);
-}
-
 void Writer_Output::writeVisibleText_escaped(const char c)
 {
 	if (options().escapeInText.find(c) != std::string::npos) {
@@ -68,13 +58,6 @@ void Writer_Output::writeVisibleText_escaped(const char c)
 	}
 }
 
-void Writer_Output::writeVisibleText_escaped(const std::string &str)
-{
-	for (const char c : str) {
-		writeVisibleText_escaped(c);
-	}
-}
-
 void Writer_Output::write(const char c) {
 	os << c;
 

writer_output.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <iosfwd>
+#include <string>
 #include "writer.h"
 
 class Writer_Output : public Writer {
@@ -13,13 +14,8 @@ class Writer_Output : public Writer {
 
 public:
 	virtual void writeMarkup(const char c) override;
-	virtual void writeMarkup(const std::string &str) override;
-
 	virtual void writeVisibleText(const char c) override;
-	virtual void writeVisibleText(const std::string &str) override;
-
 	virtual void writeVisibleText_escaped(const char c) override;
-	virtual void writeVisibleText_escaped(const std::string &str) override;
 
 private:
 	void write(const char c);