]> git.lyx.org Git - lyx.git/blobdiff - src/Paragraph.cpp
Correct Right Arrow key processing in Modules list
[lyx.git] / src / Paragraph.cpp
index 757ff60b9ffa74f677c38188200e3470e753ecce..45cc80ef6aeaa1d426e6bfc01ec5d6d3808729bc 100644 (file)
@@ -30,7 +30,6 @@
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Layout.h"
-#include "Length.h"
 #include "Font.h"
 #include "FontList.h"
 #include "LyXRC.h"
@@ -62,6 +61,7 @@
 #include "support/ExceptionMessage.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
+#include "support/Length.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
 #include "output_docbook.h"
@@ -84,14 +84,6 @@ using namespace lyx::support;
 
 namespace lyx {
 
-namespace {
-
-/// Inset identifier (above 0x10ffff, for ucs-4)
-char_type const META_INSET = 0x200001;
-
-} // namespace
-
-
 /////////////////////////////////////////////////////////////////////
 //
 // SpellResultRange
@@ -274,9 +266,9 @@ private:
        Ranges ranges_;
        /// the area of the paragraph with pending spell check
        FontSpan refresh_;
-       bool needs_refresh_;
        /// spell state cache version number
        SpellChecker::ChangeNumber current_change_number_;
+       bool needs_refresh_;
 
 
        void correctRangesAfterPos(pos_type pos, int offset)
@@ -460,7 +452,7 @@ public:
        {
                int numskips = 0;
                while (it != et && it->first < start) {
-                       int skip = it->last - it->first + 1;
+                       long skip = it->last - it->first + 1;
                        start += skip;
                        numskips += skip;
                        ++it;
@@ -487,9 +479,6 @@ public:
        ///
        FontList fontlist_;
 
-       ///
-       int id_;
-
        ///
        ParagraphParameters params_;
 
@@ -514,11 +503,13 @@ public:
        Layout const * layout_;
        ///
        SpellCheckerState speller_state_;
+       ///
+       int id_;
 };
 
 
 Paragraph::Private::Private(Paragraph * owner, Layout const & layout)
-       : owner_(owner), inset_owner_(nullptr), id_(-1), begin_of_body_(0), layout_(&layout)
+       : owner_(owner), inset_owner_(nullptr), begin_of_body_(0), layout_(&layout), id_(-1)
 {
        text_.reserve(100);
 }
@@ -531,17 +522,16 @@ int Paragraph::Private::make_id()
        // LFUN_PARAGRAPH_GOTO to switch to a different buffer, for instance in the
        // outliner.
        // (thread-safe)
-       static atomic_uint next_id(0);
+       static int next_id(0);
        return next_id++;
 }
 
 
 Paragraph::Private::Private(Private const & p, Paragraph * owner)
        : owner_(owner), inset_owner_(p.inset_owner_), fontlist_(p.fontlist_),
-         id_(make_id()),
          params_(p.params_), changes_(p.changes_), insetlist_(p.insetlist_),
          begin_of_body_(p.begin_of_body_), text_(p.text_), words_(p.words_),
-         layout_(p.layout_)
+         layout_(p.layout_), id_(make_id())
 {
        requestSpellCheck(p.text_.size());
 }
@@ -549,11 +539,11 @@ Paragraph::Private::Private(Private const & p, Paragraph * owner)
 
 Paragraph::Private::Private(Private const & p, Paragraph * owner,
        pos_type beg, pos_type end)
-       : owner_(owner), inset_owner_(p.inset_owner_), id_(make_id()),
+       : owner_(owner), inset_owner_(p.inset_owner_),
          params_(p.params_), changes_(p.changes_),
          insetlist_(p.insetlist_, beg, end),
          begin_of_body_(p.begin_of_body_), words_(p.words_),
-         layout_(p.layout_)
+         layout_(p.layout_), id_(make_id())
 {
        if (beg >= pos_type(p.text_.size()))
                return;
@@ -1037,45 +1027,70 @@ void Paragraph::Private::latexInset(BufferParams const & bparams,
                close = true;
        }
 
-       // FIXME: Bug: we can have an empty font change here!
-       // if there has just been a font change, we are going to close it
-       // right now, which means stupid latex code like \textsf{}. AFAIK,
-       // this does not harm dvi output. A minor bug, thus (JMarc)
-
-       // Some insets cannot be inside a font change command.
-       // However, even such insets *can* be placed in \L or \R
-       // or their equivalents (for RTL language switches), so we don't
-       // close the language in those cases.
-       // ArabTeX, though, cannot handle this special behavior, it seems.
-       bool arabtex = basefont.language()->lang() == "arabic_arabtex"
-               || running_font.language()->lang() == "arabic_arabtex";
-       if (open_font && !inset->inheritFont()) {
-               bool needPar = false;
-               bool closeLanguage = arabtex
-                       || basefont.isRightToLeft() == running_font.isRightToLeft();
-               // We pass non_inherit_inset = true here since size switches
-               // ought not to be terminated here (#8384).
-               unsigned int count = running_font.latexWriteEndChanges(os,
-                                       bparams, runparams, basefont, basefont,
-                                       needPar, closeLanguage, true);
-               column += count;
-               // if any font properties were closed, update the running_font,
-               // making sure, however, to leave the language as it was
-               if (count > 0) {
-                       // FIXME: probably a better way to keep track of the old
-                       // language, than copying the entire font?
-                       Font const copy_font(running_font);
-                       basefont = owner_->getLayoutFont(bparams, outerfont);
-                       running_font = basefont;
-                       if (!closeLanguage)
-                               running_font.setLanguage(copy_font.language());
-                       basefont.fontInfo().setSize(copy_font.fontInfo().size());
-                       // leave font open if language is still open
-                       open_font = (running_font.language() == basefont.language()
-                                    || running_font.fontInfo().size() == basefont.fontInfo().size());
-                       if (closeLanguage)
-                               runparams.local_font = &basefont;
+       if (open_font && (!inset->inheritFont() || inset->allowMultiPar())) {
+               // Some insets cannot be inside a font change command.
+               // However, even such insets *can* be placed in \L or \R
+               // or their equivalents (for RTL language switches),
+               // so we don't close the language in those cases
+               // (= differing isRightToLeft()).
+               // ArabTeX, though, doesn't seem to handle this special behavior.
+               bool const inRLSwitch = 
+                               basefont.isRightToLeft() != running_font.isRightToLeft()
+                               && basefont.language()->lang() != "arabic_arabtex"
+                               && running_font.language()->lang() != "arabic_arabtex";
+               // Having said that, PassThru insets must be inside a font change command,
+               // as we do not re-open the font inside. So:
+               bool const closeLanguage = !inset->isPassThru() && !inRLSwitch;
+               bool lang_closed = false;
+               bool lang_switched_at_inset = false;
+               // Close language if needed
+               if (closeLanguage) {
+                       // We need prev_font here as language changes directly at inset
+                       // will only be started inside the inset.
+                       Font const prev_font = (i > 0) ?
+                                               owner_->getFont(bparams, i - 1, outerfont)
+                                             : running_font;
+                       Font tmpfont(basefont);
+                       tmpfont.setLanguage(prev_font.language());
+                       bool needPar = false;
+                       unsigned int count = tmpfont.latexWriteEndChanges(os, bparams, runparams,
+                                                                         basefont, basefont,
+                                                                         needPar, closeLanguage);
+                       column += count;
+                       lang_closed = count > 0;
+                       lang_switched_at_inset = prev_font.language() != running_font.language();
                }
+               // Now re-do font changes in a way needed here
+               // (using switches with multi-par insets)
+               InsetText const * textinset = inset->asInsetText();
+               bool const cprotect = textinset
+                       ? textinset->hasCProtectContent(runparams.moving_arg)
+                         && !textinset->text().isMainText()
+                       : false;
+               unsigned int count2 = running_font.latexWriteStartChanges(os, bparams,
+                                                     runparams, basefont,
+                                                     running_font, true,
+                                                     cprotect);
+               column += count2;
+               // Update the running_font, making sure, however,
+               // to leave the language as it was.
+               // FIXME: probably a better way to keep track of the old
+               // language, than copying the entire font?
+               Font const copy_font(running_font);
+               basefont = owner_->getLayoutFont(bparams, outerfont);
+               running_font = basefont;
+               if (!closeLanguage)
+                       running_font.setLanguage(copy_font.language());
+               // For these, we use switches, so they should be taken as
+               // base inside the inset.
+               basefont.fontInfo().setSize(copy_font.fontInfo().size());
+               basefont.fontInfo().setFamily(copy_font.fontInfo().family());
+               basefont.fontInfo().setSeries(copy_font.fontInfo().series());
+               if (count2 == 0 && (lang_closed || lang_switched_at_inset))
+                       // All fonts closed
+                       open_font = false;
+               if (closeLanguage)
+                       runparams.local_font = &basefont;
        }
 
        size_t const previous_row_count = os.texrow().rows();
@@ -2398,8 +2413,9 @@ void Paragraph::latex(BufferParams const & bparams,
        pos_type body_pos = beginOfBody();
        unsigned int column = 0;
 
-       // If we are inside an inset, the real outerfont is local_font
-       Font const real_outerfont = (runparams.local_font != nullptr)
+       // If we are inside an non inheritFont() inset, the real outerfont is local_font
+       Font const real_outerfont = (!inInset().inheritFont()
+                                    && runparams.local_font != nullptr)
                        ? Font(runparams.local_font->fontInfo()) : outerfont;
 
        if (body_pos > 0) {
@@ -2564,17 +2580,26 @@ void Paragraph::latex(BufferParams const & bparams,
 
                // Fully instantiated font
                Font const current_font = getFont(bparams, i, outerfont);
+               // Previous font
+               Font const prev_font = (i > 0) ?
+                                       getFont(bparams, i - 1, outerfont)
+                                     : current_font;
 
                Font const last_font = running_font;
                bool const in_ct_deletion = (bparams.output_changes
                                             && runningChange == change
                                             && change.type == Change::DELETED
                                             && !os.afterParbreak());
+               bool const multipar_inset =
+                       (c == META_INSET && getInset(i) && getInset(i)->allowMultiPar());
 
                // Do we need to close the previous font?
                if (open_font &&
-                   (current_font != running_font ||
-                    current_font.language() != running_font.language()))
+                   ((current_font != running_font
+                     || current_font.language() != running_font.language())
+                    || (multipar_inset
+                        && (current_font == prev_font
+                            || current_font.language() == prev_font.language()))))
                {
                        // ensure there is no open script-wrapper
                        if (!alien_script.empty()) {
@@ -2659,10 +2684,17 @@ void Paragraph::latex(BufferParams const & bparams,
                                os << '}';
                                column += 1;
                        }
-                       odocstringstream ods;
-                       column += current_font.latexWriteStartChanges(ods, bparams,
-                                                             runparams, basefont,
-                                                             last_font);
+                       otexstringstream ots;
+                       if (!multipar_inset) {
+                               InsetText const * textinset = inInset().asInsetText();
+                               bool const cprotect = textinset
+                                       ? textinset->hasCProtectContent(runparams.moving_arg)
+                                         && !textinset->text().isMainText()
+                                       : false;
+                               column += current_font.latexWriteStartChanges(ots, bparams,
+                                                                             runparams, basefont, last_font, false,
+                                                                             cprotect);
+                       }
                        // Check again for display math in ulem commands as a
                        // font change may also occur just before a math inset.
                        if (runparams.inDisplayMath && !deleted_display_math
@@ -2674,19 +2706,17 @@ void Paragraph::latex(BufferParams const & bparams,
                        }
                        running_font = current_font;
                        open_font = true;
-                       docstring fontchange = ods.str();
+                       docstring fontchange = ots.str();
+                       os << fontchange;
                        // check whether the fontchange ends with a \\textcolor
-                       // modifier and the text starts with a space (bug 4473)
+                       // modifier and the text starts with a space. If so we
+                       // need to add } in order to prevent \\textcolor from gobbling
+                       // the space (bug 4473).
                        docstring const last_modifier = rsplit(fontchange, '\\');
                        if (prefixIs(last_modifier, from_ascii("textcolor")) && c == ' ')
-                               os << fontchange << from_ascii("{}");
-                       // check if the fontchange ends with a trailing blank
-                       // (like "\small " (see bug 3382)
-                       else if (suffixIs(fontchange, ' ') && c == ' ')
-                               os << fontchange.substr(0, fontchange.size() - 1)
-                                  << from_ascii("{}");
-                       else
-                               os << fontchange;
+                               os << from_ascii("{}");
+                       else if (ots.terminateCommand())
+                               os << termcmd;
                        if (in_ct_deletion) {
                                // We have to close and then reopen \lyxdeleted,
                                // as strikeout needs to be on lowest level.
@@ -2755,9 +2785,17 @@ void Paragraph::latex(BufferParams const & bparams,
                                                incremented = true;
                                        }
                                }
+                               // We need to restore these after insets with
+                               // allowMultiPar() true
+                               Font const save_running_font = running_font;
+                               Font const save_basefont = basefont;
                                d->latexInset(bparams, os, rp, running_font,
                                                basefont, real_outerfont, open_font,
                                                runningChange, style, i, column);
+                               if (multipar_inset) {
+                                       running_font = save_running_font;
+                                       basefont = save_basefont;
+                               }
                                if (incremented)
                                        --parInline;
 
@@ -3023,11 +3061,11 @@ void doFontSwitchDocBook(vector<xml::FontTag> & tagsToOpen,
 
 class OptionalFontType {
 public:
-       bool has_value;
        xml::FontTypes ft;
+       bool has_value;
 
-       OptionalFontType(): has_value(false), ft(xml::FT_EMPH) {} // A possible value at random for ft.
-       OptionalFontType(xml::FontTypes ft): has_value(true), ft(ft) {}
+       OptionalFontType(): ft(xml::FT_EMPH), has_value(false) {} // A possible value at random for ft.
+       OptionalFontType(xml::FontTypes ft): ft(ft), has_value(true) {}
 };
 
 OptionalFontType fontShapeToXml(FontShape fs)
@@ -3054,13 +3092,10 @@ OptionalFontType fontFamilyToXml(FontFamily fm)
        switch (fm) {
        case ROMAN_FAMILY:
                return {xml::FT_ROMAN};
-               break;
        case SANS_FAMILY:
                return {xml::FT_SANS};
-               break;
        case TYPEWRITER_FAMILY:
                return {xml::FT_TYPE};
-               break;
        case INHERIT_FAMILY:
                return {};
        default:
@@ -3105,16 +3140,12 @@ OptionalFontType fontSizeToXml(FontSize fs)
        }
 }
 
-}// anonymous namespace
-
-
-void Paragraph::simpleDocBookOnePar(Buffer const & buf,
-                                    XMLStream & xs,
-                                    OutputParams const & runparams,
-                                    Font const & outerfont,
-                                    bool start_paragraph, bool close_paragraph,
-                                    pos_type initial) const
+struct DocBookFontState
 {
+       FontShape  curr_fs   = INHERIT_SHAPE;
+       FontFamily curr_fam  = INHERIT_FAMILY;
+       FontSize   curr_size = INHERIT_SIZE;
+
        // track whether we have opened these tags
        bool emph_flag = false;
        bool bold_flag = false;
@@ -3122,6 +3153,7 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf,
        bool ubar_flag = false;
        bool dbar_flag = false;
        bool sout_flag = false;
+       bool xout_flag = false;
        bool wave_flag = false;
        // shape tags
        bool shap_flag = false;
@@ -3129,19 +3161,154 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf,
        bool faml_flag = false;
        // size tags
        bool size_flag = false;
+};
 
-       Layout const & style = *d->layout_;
+std::tuple<vector<xml::FontTag>, vector<xml::EndFontTag>> computeDocBookFontSwitch(FontInfo const & font_old,
+                                                                                          Font const & font,
+                                                                                          std::string const & default_family,
+                                                                                          DocBookFontState & fs)
+{
+       vector<xml::FontTag> tagsToOpen;
+       vector<xml::EndFontTag> tagsToClose;
+
+       // emphasis
+       FontState curstate = font.fontInfo().emph();
+       if (font_old.emph() != curstate)
+               doFontSwitchDocBook(tagsToOpen, tagsToClose, fs.emph_flag, curstate, xml::FT_EMPH);
+
+       // noun
+       curstate = font.fontInfo().noun();
+       if (font_old.noun() != curstate)
+               doFontSwitchDocBook(tagsToOpen, tagsToClose, fs.noun_flag, curstate, xml::FT_NOUN);
+
+       // underbar
+       curstate = font.fontInfo().underbar();
+       if (font_old.underbar() != curstate)
+               doFontSwitchDocBook(tagsToOpen, tagsToClose, fs.ubar_flag, curstate, xml::FT_UBAR);
+
+       // strikeout
+       curstate = font.fontInfo().strikeout();
+       if (font_old.strikeout() != curstate)
+               doFontSwitchDocBook(tagsToOpen, tagsToClose, fs.sout_flag, curstate, xml::FT_SOUT);
+
+       // xout
+       curstate = font.fontInfo().xout();
+       if (font_old.xout() != curstate)
+               doFontSwitchDocBook(tagsToOpen, tagsToClose, fs.xout_flag, curstate, xml::FT_XOUT);
+
+       // double underbar
+       curstate = font.fontInfo().uuline();
+       if (font_old.uuline() != curstate)
+               doFontSwitchDocBook(tagsToOpen, tagsToClose, fs.dbar_flag, curstate, xml::FT_DBAR);
+
+       // wavy line
+       curstate = font.fontInfo().uwave();
+       if (font_old.uwave() != curstate)
+               doFontSwitchDocBook(tagsToOpen, tagsToClose, fs.wave_flag, curstate, xml::FT_WAVE);
+
+       // bold
+       // a little hackish, but allows us to reuse what we have.
+       curstate = (font.fontInfo().series() == BOLD_SERIES ? FONT_ON : FONT_OFF);
+       if (font_old.series() != font.fontInfo().series())
+               doFontSwitchDocBook(tagsToOpen, tagsToClose, fs.bold_flag, curstate, xml::FT_BOLD);
+
+       // Font shape
+       fs.curr_fs = font.fontInfo().shape();
+       FontShape old_fs = font_old.shape();
+       if (old_fs != fs.curr_fs) {
+               if (fs.shap_flag) {
+                       OptionalFontType tag = fontShapeToXml(old_fs);
+                       if (tag.has_value)
+                               tagsToClose.push_back(docbookEndFontTag(tag.ft));
+                       fs.shap_flag = false;
+               }
+
+               OptionalFontType tag = fontShapeToXml(fs.curr_fs);
+               if (tag.has_value)
+                       tagsToOpen.push_back(docbookStartFontTag(tag.ft));
+       }
+
+       // Font family
+       fs.curr_fam = font.fontInfo().family();
+       FontFamily old_fam = font_old.family();
+       if (old_fam != fs.curr_fam) {
+               if (fs.faml_flag) {
+                       OptionalFontType tag = fontFamilyToXml(old_fam);
+                       if (tag.has_value)
+                               tagsToClose.push_back(docbookEndFontTag(tag.ft));
+                       fs.faml_flag = false;
+               }
+               switch (fs.curr_fam) {
+                       case ROMAN_FAMILY:
+                               // we will treat a "default" font family as roman, since we have
+                               // no other idea what to do.
+                               if (default_family != "rmdefault" && default_family != "default") {
+                                       tagsToOpen.push_back(docbookStartFontTag(xml::FT_ROMAN));
+                                       fs.faml_flag = true;
+                               }
+                               break;
+                       case SANS_FAMILY:
+                               if (default_family != "sfdefault") {
+                                       tagsToOpen.push_back(docbookStartFontTag(xml::FT_SANS));
+                                       fs.faml_flag = true;
+                               }
+                               break;
+                       case TYPEWRITER_FAMILY:
+                               if (default_family != "ttdefault") {
+                                       tagsToOpen.push_back(docbookStartFontTag(xml::FT_TYPE));
+                                       fs.faml_flag = true;
+                               }
+                               break;
+                       case INHERIT_FAMILY:
+                               break;
+                       default:
+                               // the other tags are for internal use
+                               LATTEST(false);
+                               break;
+               }
+       }
+
+       // Font size
+       fs.curr_size = font.fontInfo().size();
+       FontSize old_size = font_old.size();
+       if (old_size != fs.curr_size) {
+               if (fs.size_flag) {
+                       OptionalFontType tag = fontSizeToXml(old_size);
+                       if (tag.has_value)
+                               tagsToClose.push_back(docbookEndFontTag(tag.ft));
+                       fs.size_flag = false;
+               }
+
+               OptionalFontType tag = fontSizeToXml(fs.curr_size);
+               if (tag.has_value) {
+                       tagsToOpen.push_back(docbookStartFontTag(tag.ft));
+                       fs.size_flag = true;
+               }
+       }
+
+       return std::tuple<vector<xml::FontTag>, vector<xml::EndFontTag>>(tagsToOpen, tagsToClose);
+}
+
+} // anonymous namespace
+
+
+void Paragraph::simpleDocBookOnePar(Buffer const & buf,
+                                    XMLStream & xs,
+                                    OutputParams const & runparams,
+                                    Font const & outerfont,
+                                    bool start_paragraph, bool close_paragraph,
+                                    pos_type initial) const
+{
+       // track whether we have opened these tags
+       DocBookFontState fs;
 
        if (start_paragraph)
                xs.startDivision(allowEmpty());
 
+       Layout const & style = *d->layout_;
        FontInfo font_old =
                        style.labeltype == LABEL_MANUAL ? style.labelfont : style.font;
 
-       FontShape  curr_fs   = INHERIT_SHAPE;
-       FontFamily curr_fam  = INHERIT_FAMILY;
-       FontSize   curr_size = INHERIT_SIZE;
-
        string const default_family =
                        buf.masterBuffer()->params().fonts_default_family;
 
@@ -3156,137 +3323,24 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf,
 
                Font const font = getFont(buf.masterBuffer()->params(), i, outerfont);
 
-               if (start_paragraph) {
-                       // emphasis
-                       FontState curstate = font.fontInfo().emph();
-                       if (font_old.emph() != curstate)
-                               doFontSwitchDocBook(tagsToOpen, tagsToClose, emph_flag, curstate, xml::FT_EMPH);
-
-                       // noun
-                       curstate = font.fontInfo().noun();
-                       if (font_old.noun() != curstate)
-                               doFontSwitchDocBook(tagsToOpen, tagsToClose, noun_flag, curstate, xml::FT_NOUN);
-
-                       // underbar
-                       curstate = font.fontInfo().underbar();
-                       if (font_old.underbar() != curstate)
-                               doFontSwitchDocBook(tagsToOpen, tagsToClose, ubar_flag, curstate, xml::FT_UBAR);
-
-                       // strikeout
-                       curstate = font.fontInfo().strikeout();
-                       if (font_old.strikeout() != curstate)
-                               doFontSwitchDocBook(tagsToOpen, tagsToClose, sout_flag, curstate, xml::FT_SOUT);
-
-                       // double underbar
-                       curstate = font.fontInfo().uuline();
-                       if (font_old.uuline() != curstate)
-                               doFontSwitchDocBook(tagsToOpen, tagsToClose, dbar_flag, curstate, xml::FT_DBAR);
-
-                       // wavy line
-                       curstate = font.fontInfo().uwave();
-                       if (font_old.uwave() != curstate)
-                               doFontSwitchDocBook(tagsToOpen, tagsToClose, wave_flag, curstate, xml::FT_WAVE);
-
-                       // bold
-                       // a little hackish, but allows us to reuse what we have.
-                       curstate = (font.fontInfo().series() == BOLD_SERIES ? FONT_ON : FONT_OFF);
-                       if (font_old.series() != font.fontInfo().series())
-                               doFontSwitchDocBook(tagsToOpen, tagsToClose, bold_flag, curstate, xml::FT_BOLD);
-
-                       // Font shape
-                       curr_fs = font.fontInfo().shape();
-                       FontShape old_fs = font_old.shape();
-                       if (old_fs != curr_fs) {
-                               if (shap_flag) {
-                                       OptionalFontType tag = fontShapeToXml(old_fs);
-                                       if (tag.has_value) {
-                                               tagsToClose.push_back(docbookEndFontTag(tag.ft));
-                                       }
-                                       shap_flag = false;
-                               }
+               // Determine which tags should be opened or closed.
+               tie(tagsToOpen, tagsToClose) = computeDocBookFontSwitch(font_old, font, default_family, fs);
 
-                               OptionalFontType tag = fontShapeToXml(curr_fs);
-                               if (tag.has_value) {
-                                       tagsToOpen.push_back(docbookStartFontTag(tag.ft));
-                               }
-                       }
-
-                       // Font family
-                       curr_fam = font.fontInfo().family();
-                       FontFamily old_fam = font_old.family();
-                       if (old_fam != curr_fam) {
-                               if (faml_flag) {
-                                       OptionalFontType tag = fontFamilyToXml(old_fam);
-                                       if (tag.has_value) {
-                                               tagsToClose.push_back(docbookEndFontTag(tag.ft));
-                                       }
-                                       faml_flag = false;
-                               }
-                               switch (curr_fam) {
-                                       case ROMAN_FAMILY:
-                                               // we will treat a "default" font family as roman, since we have
-                                               // no other idea what to do.
-                                               if (default_family != "rmdefault" && default_family != "default") {
-                                                       tagsToOpen.push_back(docbookStartFontTag(xml::FT_ROMAN));
-                                                       faml_flag = true;
-                                               }
-                                               break;
-                                       case SANS_FAMILY:
-                                               if (default_family != "sfdefault") {
-                                                       tagsToOpen.push_back(docbookStartFontTag(xml::FT_SANS));
-                                                       faml_flag = true;
-                                               }
-                                               break;
-                                       case TYPEWRITER_FAMILY:
-                                               if (default_family != "ttdefault") {
-                                                       tagsToOpen.push_back(docbookStartFontTag(xml::FT_TYPE));
-                                                       faml_flag = true;
-                                               }
-                                               break;
-                                       case INHERIT_FAMILY:
-                                               break;
-                                       default:
-                                               // the other tags are for internal use
-                                               LATTEST(false);
-                                               break;
-                               }
-                       }
-
-                       // Font size
-                       curr_size = font.fontInfo().size();
-                       FontSize old_size = font_old.size();
-                       if (old_size != curr_size) {
-                               if (size_flag) {
-                                       OptionalFontType tag = fontSizeToXml(old_size);
-                                       if (tag.has_value) {
-                                               tagsToClose.push_back(docbookEndFontTag(tag.ft));
-                                       }
-                                       size_flag = false;
-                               }
-
-                               OptionalFontType tag = fontSizeToXml(curr_size);
-                               if (tag.has_value) {
-                                       tagsToOpen.push_back(docbookStartFontTag(tag.ft));
-                                       size_flag = true;
-                               }
-                       }
-
-                       // FIXME XHTML
-                       // Other such tags? What about the other text ranges?
+               // FIXME XHTML
+               // Other such tags? What about the other text ranges?
 
-                       vector<xml::EndFontTag>::const_iterator cit = tagsToClose.begin();
-                       vector<xml::EndFontTag>::const_iterator cen = tagsToClose.end();
-                       for (; cit != cen; ++cit)
-                               xs << *cit;
+               vector<xml::EndFontTag>::const_iterator cit = tagsToClose.begin();
+               vector<xml::EndFontTag>::const_iterator cen = tagsToClose.end();
+               for (; cit != cen; ++cit)
+                       xs << *cit;
 
-                       vector<xml::FontTag>::const_iterator sit = tagsToOpen.begin();
-                       vector<xml::FontTag>::const_iterator sen = tagsToOpen.end();
-                       for (; sit != sen; ++sit)
-                               xs << *sit;
+               vector<xml::FontTag>::const_iterator sit = tagsToOpen.begin();
+               vector<xml::FontTag>::const_iterator sen = tagsToOpen.end();
+               for (; sit != sen; ++sit)
+                       xs << *sit;
 
-                       tagsToClose.clear();
-                       tagsToOpen.clear();
-               }
+               tagsToClose.clear();
+               tagsToOpen.clear();
 
                if (Inset const * inset = getInset(i)) {
                        if (!runparams.for_toc || inset->isInToc()) {
@@ -4054,7 +4108,7 @@ bool Paragraph::brokenBiblio() const
 int Paragraph::fixBiblio(Buffer const & buffer)
 {
        // FIXME: when there was already an inset at 0, the return value is 1,
-       // which does not tell whether another inset has been remove; the
+       // which does not tell whether another inset has been removed; the
        // cursor cannot be correctly updated.
 
        bool const track_changes = buffer.params().track_changes;
@@ -4086,6 +4140,8 @@ int Paragraph::fixBiblio(Buffer const & buffer)
                // than keep the first? (JMarc)
                Inset * inset = releaseInset(bibitem_pos);
                d->insetlist_.begin()->inset = inset;
+               // This needs to be done to update the counter (#8499)
+               buffer.updateBuffer();
                return -bibitem_pos;
        }