From fdc6082cfc9ca47bd6e8482ab78dc1fd7ff4a02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Fri, 27 Apr 2001 07:58:56 +0000 Subject: [PATCH] hack for listof algorithm git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1966 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferView_pimpl.C | 12 ++++++------ src/ChangeLog | 8 ++++++++ src/buffer.C | 3 ++- src/insets/ChangeLog | 4 ++++ src/insets/insettoc.C | 29 +++++++++++++++-------------- src/lyxfunc.C | 14 +++++++------- 6 files changed, 42 insertions(+), 28 deletions(-) diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index a6f510b7e2..de14a84718 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -1510,16 +1510,16 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) InsetCommandParams p; if (action == LFUN_TOC_INSERT ) - p.setCmdName( "tableofcontents" ); + p.setCmdName("tableofcontents"); else if (action == LFUN_LOA_INSERT ) - p.setCmdName( "listofalgorithms" ); + p.setCmdName("listof{algorithm}{List of Algorithms}"); else if (action == LFUN_LOF_INSERT ) - p.setCmdName( "listoffigures" ); + p.setCmdName("listoffigures"); else - p.setCmdName( "listoftables" ); + p.setCmdName("listoftables"); - Inset * inset = new InsetTOC( p ); - if (!bv_->insertInset( inset, "Standard", true ) ) + Inset * inset = new InsetTOC(p); + if (!bv_->insertInset(inset, "Standard", true)) delete inset; break; } diff --git a/src/ChangeLog b/src/ChangeLog index 9facae4b1b..5dbf0db0e1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2001-04-27 Lars Gullik Bjønnes + + * lyxfunc.C (Dispatch): hack to make listof algorithm work + + * buffer.C (readInset): hack to make listof algorithm work + + * BufferView_pimpl.C: hack to make listof algorithm work + 2001-04-26 Lars Gullik Bjønnes * LyXAction.C: removed all !NEW_INSETS cruft diff --git a/src/buffer.C b/src/buffer.C index 0f068f40ba..5de92cfbcb 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -1293,7 +1293,8 @@ void Buffer::readInset(LyXLex & lex, LyXParagraph *& par, } else if (inscmd.getCmdName() == "tableofcontents" || inscmd.getCmdName() == "listofalgorithms" || inscmd.getCmdName() == "listoffigures" - || inscmd.getCmdName() == "listoftables") { + || inscmd.getCmdName() == "listoftables" + || inscmd.getCmdName() == "listof{algorithm}{List of Algorithms}") { inset = new InsetTOC(inscmd); } else if (inscmd.getCmdName() == "printindex") { inset = new InsetPrintIndex(inscmd); diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 54d75c6cb0..030545f676 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2001-04-27 Lars Gullik Bjønnes + + * insettoc.C: hack to make listof algorithm work + 2001-04-20 Juergen Vigna * insettext.C (Edit): call checkAndActivateInset with y=0 if y < 0. diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C index 74be043cf6..72b8861d0c 100644 --- a/src/insets/insettoc.C +++ b/src/insets/insettoc.C @@ -16,12 +16,13 @@ using std::vector; string const InsetTOC::getScreenLabel() const { - string const cmdname( getCmdName() ); - if (cmdname == "tableofcontents" ) + string const cmdname(getCmdName()); + + if (cmdname == "tableofcontents") return _("Table of Contents"); - else if (cmdname == "listofalgorithms" ) + else if (cmdname == "listof{algorithm}{List of Algorithms}") return _("List of Algorithms"); - else if (cmdname == "listoffigures" ) + else if (cmdname == "listoffigures") return _("List of Figures"); else return _("List of Tables"); @@ -33,7 +34,7 @@ Inset::Code InsetTOC::LyxCode() const string const cmdname(getCmdName()); if (cmdname == "tableofcontents") return Inset::TOC_CODE; - else if (cmdname == "listofalgorithms") + else if (cmdname == "listof{algorithm}{List of Algorithms}") return Inset::LOA_CODE; else if (cmdname == "listoffigures") return Inset::LOF_CODE; @@ -44,7 +45,7 @@ Inset::Code InsetTOC::LyxCode() const void InsetTOC::Edit(BufferView * bv, int, int, unsigned int) { - bv->owner()->getDialogs()->showTOC( this ); + bv->owner()->getDialogs()->showTOC(this); } @@ -55,11 +56,11 @@ int InsetTOC::Ascii(Buffer const * buffer, std::ostream & os, int) const #if 0 Buffer::TocType type; string cmdname = getCmdName(); - if (cmdname == "tableofcontents" ) + if (cmdname == "tableofcontents") type = Buffer::TOC_TOC; - else if (cmdname == "listofalgorithms" ) + else if (cmdname == "listof{algorithm}{List of Algorithms}") type = Buffer::TOC_LOA; - else if (cmdname == "listoffigures" ) + else if (cmdname == "listoffigures") type = Buffer::TOC_LOF; else type = Buffer::TOC_LOT; @@ -76,11 +77,11 @@ int InsetTOC::Ascii(Buffer const * buffer, std::ostream & os, int) const #endif string type; string const cmdname = getCmdName(); - if (cmdname == "tableofcontents" ) + if (cmdname == "tableofcontents") type = "TOC"; - else if (cmdname == "listofalgorithms" ) + else if (cmdname == "listof{algorithm}{List of Algorithms}") type = "LOA"; - else if (cmdname == "listoffigures" ) + else if (cmdname == "listoffigures") type = "LOF"; else type = "LOT"; @@ -103,7 +104,7 @@ int InsetTOC::Ascii(Buffer const * buffer, std::ostream & os, int) const int InsetTOC::Linuxdoc(Buffer const *, std::ostream & os) const { - if (getCmdName() == "tableofcontents" ) + if (getCmdName() == "tableofcontents") os << ""; return 0; } @@ -111,7 +112,7 @@ int InsetTOC::Linuxdoc(Buffer const *, std::ostream & os) const int InsetTOC::DocBook(Buffer const *, std::ostream & os) const { - if (getCmdName() == "tableofcontents" ) + if (getCmdName() == "tableofcontents") os << ""; return 0; } diff --git a/src/lyxfunc.C b/src/lyxfunc.C index fc224e654e..9cf3a6ae2b 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -924,16 +924,16 @@ string const LyXFunc::Dispatch(int ac, { InsetCommandParams p; - if (action == LFUN_TOCVIEW ) - p.setCmdName( "tableofcontents" ); + if (action == LFUN_TOCVIEW) + p.setCmdName("tableofcontents"); else if (action == LFUN_LOAVIEW ) - p.setCmdName( "listofalgorithms" ); - else if (action == LFUN_LOFVIEW ) - p.setCmdName( "listoffigures" ); + p.setCmdName("listof{algorithm}{List of Algorithms}"); + else if (action == LFUN_LOFVIEW) + p.setCmdName("listoffigures"); else - p.setCmdName( "listoftables" ); + p.setCmdName("listoftables"); - owner->getDialogs()->createTOC( p.getAsString() ); + owner->getDialogs()->createTOC(p.getAsString()); break; }