hack for listof algorithm

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1966 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2001-04-27 07:58:56 +00:00
parent 662d0acd45
commit fdc6082cfc
6 changed files with 42 additions and 28 deletions

View File

@ -1510,16 +1510,16 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
InsetCommandParams p; InsetCommandParams p;
if (action == LFUN_TOC_INSERT ) if (action == LFUN_TOC_INSERT )
p.setCmdName( "tableofcontents" ); p.setCmdName("tableofcontents");
else if (action == LFUN_LOA_INSERT ) else if (action == LFUN_LOA_INSERT )
p.setCmdName( "listofalgorithms" ); p.setCmdName("listof{algorithm}{List of Algorithms}");
else if (action == LFUN_LOF_INSERT ) else if (action == LFUN_LOF_INSERT )
p.setCmdName( "listoffigures" ); p.setCmdName("listoffigures");
else else
p.setCmdName( "listoftables" ); p.setCmdName("listoftables");
Inset * inset = new InsetTOC( p ); Inset * inset = new InsetTOC(p);
if (!bv_->insertInset( inset, "Standard", true ) ) if (!bv_->insertInset(inset, "Standard", true))
delete inset; delete inset;
break; break;
} }

View File

@ -1,3 +1,11 @@
2001-04-27 Lars Gullik Bjønnes <larsbj@birdstep.com>
* 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 <larsbj@birdstep.com> 2001-04-26 Lars Gullik Bjønnes <larsbj@birdstep.com>
* LyXAction.C: removed all !NEW_INSETS cruft * LyXAction.C: removed all !NEW_INSETS cruft

View File

@ -1293,7 +1293,8 @@ void Buffer::readInset(LyXLex & lex, LyXParagraph *& par,
} else if (inscmd.getCmdName() == "tableofcontents" } else if (inscmd.getCmdName() == "tableofcontents"
|| inscmd.getCmdName() == "listofalgorithms" || inscmd.getCmdName() == "listofalgorithms"
|| inscmd.getCmdName() == "listoffigures" || inscmd.getCmdName() == "listoffigures"
|| inscmd.getCmdName() == "listoftables") { || inscmd.getCmdName() == "listoftables"
|| inscmd.getCmdName() == "listof{algorithm}{List of Algorithms}") {
inset = new InsetTOC(inscmd); inset = new InsetTOC(inscmd);
} else if (inscmd.getCmdName() == "printindex") { } else if (inscmd.getCmdName() == "printindex") {
inset = new InsetPrintIndex(inscmd); inset = new InsetPrintIndex(inscmd);

View File

@ -1,3 +1,7 @@
2001-04-27 Lars Gullik Bjønnes <larsbj@birdstep.com>
* insettoc.C: hack to make listof algorithm work
2001-04-20 Juergen Vigna <jug@sad.it> 2001-04-20 Juergen Vigna <jug@sad.it>
* insettext.C (Edit): call checkAndActivateInset with y=0 if y < 0. * insettext.C (Edit): call checkAndActivateInset with y=0 if y < 0.

View File

@ -16,12 +16,13 @@ using std::vector;
string const InsetTOC::getScreenLabel() const string const InsetTOC::getScreenLabel() const
{ {
string const cmdname( getCmdName() ); string const cmdname(getCmdName());
if (cmdname == "tableofcontents" )
if (cmdname == "tableofcontents")
return _("Table of Contents"); return _("Table of Contents");
else if (cmdname == "listofalgorithms" ) else if (cmdname == "listof{algorithm}{List of Algorithms}")
return _("List of Algorithms"); return _("List of Algorithms");
else if (cmdname == "listoffigures" ) else if (cmdname == "listoffigures")
return _("List of Figures"); return _("List of Figures");
else else
return _("List of Tables"); return _("List of Tables");
@ -33,7 +34,7 @@ Inset::Code InsetTOC::LyxCode() const
string const cmdname(getCmdName()); string const cmdname(getCmdName());
if (cmdname == "tableofcontents") if (cmdname == "tableofcontents")
return Inset::TOC_CODE; return Inset::TOC_CODE;
else if (cmdname == "listofalgorithms") else if (cmdname == "listof{algorithm}{List of Algorithms}")
return Inset::LOA_CODE; return Inset::LOA_CODE;
else if (cmdname == "listoffigures") else if (cmdname == "listoffigures")
return Inset::LOF_CODE; return Inset::LOF_CODE;
@ -44,7 +45,7 @@ Inset::Code InsetTOC::LyxCode() const
void InsetTOC::Edit(BufferView * bv, int, int, unsigned int) 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 #if 0
Buffer::TocType type; Buffer::TocType type;
string cmdname = getCmdName(); string cmdname = getCmdName();
if (cmdname == "tableofcontents" ) if (cmdname == "tableofcontents")
type = Buffer::TOC_TOC; type = Buffer::TOC_TOC;
else if (cmdname == "listofalgorithms" ) else if (cmdname == "listof{algorithm}{List of Algorithms}")
type = Buffer::TOC_LOA; type = Buffer::TOC_LOA;
else if (cmdname == "listoffigures" ) else if (cmdname == "listoffigures")
type = Buffer::TOC_LOF; type = Buffer::TOC_LOF;
else else
type = Buffer::TOC_LOT; type = Buffer::TOC_LOT;
@ -76,11 +77,11 @@ int InsetTOC::Ascii(Buffer const * buffer, std::ostream & os, int) const
#endif #endif
string type; string type;
string const cmdname = getCmdName(); string const cmdname = getCmdName();
if (cmdname == "tableofcontents" ) if (cmdname == "tableofcontents")
type = "TOC"; type = "TOC";
else if (cmdname == "listofalgorithms" ) else if (cmdname == "listof{algorithm}{List of Algorithms}")
type = "LOA"; type = "LOA";
else if (cmdname == "listoffigures" ) else if (cmdname == "listoffigures")
type = "LOF"; type = "LOF";
else else
type = "LOT"; 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 int InsetTOC::Linuxdoc(Buffer const *, std::ostream & os) const
{ {
if (getCmdName() == "tableofcontents" ) if (getCmdName() == "tableofcontents")
os << "<toc>"; os << "<toc>";
return 0; return 0;
} }
@ -111,7 +112,7 @@ int InsetTOC::Linuxdoc(Buffer const *, std::ostream & os) const
int InsetTOC::DocBook(Buffer const *, std::ostream & os) const int InsetTOC::DocBook(Buffer const *, std::ostream & os) const
{ {
if (getCmdName() == "tableofcontents" ) if (getCmdName() == "tableofcontents")
os << "<toc></toc>"; os << "<toc></toc>";
return 0; return 0;
} }

View File

@ -924,16 +924,16 @@ string const LyXFunc::Dispatch(int ac,
{ {
InsetCommandParams p; InsetCommandParams p;
if (action == LFUN_TOCVIEW ) if (action == LFUN_TOCVIEW)
p.setCmdName( "tableofcontents" ); p.setCmdName("tableofcontents");
else if (action == LFUN_LOAVIEW ) else if (action == LFUN_LOAVIEW )
p.setCmdName( "listofalgorithms" ); p.setCmdName("listof{algorithm}{List of Algorithms}");
else if (action == LFUN_LOFVIEW ) else if (action == LFUN_LOFVIEW)
p.setCmdName( "listoffigures" ); p.setCmdName("listoffigures");
else else
p.setCmdName( "listoftables" ); p.setCmdName("listoftables");
owner->getDialogs()->createTOC( p.getAsString() ); owner->getDialogs()->createTOC(p.getAsString());
break; break;
} }