* src/insets/insetbox.[Ch]:

	* src/insets/insetnote.[Ch]: fix plaintext()

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17207 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C
index 2af61d15e5f8c4343bb0e4a04d02b8b7be3cc14b..1bb0bd3713d3cddf3f7c071a977232fe503b2075 100644 (file)
--- a/src/insets/insetbox.C
+++ b/src/insets/insetbox.C
@@ -253,7 +253,7 @@ bool InsetBox::getStatus(LCursor & cur, FuncRequest const & cmd,
 
 
 int InsetBox::latex(Buffer const & buf, odocstream & os,
-                               OutputParams const & runparams) const
+                    OutputParams const & runparams) const
 {
        BoxType btype = boxtranslator().find(params_.type);
 
@@ -389,39 +389,40 @@ int InsetBox::latex(Buffer const & buf, odocstream & os,
 }
 
 
-int InsetBox::docbook(Buffer const & buf, odocstream & os,
-                     OutputParams const & runparams) const
-{
-       return InsetText::docbook(buf, os, runparams);
-}
-
-
 int InsetBox::plaintext(Buffer const & buf, odocstream & os,
-                   OutputParams const & runparams) const
+                        OutputParams const & runparams) const
 {
        BoxType const btype = boxtranslator().find(params_.type);
 
        switch (btype) {
                case Frameless: break;
-               case Boxed:     os << "[";  break;
-               case ovalbox:   os << "(";  break;
-               case Ovalbox:   os << "(("; break;
-               case Shadowbox: os << "[";  break;
-               case Doublebox: os << "[["; break;
+               case Boxed:     os << "[\n";  break;
+               case ovalbox:   os << "(\n";  break;
+               case Ovalbox:   os << "((\n"; break;
+               case Shadowbox: os << "[/\n"; break;
+               case Doublebox: os << "[[\n"; break;
        }
 
-       int i = InsetText::plaintext(buf, os, runparams);
+       InsetText::plaintext(buf, os, runparams);
 
+       int len = 0;
        switch (btype) {
                case Frameless: break;
-               case Boxed:     os << "]";  break;
-               case ovalbox:   os << ")";  break;
-               case Ovalbox:   os << "))"; break;
-               case Shadowbox: os << "]/"; break;
-               case Doublebox: os << "]]"; break;
+               case Boxed:     os << "\n]";  len = 1; break;
+               case ovalbox:   os << "\n)";  len = 1; break;
+               case Ovalbox:   os << "\n))"; len = 2; break;
+               case Shadowbox: os << "\n/]"; len = 2; break;
+               case Doublebox: os << "\n]]"; len = 2; break;
        }
 
-       return i;
+       return len + runparams.linelen; // len chars on a separate line
+}
+
+
+int InsetBox::docbook(Buffer const & buf, odocstream & os,
+                      OutputParams const & runparams) const
+{
+       return InsetText::docbook(buf, os, runparams);
 }
 
 

diff --git a/src/insets/insetbox.h b/src/insets/insetbox.h
index 8786c1c649efb1301eeaec92995e0f9d7ddc9f63..77f1d3354a72bc103a3f8c601bf68fd801583579 100644 (file)
--- a/src/insets/insetbox.h
+++ b/src/insets/insetbox.h
@@ -86,10 +86,9 @@ public:
        ///
        int latex(Buffer const &, odocstream &, OutputParams const &) const;
        ///
-       int docbook(Buffer const &, odocstream &, OutputParams const &) const;
+       int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
        ///
-       int plaintext(Buffer const &, odocstream &,
-                 OutputParams const & runparams) const;
+       int docbook(Buffer const &, odocstream &, OutputParams const &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///

diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index b840955032cdb0b16831769f57f38ed2e1158825..d1a575639d132f373aef2c5960ccf7475407afd0 100644 (file)
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -295,49 +295,48 @@ int InsetNote::latex(Buffer const & buf, odocstream & os,
 }
 
 
-int InsetNote::docbook(Buffer const & buf, odocstream & os,
-                      OutputParams const & runparams_in) const
+int InsetNote::plaintext(Buffer const & buf, odocstream & os,
+                         OutputParams const & runparams_in) const
 {
        if (params_.type == InsetNoteParams::Note)
                return 0;
 
        OutputParams runparams(runparams_in);
        if (params_.type == InsetNoteParams::Comment) {
-               os << "<remark>\n";
                runparams.inComment = true;
                // Ignore files that are exported inside a comment
                runparams.exportdata.reset(new ExportData);
        }
+       os << '[' << _("note") << ":\n";
+       InsetText::plaintext(buf, os, runparams);
+       os << "\n]";
 
-       int const n = InsetText::docbook(buf, os, runparams);
-
-       if (params_.type == InsetNoteParams::Comment)
-               os << "\n</remark>\n";
-
-       // Return how many newlines we issued.
-       //return int(count(str.begin(), str.end(), '\n'));
-        return n + 1 + 2;
+       return 1 + runparams.linelen; // one char on a separate line
 }
 
 
-int InsetNote::plaintext(Buffer const & buf, odocstream & os,
-                        OutputParams const & runparams_in) const
+int InsetNote::docbook(Buffer const & buf, odocstream & os,
+                       OutputParams const & runparams_in) const
 {
        if (params_.type == InsetNoteParams::Note)
                return 0;
 
        OutputParams runparams(runparams_in);
        if (params_.type == InsetNoteParams::Comment) {
+               os << "<remark>\n";
                runparams.inComment = true;
                // Ignore files that are exported inside a comment
                runparams.exportdata.reset(new ExportData);
        }
-       os << "[";
-       int const nlines = InsetText::plaintext(buf, os, runparams);
-       os << "]";
+
+       int const n = InsetText::docbook(buf, os, runparams);
+
+       if (params_.type == InsetNoteParams::Comment)
+               os << "\n</remark>\n";
 
        // Return how many newlines we issued.
-       return nlines;
+       //return int(count(str.begin(), str.end(), '\n'));
+        return n + 1 + 2;
 }
 
 

diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index 034f81158b8766b6c1b86a4e5babe26a08d64e29..f241725a667fcb2fb6cc53856a58bfdad4423976 100644 (file)
--- a/src/insets/insetnote.h
+++ b/src/insets/insetnote.h
@@ -62,10 +62,10 @@ public:
        ///
        int latex(Buffer const &, odocstream &, OutputParams const &) const;
        ///
-       int docbook(Buffer const &, odocstream &, OutputParams const &) const;
-       ///
        int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
        ///
+       int docbook(Buffer const &, odocstream &, OutputParams const &) const;
+       ///
        void validate(LaTeXFeatures &) const;
        ///
        InsetNoteParams const & params() const { return params_; }