X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=73157e6b7d60f5605b698b419e157d93e4509564;hb=4eb9b50dc642a3532d8126a93571696b3db57640;hp=e497a85ae60e3672baa1426c839727d9854ee8ed;hpb=80f3f219b7ed4a0c200fdf12e4e1c21faba1f636;p=lyx.git diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index e497a85ae6..73157e6b7d 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -397,7 +397,7 @@ public: typedef SkipPositions::const_iterator SkipPositionsIterator; void appendSkipPosition(SkipPositions & skips, pos_type const pos) const; - + Language * getSpellLanguage(pos_type const from) const; Language * locateSpellRange(pos_type & from, pos_type & to, @@ -412,7 +412,7 @@ public: } bool ignoreWord(docstring const & word) const ; - + void setMisspelled(pos_type from, pos_type to, SpellChecker::Result state) { pos_type textsize = owner_->size(); @@ -2967,13 +2967,13 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf, FontShape curr_fs = INHERIT_SHAPE; FontFamily curr_fam = INHERIT_FAMILY; FontSize curr_size = FONT_SIZE_INHERIT; - - string const default_family = - buf.masterBuffer()->params().fonts_default_family; + + string const default_family = + buf.masterBuffer()->params().fonts_default_family; vector tagsToOpen; vector tagsToClose; - + // parsing main loop for (pos_type i = initial; i < size(); ++i) { // let's not show deleted material in the output @@ -2996,7 +2996,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf, curstate = font.fontInfo().underbar(); if (font_old.underbar() != curstate) doFontSwitch(tagsToOpen, tagsToClose, ubar_flag, curstate, html::FT_UBAR); - + // strikeout curstate = font.fontInfo().strikeout(); if (font_old.strikeout() != curstate) @@ -3627,7 +3627,7 @@ int Paragraph::fixBiblio(Buffer const & buffer) InsetCommandParams(BIBITEM_CODE)); Font font(inherit_font, buffer.params().language); - insertInset(0, inset, font, Change(track_changes ? Change::INSERTED + insertInset(0, inset, font, Change(track_changes ? Change::INSERTED : Change::UNCHANGED)); return 1;