From c5df681fe87aba4058870041074a323994268989 Mon Sep 17 00:00:00 2001 From: Michael Schmitt Date: Thu, 18 Jan 2007 22:29:50 +0000 Subject: [PATCH] * insets/insetfloatlist.C: * insets/insettoc.C: * TocBackend.C: * TocBackend.h: rename 'asciiTocList()' to '.writePlaintextTocList' * insets/insettext.C: * output_plaintext.C: * output_plaintext.h: rename 'asciiParagraph' to 'writePlaintextParagraph' * output_plaintext.C: * exporter.C: * output_plaintext.h: rename 'writeFileAscii' to 'writePlaintextFile' * lyxrc.C: change lyxrc section title (ASCII => PLAIN TEXT) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16756 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/TocBackend.C | 2 +- src/TocBackend.h | 2 +- src/exporter.C | 4 ++-- src/insets/insetfloatlist.C | 2 +- src/insets/insettext.C | 2 +- src/insets/insettoc.C | 2 +- src/lyxrc.C | 2 +- src/output_plaintext.C | 12 ++++++------ src/output_plaintext.h | 6 +++--- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/TocBackend.C b/src/TocBackend.C index 841c4cf090..fd714ce562 100644 --- a/src/TocBackend.C +++ b/src/TocBackend.C @@ -224,7 +224,7 @@ TocIterator const TocBackend::item( } -void TocBackend::asciiTocList(string const & type, odocstream & os) const +void TocBackend::writePlaintextTocList(string const & type, odocstream & os) const { TocList::const_iterator cit = tocs_.find(type); if (cit != tocs_.end()) { diff --git a/src/TocBackend.h b/src/TocBackend.h index 379c47e536..20c87294a6 100644 --- a/src/TocBackend.h +++ b/src/TocBackend.h @@ -110,7 +110,7 @@ public: /// Return the first Toc Item before the cursor TocIterator const item(std::string const & type, ParConstIterator const &) const; - void asciiTocList(std::string const & type, odocstream & os) const; + void writePlaintextTocList(std::string const & type, odocstream & os) const; private: /// diff --git a/src/exporter.C b/src/exporter.C index d5c0fe41f4..decde47a4f 100644 --- a/src/exporter.C +++ b/src/exporter.C @@ -191,9 +191,9 @@ bool Exporter::Export(Buffer * buffer, string const & format, filename = changeExtension(filename, formats.extension(backend_format)); - // Ascii backend + // Plain text backend if (backend_format == "text") - writeFileAscii(*buffer, FileName(filename), runparams); + writePlaintextFile(*buffer, FileName(filename), runparams); // no backend else if (backend_format == "lyx") buffer->writeFile(FileName(filename)); diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C index 2e2aa13b42..6d11d93aa0 100644 --- a/src/insets/insetfloatlist.C +++ b/src/insets/insetfloatlist.C @@ -133,7 +133,7 @@ int InsetFloatList::plaintext(Buffer const & buffer, odocstream & os, { os << getScreenLabel(buffer) << "\n\n"; - buffer.tocBackend().asciiTocList(to_ascii(getParam("type")), os); + buffer.tocBackend().writePlaintextTocList(to_ascii(getParam("type")), os); os << "\n"; return 0; diff --git a/src/insets/insettext.C b/src/insets/insettext.C index e782eb2d55..9b2233c5dd 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -319,7 +319,7 @@ int InsetText::plaintext(Buffer const & buf, odocstream & os, bool ref_printed = false; odocstringstream oss; for (; it != end; ++it) - asciiParagraph(buf, *it, oss, runparams, ref_printed); + writePlaintextParagraph(buf, *it, oss, runparams, ref_printed); docstring const str = oss.str(); os << str; diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C index 8f605b7910..c959ee47c5 100644 --- a/src/insets/insettoc.C +++ b/src/insets/insettoc.C @@ -60,7 +60,7 @@ int InsetTOC::plaintext(Buffer const & buffer, odocstream & os, { os << getScreenLabel(buffer) << "\n\n"; - buffer.tocBackend().asciiTocList(getCmdName(), os); + buffer.tocBackend().writePlaintextTocList(getCmdName(), os); os << "\n"; return 0; diff --git a/src/lyxrc.C b/src/lyxrc.C index 96a82dc106..90cc102362 100644 --- a/src/lyxrc.C +++ b/src/lyxrc.C @@ -1874,7 +1874,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const } os << "\n#\n" - << "# ASCII EXPORT SECTION ##############################\n" + << "# PLAIN TEXT EXPORT SECTION ##############################\n" << "#\n\n"; case RC_PLAINTEXT_ROFF_COMMAND: diff --git a/src/output_plaintext.C b/src/output_plaintext.C index 87919c0bf1..0a6d16eddc 100644 --- a/src/output_plaintext.C +++ b/src/output_plaintext.C @@ -39,17 +39,17 @@ using std::pair; using std::string; -void writeFileAscii(Buffer const & buf, FileName const & fname, +void writePlaintextFile(Buffer const & buf, FileName const & fname, OutputParams const & runparams) { odocfstream ofs; if (!openFileWrite(ofs, fname)) return; - writeFileAscii(buf, ofs, runparams); + writePlaintextFile(buf, ofs, runparams); } -void writeFileAscii(Buffer const & buf, odocstream & os, +void writePlaintextFile(Buffer const & buf, odocstream & os, OutputParams const & runparams) { bool ref_printed = false; @@ -58,7 +58,7 @@ void writeFileAscii(Buffer const & buf, odocstream & os, ParagraphList::const_iterator end = par.end(); ParagraphList::const_iterator it = beg; for (; it != end; ++it) { - asciiParagraph(buf, *it, os, runparams, ref_printed); + writePlaintextParagraph(buf, *it, os, runparams, ref_printed); } os << "\n"; } @@ -77,7 +77,7 @@ pair const addDepth(int depth, int ldepth) } -void asciiParagraph(Buffer const & buf, +void writePlaintextParagraph(Buffer const & buf, Paragraph const & par, odocstream & os, OutputParams const & runparams, @@ -228,7 +228,7 @@ void asciiParagraph(Buffer const & buf, case '\0': lyxerr[Debug::INFO] << - "writeAsciiFile: NULL char in structure." << endl; + "writePlaintextFile: NULL char in structure." << endl; break; default: diff --git a/src/output_plaintext.h b/src/output_plaintext.h index 682a94794f..5e88d0e765 100644 --- a/src/output_plaintext.h +++ b/src/output_plaintext.h @@ -25,14 +25,14 @@ class Paragraph; /// -void writeFileAscii(Buffer const & buf, support::FileName const &, +void writePlaintextFile(Buffer const & buf, support::FileName const &, OutputParams const &); /// -void writeFileAscii(Buffer const & buf, odocstream &, OutputParams const &); +void writePlaintextFile(Buffer const & buf, odocstream &, OutputParams const &); /// -void asciiParagraph(Buffer const & buf, +void writePlaintextParagraph(Buffer const & buf, Paragraph const & paragraphs, odocstream & ofs, OutputParams const &,