From 2470d9297d3f2c303f555c8f235d022b19396679 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Matox?= Date: Tue, 4 Sep 2001 11:02:09 +0000 Subject: [PATCH] rename docBook method to docbook git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2681 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 5 +++++ src/buffer.C | 4 ++-- src/buffer.h | 2 +- src/insets/ChangeLog | 36 +++++++++++++++++++++++++++++++++++ src/insets/figinset.C | 2 +- src/insets/figinset.h | 2 +- src/insets/inset.h | 2 +- src/insets/insetcaption.C | 2 +- src/insets/insetcaption.h | 2 +- src/insets/insetcollapsable.h | 2 +- src/insets/insetcommand.C | 2 +- src/insets/insetcommand.h | 2 +- src/insets/inseterror.h | 2 +- src/insets/insetert.C | 2 +- src/insets/insetert.h | 2 +- src/insets/insetexternal.C | 2 +- src/insets/insetexternal.h | 2 +- src/insets/insetfloat.C | 4 ++-- src/insets/insetfloat.h | 2 +- src/insets/insetfloatlist.h | 2 +- src/insets/insetgraphics.C | 2 +- src/insets/insetgraphics.h | 2 +- src/insets/insetinclude.C | 2 +- src/insets/insetinclude.h | 2 +- src/insets/insetlabel.C | 2 +- src/insets/insetlabel.h | 2 +- src/insets/insetlatexaccent.C | 2 +- src/insets/insetlatexaccent.h | 2 +- src/insets/insetquotes.C | 2 +- src/insets/insetquotes.h | 2 +- src/insets/insetref.C | 2 +- src/insets/insetref.h | 2 +- src/insets/insetspecialchar.C | 2 +- src/insets/insetspecialchar.h | 2 +- src/insets/insettabular.C | 2 +- src/insets/insettabular.h | 2 +- src/insets/insettext.C | 2 +- src/insets/insettext.h | 2 +- src/mathed/ChangeLog | 8 ++++++++ src/mathed/formula.C | 2 +- src/mathed/formula.h | 2 +- src/mathed/formulabase.C | 4 ++-- src/mathed/formulabase.h | 4 ++-- src/mathed/formulamacro.C | 2 +- src/mathed/formulamacro.h | 2 +- src/tabular.C | 2 +- 46 files changed, 96 insertions(+), 47 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 631f36b069..4b74e9f081 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2001-09-04 José Matos + * buffer.C + * buffer.h + * tabular.C (docbook): rename docBook method to docbook. + 2001-09-02 Angus Leeming * Makefile.am: add dependencies to main.o. diff --git a/src/buffer.C b/src/buffer.C index d94e6b922e..de3fd4f81a 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -2719,7 +2719,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) } -void Buffer::docBookHandleCaption(ostream & os, string & inner_tag, +void Buffer::docbookHandleCaption(ostream & os, string & inner_tag, Paragraph::depth_type depth, int desc_on, Paragraph * & par) { @@ -3340,7 +3340,7 @@ void Buffer::simpleDocBookOnePar(ostream & os, string & extra, if (c == Paragraph::META_INSET) { Inset * inset = par->getInset(i); ostringstream ost; - inset->docBook(this, ost); + inset->docbook(this, ost); string tmp_out = ost.str().c_str(); // diff --git a/src/buffer.h b/src/buffer.h index 0a34563cf0..5460dec970 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -328,7 +328,7 @@ public: TexRow texrow; private: /// - void docBookHandleCaption(std::ostream & os, string & inner_tag, + void docbookHandleCaption(std::ostream & os, string & inner_tag, Paragraph::depth_type depth, int desc_on, Paragraph * & par); /// Open SGML/XML tag. diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 53a723b5d0..a3499d693d 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,39 @@ +2001-09-04 José Matos + * figinset.C + * figinset.h + * insetcaption.C + * insetcaption.h + * insetcollapsable.h + * insetcommand.C + * insetcommand.h + * inseterror.h + * insetert.C + * insetert.h + * insetexternal.C + * insetexternal.h + * insetfloat.C + * insetfloat.h + * insetfloatlist.h + * insetgraphics.C + * insetgraphics.h + * inset.h + * insetinclude.C + * insetinclude.h + * insetlabel.C + * insetlabel.h + * insetlatexaccent.C + * insetlatexaccent.h + * insetquotes.C + * insetquotes.h + * insetref.C + * insetref.h + * insetspecialchar.C + * insetspecialchar.h + * insettabular.C + * insettabular.h + * insettext.C + * insettext.C (docbook): rename docBook method to docbook. + 2001-09-02 Dekel Tsur * inset.h (getFirstParagraph): New virtual method. diff --git a/src/insets/figinset.C b/src/insets/figinset.C index 96ccb14f20..a1285e5b62 100644 --- a/src/insets/figinset.C +++ b/src/insets/figinset.C @@ -1174,7 +1174,7 @@ int InsetFig::linuxdoc(Buffer const *, ostream &) const } -int InsetFig::docBook(Buffer const *, ostream & os) const +int InsetFig::docbook(Buffer const *, ostream & os) const { string const buf1 = OnlyPath(owner->fileName()); string figurename = MakeRelPath(fname, buf1); diff --git a/src/insets/figinset.h b/src/insets/figinset.h index b17a3b8512..73d70d95d1 100644 --- a/src/insets/figinset.h +++ b/src/insets/figinset.h @@ -43,7 +43,7 @@ public: /// int linuxdoc(Buffer const *, std::ostream &) const; /// - int docBook(Buffer const *, std::ostream &) const; + int docbook(Buffer const *, std::ostream &) const; /// Updates needed features for this inset. void validate(LaTeXFeatures & features) const; diff --git a/src/insets/inset.h b/src/insets/inset.h index 7a36f61686..bc36d77a98 100644 --- a/src/insets/inset.h +++ b/src/insets/inset.h @@ -190,7 +190,7 @@ public: /// virtual int linuxdoc(Buffer const *, std::ostream &) const = 0; /// - virtual int docBook(Buffer const *, std::ostream &) const = 0; + virtual int docbook(Buffer const *, std::ostream &) const = 0; /// Updates needed features for this inset. virtual void validate(LaTeXFeatures & features) const; /// diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C index a4dd96f531..cd793a2d73 100644 --- a/src/insets/insetcaption.C +++ b/src/insets/insetcaption.C @@ -120,7 +120,7 @@ int InsetCaption::ascii(Buffer const * /*buf*/, } -int InsetCaption::docBook(Buffer const * /*buf*/, ostream & /*os*/) const +int InsetCaption::docbook(Buffer const * /*buf*/, ostream & /*os*/) const { // Fix: Implement me! return 0; diff --git a/src/insets/insetcaption.h b/src/insets/insetcaption.h index 986bde07f2..27088e5e64 100644 --- a/src/insets/insetcaption.h +++ b/src/insets/insetcaption.h @@ -54,7 +54,7 @@ public: int ascii(Buffer const * buf, std::ostream & os, int linelen) const; /// virtual - int docBook(Buffer const * buf, std::ostream & os) const; + int docbook(Buffer const * buf, std::ostream & os) const; protected: private: }; diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h index 3c9a29aca3..a8547cab52 100644 --- a/src/insets/insetcollapsable.h +++ b/src/insets/insetcollapsable.h @@ -107,7 +107,7 @@ public: /// int linuxdoc(Buffer const *, std::ostream &) const { return 0; } /// - int docBook(Buffer const *, std::ostream &) const { return 0; } + int docbook(Buffer const *, std::ostream &) const { return 0; } /// void validate(LaTeXFeatures & features) const; /// diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C index 9d10720328..cb40f395ea 100644 --- a/src/insets/insetcommand.C +++ b/src/insets/insetcommand.C @@ -213,7 +213,7 @@ int InsetCommand::linuxdoc(Buffer const *, ostream &) const } -int InsetCommand::docBook(Buffer const *, ostream &) const +int InsetCommand::docbook(Buffer const *, ostream &) const { return 0; } diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h index 10eee35774..c0aeaa615b 100644 --- a/src/insets/insetcommand.h +++ b/src/insets/insetcommand.h @@ -97,7 +97,7 @@ public: /// virtual int linuxdoc(Buffer const *, std::ostream &) const; /// - virtual int docBook(Buffer const *, std::ostream &) const; + virtual int docbook(Buffer const *, std::ostream &) const; /// Inset::Code lyxCode() const { return Inset::NO_CODE; } diff --git a/src/insets/inseterror.h b/src/insets/inseterror.h index 71fe69716c..8619f644a1 100644 --- a/src/insets/inseterror.h +++ b/src/insets/inseterror.h @@ -51,7 +51,7 @@ public: /// int linuxdoc(Buffer const *, std::ostream &) const { return 0; } /// - int docBook(Buffer const *, std::ostream &) const { return 0; } + int docbook(Buffer const *, std::ostream &) const { return 0; } /// bool autoDelete() const { return true; } /// what appears in the minibuffer when opening diff --git a/src/insets/insetert.C b/src/insets/insetert.C index 4b93756d86..d8e0873597 100644 --- a/src/insets/insetert.C +++ b/src/insets/insetert.C @@ -350,7 +350,7 @@ int InsetERT::linuxdoc(Buffer const *, std::ostream &) const } -int InsetERT::docBook(Buffer const *, std::ostream &) const +int InsetERT::docbook(Buffer const *, std::ostream &) const { return 0; } diff --git a/src/insets/insetert.h b/src/insets/insetert.h index 4120b8d5f0..3a87c1d430 100644 --- a/src/insets/insetert.h +++ b/src/insets/insetert.h @@ -78,7 +78,7 @@ public: /// int linuxdoc(Buffer const *, std::ostream &) const; /// - int docBook(Buffer const *, std::ostream &) const; + int docbook(Buffer const *, std::ostream &) const; /// void validate(LaTeXFeatures &) const {} /// diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C index 8ee91192fe..d1765de1fa 100644 --- a/src/insets/insetexternal.C +++ b/src/insets/insetexternal.C @@ -170,7 +170,7 @@ int InsetExternal::linuxdoc(Buffer const * buf, std::ostream & os) const } -int InsetExternal::docBook(Buffer const * buf, std::ostream & os) const +int InsetExternal::docbook(Buffer const * buf, std::ostream & os) const { return write("DocBook", buf, os); } diff --git a/src/insets/insetexternal.h b/src/insets/insetexternal.h index 2dfd03ef87..66f932fdaa 100644 --- a/src/insets/insetexternal.h +++ b/src/insets/insetexternal.h @@ -67,7 +67,7 @@ public: /// write LinuxDoc output to the ostream virtual int linuxdoc(Buffer const *, std::ostream &) const; /// write DocBook output to the ostream - virtual int docBook(Buffer const *, std::ostream &) const; + virtual int docbook(Buffer const *, std::ostream &) const; /// Updates needed features for this inset. virtual void validate(LaTeXFeatures & features) const; diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C index cdcfff6ac1..8b8babdc11 100644 --- a/src/insets/insetfloat.C +++ b/src/insets/insetfloat.C @@ -240,10 +240,10 @@ int InsetFloat::latex(Buffer const * buf, } -int InsetFloat::docBook(Buffer const * buf, ostream & os) const +int InsetFloat::docbook(Buffer const * buf, ostream & os) const { os << "<" << floatType_ << ">"; - int const i = inset.docBook(buf, os); + int const i = inset.docbook(buf, os); os << ""; return i; diff --git a/src/insets/insetfloat.h b/src/insets/insetfloat.h index 4d875f68c0..9376c626be 100644 --- a/src/insets/insetfloat.h +++ b/src/insets/insetfloat.h @@ -45,7 +45,7 @@ public: /// int latex(Buffer const *, std::ostream &, bool fragile, bool fp) const; /// - int docBook(Buffer const *, std::ostream &) const; + int docbook(Buffer const *, std::ostream &) const; /// string const editMessage() const; /// diff --git a/src/insets/insetfloatlist.h b/src/insets/insetfloatlist.h index a279574a7f..caf19cdecd 100644 --- a/src/insets/insetfloatlist.h +++ b/src/insets/insetfloatlist.h @@ -52,7 +52,7 @@ public: /// int linuxdoc(Buffer const *, std::ostream &) const { return 0; } /// - int docBook(Buffer const *, std::ostream &) const { return 0; } + int docbook(Buffer const *, std::ostream &) const { return 0; } /// int ascii(Buffer const *, std::ostream &, int linelen) const; private: diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index bdbd09366f..7db9d2a878 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -746,7 +746,7 @@ int InsetGraphics::linuxdoc(Buffer const *, ostream &) const // For explanation on inserting graphics into DocBook checkout: // http://linuxdoc.org/LDP/LDP-Author-Guide/inserting-pictures.html // See also the docbook guide at http://www.docbook.org/ -int InsetGraphics::docBook(Buffer const * buf, ostream & os) const +int InsetGraphics::docbook(Buffer const * buf, ostream & os) const { // Change the path to be relative to the main file. string const buffer_dir = OnlyPath(buf->fileName()); diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h index ab83affc1b..6145bfe41c 100644 --- a/src/insets/insetgraphics.h +++ b/src/insets/insetgraphics.h @@ -71,7 +71,7 @@ public: /// int linuxdoc(Buffer const *, std::ostream &) const; /// - int docBook(Buffer const *, std::ostream &) const; + int docbook(Buffer const *, std::ostream &) const; /** Tell LyX what the latex features you need i.e. what latex packages you need to be included. diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C index 1c8189166e..7ee6d2f988 100644 --- a/src/insets/insetinclude.C +++ b/src/insets/insetinclude.C @@ -339,7 +339,7 @@ int InsetInclude::linuxdoc(Buffer const * buffer, ostream & os) const } -int InsetInclude::docBook(Buffer const * buffer, ostream & os) const +int InsetInclude::docbook(Buffer const * buffer, ostream & os) const { string incfile(params_.cparams.getContents()); diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h index 043f23c273..546253d7f8 100644 --- a/src/insets/insetinclude.h +++ b/src/insets/insetinclude.h @@ -97,7 +97,7 @@ public: /// int linuxdoc(Buffer const *, std::ostream &) const; /// - int docBook(Buffer const *, std::ostream &) const; + int docbook(Buffer const *, std::ostream &) const; /// void validate(LaTeXFeatures &) const; diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C index c4134be272..b7065f4a8d 100644 --- a/src/insets/insetlabel.C +++ b/src/insets/insetlabel.C @@ -96,7 +96,7 @@ int InsetLabel::linuxdoc(Buffer const *, ostream & os) const } -int InsetLabel::docBook(Buffer const *, ostream & os) const +int InsetLabel::docbook(Buffer const *, ostream & os) const { os << ""; return 0; diff --git a/src/insets/insetlabel.h b/src/insets/insetlabel.h index 8fbfeeaa5a..06aaa043b8 100644 --- a/src/insets/insetlabel.h +++ b/src/insets/insetlabel.h @@ -46,7 +46,7 @@ public: /// int linuxdoc(Buffer const *, std::ostream &) const; /// - int docBook(Buffer const *, std::ostream &) const; + int docbook(Buffer const *, std::ostream &) const; }; #endif diff --git a/src/insets/insetlatexaccent.C b/src/insets/insetlatexaccent.C index 11a0ffd1d9..5321f006ec 100644 --- a/src/insets/insetlatexaccent.C +++ b/src/insets/insetlatexaccent.C @@ -655,7 +655,7 @@ int InsetLatexAccent::linuxdoc(Buffer const *, ostream & os) const } -int InsetLatexAccent::docBook(Buffer const *, ostream & os) const +int InsetLatexAccent::docbook(Buffer const *, ostream & os) const { os << contents; return 0; diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h index 6c184514c5..b1fefd5570 100644 --- a/src/insets/insetlatexaccent.h +++ b/src/insets/insetlatexaccent.h @@ -61,7 +61,7 @@ public: /// int linuxdoc(Buffer const *, std::ostream &) const; /// - int docBook(Buffer const *, std::ostream &) const; + int docbook(Buffer const *, std::ostream &) const; /// bool deletable() const; /// diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C index a2396f0234..0ad0d96b20 100644 --- a/src/insets/insetquotes.C +++ b/src/insets/insetquotes.C @@ -309,7 +309,7 @@ int InsetQuotes::linuxdoc(Buffer const *, ostream & os) const } -int InsetQuotes::docBook(Buffer const *, ostream & os) const +int InsetQuotes::docbook(Buffer const *, ostream & os) const { if (times_ == DoubleQ) { if (side_ == LeftQ) diff --git a/src/insets/insetquotes.h b/src/insets/insetquotes.h index 0e86e0aa2b..d6f117f6bb 100644 --- a/src/insets/insetquotes.h +++ b/src/insets/insetquotes.h @@ -96,7 +96,7 @@ public: /// int linuxdoc(Buffer const *, std::ostream &) const; /// - int docBook(Buffer const *, std::ostream &) const; + int docbook(Buffer const *, std::ostream &) const; /// void validate(LaTeXFeatures &) const; /// diff --git a/src/insets/insetref.C b/src/insets/insetref.C index 8910dcb4b8..5ce084749f 100644 --- a/src/insets/insetref.C +++ b/src/insets/insetref.C @@ -85,7 +85,7 @@ int InsetRef::linuxdoc(Buffer const *, ostream & os) const } -int InsetRef::docBook(Buffer const *, ostream & os) const +int InsetRef::docbook(Buffer const *, ostream & os) const { if (getOptions().empty()) { os << ""; diff --git a/src/insets/insetref.h b/src/insets/insetref.h index 31eed6a1e4..46a82f206b 100644 --- a/src/insets/insetref.h +++ b/src/insets/insetref.h @@ -63,7 +63,7 @@ public: /// int linuxdoc(Buffer const *, std::ostream &) const; /// - int docBook(Buffer const *, std::ostream &) const; + int docbook(Buffer const *, std::ostream &) const; /// void validate(LaTeXFeatures & features) const; private: diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C index eacb1d4c4f..f328320c22 100644 --- a/src/insets/insetspecialchar.C +++ b/src/insets/insetspecialchar.C @@ -269,7 +269,7 @@ int InsetSpecialChar::linuxdoc(Buffer const * buf, ostream & os) const } -int InsetSpecialChar::docBook(Buffer const * buf, ostream & os) const +int InsetSpecialChar::docbook(Buffer const * buf, ostream & os) const { return ascii(buf, os, 0); } diff --git a/src/insets/insetspecialchar.h b/src/insets/insetspecialchar.h index 20ff5b3360..6fcad6c89f 100644 --- a/src/insets/insetspecialchar.h +++ b/src/insets/insetspecialchar.h @@ -67,7 +67,7 @@ public: /// int linuxdoc(Buffer const *, std::ostream &) const; /// - int docBook(Buffer const *, std::ostream &) const; + int docbook(Buffer const *, std::ostream &) const; /// virtual Inset * clone(Buffer const &, bool same_id = false) const; /// diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index 0da1e92eb0..75d27bd9a7 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -1151,7 +1151,7 @@ int InsetTabular::linuxdoc(Buffer const *, ostream &) const } -int InsetTabular::docBook(Buffer const * buf, ostream & os) const +int InsetTabular::docbook(Buffer const * buf, ostream & os) const { return tabular->DocBook(buf,os); } diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h index 40c2b07360..2c2b6664f9 100644 --- a/src/insets/insettabular.h +++ b/src/insets/insettabular.h @@ -148,7 +148,7 @@ public: /// int linuxdoc(Buffer const *, std::ostream &) const; /// - int docBook(Buffer const *, std::ostream &) const; + int docbook(Buffer const *, std::ostream &) const; /// void validate(LaTeXFeatures & features) const; /// diff --git a/src/insets/insettext.C b/src/insets/insettext.C index ba50705075..9668fea174 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -1352,7 +1352,7 @@ int InsetText::ascii(Buffer const * buf, ostream & os, int linelen) const } -int InsetText::docBook(Buffer const * buf, ostream & os) const +int InsetText::docbook(Buffer const * buf, ostream & os) const { Paragraph * p = par; unsigned int lines = 0; diff --git a/src/insets/insettext.h b/src/insets/insettext.h index f611bdbec2..8b5eace5ee 100644 --- a/src/insets/insettext.h +++ b/src/insets/insettext.h @@ -140,7 +140,7 @@ public: /// int linuxdoc(Buffer const *, std::ostream &) const { return 0; } /// - int docBook(Buffer const *, std::ostream &) const ; + int docbook(Buffer const *, std::ostream &) const ; /// void validate(LaTeXFeatures & features) const; /// diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 5c3683bab1..a135c9f802 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,11 @@ +2001-09-04 José Matos + * formulabase.C + * formulabase.h + * formula.C + * formula.h + * formulamacro.C + * formulamacro.h (docbook): rename docBook method to docbook. + 2001-09-03 Dekel Tsur * math_hash.C (ReadSymbols): Check for duplicate symbols diff --git a/src/mathed/formula.C b/src/mathed/formula.C index dd07554f61..8e7f6ad91b 100644 --- a/src/mathed/formula.C +++ b/src/mathed/formula.C @@ -115,7 +115,7 @@ int InsetFormula::linuxdoc(ostream & os) const } -int InsetFormula::docBook(ostream & os) const +int InsetFormula::docbook(ostream & os) const { return ascii(os, 0); } diff --git a/src/mathed/formula.h b/src/mathed/formula.h index 0bbe02cdc3..08035e45d1 100644 --- a/src/mathed/formula.h +++ b/src/mathed/formula.h @@ -64,7 +64,7 @@ public: /// int linuxdoc(std::ostream &) const; /// - int docBook(std::ostream &) const; + int docbook(std::ostream &) const; /// Inset * clone(Buffer const &, bool same_id = false) const; diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C index 70b06ae835..e6421cff7c 100644 --- a/src/mathed/formulabase.C +++ b/src/mathed/formulabase.C @@ -151,9 +151,9 @@ int InsetFormulaBase::linuxdoc(Buffer const *, ostream & os) const } -int InsetFormulaBase::docBook(Buffer const *, ostream & os) const +int InsetFormulaBase::docbook(Buffer const *, ostream & os) const { - return docBook(os); + return docbook(os); } diff --git a/src/mathed/formulabase.h b/src/mathed/formulabase.h index ab614a6f94..f206eece75 100644 --- a/src/mathed/formulabase.h +++ b/src/mathed/formulabase.h @@ -56,7 +56,7 @@ public: /// virtual int linuxdoc(Buffer const *, std::ostream &) const; /// - virtual int docBook(Buffer const *, std::ostream &) const; + virtual int docbook(Buffer const *, std::ostream &) const; /// virtual MathInsetTypes getType() const = 0; @@ -73,7 +73,7 @@ protected: /// virtual int linuxdoc(std::ostream &) const = 0; /// - virtual int docBook(std::ostream &) const = 0; + virtual int docbook(std::ostream &) const = 0; public: /// diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C index bd0116c584..d6f574aba0 100644 --- a/src/mathed/formulamacro.C +++ b/src/mathed/formulamacro.C @@ -99,7 +99,7 @@ int InsetFormulaMacro::linuxdoc(ostream & os) const } -int InsetFormulaMacro::docBook(ostream & os) const +int InsetFormulaMacro::docbook(ostream & os) const { return ascii(os, 0); } diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h index a486179bfe..afa896de7d 100644 --- a/src/mathed/formulamacro.h +++ b/src/mathed/formulamacro.h @@ -57,7 +57,7 @@ public: /// int linuxdoc(std::ostream & os) const; /// - int docBook(std::ostream &) const; + int docbook(std::ostream &) const; /// Inset * clone(Buffer const &, bool same_id = false) const; diff --git a/src/tabular.C b/src/tabular.C index 833997d9fc..6c5d2f388c 100644 --- a/src/tabular.C +++ b/src/tabular.C @@ -2356,7 +2356,7 @@ int LyXTabular::DocBook(Buffer const * buf, ostream & os) const } os << ">"; - ret += GetCellInset(cell)->docBook(buf, os); + ret += GetCellInset(cell)->docbook(buf, os); os << ""; ++cell; } -- 2.39.2