// create a new paragraph
ParagraphList::iterator tmp = paragraphs.insert(boost::next(par),
new Paragraph);
- tmp->makeSameLayout(&*par);
+ tmp->makeSameLayout(*par);
- // When can pos > Last()?
- // I guess pos == Last() is possible.
+ // When can pos > size()?
+ // I guess pos == size() is possible.
if (par->size() > pos) {
// copy everything behind the break-position to the new
// paragraph
}
-#if 0
-Paragraph * depthHook(Paragraph * par, Paragraph::depth_type depth)
+ParagraphList::iterator depthHook(ParagraphList::iterator pit,
+ ParagraphList const & plist,
+ Paragraph::depth_type depth)
{
- Paragraph * newpar = par;
+ ParagraphList::iterator newpit = pit;
+ ParagraphList::iterator beg = plist.begin();
- do {
- newpar = newpar->previous();
- } while (newpar && newpar->getDepth() > depth);
-
- if (!newpar) {
- if (par->previous() || par->getDepth())
- lyxerr << "Error (depthHook): "
- << "no hook." << endl;
- newpar = par;
+ if (newpit != beg)
+ --newpit;
+
+ while (newpit != beg && newpit->getDepth() > depth) {
+ --newpit;
}
- return newpar;
+
+ if (newpit->getDepth() > depth)
+ return pit;
+
+ return newpit;
}
-Paragraph * outerHook(Paragraph * par)
+ParagraphList::iterator outerHook(ParagraphList::iterator pit,
+ ParagraphList const & plist)
{
- if (!par->getDepth())
- return 0;
- return depthHook(par, Paragraph::depth_type(par->getDepth() - 1));
+ if (!pit->getDepth())
+ return plist.end();
+ return depthHook(pit, plist,
+ Paragraph::depth_type(pit->getDepth() - 1));
}
-bool isFirstInSequence(Paragraph * par)
+bool isFirstInSequence(ParagraphList::iterator pit,
+ ParagraphList const & plist)
{
- Paragraph const * dhook = depthHook(par, par->getDepth());
- return (dhook == par
- || dhook->getLayout() != par->getLayout()
- || dhook->getDepth() != par->getDepth());
+ ParagraphList::iterator dhook = depthHook(pit, plist, pit->getDepth());
+ return (dhook == pit
+ || dhook->layout() != pit->layout()
+ || dhook->getDepth() != pit->getDepth());
}
-int getEndLabel(Paragraph * para, BufferParams const & bparams)
+int getEndLabel(ParagraphList::iterator p,
+ ParagraphList const & plist)
{
- Paragraph * par = para;
- while (par) {
- Paragraph::depth_type par_depth = par->getDepth();
- layout_type layout = par->getLayout();
- int const endlabeltype =
- textclasslist.Style(bparams.textclass,
- layout).endlabeltype;
+ ParagraphList::iterator pit = p;
+ Paragraph::depth_type par_depth = p->getDepth();
+ while (pit != plist.end()) {
+ LyXLayout_ptr const & layout = pit->layout();
+ int const endlabeltype = layout->endlabeltype;
+
if (endlabeltype != END_LABEL_NO_LABEL) {
- if (!para->next())
+ if (boost::next(p) == plist.end())
return endlabeltype;
- Paragraph::depth_type const next_depth =
- para->next()->getDepth();
+ Paragraph::depth_type const next_depth = boost::next(p)->getDepth();
if (par_depth > next_depth ||
- (par_depth == next_depth
- && layout != para->next()->getLayout()))
+ (par_depth == next_depth &&
+ layout != boost::next(p)->layout()))
return endlabeltype;
break;
}
if (par_depth == 0)
break;
- par = outerHook(par);
+ pit = outerHook(pit, plist);
+ if (pit != plist.end())
+ par_depth = pit->getDepth();
}
return END_LABEL_NO_LABEL;
}
-#endif
namespace {
lyxerr[Debug::LATEX] << "TeXDeeper... " << &*pit << endl;
ParagraphList::iterator par = pit;
- while (par != paragraphs.end()&& par->params().depth() == pit->params().depth()) {
+ while (par != paragraphs.end() &&
+ par->params().depth() == pit->params().depth()) {
if (par->layout()->isEnvironment()) {
par = TeXEnvironment(buf, paragraphs, par,
os, texrow);
}
if (!pit->params().spacing().isDefault()
- && (pit == paragraphs.begin() || !boost::prior(pit)->hasSameLayout(&*pit))) {
+ && (pit == paragraphs.begin() || !boost::prior(pit)->hasSameLayout(*pit))) {
os << pit->params().spacing().writeEnvirBegin() << '\n';
texrow.newline();
}
}
if (pit->params().lineTop()) {
- os << "\\lyxline{\\" << pit->getFont(bparams, 0).latexSize() << '}'
+ os << "\\lyxline{\\"
+ << pit->getFont(bparams, 0, outerFont(pit, paragraphs)).latexSize()
+ << '}'
<< "\\vspace{-1\\parskip}";
further_blank_line = true;
}
break;
}
- bool need_par = pit->simpleTeXOnePar(buf, bparams, os, texrow, moving_arg);
+ bool need_par = pit->simpleTeXOnePar(buf, bparams,
+ outerFont(pit, paragraphs),
+ os, texrow, moving_arg);
// Make sure that \\par is done with the font of the last
// character if this has another size as the default.
// Is this really needed ? (Dekel)
// We do not need to use to change the font for the last paragraph
// or for a command.
+ LyXFont const outerfont(outerFont(pit, paragraphs));
+
LyXFont const font =
(pit->empty()
- ? pit->getLayoutFont(bparams) : pit->getFont(bparams, pit->size() - 1));
+ ? pit->getLayoutFont(bparams, outerfont)
+ : pit->getFont(bparams, pit->size() - 1, outerfont));
bool is_command = style->isCommand();
}
if (!pit->params().spacing().isDefault()
- && (boost::next(pit) == paragraphs.end()|| !boost::next(pit)->hasSameLayout(&*pit))) {
+ && (boost::next(pit) == paragraphs.end()|| !boost::next(pit)->hasSameLayout(*pit))) {
os << pit->params().spacing().writeEnvirEnd() << '\n';
texrow.newline();
}
return unknown;
}
+
+
+LyXFont const outerFont(ParagraphList::iterator pit,
+ ParagraphList const & plist)
+{
+ Paragraph::depth_type par_depth = pit->getDepth();
+ LyXFont tmpfont(LyXFont::ALL_INHERIT);
+
+ // Resolve against environment font information
+ while (pit != plist.end() &&
+ par_depth && !tmpfont.resolved()) {
+ pit = outerHook(pit, plist);
+ if (pit != plist.end()) {
+ tmpfont.realize(pit->layout()->font);
+ par_depth = pit->getDepth();
+ }
+ }
+
+ return tmpfont;
+}
+
+
+LyXFont const realizeFont(LyXFont const & font,
+ BufferParams const & params)
+{
+ LyXTextClass const & tclass = params.getLyXTextClass();
+ LyXFont tmpfont(font);
+ tmpfont.realize(tclass.defaultfont());
+ return tmpfont;
+}
projects / lyx.git / blobdiff