#include "frontends/Alert.h"
#include "insets/insetbibitem.h"
+#include "insets/insetcaption.h"
#include "insets/insetinclude.h"
+#include "insets/insettabular.h"
#include "support/filetools.h"
#include "support/fs_extras.h"
using support::bformat;
using support::FileName;
using support::libFileSearch;
+using support::makeAbsPath;
using support::makeDisplayPath;
using support::onlyFilename;
using support::onlyPath;
case 0:
// the file is not saved if we load the emergency file.
b->markDirty();
- return b->readFile(e.absFilename());
+ return b->readFile(e);
case 1:
break;
default:
case 0:
// the file is not saved if we load the autosave file.
b->markDirty();
- return b->readFile(a.absFilename());
+ return b->readFile(a);
case 1:
// Here we delete the autosave
unlink(a);
return false;
}
}
- return b->readFile(s.absFilename());
+ return b->readFile(s);
}
Buffer * b = theBufferList().newBuffer(filename);
BOOST_ASSERT(b);
- string tname;
+ FileName tname;
// use defaults.lyx as a default template if it exists.
if (templatename.empty())
- tname = libFileSearch("templates", "defaults.lyx").absFilename();
+ tname = libFileSearch("templates", "defaults.lyx");
else
- tname = templatename;
+ tname = makeAbsPath(templatename);
if (!tname.empty()) {
if (!b->readFile(tname)) {
- docstring const file = makeDisplayPath(tname, 50);
+ docstring const file = makeDisplayPath(tname.absFilename(), 50);
docstring const text = bformat(
_("The specified document template\n%1$s\ncould not be read."),
file);
}
+void setCaptionLabels(InsetBase & inset, string const & type,
+ docstring const label, Counters & counters)
+{
+ LyXText * text = inset.getText(0);
+ if (!text)
+ return;
+
+ ParagraphList & pars = text->paragraphs();
+ if (pars.empty())
+ return;
+
+ docstring const counter = from_ascii(type);
+
+ ParagraphList::iterator p = pars.begin();
+ for (; p != pars.end(); ++p) {
+ InsetList::iterator it2 = p->insetlist.begin();
+ InsetList::iterator end2 = p->insetlist.end();
+ // Any caption within this float should have the same
+ // label prefix but different numbers.
+ for (; it2 != end2; ++it2) {
+ InsetBase & icap = *it2->inset;
+ // Look deeper just in case.
+ setCaptionLabels(icap, type, label, counters);
+ if (icap.lyxCode() == InsetBase::CAPTION_CODE) {
+ // We found a caption!
+ counters.step(counter);
+ int number = counters.value(counter);
+ InsetCaption & ic = static_cast<InsetCaption &>(icap);
+ ic.setType(type);
+ ic.setCount(number);
+ ic.setCustomLabel(label);
+ }
+ }
+ }
+}
+
+
+void setCaptions(Paragraph & par, LyXTextClass const & textclass)
+{
+ if (par.insetlist.empty())
+ return;
+
+ Counters & counters = textclass.counters();
+
+ InsetList::iterator it = par.insetlist.begin();
+ InsetList::iterator end = par.insetlist.end();
+ for (; it != end; ++it) {
+ InsetBase & inset = *it->inset;
+ if (inset.lyxCode() == InsetBase::FLOAT_CODE
+ || inset.lyxCode() == InsetBase::WRAP_CODE) {
+ docstring const & name = inset.getInsetName();
+ if (name.empty())
+ continue;
+
+ Floating const & fl = textclass.floats().getType(to_ascii(name));
+ // FIXME UNICODE
+ string const & type = fl.type();
+ docstring const label = from_utf8(fl.name());
+ setCaptionLabels(inset, type, label, counters);
+ }
+ else if (inset.lyxCode() == InsetBase::TABULAR_CODE
+ && static_cast<InsetTabular &>(inset).tabular.isLongTabular()) {
+ // FIXME: are "table" and "Table" the correct type and label?
+ setCaptionLabels(inset, "table", from_ascii("Table"), counters);
+ }
+ }
+}
+
// set the label of a paragraph. This includes the counters.
void setLabel(Buffer const & buf, ParIterator & it, LyXTextClass const & textclass)
{
// Compute the item depth of the paragraph
par.itemdepth = getItemDepth(it);
- // erase what was there before
- par.params().labelString(docstring());
-
if (layout->margintype == MARGIN_MANUAL) {
if (par.params().labelWidthString().empty())
- par.setLabelWidthString(buf.translateLabel(layout->labelstring()));
+ par.params().labelWidthString(par.translateIfPossible(layout->labelstring(), buf.params()));
} else {
- par.setLabelWidthString(docstring());
+ par.params().labelWidthString(docstring());
}
+ // Optimisation: setLabel() can be called for each for each
+ // paragraph of the document. So we make the string static to
+ // avoid the repeated instanciation.
+ static docstring itemlabel;
+
// is it a layout that has an automatic label?
if (layout->labeltype == LABEL_COUNTER) {
if (layout->toclevel <= buf.params().secnumdepth
&& (layout->latextype != LATEX_ENVIRONMENT
|| isFirstInSequence(it.pit(), it.plist()))) {
counters.step(layout->counter);
- docstring label = expandLabel(buf, layout,
- par.params().appendix());
- par.params().labelString(label);
- }
+ par.params().labelString(
+ par.expandLabel(layout, buf.params()));
+ } else
+ par.params().labelString(docstring());
+
} else if (layout->labeltype == LABEL_ITEMIZE) {
// At some point of time we should do something more
// clever here, like:
// par.params().labelString(
// buf.params().user_defined_bullet(par.itemdepth).getText());
// for now, use a simple hardcoded label
- docstring itemlabel;
switch (par.itemdepth) {
case 0:
itemlabel = char_type(0x2022);
itemlabel = char_type(0x2217);
break;
case 3:
- itemlabel += char_type(0x2219); // or 0x00b7
+ itemlabel = char_type(0x2219); // or 0x00b7
break;
}
-
par.params().labelString(itemlabel);
+
} else if (layout->labeltype == LABEL_ENUMERATE) {
// FIXME
// Yes I know this is a really, really! bad solution
break;
}
- par.params().labelString(counters.counterLabel(buf.B_(format)));
+ par.params().labelString(counters.counterLabel(
+ par.translateIfPossible(from_ascii(format), buf.params())));
+
} else if (layout->labeltype == LABEL_BIBLIO) {// ale970302
counters.step(from_ascii("bibitem"));
int number = counters.value(from_ascii("bibitem"));
if (par.bibitem())
par.bibitem()->setCounter(number);
- par.params().labelString(buf.translateLabel(layout->labelstring()));
- // In biblio should't be following counters but...
+
+ par.params().labelString(
+ par.translateIfPossible(layout->labelstring(), buf.params()));
+ // In biblio shouldn't be following counters but...
} else if (layout->labeltype == LABEL_SENSITIVE) {
// Search for the first float or wrap inset in the iterator
- docstring type;
size_t i = it.depth();
+ InsetBase * in = 0;
while (i > 0) {
--i;
- InsetBase * const in = &it[i].inset();
- if (in->lyxCode() == InsetBase::FLOAT_CODE
- || in->lyxCode() == InsetBase::WRAP_CODE) {
- type = in->getInsetName();
+ InsetBase::Code const code = it[i].inset().lyxCode();
+ if (code == InsetBase::FLOAT_CODE ||
+ code == InsetBase::WRAP_CODE) {
+ in = &it[i].inset();
break;
}
}
+ // FIXME Can getInsetName() return an empty name for wide or
+ // float insets? If not we can put the definition of type
+ // inside the if (in) clause and use that instead of
+ // if (!type.empty()).
+ docstring type;
+ if (in)
+ type = in->getInsetName();
- docstring s;
if (!type.empty()) {
Floating const & fl = textclass.floats().getType(to_ascii(type));
// FIXME UNICODE
counters.step(from_ascii(fl.type()));
// Doesn't work... yet.
- s = bformat(_("%1$s #:"), buf.B_(fl.name()));
+ par.params().labelString(par.translateIfPossible(
+ bformat(from_ascii("%1$s #:"), from_utf8(fl.name())),
+ buf.params()));
} else {
// par->SetLayout(0);
- s = buf.translateLabel(layout->labelstring());
+ par.params().labelString(par.translateIfPossible(
+ layout->labelstring(), buf.params()));
}
- par.params().labelString(s);
} else if (layout->labeltype == LABEL_NO_LABEL)
par.params().labelString(docstring());
else
- par.params().labelString(buf.translateLabel(layout->labelstring()));
+ par.params().labelString(
+ par.translateIfPossible(layout->labelstring(), buf.params()));
}
} // anon namespace
// set the counter for this paragraph
setLabel(buf, it, textclass);
+ // It is better to set the captions after setLabel because
+ // the caption number might need the section number in the
+ // future.
+ setCaptions(*it, textclass);
+
// Now included docs
InsetList::const_iterator iit = it->insetlist.begin();
InsetList::const_iterator end = it->insetlist.end();
}
-docstring expandLabel(Buffer const & buf,
- LyXLayout_ptr const & layout, bool appendix)
-{
- LyXTextClass const & tclass = buf.params().getLyXTextClass();
-
- docstring fmt = buf.translateLabel(appendix ?
- layout->labelstring_appendix() :
- layout->labelstring());
-
- // handle 'inherited level parts' in 'fmt',
- // i.e. the stuff between '@' in '@Section@.\arabic{subsection}'
- size_t const i = fmt.find('@', 0);
- if (i != docstring::npos) {
- size_t const j = fmt.find('@', i + 1);
- if (j != docstring::npos) {
- docstring parent(fmt, i + 1, j - i - 1);
- // FIXME UNICODE
- docstring label = expandLabel(buf, tclass[to_utf8(parent)], appendix);
- fmt = docstring(fmt, 0, i) + label + docstring(fmt, j + 1, docstring::npos);
- }
- }
-
- return tclass.counters().counterLabel(fmt);
-}
-
-
} // namespace lyx
projects / lyx.git / blobdiff