From 233c346c4af51371cb4744be5e1c9798d2fcac02 Mon Sep 17 00:00:00 2001 From: Aleksey Veresov Date: Fri, 15 Nov 2019 19:14:11 +0300 Subject: . --- src/html.cpp | 11 ++++++----- src/html.hpp | 5 +++-- src/markdown.cpp | 12 ++++++------ src/markdown.hpp | 5 +++-- src/plain.cpp | 5 ++--- src/producer.cpp | 14 ++++++++------ src/producer.hpp | 28 ++++++++++++++-------------- 7 files changed, 42 insertions(+), 38 deletions(-) diff --git a/src/html.cpp b/src/html.cpp index fb2fb5e..d492c19 100644 --- a/src/html.cpp +++ b/src/html.cpp @@ -131,8 +131,8 @@ bool TexoProducerHTML::CloseUnderline() return exporter.Put(""); } -bool TexoProducerHTML::StartLink( - const ScriptVariable & link, const ScriptVariable & title) +bool TexoProducerHTML::StartLink(const ScriptVariable & link, + const ScriptVariable & title) { bool ok = true; if (link != "") { @@ -147,8 +147,8 @@ bool TexoProducerHTML::StartLink( return ok; } -bool TexoProducerHTML::CloseLink( - const ScriptVariable & link, const ScriptVariable & title) +bool TexoProducerHTML::CloseLink(const ScriptVariable & link, + const ScriptVariable & title) { if (link != "") { return exporter.Put(""); @@ -159,7 +159,8 @@ bool TexoProducerHTML::CloseLink( bool TexoProducerHTML::TruePutImage(const ScriptVariable & src, - const ScriptVariable & alt, const ScriptVariable & title) + const ScriptVariable & alt, + const ScriptVariable & title) { bool ok = true; if (src != "") { diff --git a/src/html.hpp b/src/html.hpp index c32b119..cc69f10 100644 --- a/src/html.hpp +++ b/src/html.hpp @@ -38,8 +38,9 @@ protected: bool StartLink(const ScriptVariable & link, const ScriptVariable & title); bool CloseLink(const ScriptVariable & link, const ScriptVariable & title); - bool TruePutImage(const ScriptVariable & src, const ScriptVariable & alt, - const ScriptVariable & title); + bool TruePutImage(const ScriptVariable & src, + const ScriptVariable & alt, + const ScriptVariable & title); bool TruePutHorizontalRule(); }; diff --git a/src/markdown.cpp b/src/markdown.cpp index 2a88717..fd5aaec 100644 --- a/src/markdown.cpp +++ b/src/markdown.cpp @@ -104,8 +104,8 @@ bool TexoProducerMarkdown::Strike() return Mod("~~"); } -bool TexoProducerMarkdown::Link( - const ScriptVariable & link, const ScriptVariable & title) +bool TexoProducerMarkdown::Link(const ScriptVariable & link, + const ScriptVariable & title) { bool ok = Link(); if (link != "") { @@ -134,7 +134,8 @@ bool TexoProducerMarkdown::Link() bool TexoProducerMarkdown::PutImage(const ScriptVariable & src, - const ScriptVariable & alt, const ScriptVariable & title) + const ScriptVariable & alt, + const ScriptVariable & title) { bool ok = true; if (src != "") { @@ -161,9 +162,8 @@ bool TexoProducerMarkdown::PutHorizontalRule() ok = ok && exporter.Put('\n'); } nospace = true; - return ok - && exporter.Put( - "--------------------------------------------------\n"); + return ok && exporter.Put( + "--------------------------------------------------\n"); } diff --git a/src/markdown.hpp b/src/markdown.hpp index d8af037..6d9919d 100644 --- a/src/markdown.hpp +++ b/src/markdown.hpp @@ -28,8 +28,9 @@ public: bool Link(const ScriptVariable & link, const ScriptVariable & title); bool Link(); - bool PutImage(const ScriptVariable & src, const ScriptVariable & alt, - const ScriptVariable & title); + bool PutImage(const ScriptVariable & src, + const ScriptVariable & alt, + const ScriptVariable & title); bool PutHorizontalRule(); private: diff --git a/src/plain.cpp b/src/plain.cpp index 1df6659..dca394f 100644 --- a/src/plain.cpp +++ b/src/plain.cpp @@ -70,9 +70,8 @@ bool TexoProducerPlain::PutHorizontalRule() ok = exporter.Put('\n'); } nospace = true; - return ok - && exporter.Put( - "--------------------------------------------------\n"); + return ok && exporter.Put( + "--------------------------------------------------\n"); } diff --git a/src/producer.cpp b/src/producer.cpp index 99e34e1..5d08369 100644 --- a/src/producer.cpp +++ b/src/producer.cpp @@ -66,8 +66,8 @@ bool TexoProducer::Underline() return true; } -bool TexoProducer::Link( - const ScriptVariable & link, const ScriptVariable & title) +bool TexoProducer::Link(const ScriptVariable & link, + const ScriptVariable & title) { return true; } @@ -79,7 +79,8 @@ bool TexoProducer::Link() bool TexoProducer::PutImage(const ScriptVariable & src, - const ScriptVariable & alt, const ScriptVariable & title) + const ScriptVariable & alt, + const ScriptVariable & title) { return true; } @@ -179,8 +180,8 @@ bool TexoProducerStrict::Underline() return SwitchMod(underline); } -bool TexoProducerStrict::Link( - const ScriptVariable & path, const ScriptVariable & title) +bool TexoProducerStrict::Link(const ScriptVariable & path, + const ScriptVariable & title) { if (IsOpened(link)) { int closed = CloseMods(link); @@ -210,7 +211,8 @@ bool TexoProducerStrict::Link() } bool TexoProducerStrict::PutImage(const ScriptVariable & src, - const ScriptVariable & alt, const ScriptVariable & title) + const ScriptVariable & alt, + const ScriptVariable & title) { return Start() && TruePutImage(src, alt, title); } diff --git a/src/producer.hpp b/src/producer.hpp index c310e19..ff79210 100644 --- a/src/producer.hpp +++ b/src/producer.hpp @@ -36,13 +36,14 @@ public: virtual bool Underline(); // Switch link to given or switch it off, if no one is given. - virtual bool Link( - const ScriptVariable & link, const ScriptVariable & title); + virtual bool Link(const ScriptVariable & link, + const ScriptVariable & title); virtual bool Link(); virtual bool PutImage(const ScriptVariable & src, - const ScriptVariable & alt, const ScriptVariable & title); + const ScriptVariable & alt, + const ScriptVariable & title); virtual bool PutHorizontalRule(); @@ -83,8 +84,9 @@ public: bool Link(const ScriptVariable & path, const ScriptVariable & title); bool Link(); - bool PutImage(const ScriptVariable & src, const ScriptVariable & alt, - const ScriptVariable & title); + bool PutImage(const ScriptVariable & src, + const ScriptVariable & alt, + const ScriptVariable & title); bool PutHorizontalRule(); @@ -114,18 +116,16 @@ protected: virtual bool CloseStrike() = 0; virtual bool CloseUnderline() = 0; - virtual bool StartLink( - const ScriptVariable & link, const ScriptVariable & title) - = 0; - virtual bool CloseLink( - const ScriptVariable & link, const ScriptVariable & title) - = 0; + virtual bool StartLink(const ScriptVariable & link, + const ScriptVariable & title) = 0; + virtual bool CloseLink(const ScriptVariable & link, + const ScriptVariable & title) = 0; virtual bool TruePutImage(const ScriptVariable & src, - const ScriptVariable & alt, const ScriptVariable & title) - = 0; - virtual bool TruePutHorizontalRule() = 0; + const ScriptVariable & alt, + const ScriptVariable & title) = 0; + virtual bool TruePutHorizontalRule() = 0; private: -- cgit v1.2.3