[LyX/master] Whitespace
commit 7fb059bce41ce66f29d74bad7865e9c2e9e57546 Author: Scott Kostyshak Date: Tue Sep 10 14:23:37 2024 +0200 Whitespace --- src/BufferParams.cpp | 8 src/BufferParams.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index a4c020e6e7..e1a31b1a18 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -3532,7 +3532,7 @@ string BufferParams::babelCall(LaTeXFeatures const & features, string lang_opts, os << "\n\\babelprovide[import"; if (l == language) os << ", main"; -if (!babelLangOptions(l->lang(), true).empty()) + if (!babelLangOptions(l->lang(), true).empty()) os << ", " << babelLangOptions(l->lang()); os << "]{" << blang << "}"; have_mods = true; @@ -3555,8 +3555,8 @@ string BufferParams::babelCall(LaTeXFeatures const & features, string lang_opts, } if ((bp == 2 && useNonTeXFonts) || have_other_forceprovide) { // Options need to go to \babeprovide -// but only those set in document settings -if (!babelLangOptions(l->lang(), true).empty()) + // but only those set in document settings + if (!babelLangOptions(l->lang(), true).empty()) os << "\n\\babelprovide[" << babelLangOptions(l->lang()) << "]{" << blang << "}"; @@ -4100,7 +4100,7 @@ string const BufferParams::babelLangOptions(string const & lang, bool const only { if (lang_options_babel_.find(lang) == lang_options_babel_.end()) { Language const * l = languages.getLanguage(lang); -return (l && !onlycust) ? l->babelOpts() : string(); + return (l && !onlycust) ? l->babelOpts() : string(); } return lang_options_babel_.find(lang)->second; } diff --git a/src/BufferParams.h b/src/BufferParams.h index 1b3393cdb3..f31f2b 100644 --- a/src/BufferParams.h +++ b/src/BufferParams.h @@ -343,8 +343,8 @@ public: /// babel language options std::map lang_options_babel_; /// -std::string const babelLangOptions(std::string const & lang, - bool const onlycust = false) const; + std::string const babelLangOptions(std::string const & lang, + bool const onlycust = false) const; /// void setBabelLangOptions(std::string const & lang, std::string const & opts) { lang_options_babel_[lang] = opts; } -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 2e227cceaff5c4647760c53daf85370358050410 Author: Scott Kostyshak Date: Sun Jun 2 22:52:18 2024 -0400 Whitespace --- src/BufferParams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 892aff5867..1740e8c764 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -1831,7 +1831,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, case DEFAULT: break; } - + if (paragraph_separation) { if (!tclass.halfparskip().empty() && getDefSkip().kind() == VSpace::HALFLINE) clsoptions << tclass.halfparskip() << ","; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 9dae88a15ad2782859f76165d654b869e22684dc Author: Juergen Spitzmueller Date: Tue May 14 13:18:05 2024 +0200 Whitespace --- src/Layout.cpp | 12 ++-- src/Layout.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Layout.cpp b/src/Layout.cpp index 1a63ca3293..e531fab362 100644 --- a/src/Layout.cpp +++ b/src/Layout.cpp @@ -885,13 +885,13 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass, lex >> docbookiteminnertagtype_; break; -case LT_DOCBOOKNOFONTINSIDE: -lex >> docbooknofontinside_; -break; + case LT_DOCBOOKNOFONTINSIDE: + lex >> docbooknofontinside_; + break; -case LT_DOCBOOKGENERATETITLE: -lex >> docbookgeneratetitle_; -break; + case LT_DOCBOOKGENERATETITLE: + lex >> docbookgeneratetitle_; + break; case LT_SPELLCHECK: lex >> spellcheck; diff --git a/src/Layout.h b/src/Layout.h index 3b8be82ee9..eef0bee290 100644 --- a/src/Layout.h +++ b/src/Layout.h @@ -403,7 +403,7 @@ public: /** true when the verbatim stuff of this layout needs to be \cprotect'ed. */ bool needcprotect; - /** true when the verbatim stuff of this layout never should be + /** true when the verbatim stuff of this layout never should be \cprotect'ed. */ bool nocprotect; /** true when specific commands in this paragraph need to be -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit dd4c67bfdc1a61dbd7cc958a00843e258d620df7 Author: Scott Kostyshak Date: Sat Apr 20 14:22:07 2024 -0400 Whitespace --- development/cmake/Install.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake index 76b53d8ff5..a901942b4a 100755 --- a/development/cmake/Install.cmake +++ b/development/cmake/Install.cmake @@ -137,7 +137,7 @@ lyx_install("data" ${TOP_SRC_DIR}/libscripts *.R . lyx_install("data" ${TOP_SRC_DIR}/libscripts saxon*.* .) lyx_install("data" ${TOP_SRC_DIR}/libdocbook * . epub3 xhtml5 xhtml lib common) lyx_install("data" ${TOP_SRC_DIR}/libxtemplates *.xtemplate .) -lyx_install("data" ${TOP_SRC_DIR}/lib tabletemplates *.lyx .) +lyx_install("data" ${TOP_SRC_DIR}/libtabletemplates *.lyx .) lyx_install("data" ${TOP_SRC_DIR}/3rdparty scripts/evince_sync * .) lyx_install("font" ${TOP_SRC_DIR}/lib/fonts .* .) lyx_install("tex" ${TOP_SRC_DIR}/lib/tex.* .) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 153a16777e59629623b39e266be7d924f9a68f96 Author: Pavel Sanda Date: Tue Sep 19 23:52:13 2023 +0200 Whitespace --- lib/Makefile.am |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index a6311e3..d5b0d44 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2847,7 +2847,6 @@ eslettertemplatesdir = $(pkgdatadir)/templates/es/Letters dist_eslettertemplates_DATA = \ templates/es/Letters/Letter_%28Standard_Class%29.lyx - obsoletetemplatesdir = $(pkgdatadir)/templates/Obsolete dist_obsoletetemplates_DATA = \ templates/Obsolete/ACM_SIGGGRAPH_0.92_%28obsolete%29.lyx \ -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] whitespace
commit 81dc79e6d632d47c50042f7c2e8fb2b7d06df168 Author: Juergen Spitzmueller Date: Wed Sep 13 13:21:37 2023 +0200 whitespace --- src/Paragraph.cpp |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index d69d09a..09bc65c 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -760,7 +760,6 @@ void Paragraph::acceptChanges(pos_type start, pos_type end) } break; } - } } -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace and range
commit 62483d102d93c401b7f1d550f0ef087ea615b211 Author: Richard Kimberly Heck Date: Wed Aug 16 18:14:48 2023 -0400 Whitespace and range --- src/frontends/qt/LayoutBox.cpp |1 - src/frontends/qt/Menus.cpp | 20 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/frontends/qt/LayoutBox.cpp b/src/frontends/qt/LayoutBox.cpp index 435bd47..ed80332 100644 --- a/src/frontends/qt/LayoutBox.cpp +++ b/src/frontends/qt/LayoutBox.cpp @@ -590,7 +590,6 @@ void LayoutBox::updateContents(bool reset) d->model_->clear(); DocumentClass::const_iterator lit = d->text_class_->begin(); DocumentClass::const_iterator len = d->text_class_->end(); - for (; lit != len; ++lit) { docstring const & name = lit->name(); bool const useEmpty = d->inset_->forcePlainLayout() || d->inset_->usePlainLayout(); diff --git a/src/frontends/qt/Menus.cpp b/src/frontends/qt/Menus.cpp index 8f62bd4..49f99cf 100644 --- a/src/frontends/qt/Menus.cpp +++ b/src/frontends/qt/Menus.cpp @@ -2438,7 +2438,6 @@ void Menus::Impl::expand(MenuDefinition const & frommenu, case MenuItem::InfoArguments: tomenu.expandInfoArguments(bv); break; - case MenuItem::Toc: tomenu.expandToc(buf); @@ -2664,28 +2663,25 @@ void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view, bool initial) bv = view->currentBufferView(); d->expand(d->menubar_, menu, bv); - MenuDefinition::const_iterator m = menu.begin(); - MenuDefinition::const_iterator end = menu.end(); - - for (; m != end; ++m) { + for (auto const & m : menu) { - if (m->kind() != MenuItem::Submenu) { - LYXERR(Debug::GUI, "\tERROR: not a submenu " << m->label()); + if (m.kind() != MenuItem::Submenu) { + LYXERR(Debug::GUI, "\tERROR: not a submenu " << m.label()); continue; } - LYXERR(Debug::GUI, "menu bar item " << m->label() - << " is a submenu named " << m->submenuname()); + LYXERR(Debug::GUI, "menu bar item " << m.label() + << " is a submenu named " << m.submenuname()); - QString name = m->submenuname(); + QString name = m.submenuname(); if (!d->hasMenu(name)) { LYXERR(Debug::GUI, "\tERROR: " << name << " submenu has no menu!"); continue; } - Menu * menuptr = new Menu(view, m->submenuname(), true); - menuptr->setTitle(label(*m)); + Menu * menuptr = new Menu(view, m.submenuname(), true); + menuptr->setTitle(label(m)); #if defined(Q_OS_MAC) // On Mac OS with Qt/Cocoa, the menu is not displayed if there is no action -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit e9fb0df5eaaf0603ccb8b2519941e1f08b3fd72e Author: Scott Kostyshak Date: Mon Jul 31 18:41:11 2023 -0400 Whitespace Use tab for consistency. --- lib/layouts/theorems-case.inc | 18 +- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/layouts/theorems-case.inc b/lib/layouts/theorems-case.inc index 3cf64e4..ac60130 100644 --- a/lib/layouts/theorems-case.inc +++ b/lib/layouts/theorems-case.inc @@ -15,21 +15,21 @@ Counter casei End Counter caseii GuiName "Case (Level 2)" -Within casei -LabelString "Case \roman{caseii}." -PrettyFormat "Case \roman{caseii}" + Within casei + LabelString "Case \roman{caseii}." + PrettyFormat "Case \roman{caseii}" End Counter caseiii GuiName "Case (Level 3)" -Within caseii -LabelString "Case \alph{caseiii}." -PrettyFormat "Case \alph{caseiii}" + Within caseii + LabelString "Case \alph{caseiii}." + PrettyFormat "Case \alph{caseiii}" End Counter caseiv GuiName "Case (Level 4)" -Within caseiii -PrettyFormat "Case \arabic{caseiv}" -LabelString "Case \arabic{caseiv}." + Within caseiii + PrettyFormat "Case \arabic{caseiv}" + LabelString "Case \arabic{caseiv}." End Style Case -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 57f284d9a8a41d3b26fd5a644d9c2976192ff5f6 Author: Richard Kimberly Heck Date: Fri Jul 28 17:16:06 2023 -0400 Whitespace --- src/Buffer.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 3d3bb53..e028fa9 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -2434,7 +2434,7 @@ void Buffer::getLabelList(vector> & shared_ptr toc = d->toc_backend.toc("label"); for (auto const & tocit : *toc) { if (tocit.depth() == 0) { - list.push_back(make_tuple(tocit.str(), tocit.asString(),tocit.prettyStr())); + list.push_back(make_tuple(tocit.str(), tocit.asString(), tocit.prettyStr())); } } } -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit bc95ff1ace326eb441b7d4da0637fd7ed594d146 Author: Juergen Spitzmueller Date: Tue Jul 25 11:13:18 2023 +0200 Whitespace --- src/insets/InsetLayout.cpp |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp index ab6108a..3efe318 100644 --- a/src/insets/InsetLayout.cpp +++ b/src/insets/InsetLayout.cpp @@ -111,8 +111,8 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass, IL_DOCBOOKINNERTAG, IL_DOCBOOKINNERTAGTYPE, IL_DOCBOOKINNERATTR, -IL_DOCBOOKNOFONTINSIDE, -IL_DOCBOOKRENDERASIMAGE, + IL_DOCBOOKNOFONTINSIDE, + IL_DOCBOOKRENDERASIMAGE, IL_INHERITFONT, IL_INTOC, IL_ISTOCCAPTION, -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 67ff56c63af67b5897c18f22aeb206d8387b086a Author: Scott Kostyshak Date: Tue Jun 13 04:32:34 2023 -0400 Whitespace --- src/insets/InsetHyperlink.cpp |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp index a0c504c..dcdcbbb 100644 --- a/src/insets/InsetHyperlink.cpp +++ b/src/insets/InsetHyperlink.cpp @@ -94,9 +94,9 @@ void InsetHyperlink::doDispatch(Cursor & cur, FuncRequest & cmd) { // Ctrl + click: open hyperlink if (cmd.action() == LFUN_MOUSE_RELEASE && cmd.modifier() == ControlModifier) { - lyx::dispatch(FuncRequest(LFUN_INSET_EDIT)); - return; - } + lyx::dispatch(FuncRequest(LFUN_INSET_EDIT)); + return; + } switch (cmd.action()) { -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 08fc56486e5d4fab79912c916fe72860533b8c74 Author: Juergen Spitzmueller Date: Wed Feb 22 14:53:25 2023 +0100 Whitespace --- src/frontends/qt/TocWidget.cpp |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt/TocWidget.cpp b/src/frontends/qt/TocWidget.cpp index 04be808..7d0de63 100644 --- a/src/frontends/qt/TocWidget.cpp +++ b/src/frontends/qt/TocWidget.cpp @@ -193,7 +193,6 @@ bool TocWidget::getStatus(Cursor & cur, FuncRequest const & cmd, void TocWidget::doDispatch(Cursor & cur, FuncRequest const & cmd, DispatchResult & dr) { - Inset * inset = itemInset(); QModelIndex const & index = tocTV->currentIndex(); @@ -379,7 +378,6 @@ void TocWidget::outline(FuncCode func_code) void TocWidget::sendDispatch(FuncRequest fr) { - fr.setViewOrigin(&gui_view_); GuiWorkArea * old_wa = gui_view_.currentWorkArea(); GuiWorkArea * doc_wa = gui_view_.currentMainWorkArea(); -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] whitespace
commit 03ced49d9f5db464f2bc128aef6563976c0be21d Author: Juergen Spitzmueller Date: Sun Feb 12 14:37:35 2023 +0100 whitespace --- src/frontends/qt/GuiDocument.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp index 6e8019d..7cedee5 100644 --- a/src/frontends/qt/GuiDocument.cpp +++ b/src/frontends/qt/GuiDocument.cpp @@ -4414,7 +4414,7 @@ void GuiDocument::paramsToDialog() font = toqstr(bp_.fontsSans()); foundfont = fontModule->fontsSansCO->set(font, false); - if (!foundfont ) { + if (!foundfont) { fontModule->fontsSansCO->addItemSort(font, font + qt_(" (not installed)"), qt_("Uninstalled used fonts"), qt_("This font is not installed and won't be used in output"), -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit e90abb2b06fbc592b522a5d7962a44e52803df22 Author: Scott Kostyshak Date: Fri Dec 16 15:40:59 2022 -0500 Whitespace --- CMakeLists.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26f182d..d2435b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -834,7 +834,7 @@ if(LYX_USE_QT MATCHES "QT6|QT5") if (LYX_USE_QT MATCHES "QT6") get_target_property(QT_MOC_EXECUTABLE Qt6::moc LOCATION) find_package(Qt6 COMPONENTS Core5Compat REQUIRED) - list(REMOVE_ITEM Qt6Core5Compat_INCLUDE_DIRS ${_Qt6ZlibPrivate_OWN_INCLUDE_DIRS}) + list(REMOVE_ITEM Qt6Core5Compat_INCLUDE_DIRS ${_Qt6ZlibPrivate_OWN_INCLUDE_DIRS}) include_directories(${Qt6Core5Compat_INCLUDE_DIRS}) set(QtCore5CompatLibrary Qt6::Core5Compat) set(QtCore5CompatModule Core5Compat) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit b9c52f20c7e714e1594134cd859638b59e476e6a Author: Richard Kimberly Heck Date: Sun Dec 4 11:59:21 2022 -0500 Whitespace --- src/output_xhtml.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp index f1bcfb8..9924be1 100644 --- a/src/output_xhtml.cpp +++ b/src/output_xhtml.cpp @@ -417,7 +417,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf, if (!style.counter.empty() && (par == pbegin || !isNormalEnv(style)) && cnts.hasCounter(cntr) - ) + ) cnts.step(cntr, OutputUpdate); ParagraphList::const_iterator send; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 172e544e2c84e2d3cfe7bb471c7f39b3528568b4 Author: Scott Kostyshak Date: Fri Oct 28 18:28:31 2022 -0400 Whitespace --- src/LyXRC.h |4 ++-- src/frontends/qt/GuiPrefs.cpp |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/LyXRC.h b/src/LyXRC.h index 1119b18..db7c539 100644 --- a/src/LyXRC.h +++ b/src/LyXRC.h @@ -512,8 +512,8 @@ public: bool full_screen_statusbar = true; /// Limit the text width? bool screen_limit = false; -/// Width of limited screen width - Length screen_width = Length(7, Length::IN); + /// Width of limited screen width + Length screen_width = Length(7, Length::IN); /// bool completion_cursor_text = true; /// diff --git a/src/frontends/qt/GuiPrefs.cpp b/src/frontends/qt/GuiPrefs.cpp index 3b2a1c2..721bace 100644 --- a/src/frontends/qt/GuiPrefs.cpp +++ b/src/frontends/qt/GuiPrefs.cpp @@ -2868,8 +2868,8 @@ void PrefEdit::applyRC(LyXRC & rc) const rc.full_screen_statusbar = toggleStatusbarCB->isChecked(); rc.full_screen_tabbar = toggleTabbarCB->isChecked(); rc.full_screen_menubar = toggleMenubarCB->isChecked(); -rc.screen_width = Length(widgetsToLength(screenWidthLE, screenWidthUnitCO)); -rc.screen_limit = screenLimitCB->isChecked(); + rc.screen_width = Length(widgetsToLength(screenWidthLE, screenWidthUnitCO)); + rc.screen_limit = screenLimitCB->isChecked(); } -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 300160df1c5a6acc656a1b0feadbf4445b8fc230 Author: Scott Kostyshak Date: Mon Oct 3 20:43:31 2022 -0400 Whitespace --- src/insets/InsetBranch.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp index 9d7cae0..c25f16a 100644 --- a/src/insets/InsetBranch.cpp +++ b/src/insets/InsetBranch.cpp @@ -112,7 +112,7 @@ docstring const InsetBranch::buttonLabel(BufferView const &) const if (inchild && master_selected != child_selected) symb += (child_selected ? tick : cross); -docstring inv_symb = from_ascii(params_.inverted ? "~" : ""); + docstring inv_symb = from_ascii(params_.inverted ? "~" : ""); if (decoration() == InsetDecoration::MINIMALISTIC) return symb + inv_symb + params_.branch; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] whitespace
commit 00bba01de96a9009ba466756b2e29809df26c1bf Author: Pavel Sanda Date: Sun Jul 31 00:24:33 2022 +0200 whitespace --- src/LyXAction.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index b14a0c0..5c62864 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -4096,7 +4096,7 @@ void LyXAction::init() scrollbar : Toggle visibility of the scrollbar.\n frame : Toggle visibility of the frames around editing window.\n zoomslider : Toggle visibility of the zoom slider in tabbar.\n - zoomlevel : Toggle visibility of the zoom level display in tabbar.\n + zoomlevel : Toggle visibility of the zoom level display in tabbar.\n fullscreen : Toggle fullscreen mode. This also covers calling the previous functions. However #LFUN_TOOLBAR_TOGGLE for the custom tweaks of the toolbars should be used. -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] whitespace
commit 2283440e77f6b05e4dce45ae00aa81570fc40c25 Author: Jean-Marc Lasgouttes Date: Tue Jun 28 23:12:36 2022 +0200 whitespace --- src/frontends/qt/FindAndReplace.h |4 ++-- src/frontends/qt/GuiView.h|8 src/frontends/qt/TocWidget.cpp|2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/frontends/qt/FindAndReplace.h b/src/frontends/qt/FindAndReplace.h index 7ea70a9..41c211d 100644 --- a/src/frontends/qt/FindAndReplace.h +++ b/src/frontends/qt/FindAndReplace.h @@ -66,9 +66,9 @@ private: void virtual hideEvent(QHideEvent *ev) override; void hideDialog(); - + void setFormatIgnores(bool const b); - + docstring const checkState(std::string const s, bool const b); protected Q_SLOTS: diff --git a/src/frontends/qt/GuiView.h b/src/frontends/qt/GuiView.h index 27d230b..7237017 100644 --- a/src/frontends/qt/GuiView.h +++ b/src/frontends/qt/GuiView.h @@ -419,17 +419,17 @@ private: /** * Write a buffer to a new file name and rename the buffer * according to the new file name. -* +* * This function is e.g. used by menu callbacks and * LFUN_BUFFER_WRITE_AS. -* +* * If 'newname' is empty, the user is asked via a * dialog for the buffer's new name and location. -* +* * If 'newname' is non-empty and has an absolute path, that is used. * Otherwise the base directory of the buffer is used as the base * for any relative path in 'newname'. -* +* * \p kind controls what is done besides the pure renaming: * LV_WRITE_AS => The buffer is written without version control actions. * LV_VC_RENAME => The file is renamed in version control. diff --git a/src/frontends/qt/TocWidget.cpp b/src/frontends/qt/TocWidget.cpp index 483f008..e0f1faf 100644 --- a/src/frontends/qt/TocWidget.cpp +++ b/src/frontends/qt/TocWidget.cpp @@ -366,7 +366,7 @@ void TocWidget::outline(FuncCode func_code) //if another window is active, this attempt will fail, //but it will work at least for the second attempt - gui_view_.activateWindow(); + gui_view_.activateWindow(); enableControls(false); goTo(list[0]); -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit ed2e242b1e9c52d9c05892445bed0f0fceb6f4d5 Author: Juergen Spitzmueller Date: Sat Mar 5 13:45:27 2022 +0100 Whitespace --- src/Bullet.cpp |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/Bullet.cpp b/src/Bullet.cpp index 00a13ec..4308189 100644 --- a/src/Bullet.cpp +++ b/src/Bullet.cpp @@ -123,7 +123,6 @@ int Bullet::getSize() const FontSize Bullet::getFontSize() const { - if (size >= 0) return bulletFontSize(size); else -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 895de6f960fd9cf8c7f59e3dc632f8bfbc5147e4 Author: Juergen Spitzmueller Date: Tue Feb 15 12:50:25 2022 +0100 Whitespace --- src/Layout.h |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Layout.h b/src/Layout.h index 99cc4df..a6c0d6c 100644 --- a/src/Layout.h +++ b/src/Layout.h @@ -116,11 +116,11 @@ public: docstring docbooktag; docstring docbooktagtype; docstring docbookattr; -/// Whether this argument should be output after the main tag (default: inside). The result if the argument -/// should be output both before and after the main tag is undefined. + /// Whether this argument should be output after the main tag (default: inside). The result if the argument + /// should be output both before and after the main tag is undefined. bool docbookargumentbeforemaintag = false; -/// Whether this argument should be output before the main tag (default: inside). The result if the argument -/// should be output both before and after the main tag is undefined. + /// Whether this argument should be output before the main tag (default: inside). The result if the argument + /// should be output both before and after the main tag is undefined. bool docbookargumentaftermaintag = false; }; /// -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 027545a2e607e86eec77bb4486c4b339c969049e Author: Juergen Spitzmueller Date: Sat Feb 12 15:10:14 2022 +0100 Whitespace --- src/frontends/qt/GuiDocument.cpp | 26 ++ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp index 4067d6c..812b8e2 100644 --- a/src/frontends/qt/GuiDocument.cpp +++ b/src/frontends/qt/GuiDocument.cpp @@ -265,15 +265,15 @@ class ModuleSelectionManager : public GuiSelectionManager public: /// ModuleSelectionManager(QObject * parent, - QTreeView * availableLVarg, - QTreeView * selectedLVarg, - QPushButton * addPBarg, - QPushButton * delPBarg, - QPushButton * upPBarg, - QPushButton * downPBarg, - QStandardItemModel * availableModelarg, - GuiIdListModel * selectedModelarg, - GuiDocument const * container) + QTreeView * availableLVarg, + QTreeView * selectedLVarg, + QPushButton * addPBarg, + QPushButton * delPBarg, + QPushButton * upPBarg, + QPushButton * downPBarg, + QStandardItemModel * availableModelarg, + GuiIdListModel * selectedModelarg, + GuiDocument const * container) : GuiSelectionManager(parent, availableLVarg, selectedLVarg, addPBarg, delPBarg, upPBarg, downPBarg, availableModelarg, selectedModelarg), container_(container) @@ -933,9 +933,9 @@ GuiDocument::GuiDocument(GuiView & lv) connect(outputModule->tableoutCB, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor())); connect(outputModule->mathmlprefixCB, SIGNAL(currentIndexChanged(int)), -this, SLOT(change_adaptor())); + this, SLOT(change_adaptor())); -connect(outputModule->shellescapeCB, SIGNAL(stateChanged(int)), + connect(outputModule->shellescapeCB, SIGNAL(stateChanged(int)), this, SLOT(shellescapeChanged())); connect(outputModule->outputsyncCB, SIGNAL(toggled(bool)), this, SLOT(setOutputSync(bool))); @@ -1331,6 +1331,7 @@ GuiDocument::GuiDocument(GuiView & lv) connect(colorModule->delBoxBackgroundTB, SIGNAL(clicked()), this, SLOT(deleteBoxBackgroundColor())); + // change tracking changesModule = new UiWidget(this); connect(changesModule->trackChangesCB, SIGNAL(clicked()), @@ -1340,6 +1341,7 @@ GuiDocument::GuiDocument(GuiView & lv) connect(changesModule->changeBarsCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); + // numbering numberingModule = new UiWidget(this); connect(numberingModule->depthSL, SIGNAL(valueChanged(int)), @@ -1762,7 +1764,7 @@ GuiDocument::GuiDocument(GuiView & lv) qt_("Input listings parameters below. Enter ? for a list of parameters.")); for (int i = 0; lst_packages[i][0]; ++i) -listingsModule->packageCO->addItem(lst_packages[i]); + listingsModule->packageCO->addItem(lst_packages[i]); // add the panels -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit a9eb3c9990b9a05c7d7e569db5d13ad294742cbb Author: Juergen Spitzmueller Date: Thu Nov 25 18:47:23 2021 +0100 Whitespace --- src/Paragraph.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index cf2f53a..7fb46ae 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -4858,7 +4858,7 @@ Language * Paragraph::Private::getSpellLanguage(pos_type const from) const void Paragraph::requestSpellCheck(pos_type pos) { d->requestSpellCheck(pos); - if (pos == -1 ) { + if (pos == -1) { // Also request spellcheck within (text) insets for (auto const & insets : insetList()) { if (!insets.inset->asInsetText()) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 73865ce9997f75f5b88160f973b316d657be20cf Author: Jean-Marc Lasgouttes Date: Mon Sep 27 11:53:46 2021 +0200 Whitespace --- src/mathed/InsetMathNest.cpp |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp index 9210886..7e763b7 100644 --- a/src/mathed/InsetMathNest.cpp +++ b/src/mathed/InsetMathNest.cpp @@ -1665,10 +1665,10 @@ void InsetMathNest::lfunMouseRelease(Cursor & cur, FuncRequest & cmd) bool InsetMathNest::interpretChar(Cursor & cur, char_type const c) { -// try auto-correction -if (lyxrc.autocorrection_math && cur.pos() != 0 && !cur.selection() - && math_autocorrect(cur, c)) -return true; + // try auto-correction + if (lyxrc.autocorrection_math && cur.pos() != 0 && !cur.selection() +&& math_autocorrect(cur, c)) + return true; //lyxerr << "interpret 2: '" << c << "'" << endl; docstring save_selection; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit f3396ae011dc03a2cb695658de941bbfae34708a Author: Jean-Marc Lasgouttes Date: Tue Jul 13 11:15:13 2021 +0200 Whitespace --- src/insets/Inset.h |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/insets/Inset.h b/src/insets/Inset.h index 4396c9b..af24423 100644 --- a/src/insets/Inset.h +++ b/src/insets/Inset.h @@ -350,8 +350,8 @@ public: /// Appends a potentially abbreviated version of the inset to /// \param str. Intended for use by the TOC. virtual void forOutliner(docstring & str, -size_t const maxlen = TOC_ENTRY_LENGTH, -bool const shorten = true) const; +size_t const maxlen = TOC_ENTRY_LENGTH, +bool const shorten = true) const; /// Can a cursor be put in there ? /// Forced to false for insets that have hidden contents, like -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit c8e04eb2f4aba52ae6b04c829dce4c1d6bbf867e Author: Juergen Spitzmueller Date: Sat Jan 30 15:11:18 2021 +0100 Whitespace --- src/Layout.cpp | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Layout.cpp b/src/Layout.cpp index 79a2e7b..b98dd3b 100644 --- a/src/Layout.cpp +++ b/src/Layout.cpp @@ -805,11 +805,11 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass, lex >> docbooksectiontag_; break; -case LT_DOCBOOKITEMWRAPPERTAG: -lex >> docbookitemwrappertag_; -break; - -case LT_DOCBOOKITEMWRAPPERATTR: + case LT_DOCBOOKITEMWRAPPERTAG: + lex >> docbookitemwrappertag_; + break; + + case LT_DOCBOOKITEMWRAPPERATTR: lex >> docbookitemwrapperattr_; break; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 0903d26f50316f36bde03592405727565ed8100d Author: Richard Kimberly Heck Date: Thu Jan 14 01:28:42 2021 -0500 Whitespace --- src/TextClass.cpp | 20 ++-- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/TextClass.cpp b/src/TextClass.cpp index 3743104..785c7a9 100644 --- a/src/TextClass.cpp +++ b/src/TextClass.cpp @@ -1879,10 +1879,10 @@ DocumentClassPtr getDocumentClass(LayoutFile const & baseClass, LayoutModuleList if (!lm) { if (show_warnings) { docstring const msg = - bformat(_("The module %1$s has been requested by\n" - "this document but has not been found in the list of\n" - "available modules. If you recently installed it, you\n" - "probably need to reconfigure LyX.\n"), from_utf8(mod)); + bformat(_("The module %1$s has been requested by\n" + "this document but has not been found in the list of\n" + "available modules. If you recently installed it, you\n" + "probably need to reconfigure LyX.\n"), from_utf8(mod)); frontend::Alert::warning(_("Module not available"), msg); } continue; @@ -1902,7 +1902,7 @@ DocumentClassPtr getDocumentClass(LayoutFile const & baseClass, LayoutModuleList FileName layout_file = libFileSearch("layouts", lm->getFilename()); if (!doc_class->read(layout_file, TextClass::MODULE)) { docstring const msg = - bformat(_("Error reading module %1$s\n"), from_utf8(mod)); + bformat(_("Error reading module %1$s\n"), from_utf8(mod)); frontend::Alert::warning(_("Read Error"), msg); } } @@ -1914,10 +1914,10 @@ DocumentClassPtr getDocumentClass(LayoutFile const & baseClass, LayoutModuleList if (!ce) { if (show_warnings) { docstring const msg = - bformat(_("The cite engine %1$s has been requested by\n" - "this document but has not been found in the list of\n" - "available engines. If you recently installed it, you\n" - "probably need to reconfigure LyX.\n"), from_utf8(cengine)); + bformat(_("The cite engine %1$s has been requested by\n" + "this document but has not been found in the list of\n" + "available engines. If you recently installed it, you\n" + "probably need to reconfigure LyX.\n"), from_utf8(cengine)); frontend::Alert::warning(_("Cite Engine not available"), msg); } } else if (!ce->isAvailable() && show_warnings) { @@ -1935,7 +1935,7 @@ DocumentClassPtr getDocumentClass(LayoutFile const & baseClass, LayoutModuleList FileName layout_file = libFileSearch("citeengines", ce->getFilename()); if (!doc_class->read(layout_file, TextClass::CITE_ENGINE)) { docstring const msg = - bformat(_("Error reading cite engine %1$s\n"), from_utf8(cengine)); + bformat(_("Error reading cite engine %1$s\n"), from_utf8(cengine)); frontend::Alert::warning(_("Read Error"), msg); } } -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 7e11cb2b3775a5e633de5fe6a87c0b391b068179 Author: Juergen Spitzmueller Date: Thu Dec 17 10:10:56 2020 +0100 Whitespace --- src/frontends/qt/GuiToolbar.h |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt/GuiToolbar.h b/src/frontends/qt/GuiToolbar.h index 53f3c9a..aebc9e2 100644 --- a/src/frontends/qt/GuiToolbar.h +++ b/src/frontends/qt/GuiToolbar.h @@ -158,8 +158,8 @@ public: /// Action * addItem(ToolbarItem const & item); -/// -GuiView const & owner() { return owner_; } + /// + GuiView const & owner() { return owner_; } Q_SIGNALS: /// -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 39a28b4b27af761c7b04fe86eee89c19e2dac5d5 Author: Juergen Spitzmueller Date: Sun Dec 13 05:08:11 2020 +0100 Whitespace --- src/insets/InsetGraphics.cpp |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp index 6341a6b..d8fabd6 100644 --- a/src/insets/InsetGraphics.cpp +++ b/src/insets/InsetGraphics.cpp @@ -126,8 +126,8 @@ string findTargetFormat(string const & format, OutputParams const & runparams) return "png"; } -// for HTML and DocBook, we leave the known formats and otherwise convert to png -if (runparams.flavor == Flavor::Html || runparams.flavor == Flavor::DocBook5) { + // for HTML and DocBook, we leave the known formats and otherwise convert to png + if (runparams.flavor == Flavor::Html || runparams.flavor == Flavor::DocBook5) { Format const * const f = theFormats().getFormat(format); // Convert vector graphics to svg if (f && f->vectorFormat() && theConverters().isReachable(format, "svg")) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace & renaming
commit 589e780e153e8cddd577b31316248e1c457c29e3 Author: Yuriy Skalko Date: Thu Nov 5 12:01:21 2020 +0200 Whitespace & renaming --- src/BufferView.cpp |6 +++--- src/insets/Inset.h |4 ++-- src/insets/InsetText.h |4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 4e704e3..bb41759 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -504,9 +504,9 @@ void BufferView::processUpdateFlags(Update::flags flags) // We handle this before FitCursor because the later will require // correct metrics at cursor position. if (!(flags & Update::ForceDraw) - && (flags & Update::SinglePar) - && !singleParUpdate()) - updateMetrics(flags); + && (flags & Update::SinglePar) + && !singleParUpdate()) + updateMetrics(flags); // Then make sure that the screen contains the cursor if needed if (flags & Update::FitCursor) { diff --git a/src/insets/Inset.h b/src/insets/Inset.h index bf165d9..c6fbfdb 100644 --- a/src/insets/Inset.h +++ b/src/insets/Inset.h @@ -529,8 +529,8 @@ public: /// virtual bool allowSpellCheck() const { return false; } - /// if this insets owns text cells (e.g. InsetText) return cell num - virtual Text * getText(int /*num*/) const { return 0; } + /// if this insets owns text cells (e.g. InsetText) return cell idx + virtual Text * getText(int /*idx*/) const { return 0; } /** Adds a LaTeX snippet to the Preview Loader for transformation * into a bitmap image. Does not start the loading process. diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h index bccaacc..d571806 100644 --- a/src/insets/InsetText.h +++ b/src/insets/InsetText.h @@ -114,8 +114,8 @@ public: /// void setFrameColor(ColorCode); /// - Text * getText(int i) const override { - return (i == 0) ? const_cast(&text_) : 0; + Text * getText(int idx) const override { + return (idx == 0) ? const_cast(&text_) : nullptr; } /// bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const override; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] whitespace and style
commit cfd19d86be61e6e4a3d66daf4dc1bac3642a202f Author: Richard Kimberly Heck Date: Mon Nov 2 11:45:09 2020 -0500 whitespace and style --- src/Author.cpp |3 ++- src/frontends/qt/Menus.cpp |2 +- src/insets/InsetBibtex.cpp |2 +- src/insets/InsetLayout.h |2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Author.cpp b/src/Author.cpp index 9007863..ffb1298 100644 --- a/src/Author.cpp +++ b/src/Author.cpp @@ -120,11 +120,12 @@ int AuthorList::record(Author const & a) return it - beg; if (it->bufferId() == a.bufferId()) { int const id = it - beg; - if (!it->valid()) + if (!it->valid()) { // we need to handle the case of a valid author being registered // after an invalid one. For instance, because "buffer-reload" // does not clear the buffer's author list. record(id, a); + } return id; } } diff --git a/src/frontends/qt/Menus.cpp b/src/frontends/qt/Menus.cpp index b6a0a42..e8734b7 100644 --- a/src/frontends/qt/Menus.cpp +++ b/src/frontends/qt/Menus.cpp @@ -358,7 +358,7 @@ public: void expandFloatInsert(Buffer const * buf); void expandFlexInsert(Buffer const * buf, InsetLayout::InsetLyXType type); void expandTocSubmenu(std::string const & type, Toc const & toc_list); - void expandToc2(Toc const & toc_list, size_t from, size_t to, int depth, const string &toc_type); + void expandToc2(Toc const & toc_list, size_t from, size_t to, int depth, const string & toc_type); void expandToc(Buffer const * buf); void expandPasteRecent(Buffer const * buf); void expandToolbars(); diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp index bb57811..469429d 100644 --- a/src/insets/InsetBibtex.cpp +++ b/src/insets/InsetBibtex.cpp @@ -311,7 +311,7 @@ void InsetBibtex::latex(otexstream & os, OutputParams const & runparams) const buffer().prepareBibFilePaths(runparams, getBibFiles(), false); vector db_out; db_out.reserve(dbs.size()); -for (pair const & db : dbs) + for (pair const & db : dbs) db_out.push_back(db.first); // Style options if (style == "default") diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h index 2dea790..8cc83dd 100644 --- a/src/insets/InsetLayout.h +++ b/src/insets/InsetLayout.h @@ -31,7 +31,7 @@ class TextClass; class InsetLayout { public: /// -InsetLayout() { labelfont_.setColor(Color_error); } + InsetLayout() { labelfont_.setColor(Color_error); } /// enum InsetDecoration { CLASSIC, -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] whitespace
commit 2945bc356eaaa062606124a1cbf6c700ca1edb19 Author: Richard Kimberly Heck Date: Mon Nov 2 11:38:52 2020 -0500 whitespace --- src/output_latex.cpp |2 +- src/tex2lyx/Preamble.cpp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/output_latex.cpp b/src/output_latex.cpp index 97a5077..1178a3b 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -600,7 +600,7 @@ void addArgInsets(Paragraph const & par, string const & prefix, string const name = prefix.empty() ? arg->name() : split(arg->name(), ':'); size_t const nr = convert(name); -ilist.insert({nr, arg}); + ilist.insert({nr, arg}); Layout::LaTeXArgMap::const_iterator const lit = latexargs.find(arg->name()); if (lit != latexargs.end()) { diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp index ebaa2f0..f7303b6 100644 --- a/src/tex2lyx/Preamble.cpp +++ b/src/tex2lyx/Preamble.cpp @@ -445,7 +445,7 @@ int Preamble::getSpecialTableColumnArguments(char c) const void Preamble::add_package(string const & name, vector & options) { // every package inherits the global options -used_packages.insert({name, split_options(h_options)}); + used_packages.insert({name, split_options(h_options)}); // Insert options passed via PassOptionsToPackage for (auto const & p : extra_package_options_) { -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 5eb913ca99529c3c5dd93789f058b192b2bff34d Author: Richard Kimberly Heck Date: Fri Oct 30 12:16:42 2020 -0400 Whitespace --- lib/ui/stdcontext.inc |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc index 45bb578..d189514 100644 --- a/lib/ui/stdcontext.inc +++ b/lib/ui/stdcontext.inc @@ -13,8 +13,8 @@ # Casing Rules: # Capitalize all words in the element, with the following exceptions: -# * Articles: a, an, the. -# * Conjunctions: and, but, for, not, so, yet ... +# * Articles: a, an, the. +# * Conjunctions: and, but, for, not, so, yet ... # * Prepositions of three or fewer letters: at, for, by, in, to ... # (except when the preposition is part of a verb phrase, such as "Check In") # (http://library.gnome.org/devel/hig-book/stable/design-text-labels.html.en) @@ -647,7 +647,7 @@ Menuset Menu "context-toc-change" Item "Accept Change|c" "change-accept" Item "Reject Change|R" "change-reject" - End + End # # Toc Table of Context context menu @@ -660,7 +660,7 @@ Menuset Item "Move Section Down|w" "outline-down" Separator Item "Select Section|S" "section-select" - End + End # # InsetERT context menu -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 1ff2de387dd7897e90448b00be386795ef56d867 Author: Richard Kimberly Heck Date: Tue Oct 13 18:26:13 2020 -0400 Whitespace --- src/output_latex.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/output_latex.cpp b/src/output_latex.cpp index b8243c1..f690134 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -588,7 +588,7 @@ namespace { void addArgInsets(Paragraph const & par, string const & prefix, Layout::LaTeXArgMap const & latexargs, -map & ilist, + map & ilist, vector & required) { for (auto const & table : par.insetList()) { -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 2afc68ede218a927e9bb7c59ba37cc2a574a323e Author: Richard Kimberly Heck Date: Fri Oct 2 13:11:28 2020 -0400 Whitespace --- src/mathed/MathStream.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h index fb229e6..1d7e1de 100644 --- a/src/mathed/MathStream.h +++ b/src/mathed/MathStream.h @@ -346,7 +346,7 @@ class MathExportException : public std::exception {}; class MathStream { public: /// Builds a stream proxy for os; the MathML namespace is given by xmlns (supposed to be already defined elsewhere in the document). - explicit MathStream(odocstream & os, std::string const & xmlns="", bool xmlMode=false); + explicit MathStream(odocstream & os, std::string const & xmlns = "", bool xmlMode = false); /// void cr(); /// -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace cleanup
commit d0a27e3afc3444d10694df10dc4cb8d604287765 Author: José Matos Date: Fri Sep 18 01:07:39 2020 +0100 Whitespace cleanup --- lib/lyx2lyx/lyx_2_4.py | 26 +- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py index e1a8e6a..3fd876c 100644 --- a/lib/lyx2lyx/lyx_2_4.py +++ b/lib/lyx2lyx/lyx_2_4.py @@ -3777,7 +3777,7 @@ def revert_counter_inset(document): ert = put_cmd_in_ert("\\setcounter{%s}{\\value{%s}}" % (cnt, savecnt)) else: document.warning("Unknown counter command `%s' in inset at line %d!" % (cnt, i)) - + if ert: document.body[i : j + 1] = ert i += 1 @@ -3804,7 +3804,7 @@ def revert_ams_spaces(document): subst = put_cmd_in_ert(inset) document.body[i : end + 1] = subst Found = True - + if Found == True: # load amsmath in the preamble if not already loaded i = find_token(document.header, "\\use_package amsmath 2", 0) @@ -3815,18 +3815,18 @@ def revert_ams_spaces(document): def convert_parskip(document): " Move old parskip settings to preamble " - + i = find_token(document.header, "\\paragraph_separation skip", 0) if i == -1: return - + j = find_token(document.header, "\\defskip", 0) if j == -1: document.warning("Malformed LyX document! Missing \\defskip.") return - + val = get_value(document.header, "\\defskip", j) - + skipval = "\\medskipamount" if val == "smallskip" or val == "medskip" or val == "bigskip": skipval = "\\" + val + "amount" @@ -3834,25 +3834,25 @@ def convert_parskip(document): skipval = val add_to_preamble(document, ["\\setlength{\\parskip}{" + skipval + "}", "\\setlength{\\parindent}{0pt}"]) - + document.header[i] = "\\paragraph_separation indent" document.header[j] = "\\paragraph_indentation default" def revert_parskip(document): " Revert new parskip settings to preamble " - + i = find_token(document.header, "\\paragraph_separation skip", 0) if i == -1: return - + j = find_token(document.header, "\\defskip", 0) if j == -1: document.warning("Malformed LyX document! Missing \\defskip.") return - + val = get_value(document.header, "\\defskip", j) - + skipval = "" if val == "smallskip" or val == "medskip" or val == "bigskip": skipval = "[skip=\\" + val + "amount]" @@ -3860,9 +3860,9 @@ def revert_parskip(document): skipval = "[skip=\\baselineskip]" elif val != "halfline": skipval = "[skip={" + val + "}]" - + add_to_preamble(document, ["\\usepackage" + skipval + "{parskip}"]) - + document.header[i] = "\\paragraph_separation indent" document.header[j] = "\\paragraph_indentation default" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 4c0073cd03021da6cefb718cb777a5e1f944afd1 Author: Scott Kostyshak Date: Thu Aug 20 21:51:06 2020 -0400 Whitespace --- lib/scripts/lyxpaperview|2 +- src/BiblioInfo.cpp |4 ++-- src/BiblioInfo.h|2 +- src/frontends/qt/qt_helpers.cpp |4 ++-- src/frontends/qt/qt_helpers.h |2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/scripts/lyxpaperview b/lib/scripts/lyxpaperview index 29093da..cc1399e 100755 --- a/lib/scripts/lyxpaperview +++ b/lib/scripts/lyxpaperview @@ -6,7 +6,7 @@ #Syntax: paperview AuthorName Year #Output: absolute path to the file(s) # -#Dependencies: +#Dependencies: #1) mlocate/updatedb or similar package installed and running. #2) stored papers must contain first author name and year of publication in filename. diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp index ab073ae..a517768 100644 --- a/src/BiblioInfo.cpp +++ b/src/BiblioInfo.cpp @@ -691,7 +691,7 @@ void BibTeXInfo::getLocators(docstring & doi, docstring & url, docstring & file) file = "file:///" + filedest; } - if (!url.empty()) + if (!url.empty()) return; // try biblatex specific fields, see its manual @@ -1342,7 +1342,7 @@ void BiblioInfo::getLocators(docstring const & key, docstring & doi, docstring & { BiblioInfo::const_iterator it = find(key); if (it == end()) - return; + return; BibTeXInfo const & data = it->second; data.getLocators(doi,url,file); } diff --git a/src/BiblioInfo.h b/src/BiblioInfo.h index 00cdfcf..ddf1daa 100644 --- a/src/BiblioInfo.h +++ b/src/BiblioInfo.h @@ -70,7 +70,7 @@ public: bool const allnames = false, bool const beginning = true) const; /// docstring const getYear() const; - /// + /// void getLocators(docstring & doi, docstring & url, docstring & file) const; /// \return formatted BibTeX data suitable for framing. /// \param vector of pointers to crossref/xdata information diff --git a/src/frontends/qt/qt_helpers.cpp b/src/frontends/qt/qt_helpers.cpp index 0ef0775..176267a 100644 --- a/src/frontends/qt/qt_helpers.cpp +++ b/src/frontends/qt/qt_helpers.cpp @@ -303,9 +303,9 @@ void showTarget(string const & target){ string tmp,tar; tar = split(target, tmp, ' '); FuncRequest cmd = FuncRequest(LFUN_VC_COMMAND,"U . \"lyxpaperview " + tar + "\""); - lyx::dispatch(cmd); + lyx::dispatch(cmd); return; - } + } QDesktopServices::openUrl(QUrl(toqstr(target), QUrl::TolerantMode)); } } // namespace frontend diff --git a/src/frontends/qt/qt_helpers.h b/src/frontends/qt/qt_helpers.h index 6c7c366..967ee5f 100644 --- a/src/frontends/qt/qt_helpers.h +++ b/src/frontends/qt/qt_helpers.h @@ -101,7 +101,7 @@ void setSectionResizeMode(QHeaderView * view, QHeaderView::ResizeMode mode); /// Shows a directory in OSs file browser void showDirectory(support::FileName const & directory); -/// handle request for showing citation content - shows pdf or +/// handle request for showing citation content - shows pdf or /// web page in target; external script can be used for pdf view void showTarget(std::string const & target); -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 8ae0841826d90b8cdee1922f91fd6ccc5009f5ef Author: Richard Kimberly Heck Date: Wed Jul 8 12:15:34 2020 -0400 Whitespace src/BiblioInfo.cpp | 136 src/Buffer.cpp | 10 +- src/Buffer.h |4 +- src/Paragraph.cpp| 415 src/insets/InsetIPAMacro.cpp | 46 ++-- src/insets/InsetIndex.cpp| 46 ++-- src/insets/InsetListings.cpp |4 +- src/insets/InsetTabular.cpp |2 +- src/insets/InsetTabular.h|6 +- src/insets/InsetText.cpp | 16 +- src/mathed/InsetMathHull.cpp | 30 +- src/output_docbook.cpp | 746 ++ src/xml.h| 432 13 files changed, 959 insertions(+), 934 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 57065afb45bbb48975cef0df9357048d96a39f89 Author: Richard Kimberly Heck Date: Sat Apr 25 22:57:09 2020 -0400 Whitespace --- src/support/types.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/support/types.h b/src/support/types.h index 4b08d7a..75ccec0 100644 --- a/src/support/types.h +++ b/src/support/types.h @@ -40,7 +40,7 @@ namespace lyx { */ // FIXME: should be unsigned as well. // however, simply changing it breaks a downward loop somewhere... - typedef size_t pit_type; + typedef size_t pit_type; /// a type for the nesting depth of a paragraph typedef size_t depth_type; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] whitespace
commit e31364fdcbda529f42df8839ee1476f953b70967 Author: Juergen Spitzmueller Date: Sat Feb 15 09:26:43 2020 +0100 whitespace --- src/support/filetools.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp index bca242d..a36446d 100644 --- a/src/support/filetools.cpp +++ b/src/support/filetools.cpp @@ -1039,7 +1039,7 @@ cmd_ret const runCommand(string const & cmd) command = rtrim(command, "2>&1"); err2out = true; } - string const cmdarg = "/d /c \"" + command+"\""; + string const cmdarg = "/d /c \"" + command + "\""; string const comspec = getEnv("COMSPEC"); security.nLength = sizeof(SECURITY_ATTRIBUTES); -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 218731c3eb35c39858665d28ab5b3b5969d24a56 Author: Juergen Spitzmueller Date: Tue Jan 14 16:23:09 2020 +0100 Whitespace --- src/insets/InsetTabular.cpp |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index d06090c..dc8645a 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -2582,7 +2582,7 @@ void Tabular::TeXTopHLine(otexstream & os, row_type row, list columns, for (col_type j = cstart ; j < c ; ++j) if (column_info[j].alignment == LYX_ALIGN_DECIMAL) ++offset; - col_type lastcol =(*it1 == *it2) ? c + 1 + offset : columns.size() - c + offset; + col_type lastcol = (*it1 == *it2) ? c + 1 + offset : columns.size() - c + offset; if (toprtrims.find(c) != toprtrims.end() && toprtrims.find(c)->second) trim += "r"; @@ -2655,7 +2655,7 @@ void Tabular::TeXBottomHLine(otexstream & os, row_type row, list colum bottomline[c] = bottomline.find(c)->second || topline.find(c)->second; bottomltrims[c] = (bottomltrims.find(c) != bottomltrims.end() && bottomltrims.find(c)->second) || (topltrims.find(c) != topltrims.end() && topltrims.find(c)->second); - bottomrtrims[c] =(bottomrtrims.find(c) != bottomrtrims.end() && bottomrtrims.find(c)->second) + bottomrtrims[c] = (bottomrtrims.find(c) != bottomrtrims.end() && bottomrtrims.find(c)->second) || (toprtrims.find(c) != toprtrims.end() && toprtrims.find(c)->second); if (bottomline.find(c)->second) ++nset; @@ -2718,7 +2718,7 @@ void Tabular::TeXBottomHLine(otexstream & os, row_type row, list colum for (col_type j = cstart ; j < c ; ++j) if (column_info[j].alignment == LYX_ALIGN_DECIMAL) ++offset; - col_type lastcol =(*it1 == *it2) ? c + 1 + offset : columns.size() - c + offset; + col_type lastcol = (*it1 == *it2) ? c + 1 + offset : columns.size() - c + offset; if (bottomrtrims.find(c) != bottomrtrims.end() && bottomrtrims.find(c)->second) trim += "r"; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit ff85641cc0f7aa90d419a2c5d65c94a698b9ed64 Author: Juergen Spitzmueller Date: Mon Jan 13 09:21:32 2020 +0100 Whitespace --- src/Paragraph.cpp |4 ++-- src/Text.cpp |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index 22aa744..710587b 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -654,8 +654,8 @@ void Paragraph::setChange(pos_type pos, Change const & change) // see comment in setChange(Change const &) above if (!change.deleted() && pos < size()) - if (Inset * inset = getInset(pos)) - inset->setChange(change); + if (Inset * inset = getInset(pos)) + inset->setChange(change); } diff --git a/src/Text.cpp b/src/Text.cpp index 6d5f7dd..b29e002 100644 --- a/src/Text.cpp +++ b/src/Text.cpp @@ -1768,7 +1768,7 @@ bool Text::backspace(Cursor & cur) needsUpdate |= handleBibitems(cur); // A singlePar update is not enough in this case. -// cur.screenUpdateFlags(Update::Force); + // cur.screenUpdateFlags(Update::Force); cur.top().setPitPos(cur.pit(), cur.pos()); return needsUpdate; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] whitespace
commit a5db5d4c902a959fb01d7a04483641ebc61187d6 Author: Juergen Spitzmueller Date: Mon Dec 30 16:28:15 2019 +0100 whitespace --- src/insets/InsetRef.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/insets/InsetRef.h b/src/insets/InsetRef.h index c1860e1..9243aa6 100644 --- a/src/insets/InsetRef.h +++ b/src/insets/InsetRef.h @@ -45,7 +45,7 @@ public: docstring toolTip(BufferView const &, int, int) const { return tooltip_; } /// - docstring getTOCString() const; + docstring getTOCString() const; /// bool hasSettings() const { return true; } /// -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit f17e868e652e22e68a5d041dbfed7bf6d1113f57 Author: Richard Kimberly Heck Date: Sat Jul 6 15:18:41 2019 -0400 Whitespace --- src/output_latex.cpp |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/output_latex.cpp b/src/output_latex.cpp index a516c0d..ed11307 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -64,7 +64,7 @@ enum OpenEncoding { struct OutputState { OutputState() : open_encoding_(none), cjk_inherited_(0), - prev_env_language_(nullptr), nest_level_(0) + prev_env_language_(nullptr), nest_level_(0) { } OpenEncoding open_encoding_; @@ -821,7 +821,7 @@ void TeXOnePar(Buffer const & buf, // inside of was opened Language const * const outer_language = (runparams.local_font != nullptr) ? - runparams.local_font->language() : doc_language; + runparams.local_font->language() : doc_language; Paragraph const * priorpar = (pit == 0) ? nullptr : ¶graphs.at(pit - 1); @@ -1183,7 +1183,7 @@ void TeXOnePar(Buffer const & buf, && (par_language->lang() != "arabic_arabtex" && outer_language->lang() != "arabic_arabtex") // have we opened an \L or \R environment? - && runparams.local_font != nullptr + && runparams.local_font != nullptr && runparams.local_font->isRightToLeft() != par_language->rightToLeft() // are we about to close the language? &&((nextpar && par_lang != nextpar_lang)
[LyX/master] whitespace
commit ed79f2cab2b85511a54f506fbc5b3e39f7a58764 Author: Juergen Spitzmueller Date: Thu Dec 27 11:23:40 2018 +0100 whitespace --- lib/bind/cua.bind |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind index 7d65eca..31a493b 100644 --- a/lib/bind/cua.bind +++ b/lib/bind/cua.bind @@ -75,7 +75,7 @@ Format 5 \bind "C-f""dialog-show findreplace" \bind "C-S-f" "dialog-show findreplaceadv" \bind "C-i""inset-toggle" # 'i' for Inset -\bind "C-M-i" "inset-settings" +\bind "C-M-i" "inset-settings" \bind "C-c""copy" \bind "C-x""cut"
[LyX/master] Whitespace.
commit ae65fb2c9815767ccadbe4a3cd7a87e5c734b518 Author: Richard Kimberly Heck Date: Mon Oct 15 22:46:31 2018 -0400 Whitespace. --- src/frontends/qt4/LayoutBox.cpp |3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/frontends/qt4/LayoutBox.cpp b/src/frontends/qt4/LayoutBox.cpp index 8626d2f..992a4bf 100644 --- a/src/frontends/qt4/LayoutBox.cpp +++ b/src/frontends/qt4/LayoutBox.cpp @@ -423,11 +423,8 @@ void LayoutBox::showPopup() bool enabled = view()->updatesEnabled(); view()->setUpdatesEnabled(false); - d->resetFilter(); - QComboBox::showPopup(); - view()->setUpdatesEnabled(enabled); }
[LyX/master] whitespace
commit d10c3bceb0223a3b5f7ab790b4aaa530cc1ed9eb Author: Juergen Spitzmueller Date: Fri Aug 24 15:33:48 2018 +0200 whitespace --- src/output_latex.cpp |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/output_latex.cpp b/src/output_latex.cpp index 4172237..1169602 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -898,8 +898,8 @@ void TeXOnePar(Buffer const & buf, // This behavior is not correct for ArabTeX, though. if (!using_begin_end // not for ArabTeX - && par_language->lang() != "arabic_arabtex" - && outer_language->lang() != "arabic_arabtex" + && par_language->lang() != "arabic_arabtex" + && outer_language->lang() != "arabic_arabtex" // are we in an inset? && runparams.local_font != 0 // is the inset within an \L or \R?
[LyX/master] Whitespace
commit 34c559edebeb37e4bba711402edb2ccfc04c3125 Author: Richard Kimberly Heck Date: Sun Apr 22 21:32:35 2018 -0400 Whitespace --- src/frontends/qt4/GuiView.cpp |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index f18bbfe..dc20c81 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -3935,8 +3935,8 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr) case LFUN_BUFFER_RELOAD: { LASSERT(doc_buffer, break); - //drop changes? - bool drop = (cmd.argument()=="dump"); + // drop changes? + bool drop = (cmd.argument() == "dump"); int ret = 0; if (!drop && !doc_buffer->isClean()) {
[LyX/master] Whitespace
commit ea17a3cd099d5c182d7f518f45dc60768e972abe Author: Scott Kostyshak Date: Sat Apr 21 14:16:24 2018 -0400 Whitespace --- src/FuncRequest.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/FuncRequest.h b/src/FuncRequest.h index f0b9e7c..35fff68 100644 --- a/src/FuncRequest.h +++ b/src/FuncRequest.h @@ -102,7 +102,7 @@ public: bool allowAsync() const { return allow_async_; } /// void allowAsync(bool allow_async) { allow_async_ = allow_async; } - + private: /// the action FuncCode action_;
[LyX/master] Whitespace.
commit ff2df8cf37b4c426be8bda64b96e04af2c869189 Author: Richard Heck Date: Sat Apr 14 22:45:11 2018 -0400 Whitespace. --- src/insets/ExternalSupport.cpp | 14 +++--- src/insets/InsetInclude.cpp| 12 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/insets/ExternalSupport.cpp b/src/insets/ExternalSupport.cpp index d333d22..3d7936a 100644 --- a/src/insets/ExternalSupport.cpp +++ b/src/insets/ExternalSupport.cpp @@ -393,16 +393,16 @@ RetVal writeExternal(InsetExternalParams const & params, if (!dryrun && !external_in_tmpdir) { if (!isValidLaTeXFileName(absname)) { lyx::frontend::Alert::warning(_("Invalid filename"), -_("The following filename will cause troubles " - "when running the exported file through LaTeX: ") + -from_utf8(absname)); +_("The following filename will cause troubles " +"when running the exported file through LaTeX: ") + + from_utf8(absname)); } if (!isValidDVIFileName(absname)) { lyx::frontend::Alert::warning(_("Problematic filename for DVI"), -_("The following filename can cause troubles " - "when running the exported file through LaTeX " - "and opening the resulting DVI: ") + -from_utf8(absname), true); +_("The following filename can cause troubles " +"when running the exported file through LaTeX " +"and opening the resulting DVI: ") + + from_utf8(absname), true); } } diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp index 9a32d05..fd67332 100644 --- a/src/insets/InsetInclude.cpp +++ b/src/insets/InsetInclude.cpp @@ -806,10 +806,8 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const ErrorList const & el = tmp->errorList("Export"); if (!el.empty()) msg = bformat(from_ascii("%1$s\n\n%2$s\n\n%3$s"), - msg, el.begin()->error, - el.begin()->description); - throw ExceptionMessage(ErrorException, _("Error: "), - msg); + msg, el.begin()->error, el.begin()->description); + throw ExceptionMessage(ErrorException, _("Error: "), msg); } } runparams.encoding = oldEnc; @@ -834,10 +832,8 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const included_file.displayName()); if (!el.empty()) msg = bformat(from_ascii("%1$s\n\n%2$s\n\n%3$s"), - msg, el.begin()->error, - el.begin()->description); - throw ExceptionMessage(ErrorException, _("Error: "), - msg); + msg, el.begin()->error, el.begin()->description); + throw ExceptionMessage(ErrorException, _("Error: "), msg); } } } else {
[LyX/master] Whitespace
commit b03c826f27738c4eea7e872b0bb81e9993c0fe0e Author: Juergen Spitzmueller Date: Sun Apr 15 12:31:56 2018 +0200 Whitespace --- lib/layouts/litinsets.inc | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/layouts/litinsets.inc b/lib/layouts/litinsets.inc index 1a72fed..11dd2d1 100644 --- a/lib/layouts/litinsets.inc +++ b/lib/layouts/litinsets.inc @@ -41,13 +41,13 @@ InsetLayout "Flex:Chunk" AddToToc literate IsTocCaption 0 Argument 1 -Mandatory 1 -LabelString "Options" -Tooltip "Options" -LeftDelim << -RightDelim>>= - IsTocCaption 1 - AutoInsert1 + Mandatory 1 + LabelString "Options" + Tooltip "Options" + LeftDelim << + RightDelim >>= + IsTocCaption1 + AutoInsert 1 EndArgument ResetsFontfalse ForceOwnlines true
[LyX/master] Whitespace
commit f648f259914b763c27d452f5a11e5deea3ccfd99 Author: Scott Kostyshak Date: Sun Apr 8 17:29:37 2018 -0400 Whitespace --- src/frontends/qt4/GuiView.cpp |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index acaa234..b63f1c7 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1695,8 +1695,8 @@ void GuiView::errors(string const & error_type, bool from_master) // have to figure out whether that is the case or not. ErrorList & el = bv->buffer().errorList(error_type); if (el.empty()) { - el = bv->buffer().masterBuffer()->errorList(error_type); - from_master = true; + el = bv->buffer().masterBuffer()->errorList(error_type); + from_master = true; } #else ErrorList const & el = from_master ?
[LyX/master] whitespace
commit 6d582e5e50e5ccc91bfb0565fef51ccff995481c Author: Jean-Marc Lasgouttes Date: Wed Feb 21 12:09:18 2018 +0100 whitespace --- lib/generate_contributions.py | 18 +- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py index 3d99040..75710d3 100755 --- a/lib/generate_contributions.py +++ b/lib/generate_contributions.py @@ -647,15 +647,15 @@ contributors = [ "27 April 2014", u"Chinese (simplified) translations"), -contributor(u"Alexander Dunlap", -"alexander.dunlap () gmail ! com", -"GPL", -"licensing statement", -"m=151914230920804", -"20 February 2018", -u"Improvement to recent files support"), - -contributor(u"Anders Ekberg", + contributor(u"Alexander Dunlap", + "alexander.dunlap () gmail ! com", + "GPL", + "licensing statement", + "m=151914230920804", + "20 February 2018", + u"Improvement to recent files support"), + + contributor(u"Anders Ekberg", "anek () chalmers ! se", "GPL", "License agreement",
[LyX/master] Whitespace
commit 10f02c41604c2df70c47f61946f17572de9f73bd Author: Juergen Spitzmueller Date: Mon Jan 29 08:37:25 2018 +0100 Whitespace --- src/Paragraph.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index 3c26bf1..4ee612b 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -1290,7 +1290,7 @@ void Paragraph::Private::latexSpecialChar(otexstream & os, // XeTeX's dash behaviour is determined via a global setting if (bparams.use_dash_ligatures && owner_->getFontSettings(bparams, i).fontInfo().family() != TYPEWRITER_FAMILY - && !runparams.inIPA + && !runparams.inIPA // TODO #10961: && not in inset Flex Code // TODO #10961: && not in layout LyXCode && (!bparams.useNonTeXFonts || runparams.flavor != OutputParams::XETEX)) {
[LyX/master] Whitespace.
commit d24a1c8fa483ca390d1fdb597139f7533ce359d7 Author: Richard Heck Date: Sun Jan 28 23:02:30 2018 -0500 Whitespace. --- src/insets/InsetCitation.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp index 167fc24..3d18456 100644 --- a/src/insets/InsetCitation.cpp +++ b/src/insets/InsetCitation.cpp @@ -152,7 +152,7 @@ void InsetCitation::doDispatch(Cursor & cur, FuncRequest & cmd) cmd = FuncRequest(LFUN_INSET_MODIFY, "changetype " + newcmdname); } } - // fall through + // fall through default: InsetCommand::doDispatch(cur, cmd); }
[LyX/master] Whitespace
commit 45ee36c0f2de6322060230d67c30094faaa141fb Author: Scott Kostyshak Date: Mon Jan 15 17:08:20 2018 -0500 Whitespace --- development/autotests/ignoredTests |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/development/autotests/ignoredTests b/development/autotests/ignoredTests index 1a1a4ce..a5592dc 100644 --- a/development/autotests/ignoredTests +++ b/development/autotests/ignoredTests @@ -54,7 +54,7 @@ export/.*/zh_CN/.*texF # see also INVERTED.TODO_export/export/latex/ja_wrong_auto_encoding_(dvi|pdf(|3)).* # For a discussion of alternatives for Japanese with LaTeX , see also # http://www.preining.info/blog/2014/12/writing-japanese-in-latex-part-1-introduction/ -# +# # Exception: ja knitr.lyx and sweave.lyx support only XeLaTeX with system fonts # because they use the "bxjsarticle" class !export/.*/ja/(knitr|sweave).*_(lyx.*|xhtml|pdf4_systemF)
[LyX/master] Whitespace.
commit 320edd1c247fbbebeeeb8c5390267e8e7abe202f Author: Richard Heck Date: Sat Dec 23 14:47:38 2017 -0500 Whitespace. --- src/Converter.cpp |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Converter.cpp b/src/Converter.cpp index badfd37..78c9b7d 100644 --- a/src/Converter.cpp +++ b/src/Converter.cpp @@ -416,9 +416,9 @@ bool Converters::convert(Buffer const * buffer, LYXERR(Debug::FILES, "No converter defined! " "I use convertDefault.py:\n\t" << command); Systemcall one; -Systemcall::Starttype starttype = -(buffer && buffer->isClone()) ? -Systemcall::WaitLoop : Systemcall::Wait; + Systemcall::Starttype starttype = + (buffer && buffer->isClone()) ? + Systemcall::WaitLoop : Systemcall::Wait; one.startscript(starttype, command, buffer ? buffer->filePath() : string(), buffer ? buffer->layoutPos() : string());
[LyX/master] Whitespace cosmetics
commit a0bd27d8b17b7109b2a171c5c8ce526e27150684 Author: Juergen Spitzmueller Date: Wed Sep 27 18:05:58 2017 +0200 Whitespace cosmetics (cherry picked from commit 745b43784ce1b6981fd31f6c5f5fbd489eef51f4) --- src/Buffer.cpp |8 src/insets/InsetInclude.cpp |2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 9c42b07..11e46ba 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -538,10 +538,10 @@ Buffer::~Buffer() for (; it != end; ++it) { Buffer * child = const_cast(it->first); if (theBufferList().isLoaded(child)) { -if (theBufferList().isOthersChild(this, child)) -child->setParent(0); -else - theBufferList().release(child); + if (theBufferList().isOthersChild(this, child)) + child->setParent(0); + else + theBufferList().release(child); } } diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp index f966fbc..6af715f 100644 --- a/src/insets/InsetInclude.cpp +++ b/src/insets/InsetInclude.cpp @@ -436,7 +436,7 @@ Buffer * InsetInclude::loadIfNeeded() const // Use cached Buffer if possible. if (child_buffer_ != 0) { if (theBufferList().isLoaded(child_buffer_) - // additional sanity check: make sure the Buffer really is + // additional sanity check: make sure the Buffer really is // associated with the file we want. && child_buffer_ == theBufferList().getBuffer(included_file)) return child_buffer_;
[LyX/master] Whitespace and const'ing.
commit 8414c38e4b6c1689f89edb3a1ee200de0c4315fa Author: Richard Heck Date: Sun Mar 12 16:27:36 2017 -0400 Whitespace and const'ing. --- src/BiblioInfo.cpp |9 + src/BiblioInfo.h | 10 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp index bfde294..6437ccf 100644 --- a/src/BiblioInfo.cpp +++ b/src/BiblioInfo.cpp @@ -289,6 +289,7 @@ BibTeXInfo::BibTeXInfo(docstring const & key, docstring const & type) {} + docstring const BibTeXInfo::getAuthorOrEditorList(Buffer const * buf, bool full, bool forceshort) const { @@ -300,9 +301,9 @@ docstring const BibTeXInfo::getAuthorOrEditorList(Buffer const * buf, } -docstring const BibTeXInfo::getAuthorList(Buffer const * buf, docstring author, - bool full, bool forceshort, bool allnames, - bool beginning) const +docstring const BibTeXInfo::getAuthorList(Buffer const * buf, + docstring const & author, bool const full, bool const forceshort, + bool const allnames, bool const beginning) const { // Maxnames treshold depend on engine size_t maxnames = buf ? @@ -364,7 +365,7 @@ docstring const BibTeXInfo::getAuthorList(Buffer const * buf, docstring author, : "%prename% %surname%"; // Shorten the list (with et al.) if forceshort is set - // and the list can actually be shorten, else if maxcitenames + // and the list can actually be shortened, else if maxcitenames // is passed and full is not set. bool shorten = forceshort && authors.size() > 1; vector::const_iterator it = authors.begin(); diff --git a/src/BiblioInfo.h b/src/BiblioInfo.h index f9126be..791f9cf 100644 --- a/src/BiblioInfo.h +++ b/src/BiblioInfo.h @@ -59,12 +59,12 @@ public: /// used for sorting. /// This will be translated to the UI language if buf is null /// otherwise, it will be translated to the buffer language. - docstring const getAuthorOrEditorList(Buffer const * buf = 0, bool full = false, - bool forceshort = false) const; + docstring const getAuthorOrEditorList(Buffer const * buf = 0, + bool full = false, bool forceshort = false) const; /// Same for a specific author role (editor, author etc.) - docstring const getAuthorList(Buffer const * buf = 0, docstring author = docstring(), - bool full = false, bool forceshort = false, - bool allnames = false, bool beginning = true) const; + docstring const getAuthorList(Buffer const * buf, docstring const & author, + bool const full = false, bool const forceshort = false, + bool const allnames = false, bool const beginning = true) const; /// docstring const getYear() const; /// \return formatted BibTeX data suitable for framing.
[LyX/master] Whitespace
commit 7c123507a4a5a79ef8cec5bb85375ce7ca99ca18 Author: Guillaume Munch Date: Tue Feb 28 22:24:51 2017 +0100 Whitespace --- src/Buffer.cpp | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 2bc454b..ac01cf4 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -1411,12 +1411,12 @@ bool Buffer::save() const // if the file does not yet exist, none of the backup activity // that follows is necessary - if (!fileName().exists()) { + if (!fileName().exists()) { if (!writeFile(fileName())) - return false; -markClean(); -return true; - } + return false; + markClean(); + return true; + } // we first write the file to a new name, then move it to its // proper location once that has been done successfully. that
[LyX/master] Whitespace and remove obsolete #ifdef.
commit d50b66fc883a1321159afc365c0dfcd8b45c80b8 Author: Guillaume Munch Date: Sun Feb 26 22:15:50 2017 +0100 Whitespace and remove obsolete #ifdef. --- src/frontends/qt4/FancyLineEdit.cpp | 21 ++--- src/frontends/qt4/FancyLineEdit.h | 78 src/frontends/qt4/PanelStack.cpp| 82 +- 3 files changed, 104 insertions(+), 77 deletions(-) diff --git a/src/frontends/qt4/FancyLineEdit.cpp b/src/frontends/qt4/FancyLineEdit.cpp index 118a9b8..0e35ebb 100644 --- a/src/frontends/qt4/FancyLineEdit.cpp +++ b/src/frontends/qt4/FancyLineEdit.cpp @@ -104,9 +104,12 @@ FancyLineEdit::FancyLineEdit(QWidget *parent) : ensurePolished(); updateMargins(); -connect(this, SIGNAL(textChanged(QString)), this, SLOT(checkButtons(QString))); -connect(m_d->m_iconbutton[Left], SIGNAL(clicked()), this, SLOT(iconClicked())); -connect(m_d->m_iconbutton[Right], SIGNAL(clicked()), this, SLOT(iconClicked())); +connect(this, SIGNAL(textChanged(QString)), +this, SLOT(checkButtons(QString))); +connect(m_d->m_iconbutton[Left], SIGNAL(clicked()), +this, SLOT(iconClicked())); +connect(m_d->m_iconbutton[Right], SIGNAL(clicked()), +this, SLOT(iconClicked())); } void FancyLineEdit::checkButtons(const QString &text) @@ -186,10 +189,12 @@ void FancyLineEdit::updateButtonPositions() if (iconpos == FancyLineEdit::Right) { const int iconoffset = textMargins().right() + 4; -m_d->m_iconbutton[i]->setGeometry(contentRect.adjusted(width() - iconoffset, 0, 0, 0)); +m_d->m_iconbutton[i]-> + setGeometry(contentRect.adjusted(width() - iconoffset, 0, 0, 0)); } else { const int iconoffset = textMargins().left() + 4; -m_d->m_iconbutton[i]->setGeometry(contentRect.adjusted(0, 0, -width() + iconoffset, 0)); +m_d->m_iconbutton[i]-> + setGeometry(contentRect.adjusted(0, 0, -width() + iconoffset, 0)); } } } @@ -295,12 +300,14 @@ void IconButton::paintEvent(QPaintEvent *) void IconButton::animateShow(bool visible) { if (visible) { -QPropertyAnimation *animation = new QPropertyAnimation(this, "iconOpacity"); +QPropertyAnimation *animation = + new QPropertyAnimation(this, "iconOpacity"); animation->setDuration(FADE_TIME); animation->setEndValue(1.0); animation->start(QAbstractAnimation::DeleteWhenStopped); } else { -QPropertyAnimation *animation = new QPropertyAnimation(this, "iconOpacity"); +QPropertyAnimation *animation = + new QPropertyAnimation(this, "iconOpacity"); animation->setDuration(FADE_TIME); animation->setEndValue(0.0); animation->start(QAbstractAnimation::DeleteWhenStopped); diff --git a/src/frontends/qt4/FancyLineEdit.h b/src/frontends/qt4/FancyLineEdit.h index cd3c6b5..ef6b45a 100644 --- a/src/frontends/qt4/FancyLineEdit.h +++ b/src/frontends/qt4/FancyLineEdit.h @@ -29,20 +29,20 @@ class IconButton: public QAbstractButton Q_PROPERTY(bool autoHide READ hasAutoHide WRITE setAutoHide) Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap) public: -explicit IconButton(QWidget *parent = 0); -void paintEvent(QPaintEvent *event); -void setPixmap(const QPixmap &pixmap) { m_pixmap = pixmap; update(); } -QPixmap pixmap() const { return m_pixmap; } -float iconOpacity() { return m_iconOpacity; } -void setIconOpacity(float value) { m_iconOpacity = value; update(); } -void animateShow(bool visible); - -void setAutoHide(bool hide) { m_autoHide = hide; } -bool hasAutoHide() const { return m_autoHide; } + explicit IconButton(QWidget *parent = 0); + void paintEvent(QPaintEvent *event); + void setPixmap(const QPixmap &pixmap) { m_pixmap = pixmap; update(); } + QPixmap pixmap() const { return m_pixmap; } + float iconOpacity() { return m_iconOpacity; } + void setIconOpacity(float value) { m_iconOpacity = value; update(); } + void animateShow(bool visible); + + void setAutoHide(bool hide) { m_autoHide = hide; } + bool hasAutoHide() const { return m_autoHide; } private: -float m_iconOpacity; -bool m_autoHide; -QPixmap m_pixmap; + float m_iconOpacity; + bool m_autoHide; + QPixmap m_pixmap; }; /* A line edit with an embedded pixmap on one side that is connected to @@ -59,52 +59,52 @@ class FancyLineEdit : public QLineEdit Q_ENUMS(Side) public: -enum Side {Left = 0, Right = 1}; + enum Side {Left = 0, Right = 1}; Q_SIGNALS: -void buttonClicked(Side side); -void leftButtonClicked(); -void rightButtonClicked(); + void buttonClicked(Side side); + void leftButtonClicked(); + void rightButtonClicked(); void downPressed(); public: -explicit FancyLi
[LyX/master] Whitespace
commit 4acc1c55355f819e5beee4bb8d6bb272616a2be0 Author: Juergen Spitzmueller Date: Sat Feb 18 08:48:00 2017 +0100 Whitespace --- lib/layouts/beamer.layout | 24 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index 8c6fff6..51933a6 100644 --- a/lib/layouts/beamer.layout +++ b/lib/layouts/beamer.layout @@ -1343,7 +1343,7 @@ InsetLayout Flex:Bold LeftDelim < RightDelim > EndArgument - ResetsFont true + ResetsFont true End InsetLayout Flex:Emphasize @@ -1361,7 +1361,7 @@ InsetLayout Flex:Emphasize LeftDelim < RightDelim > EndArgument - ResetsFont true + ResetsFont true End InsetLayout Flex:Alert @@ -1379,7 +1379,7 @@ InsetLayout Flex:Alert LeftDelim < RightDelim > EndArgument - ResetsFont true + ResetsFont true End InsetLayout Flex:Structure @@ -1397,7 +1397,7 @@ InsetLayout Flex:Structure LeftDelim < RightDelim > EndArgument - ResetsFont true + ResetsFont true End InsetLayout Flex:Only @@ -1416,7 +1416,7 @@ InsetLayout Flex:Only RightDelim > AutoInsert 1 EndArgument - ResetsFont true + ResetsFont true End InsetLayout Flex:Uncover @@ -1435,7 +1435,7 @@ InsetLayout Flex:Uncover RightDelim > AutoInsert 1 EndArgument - ResetsFont true + ResetsFont true End InsetLayout Flex:Visible @@ -1454,7 +1454,7 @@ InsetLayout Flex:Visible RightDelim > AutoInsert 1 EndArgument - ResetsFont true + ResetsFont true End InsetLayout Flex:Invisible @@ -1473,7 +1473,7 @@ InsetLayout Flex:Invisible RightDelim > AutoInsert 1 EndArgument - ResetsFont true + ResetsFont true End InsetLayout Flex:Alternative @@ -1496,7 +1496,7 @@ InsetLayout Flex:Alternative Tooltip"Enter the default text here" Mandatory 1 EndArgument - ResetsFont true + ResetsFont true End InsetLayout Flex:Beamer_Note @@ -1519,7 +1519,7 @@ InsetLayout Flex:Beamer_Note LabelString"Note Options" Tooltip"Specifiy note options (see beamer manual)" EndArgument - ResetsFont true + ResetsFont true End InsetLayout Flex:ArticleMode @@ -1530,7 +1530,7 @@ InsetLayout Flex:ArticleMode Decoration classic LabelString Article MultiPartrue - ResetsFont true + ResetsFont true End InsetLayout Flex:PresentationMode @@ -1541,7 +1541,7 @@ InsetLayout Flex:PresentationMode Decoration classic LabelString Presentation MultiPartrue - ResetsFont true + ResetsFont true End
[LyX/master] Whitespace
commit 83074c431c97f5447ddbfd8394c97c1118c93693 Author: Juergen Spitzmueller Date: Sat Jan 28 13:00:33 2017 +0100 Whitespace --- src/insets/InsetCommandParams.cpp |2 +- src/insets/InsetRef.cpp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp index 931e1bb..79e3bd7 100644 --- a/src/insets/InsetCommandParams.cpp +++ b/src/insets/InsetCommandParams.cpp @@ -437,7 +437,7 @@ docstring InsetCommandParams::prepareCommand(OutputParams const & runparams, from_utf8(insetType()), command_latexed.second)); } break; - } + } case ParamInfo::HANDLING_ESCAPE: result = escape(command); break; diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp index 32b8058..98fb846 100644 --- a/src/insets/InsetRef.cpp +++ b/src/insets/InsetRef.cpp @@ -152,7 +152,7 @@ docstring InsetRef::getEscapedLabel(OutputParams const & rp) const InsetCommandParams const & p = params(); ParamInfo const & pi = p.info(); ParamInfo::ParamData const & pd = pi["reference"]; - return p.prepareCommand(rp, getParam("reference"), pd.handling()); + return p.prepareCommand(rp, getParam("reference"), pd.handling()); }
[LyX/master] whitespace
commit f38827b63b5ca31c0dc5c98123fcca4c9d25c285 Author: Juergen Spitzmueller Date: Sun Jan 1 08:36:13 2017 +0100 whitespace --- lib/citeengines/natbib.citeengine |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/citeengines/natbib.citeengine b/lib/citeengines/natbib.citeengine index 98e5a10..9a24c80 100644 --- a/lib/citeengines/natbib.citeengine +++ b/lib/citeengines/natbib.citeengine @@ -1,8 +1,8 @@ # \DeclareLyXCiteEngine[natbib.sty]{Natbib (BibTeX)} # DescriptionBegin # Natbib supports a range of both author-year and numerical styles mainly -# aimed at the Humanities. It features automatic sorting and merging of -# numerical citations, annotations, capitalization of the `van' part of +# aimed at the Humanities. It features automatic sorting and merging of +# numerical citations, annotations, capitalization of the `van' part of # author names, shortened and full author lists, and more. # DescriptionEnd # Excludes: basic | jurabib | biblatex
[LyX/master] whitespace.
commit e4ca4a564d01bf695145951f46e90455d6e82715 Author: Juergen Spitzmueller Date: Sun Dec 18 09:54:37 2016 +0100 whitespace. --- src/insets/InsetQuotes.cpp |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp index 147e177..60c6426 100644 --- a/src/insets/InsetQuotes.cpp +++ b/src/insets/InsetQuotes.cpp @@ -114,6 +114,7 @@ InsetQuotes::InsetQuotes(Buffer * buf, string const & str) : Inset(buf) parseString(str); } + InsetQuotes::InsetQuotes(Buffer * buf, char_type c, QuoteTimes t, string const & s, string const & l) : Inset(buf), times_(t), pass_thru_(false) @@ -205,6 +206,7 @@ void InsetQuotes::parseString(string const & s) } } + InsetQuotes::QuoteLanguage InsetQuotes::getLanguage(string const & s) { QuoteLanguage ql = EnglishQuotes; @@ -297,6 +299,7 @@ void InsetQuotes::draw(PainterInfo & pi, int x, int y) const pi.pain.text(x, y, displayString(), font); } + string InsetQuotes::getType() const { string text; @@ -305,7 +308,8 @@ string InsetQuotes::getType() const text += times_char[times_]; return text; } - + + void InsetQuotes::write(ostream & os) const { os << "Quotes " << getType();
[LyX/master] Whitespace
commit 5c1fb98885a6695352004346cb1db8cefea67a8a Author: Juergen Spitzmueller Date: Sat Dec 17 12:59:03 2016 +0100 Whitespace --- src/frontends/qt4/GuiDocument.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index a69a111..0950327 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -1068,7 +1068,7 @@ GuiDocument::GuiDocument(GuiView & lv) langModule->encodingCO->addItems(encodinglist); langModule->quoteStyleCO->addItem( - qt_("``text''"),InsetQuotes::EnglishQuotes); + qt_("``text''"), InsetQuotes::EnglishQuotes); langModule->quoteStyleCO->addItem( qt_("''text''"), InsetQuotes::SwedishQuotes); langModule->quoteStyleCO->addItem
[LyX/master] Whitespace
commit eca3015f302ef57e6e23f4628a0170af3d4d28c1 Author: Juergen Spitzmueller Date: Mon Oct 31 18:47:16 2016 +0100 Whitespace --- src/BufferParams.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 50870c5..7995c9e 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -1452,7 +1452,7 @@ void BufferParams::validate(LaTeXFeatures & features) const // some languages are only available via polyglossia if (features.hasPolyglossiaExclusiveLanguages()) - features.require("polyglossia"); + features.require("polyglossia"); if (useNonTeXFonts && fontsMath() != "auto") features.require("unicode-math");
[LyX/master] Whitespace
commit 6a0e5571c54bcb7deb2c23cded9bb815803612f8 Author: Scott Kostyshak Date: Sun Oct 9 13:42:18 2016 -0400 Whitespace --- src/frontends/qt4/GuiView.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index fdc05a9..b8a0777 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -4091,7 +4091,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr) bv = currentBufferView(); // Clear non-empty selections -// (e.g. from a "char-forward-select" followed by "char-backward-select") + // (e.g. from a "char-forward-select" followed by "char-backward-select") if (bv) { Cursor & cur = bv->cursor(); if ((cur.selection() && cur.selBegin() == cur.selEnd())) {
[LyX/master] Whitespace
commit 4084b2d629df7291cb0e71843d8a4c664aeaa213 Author: Juergen Spitzmueller Date: Thu Aug 4 12:49:33 2016 +0200 Whitespace --- development/FORMAT | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/development/FORMAT b/development/FORMAT index bced95a..902c145 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -13,22 +13,22 @@ adjustments are made to tex2lyx and bugs are fixed in lyx2lyx. 2016-08-04 Jürgen Spitzmüller * Format incremented to 512 - Added inclusion of styles from [scr]article to the [scr]article-beamer - layouts. On reversion, this is handled via local layout additions that - are removed again on conversion. + Added inclusion of styles from [scr]article to the [scr]article-beamer + layouts. On reversion, this is handled via local layout additions that + are removed again on conversion. 2016-07-11 Richard Heck * Format incremented to 511 - Added "inverted" branches + Added "inverted" branches 2016-06-19 Georg Baum * Format incremented to 510 -Removed external date inset + Removed external date inset 2016-06-16 Pavel Sanda * Format incremented to 509. - New parameter "\use_microtype bool" for including microtype LaTeX - package into preamble. + New parameter "\use_microtype bool" for including microtype LaTeX + package into preamble. 2016-04-05 Enrico Forestieri * Format incremented to 508
[LyX/master] whitespace
commit d142ab94efbd8fe4bced048e9e08a5ea92d713ca Author: Richard Heck Date: Sun Jul 31 00:15:42 2016 -0400 whitespace --- lib/scripts/fen2ascii.py |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/lib/scripts/fen2ascii.py b/lib/scripts/fen2ascii.py index 212dae4..d7f0fb3 100644 --- a/lib/scripts/fen2ascii.py +++ b/lib/scripts/fen2ascii.py @@ -28,7 +28,6 @@ margin= " "*6 print margin+' +'+"-"*15+'+' for i in range(8): - cont = cont + 1 tmp="" for j in comp[i]:
[LyX/master] Whitespace.
commit aad0802b5304d0f189552afde291be6904df69c7 Author: Richard Heck Date: Sat Jul 30 01:35:22 2016 -0400 Whitespace. --- src/insets/InsetBranch.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h index fcf7061..afb07d1 100644 --- a/src/insets/InsetBranch.h +++ b/src/insets/InsetBranch.h @@ -103,7 +103,7 @@ private: * Note that Branch insets are considered part of the * document when they are selected XOR inverted. */ -bool producesOutput(bool const child = false) const; + bool producesOutput(bool const child = false) const; /// bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const; ///
[LyX/master] Whitespace.
commit 858f6b6c7b630f7672001fb19b55109a89aed142 Author: Juergen Spitzmueller Date: Mon Jul 18 16:28:12 2016 +0200 Whitespace. --- src/insets/InsetText.cpp |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp index 1222a69..df4f6e2 100644 --- a/src/insets/InsetText.cpp +++ b/src/insets/InsetText.cpp @@ -227,8 +227,8 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const pi.backgroundColor(this)); // Change color of the frame in tracked changes, like for tabulars. -// Only do so if the color is not custom. But do so even if RowPainter -// handles the strike-through already. + // Only do so if the color is not custom. But do so even if RowPainter + // handles the strike-through already. Color c; if (pi.change_.changed() // Originally, these are the colors with role Text, from role() in
[LyX/master] whitespace
commit 5b04b91d54bb50ef70a53d88d7c067e3cdfe73da Author: Georg Baum Date: Sat Jul 2 14:52:46 2016 +0200 whitespace --- lib/unicodesymbols | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/unicodesymbols b/lib/unicodesymbols index 1a1d420..1c31010 100644 --- a/lib/unicodesymbols +++ b/lib/unicodesymbols @@ -285,7 +285,7 @@ #0x0185 "" "" "" # LATIN SMALL LETTER TONE SIX #0x0186 "" "" "" # LATIN CAPITAL LETTER OPEN O #0x0187 "" "" "" # LATIN CAPITAL LETTER C WITH HOOK -0x0188 "\\texthtc" "tipa" "force" # LATIN SMALL LETTER C WITH HOOK +0x0188 "\\texthtc""tipa" "force" "" "" # LATIN SMALL LETTER C WITH HOOK #0x0189 "" "" "" # LATIN CAPITAL LETTER AFRICAN D #0x018a "" "" "" # LATIN CAPITAL LETTER D WITH HOOK #0x018b "" "" "" # LATIN CAPITAL LETTER D WITH TOPBAR @@ -816,8 +816,8 @@ 0x03a7 "\\textgreek{Q}" "textgreek" "" # GREEK CAPITAL LETTER CHI 0x03a8 "\\textgreek{Y}" "textgreek" "" "\\Psi" "" # GREEK CAPITAL LETTER PSI 0x03a9 "\\textgreek{W}" "textgreek" "" "\\Omega" "" # GREEK CAPITAL LETTER OMEGA -0x03aa "\\textgreek{\"I}""textgreek" "" # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA -0x03ab "\\textgreek{\"U}""textgreek" "" # GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA +0x03aa "\\textgreek{\"I}" "textgreek" "" "" "" # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA +0x03ab "\\textgreek{\"U}" "textgreek" "" "" "" # GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA 0x03ac "\\textgreek{\\char136}" "textgreek" "" # GREEK SMALL LETTER ALPHA WITH TONOS 0x03ad "\\textgreek{\\char232}" "textgreek" "" # GREEK SMALL LETTER EPSILON WITH TONOS 0x03ae "\\textgreek{\\char160}" "textgreek" "" # GREEK SMALL LETTER ETA WITH TONOS @@ -848,8 +848,8 @@ 0x03c7 "\\textgreek{q}" "textgreek" "mathalpha,tipashortcut=X" "\\chi" "" # GREEK SMALL LETTER CHI 0x03c8 "\\textgreek{y}" "textgreek" "mathalpha" "\\psi" "" # GREEK SMALL LETTER PSI 0x03c9 "\\textgreek{w}" "textgreek" "mathalpha" "\\omega" "" # GREEK SMALL LETTER OMEGA -0x03ca "\\textgreek{\"i}""textgreek" "" # GREEK SMALL LETTER IOTA WITH DIALYTIKA -0x03cb "\\textgreek{\"u}""textgreek" "" # GREEK SMALL LETTER UPSILON WITH DIALYTIKA +0x03ca "\\textgreek{\"i}" "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH DIALYTIKA +0x03cb "\\textgreek{\"u}" "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH DIALYTIKA 0x03cc "\\textgreek{\\char236}" "textgreek" "" # GREEK SMALL LETTER OMICRON WITH TONOS 0x03cd "\\textgreek{\\char212}" "textgreek" "" # GREEK SMALL LETTER UPSILON WITH TONOS 0x03ce "\\textgreek{\\char184}" "textgreek" "" # GREEK SMALL LETTER OMEGA WITH TONOS
[LyX/master] Whitespace only.
commit fd4645c91202e660ed62c1d8a68ae55363263089 Author: Richard Heck Date: Mon Jun 27 18:54:14 2016 -0400 Whitespace only. --- src/FuncRequest.cpp |2 +- src/Server.cpp|2 +- src/frontends/qt4/GuiWorkArea.cpp | 13 ++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp index 62ba9cd..a8d8859 100644 --- a/src/FuncRequest.cpp +++ b/src/FuncRequest.cpp @@ -56,7 +56,7 @@ FuncRequest::FuncRequest(FuncCode act, string const & arg, Origin o) FuncRequest::FuncRequest(FuncCode act, int ax, int ay, mouse_button::state but, KeyModifier modifier, Origin o) : action_(act), origin_(o), x_(ax), y_(ay), button_(but), -modifier_(modifier) + modifier_(modifier) {} diff --git a/src/Server.cpp b/src/Server.cpp index 0eec4b5..b89e834 100644 --- a/src/Server.cpp +++ b/src/Server.cpp @@ -1175,7 +1175,7 @@ void Server::callback(string const & msg) // connect to the lyxfunc in the single GuiView we // support currently. (Lgb) - FuncRequest fr(lyxaction.lookupFunc(cmd), from_ascii(arg)); + FuncRequest fr(lyxaction.lookupFunc(cmd), from_ascii(arg)); fr.setOrigin(FuncRequest::LYXSERVER); DispatchResult dr; theApp()->dispatch(fr, dr); diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp index 192c82c..b273183 100644 --- a/src/frontends/qt4/GuiWorkArea.cpp +++ b/src/frontends/qt4/GuiWorkArea.cpp @@ -802,7 +802,7 @@ void GuiWorkArea::mousePressEvent(QMouseEvent * e) if (d->dc_event_.active && d->dc_event_ == *e) { d->dc_event_.active = false; FuncRequest cmd(LFUN_MOUSE_TRIPLE, e->x(), e->y(), - q_button_state(e->button()), q_key_state(e->modifiers())); + q_button_state(e->button()), q_key_state(e->modifiers())); d->dispatch(cmd); e->accept(); return; @@ -813,7 +813,7 @@ void GuiWorkArea::mousePressEvent(QMouseEvent * e) #endif FuncRequest const cmd(LFUN_MOUSE_PRESS, e->x(), e->y(), - q_button_state(e->button()), q_key_state(e->modifiers())); + q_button_state(e->button()), q_key_state(e->modifiers())); d->dispatch(cmd); // Save the context menu on mouse press, because also the mouse @@ -834,7 +834,7 @@ void GuiWorkArea::mouseReleaseEvent(QMouseEvent * e) d->synthetic_mouse_event_.timeout.stop(); FuncRequest const cmd(LFUN_MOUSE_RELEASE, e->x(), e->y(), - q_button_state(e->button()), q_key_state(e->modifiers())); + q_button_state(e->button()), q_key_state(e->modifiers())); d->dispatch(cmd); e->accept(); } @@ -845,7 +845,7 @@ void GuiWorkArea::mouseMoveEvent(QMouseEvent * e) // we kill the triple click if we move doubleClickTimeout(); FuncRequest cmd(LFUN_MOUSE_MOTION, e->x(), e->y(), - q_motion_state(e->buttons()), q_key_state(e->modifiers())); + q_motion_state(e->buttons()), q_key_state(e->modifiers())); e->accept(); @@ -1106,9 +1106,8 @@ void GuiWorkArea::mouseDoubleClickEvent(QMouseEvent * ev) { d->dc_event_ = DoubleClick(ev); QTimer::singleShot(QApplication::doubleClickInterval(), this, - SLOT(doubleClickTimeout())); - FuncRequest cmd(LFUN_MOUSE_DOUBLE, - ev->x(), ev->y(), + SLOT(doubleClickTimeout())); + FuncRequest cmd(LFUN_MOUSE_DOUBLE, ev->x(), ev->y(), q_button_state(ev->button()), q_key_state(ev->modifiers())); d->dispatch(cmd); ev->accept();
[LyX/master] Whitespace
commit 459a9d1a8f7c2f2a18fafe22b32d1bb92bda Author: Scott Kostyshak Date: Fri Jun 24 22:26:34 2016 -0400 Whitespace --- src/frontends/qt4/GuiView.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 445678f..a5a7098 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -3539,7 +3539,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr) if (!dest.empty() && FileName::isAbsolute(dest)) target_dir = FileName(support::onlyPath(dest)); else -target_dir = doc_buffer->fileName().onlyPath(); + target_dir = doc_buffer->fileName().onlyPath(); if (doc_buffer->isUnnamed() || !target_dir.isDirWritable()) { exportBufferAs(*doc_buffer, cmd.argument());
[LyX/master] Whitespace.
commit ff4005de6814f8a1f627d3a647d1a897ce041e99 Author: Richard Heck Date: Wed Jun 15 00:23:34 2016 +0100 Whitespace. diff --git a/po/pt_PT.gmo b/po/pt_PT.gmo index b1096b1..2dd4a1b 100644 Binary files a/po/pt_PT.gmo and b/po/pt_PT.gmo differ diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index 958eca1..eb8c305 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -1671,17 +1671,17 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) boost::crc_32_type crc; crc = for_each(fname.begin(), fname.end(), crc); createView(crc.checksum()); -// we know current_view_ is non-null, because createView sets it. -// but let's make sure -LASSERT(current_view_, break); + // we know current_view_ is non-null, because createView sets it. + // but let's make sure + LASSERT(current_view_, break); current_view_->openDocument(fname); // FIXME but then why check current_view_ here? if (current_view_ && !current_view_->documentBufferView()) current_view_->close(); } else { // we know !d->views.empty(), so this should be ok -// but let's make sure -LASSERT(current_view_, break); + // but let's make sure + LASSERT(current_view_, break); current_view_->openDocument(fname); } break;
[LyX/master] Whitespace
commit 0e740018ff15aa005f024b0c4ebbf68079778b3b Author: Guillaume Munch Date: Fri Apr 29 22:29:27 2016 +0100 Whitespace diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp index bb15f31..24bc433 100644 --- a/src/frontends/qt4/TocWidget.cpp +++ b/src/frontends/qt4/TocWidget.cpp @@ -86,7 +86,7 @@ TocWidget::TocWidget(GuiView & gui_view, QWidget * parent) this, SLOT(showContextMenu(const QPoint &))); connect(tocTV, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(showContextMenu(const QPoint &))); - connect(filterLE, SIGNAL(textEdited(QString)), + connect(filterLE, SIGNAL(textEdited(QString)), this, SLOT(filterContents())); init(QString()); @@ -98,7 +98,7 @@ void TocWidget::showContextMenu(const QPoint & pos) std::string name = "context-toc-" + fromqstr(current_type_); QMenu * menu = guiApp->menus().menu(toqstr(name), gui_view_); if (!menu) - return; + return; menu->exec(mapToGlobal(pos)); } @@ -109,9 +109,9 @@ Inset * TocWidget::itemInset() const TocItem const & item = gui_view_.tocModels().currentItem(current_type_, index); DocIterator const & dit = item.dit(); - + Inset * inset = 0; - if (current_type_ == "label" + if (current_type_ == "label" || current_type_ == "graphics" || current_type_ == "citation" || current_type_ == "child") @@ -120,7 +120,7 @@ Inset * TocWidget::itemInset() const else if (current_type_ == "branch" || current_type_ == "index" || current_type_ == "change" -|| current_type_ == "table" +|| current_type_ == "table" || current_type_ == "listing" || current_type_ == "figure") inset = &dit.inset(); @@ -415,7 +415,7 @@ void TocWidget::updateViewForce() tocTV->setEnabled(false); tocTV->setUpdatesEnabled(false); - QAbstractItemModel * toc_model = + QAbstractItemModel * toc_model = gui_view_.tocModels().model(current_type_); if (tocTV->model() != toc_model) { tocTV->setModel(toc_model); @@ -470,7 +470,7 @@ void TocWidget::filterContents() filterLE->text(), Qt::CaseInsensitive); tocTV->setRowHidden(index.row(), index.parent(), !matches); } - // recursively unhide parents of unhidden children + // recursively unhide parents of unhidden children for (int i = size - 1; i >= 0; i--) { QModelIndex index = indices[i]; if (!tocTV->isRowHidden(index.row(), index.parent()) diff --git a/src/frontends/qt4/TocWidget.h b/src/frontends/qt4/TocWidget.h index 608920a..962c21a 100644 --- a/src/frontends/qt4/TocWidget.h +++ b/src/frontends/qt4/TocWidget.h @@ -74,15 +74,15 @@ private: /// void enableControls(bool enable = true); /// - bool canOutline() + bool canOutline() { return current_type_ == "tableofcontents"; } /// It is not possible to have synchronous navigation in a correct /// and efficient way with the label and change type because Toc::item() /// does a linear search. Even when fixed, it might even not be desirable /// to do so if we want to support drag&drop of labels and references. - bool canNavigate() + bool canNavigate() { return current_type_ != "label" && current_type_ != "change"; } - /// + /// bool isSortable() { return current_type_ != "tableofcontents"; } ///
[LyX/master] whitespace only
commit f23a8fed80ccf92f1da1eaab32ca1bec0742bced Author: Jean-Marc Lasgouttes Date: Wed Feb 3 10:42:01 2016 +0100 whitespace only diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp index f94d7fd..c4ca450 100644 --- a/src/insets/InsetCollapsable.cpp +++ b/src/insets/InsetCollapsable.cpp @@ -316,11 +316,11 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const const int xx1 = x + TEXT_TO_INSET_OFFSET - 1; const int xx2 = x + textdim.wid - TEXT_TO_INSET_OFFSET + 1; - pi.pain.line(xx1, y + desc - 4, -xx1, y + desc, + pi.pain.line(xx1, y + desc - 4, +xx1, y + desc, Color_foreground); if (status_ == Open) - pi.pain.line(xx1, y + desc, + pi.pain.line(xx1, y + desc, xx2, y + desc, Color_foreground); else { @@ -332,7 +332,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const xx2, y + desc, Color_foreground); } - pi.pain.line(x + textdim.wid - 3, y + desc, x + textdim.wid - 3, + pi.pain.line(x + textdim.wid - 3, y + desc, x + textdim.wid - 3, y + desc - 4, Color_foreground); // the label below the text. Can be toggled. @@ -454,8 +454,8 @@ Inset * InsetCollapsable::editXY(Cursor & cur, int x, int y) { //lyxerr << "InsetCollapsable: edit xy" << endl; if (geometry(cur.bv()) == ButtonOnly -|| (button_dim.contains(x, y) - && geometry(cur.bv()) != NoButton)) + || (button_dim.contains(x, y) + && geometry(cur.bv()) != NoButton)) return this; cur.push(*this); return InsetText::editXY(cur, x, y); @@ -508,7 +508,7 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd) if (geometry(cur.bv()) != ButtonOnly) InsetText::doDispatch(cur, cmd); else - cur.undispatched(); + cur.undispatched(); break; } if (cmd.button() != mouse_button::button1) { @@ -586,7 +586,7 @@ void InsetCollapsable::setLabel(docstring const & l) docstring const InsetCollapsable::buttonLabel(BufferView const & bv) const { InsetLayout const & il = getLayout(); - docstring const label = labelstring_.empty() ? + docstring const label = labelstring_.empty() ? translateIfPossible(il.labelstring()) : labelstring_; if (!il.contentaslabel() || geometry(bv) != ButtonOnly) return label; diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h index f24beb5..e231ca0 100644 --- a/src/insets/InsetCollapsable.h +++ b/src/insets/InsetCollapsable.h @@ -79,7 +79,7 @@ public: /// virtual docstring const buttonLabel(BufferView const &) const; /// - bool isOpen(BufferView const & bv) const + bool isOpen(BufferView const & bv) const { return geometry(bv) != ButtonOnly; } /// enum CollapseStatus { @@ -90,7 +90,7 @@ public: virtual void setStatus(Cursor & cur, CollapseStatus st); /// CollapseStatus status(BufferView const & bv) const; - /** Of the old CollapseStatus we only keep the values + /** Of the old CollapseStatus we only keep the values * Open and Collapsed. * We define a list of possible inset decoration * styles, and a list of possible (concrete, visual) @@ -152,7 +152,7 @@ protected: /// void doDispatch(Cursor & cur, FuncRequest & cmd); /// - void edit(Cursor & cur, bool front, + void edit(Cursor & cur, bool front, EntryDirection entry_from = ENTRY_DIRECTION_IGNORE); /// Inset * editXY(Cursor & cur, int x, int y);
[LyX/master] Whitespace
commit 8fd223146b02c83fbe78ff361590c9578a7d0454 Author: Guillaume Munch Date: Fri Apr 29 21:45:18 2016 +0100 Whitespace diff --git a/src/frontends/qt4/GuiClipboard.cpp b/src/frontends/qt4/GuiClipboard.cpp index b67361f..1de945e 100644 --- a/src/frontends/qt4/GuiClipboard.cpp +++ b/src/frontends/qt4/GuiClipboard.cpp @@ -61,7 +61,7 @@ namespace lyx { namespace frontend { -static QMimeData const * read_clipboard() +static QMimeData const * read_clipboard() { LYXERR(Debug::CLIPBOARD, "Getting Clipboard"); QMimeData const * source = @@ -93,7 +93,7 @@ void CacheMimeData::update() } -QByteArray CacheMimeData::data(QString const & mimeType) const +QByteArray CacheMimeData::data(QString const & mimeType) const { return read_clipboard()->data(mimeType); } @@ -281,10 +281,10 @@ FileName GuiClipboard::getAsGraphics(Cursor const & cur, GraphicsType type) cons image.save(toqstr(filename.absFileName()), "JPEG"); else LATTEST(false); - + return filename; } - + // get mime for type QString mime; switch (type) { @@ -294,7 +294,7 @@ FileName GuiClipboard::getAsGraphics(Cursor const & cur, GraphicsType type) cons case WmfGraphicsType: mime = wmfMimeType(); break; default: LASSERT(false, return FileName()); } - + // get data if (!cache_.hasFormat(mime)) return FileName(); @@ -309,7 +309,7 @@ FileName GuiClipboard::getAsGraphics(Cursor const & cur, GraphicsType type) cons << filename.absFileName() << " for writing"); return FileName(); } - + // write the (LinkBack) PDF data f.write(ar); if (type == LinkBackGraphicsType) { @@ -459,7 +459,7 @@ bool GuiClipboard::hasTextContents(Clipboard::TextType type) const case LyXTextType: return cache_.hasFormat(lyxMimeType()); case PlainTextType: - return cache_.hasText(); + return cache_.hasText(); case HtmlTextType: return cache_.hasHtml(); case LaTeXTextType: @@ -493,7 +493,7 @@ bool GuiClipboard::hasGraphicsContents(Clipboard::GraphicsType type) const #else return false; #endif // Q_OS_MAC - + // get mime data QStringList const & formats = cache_.formats(); LYXERR(Debug::CLIPBOARD, "We found " << formats.size() << " formats"); @@ -508,7 +508,7 @@ bool GuiClipboard::hasGraphicsContents(Clipboard::GraphicsType type) const case PdfGraphicsType: mime = pdfMimeType(); break; default: LASSERT(false, return false); } - + return cache_.hasFormat(mime); } @@ -537,7 +537,7 @@ bool GuiClipboard::isInternal() const bool GuiClipboard::hasInternal() const { // Windows and Mac OS X does not have the concept of ownership; - // the clipboard is a fully global resource so all applications + // the clipboard is a fully global resource so all applications // are notified of changes. However, on Windows ownership is // emulated by Qt through the OleIsCurrentClipboard() API, while // on Mac OS X we deal with this issue by ourself. diff --git a/src/frontends/qt4/GuiClipboard.h b/src/frontends/qt4/GuiClipboard.h index 392f059..b080598 100644 --- a/src/frontends/qt4/GuiClipboard.h +++ b/src/frontends/qt4/GuiClipboard.h @@ -28,9 +28,9 @@ namespace frontend { class QMacPasteboardMimeGraphics; /** - * \class CacheMimeData - * - * This class is used in order to query the clipboard only once on + * \class CacheMimeData + * + * This class is used in order to query the clipboard only once on * startup and once each time the contents of the clipboard changes. */ class CacheMimeData : public QMimeData @@ -92,7 +92,7 @@ private: /// the cached mime data used to describe the information /// that can be stored in the clipboard CacheMimeData cache_; - /// checksum for internal clipboard data (used on Mac) + /// checksum for internal clipboard data (used on Mac) boost::uint32_t checksum; };
[LyX/master] Whitespace
commit 28a22f40fb0a09b0dfb6bb241f9b67e879dda8e8 Author: Juergen Spitzmueller Date: Mon Dec 28 13:42:36 2015 +0100 Whitespace diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py index a61f9e9..176d481 100644 --- a/lib/lyx2lyx/lyx_2_1.py +++ b/lib/lyx2lyx/lyx_2_1.py @@ -1689,46 +1689,48 @@ def revert_latexargs(document): def revert_IEEEtran(document): - ''' - Reverts InsetArgument of - Page headings - Biography - Biography without photo - to TeX-code - ''' - if document.textclass == "IEEEtran": +''' +Reverts InsetArgument of +Page headings +Biography +Biography without photo +to TeX-code +''' +if document.textclass != "IEEEtran": +return + i = 0 i2 = 0 j = 0 k = 0 while True: - if i != -1: -i = find_token(document.body, "\\begin_layout Page headings", i) - if i != -1: -revert_Argument_to_TeX_brace(document, i, 0, 1, 1, False, False) -i += 1 - if i2 != -1: -i2 = find_token(document.body, "\\begin_inset Flex Paragraph Start", i2) - if i2 != -1: -revert_Argument_to_TeX_brace(document, i2, 0, 1, 1, False, False) -i2 = i2 + 1 - if j != -1: -j = find_token(document.body, "\\begin_layout Biography without photo", j) - if j != -1: -revert_Argument_to_TeX_brace(document, j, 0, 1, 1, True, False) -j += 1 - if k != -1: -k = find_token(document.body, "\\begin_layout Biography", k) -kA = find_token(document.body, "\\begin_layout Biography without photo", k) -if k == kA and k != -1: - k += 1 - continue - if k != -1: -# start with the second argument, therefore 2 -revert_Argument_to_TeX_brace(document, k, 0, 2, 2, True, False) -k += 1 - if i == -1 and i2 == -1 and j == -1 and k == -1: -return +if i != -1: +i = find_token(document.body, "\\begin_layout Page headings", i) +if i != -1: +revert_Argument_to_TeX_brace(document, i, 0, 1, 1, False, False) +i += 1 +if i2 != -1: +i2 = find_token(document.body, "\\begin_inset Flex Paragraph Start", i2) +if i2 != -1: +revert_Argument_to_TeX_brace(document, i2, 0, 1, 1, False, False) +i2 = i2 + 1 +if j != -1: +j = find_token(document.body, "\\begin_layout Biography without photo", j) +if j != -1: +revert_Argument_to_TeX_brace(document, j, 0, 1, 1, True, False) +j += 1 +if k != -1: +k = find_token(document.body, "\\begin_layout Biography", k) +kA = find_token(document.body, "\\begin_layout Biography without photo", k) +if k == kA and k != -1: +k += 1 +continue +if k != -1: +# start with the second argument, therefore 2 +revert_Argument_to_TeX_brace(document, k, 0, 2, 2, True, False) +k += 1 +if i == -1 and i2 == -1 and j == -1 and k == -1: +return def revert_IEEEtran_2(document): @@ -1748,41 +1750,43 @@ def revert_IEEEtran_2(document): def convert_IEEEtran(document): - ''' - Converts ERT of - Page headings - Biography - Biography without photo - to InsetArgument - ''' - if document.textclass == "IEEEtran": +''' +Converts ERT of +Page headings +Biography +Biography without photo +to InsetArgument +''' +if document.textclass != "IEEEtran": +return + i = 0 j = 0 k = 0 while True: - if i != -1: -i = find_token(document.body, "\\begin_layout Page headings", i) - if i != -1: -convert_TeX_brace_to_Argument(document, i, 1, 1, False, False, False) -i += 1 - if j != -1: -j = find_token(document.body, "\\begin_layout Biography without photo", j) - if j != -1: -convert_TeX_brace_to_Argument(document, j, 1, 1, False, True, False) -j += 1 - if k != -1: -# assure that we don't handle Biography Biography without photo -k = find_token(document.body, "\\begin_layout Biography", k) -kA = find_token(document.body, "\\begin_layout Biography without photo", k - 1) - if k == kA and k != -1: -k += 1 -continue - if k != -1: -# the argument we want to convert is the second one -convert_TeX_brace_to_Argument(document, k, 2, 2, False, True, False) -k += 1 - if i == -1 and j == -1 and k == -1: -return +if i != -1: +i = find_token(document.body, "\\begin_layout Page headings", i) +if i != -1: +convert_TeX_brace_to_Argument(document, i, 1, 1, False, False, False) +i += 1 +if j != -1: +j = find_token(document.body, "\\begin_layout Biography without photo", j) +if j != -1: +convert_TeX_brace_to_Argument(document,
[LyX/master] Whitespace.
commit c01a533acccbc77189b5009a45216f7da78ec3a9 Author: Richard Heck Date: Sun Nov 29 11:20:56 2015 -0500 Whitespace. diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index f17ab77..7676356 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -2886,7 +2886,7 @@ bool GuiView::closeBuffer(Buffer & buf) bool GuiView::closeTabWorkArea(TabWorkArea * twa) { while (twa == d.currentTabWorkArea()) { - twa->setCurrentIndex(twa->count()-1); + twa->setCurrentIndex(twa->count() - 1); GuiWorkArea * wa = twa->currentWorkArea(); Buffer & b = wa->bufferView().buffer();
[LyX/master] Whitespace.
commit 23add332d9f6263a588bb417d1b91311e29fad3f Author: Richard Heck Date: Thu Nov 26 22:08:43 2015 -0500 Whitespace. diff --git a/lib/scripts/prefs2prefs_lfuns.py b/lib/scripts/prefs2prefs_lfuns.py index e06af7c..78d8514 100644 --- a/lib/scripts/prefs2prefs_lfuns.py +++ b/lib/scripts/prefs2prefs_lfuns.py @@ -133,6 +133,7 @@ def paragraph_spacing(line): def tabular_feature(line): return simple_renaming(line, "tabular-feature", "inset-modify tabular") + re_Bar2bar = re.compile(r'^(\\(?:bind|unbind))\s+"([^"]*)Bar"(\s+"[^"]+")') def Bar2bar(line): m = re_Bar2bar.search(line) @@ -145,15 +146,19 @@ def Bar2bar(line): newline = btype + " \"" + mod + "bar\"" + rest return (True, newline) + def paragraph_break(line): return simple_renaming(line, "break-paragraph", "paragraph-break") + def tab_group_close(line): return simple_renaming(line, "close-tab-group", "tab-group-close") + def view_split(line): return simple_renaming(line, "split-view", "view-split") + def label_copy_as_reference(line): return simple_renaming(line, "copy-label-as-reference", "label-copy-as-reference")
[LyX/master] Whitespace
commit be040c4469aaebcc9aa0bdad24fa2d1e26686933 Author: Juergen Spitzmueller Date: Sat May 9 12:05:45 2015 +0200 Whitespace diff --git a/src/Text.cpp b/src/Text.cpp index 1eecee1..06700a4 100644 --- a/src/Text.cpp +++ b/src/Text.cpp @@ -848,7 +848,7 @@ void Text::insertStringAsLines(Cursor & cur, docstring const & str, } else { continue; } - // do not insert consecutive spaces if !free_spacing + // do not insert consecutive spaces if !free_spacing } else if ((*cit == ' ' || *cit == '\t') && space_inserted && !par.isFreeSpacing()) { continue;
[LyX/master] Whitespace
commit 72838f24b9fc9e2dd4b73cabc4225180c8973b42 Author: Scott Kostyshak Date: Fri Apr 24 00:10:00 2015 -0400 Whitespace diff --git a/src/insets/InsetPreview.cpp b/src/insets/InsetPreview.cpp index 9f6b0b8..1b3456e 100644 --- a/src/insets/InsetPreview.cpp +++ b/src/insets/InsetPreview.cpp @@ -68,12 +68,12 @@ void InsetPreview::addPreview(DocIterator const & inset_pos, void InsetPreview::preparePreview(DocIterator const & pos) const { TexRow texrow; - odocstringstream str; + odocstringstream str; otexstream os(str, texrow); OutputParams runparams(&pos.buffer()->params().encoding()); latex(os, runparams); docstring const snippet = str.str(); - preview_->addPreview(snippet, *pos.buffer()); + preview_->addPreview(snippet, *pos.buffer()); }
[LyX/master] whitespace
commit cdd79e76a6c4cb5b61a4989af5bede0b03d6aa33 Author: Georg Baum Date: Mon Mar 30 22:03:03 2015 +0200 whitespace diff --git a/src/mathed/MathMacro.h b/src/mathed/MathMacro.h index e3fdde9..81cb7ea 100644 --- a/src/mathed/MathMacro.h +++ b/src/mathed/MathMacro.h @@ -56,7 +56,7 @@ public: /// virtual bool notifyCursorLeaves(Cursor const & old, Cursor & cur); - + /// Remove cell (starting from 0) void removeArgument(pos_type pos); /// Insert empty cell (starting from 0) @@ -92,7 +92,7 @@ public: void unfold(Cursor & cur); /// will it be folded or unfolded in the next metric call? bool folded() const; - + enum DisplayMode { DISPLAY_INIT, DISPLAY_INTERACTIVE_INIT, @@ -111,17 +111,17 @@ public: /// bool validName() const; /// - size_t arity() const { + size_t arity() const { if (displayMode_ == DISPLAY_NORMAL ) return cells_.size(); else return 0; } - + /// size_t optionals() const { return optionals_; } /// - void setOptionals(int n) { + void setOptionals(int n) { if (n <= int(nargs())) optionals_ = n; } @@ -159,7 +159,7 @@ private: virtual Inset * clone() const; /// bool editMode(BufferView const * bv) const; - + /// name of macro docstring name_; /// current display mode
[LyX/master] Whitespace.
commit eb79a98e01cfe189a6e45b7c683697396b650482 Author: Richard Heck Date: Mon Mar 23 21:58:45 2015 -0400 Whitespace. diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp index 3d35e29..e70b519 100644 --- a/src/insets/InsetInfo.cpp +++ b/src/insets/InsetInfo.cpp @@ -397,7 +397,7 @@ void InsetInfo::updateInfo() case ICON_INFO: { FuncRequest func = lyxaction.lookupFunc(name_); docstring icon_name = frontend::Application::iconName(func, true); - //FIXME: We should use the icon directly instead of + // FIXME: We should use the icon directly instead of // going through FileName. The code below won't work // if the icon is embedded in the executable through // the Qt resource system.
[LyX/master] whitespace
commit 423a55acc6eb88e31283b98476a494e22ef6780e Author: Georg Baum Date: Sun Mar 15 18:20:01 2015 +0100 whitespace diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 54da9b2..f9da416 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -367,7 +367,7 @@ private: static FileName createBufferTmpDir() { // FIXME This would be the ideal application for a TempDir class (like - // TempFile but for directories) + // TempFile but for directories) string counter; { static int count; @@ -3335,7 +3335,7 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope) continue; // register macro - // FIXME (Abdel), I don't understandt why we pass 'it' here + // FIXME (Abdel), I don't understand why we pass 'it' here // instead of 'macroTemplate' defined above... is this correct? macros[macroTemplate.name()][it] = Impl::ScopeMacro(scope, MacroData(const_cast(owner_), it)); @@ -4453,9 +4453,9 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const if (master != this) { bufToUpdate.insert(this); master->updateBuffer(UpdateMaster, utype); - // If the master buffer has no gui associated with it, then the TocModel is - // not updated during the updateBuffer call and TocModel::toc_ is invalid - // (bug 5699). The same happens if the master buffer is open in a different + // If the master buffer has no gui associated with it, then the TocModel is + // not updated during the updateBuffer call and TocModel::toc_ is invalid + // (bug 5699). The same happens if the master buffer is open in a different // window. This test catches both possibilities. // See: http://marc.info/?l=lyx-devel&m=138590578911716&w=2 // There remains a problem here: If there is another child open in yet a third diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp index fe73aa8..1b79f0c 100644 --- a/src/mathed/MathData.cpp +++ b/src/mathed/MathData.cpp @@ -273,16 +273,16 @@ void MathData::metrics(MetricsInfo & mi, Dimension & dim) const dim += d; if (i == n - 1) kerning_ = at->kerning(mi.base.bv); - + // HACK to draw completion suggestion inline if (inlineCompletionData != this || size_t(inlineCompletionPos.pos()) != i + 1) continue; - + docstring const & completion = mi.base.bv->inlineCompletion(); if (completion.length() == 0) continue; - + FontInfo font = mi.base.font; augmentFont(font, from_ascii("mathnormal")); dim.wid += mathed_string_width(font, completion); @@ -324,7 +324,7 @@ void MathData::draw(PainterInfo & pi, int x, int y) const at->drawSelection(pi, x, y); at->draw(pi, x, y); x += coords.dim(at.nucleus()).wid; - + // Is the inline completion here? if (inlineCompletionData != this || size_t(inlineCompletionPos.pos()) != i + 1) @@ -334,20 +334,20 @@ void MathData::draw(PainterInfo & pi, int x, int y) const continue; FontInfo f = pi.base.font; augmentFont(f, from_ascii("mathnormal")); - + // draw the unique and the non-unique completion part // Note: this is not time-critical as it is // only done once per screen. size_t uniqueTo = bv.inlineCompletionUniqueChars(); docstring s1 = completion.substr(0, uniqueTo); docstring s2 = completion.substr(uniqueTo); - + if (!s1.empty()) { f.setColor(Color_inlinecompletion); pi.pain.text(x, y, s1, f); x += mathed_string_width(f, s1); } - + if (!s2.empty()) { f.setColor(Color_nonunique_inlinecompletion); pi.pain.text(x, y, s2, f); @@ -444,7 +444,7 @@ void MathData::updateMacros(Cursor * cur, MacroContext const & mc, macroInset = operator[](i).nucleus()->asMacro(); // Cursor in \label? - if (newDisplayMode != MathMacro::DISPLAY_UNFOLDED + if (newDisplayMode != MathMacro::DISPLAY_UNFOLDED && oldDisplayMode == MathMac
[LyX/master] Whitespace
commit e30db1e44474ee379bedb0d1c752297541156497 Author: Juergen Spitzmueller Date: Mon Mar 16 14:15:05 2015 +0100 Whitespace Time to properly set up QtCreator... diff --git a/src/insets/InsetPhantom.cpp b/src/insets/InsetPhantom.cpp index f8d99d8..c2309bc 100644 --- a/src/insets/InsetPhantom.cpp +++ b/src/insets/InsetPhantom.cpp @@ -311,8 +311,8 @@ docstring InsetPhantom::toolTip(BufferView const &, int, int) const void InsetPhantom::latex(otexstream & os, OutputParams const & runparams) const { -if (runparams.moving_arg) -os << "\\protect"; + if (runparams.moving_arg) + os << "\\protect"; if (params_.type == InsetPhantomParams::Phantom) os << "\\phantom{"; else if (params_.type == InsetPhantomParams::HPhantom)
[LyX/master] whitespace
commit 361967e613c47b67ea08b0c13a647e7edca70c2d Author: Georg Baum Date: Wed Mar 11 22:03:29 2015 +0100 whitespace diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp index 709f558..ee0c3e0 100644 --- a/src/insets/InsetCaption.cpp +++ b/src/insets/InsetCaption.cpp @@ -62,11 +62,9 @@ InsetCaption::InsetCaption(Buffer * buf, string const & type) void InsetCaption::write(ostream & os) const { os << "Caption"; - if (!type_.empty()) { - os << " " - << type_; - } - os << "\n"; + if (!type_.empty()) + os << ' ' << type_; + os << '\n'; text().write(os); } @@ -319,7 +317,7 @@ void InsetCaption::getArgument(otexstream & os, if (!il.leftdelim().empty()) os << il.leftdelim(); - + OutputParams rp = runparams; if (isPassThru()) rp.pass_thru = true; @@ -352,7 +350,7 @@ docstring InsetCaption::getCaptionAsHTML(XHTMLStream & xs, OutputParams const & runparams) const { xs << full_label_ << ' '; - InsetText::XHTMLOptions const opts = + InsetText::XHTMLOptions const opts = InsetText::WriteLabel | InsetText::WriteInnerTag; return InsetText::insetAsXHTML(xs, runparams, opts); }
[LyX/master] whitespace
commit 93be0e08a13f52bce13c466b94d863e1583a87cf Author: Georg Baum Date: Thu Feb 26 20:43:05 2015 +0100 whitespace diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index 95fe50c..db890d1 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -14,9 +14,9 @@ # Guidelines (http://techbase.kde.org/Projects/Usability/HIG) # Casing Rules: -# Capitalize all words in the element, with the following exceptions: -# * Articles: a, an, the. -# * Conjunctions: and, but, for, not, so, yet ... +# Capitalize all words in the element, with the following exceptions: +# * Articles: a, an, the. +# * Conjunctions: and, but, for, not, so, yet ... # * Prepositions of three or fewer letters: at, for, by, in, to ... # (except when the preposition is part of a verb phrase, such as "Check In") # (http://library.gnome.org/devel/hig-book/stable/design-text-labels.html.en) @@ -341,7 +341,7 @@ Menuset Item "Split View Into Left and Right Half|i" "view-split horizontal" Item "Split View Into Upper and Lower Half|e" "view-split vertical" OptItem "Close Current View|w" "tab-group-close" - Item "Fullscreen|l" "ui-toggle fullscreen" + Item "Fullscreen|l" "ui-toggle fullscreen" Separator Documents End @@ -495,7 +495,7 @@ Menuset Separator Item "Insert New Branch...|I" "branch-add-insert" End - + Menu "insert_phantom" Item "Phantom|P" "phantom-insert Phantom" Item "Horizontal Phantom|H" "phantom-insert HPhantom" diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc index 163beab..34d5ebe 100644 --- a/lib/ui/stdtoolbars.inc +++ b/lib/ui/stdtoolbars.inc @@ -17,9 +17,9 @@ # capitalized in sentences, such as application names. # # Casing Rules for the "GUI Name": -# Capitalize all words in the element, with the following exceptions: -# * Articles: a, an, the. -# * Conjunctions: and, but, for, not, so, yet ... +# Capitalize all words in the element, with the following exceptions: +# * Articles: a, an, the. +# * Conjunctions: and, but, for, not, so, yet ... # * Prepositions of three or fewer letters: at, for, by, in, to ... # # (http://library.gnome.org/devel/hig-book/stable/design-text-labels.html.en) @@ -139,7 +139,7 @@ ToolbarSet Item "Paragraph settings" "layout-paragraph" Item "Thesaurus" "thesaurus-entry" End - + Toolbar "table" "Table" Item "Add row" "inset-modify tabular append-row" Item "Add column" "inset-modify tabular append-column" @@ -172,7 +172,7 @@ ToolbarSet Item "Set multi-column" "inset-modify tabular multicolumn" Item "Set multi-row" "inset-modify tabular multirow" End - + Toolbar "math" "Math" Item "Set display mode" "math-display" Separator @@ -228,7 +228,7 @@ ToolbarSet Toolbar "minibuffer" "Command Buffer" Minibuffer End - + Toolbar "review" "Review[[Toolbar]]" Item "Track changes" "changes-track" Item "Show changes in output" "changes-output" @@ -244,11 +244,11 @@ ToolbarSet Item "Insert note" "note-insert" Item "Next note" "note-next" End - + Toolbar "view-others" "View Other Formats" ViewFormats End - + Toolbar "update-others" "Update Other Formats" UpdateFormats End @@ -364,7 +364,7 @@ ToolbarSet Item "Square root \\sqrt" "math-insert \sqrt" Item "Other root\\root" "math-insert \root" End - + Toolbar "style" "Styles" Item "Display style \\displaystyle" "math-size \displaystyle" Item "Normal text style \\textstyle" "math-size \textstyle"
[LyX/master] Whitespace
commit 58f428d57c0481323a895879e82935eb4b67fd64 Author: Scott Kostyshak Date: Fri Feb 20 01:46:33 2015 -0500 Whitespace diff --git a/src/Converter.cpp b/src/Converter.cpp index 307eb23..1e02637 100644 --- a/src/Converter.cpp +++ b/src/Converter.cpp @@ -672,7 +672,6 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command, LaTeX::NO_OUTPUT; return (result & ERROR_MASK) == 0; - }
[LyX/master] whitespace
commit edddb47bae9a29f678e083807fc12e03135f5065 Author: Jean-Marc Lasgouttes Date: Fri Feb 20 15:57:45 2015 +0100 whitespace diff --git a/src/Counters.cpp b/src/Counters.cpp index 1c8bdf6..79fe76f 100644 --- a/src/Counters.cpp +++ b/src/Counters.cpp @@ -39,7 +39,7 @@ Counter::Counter() } -Counter::Counter(docstring const & mc, docstring const & ls, +Counter::Counter(docstring const & mc, docstring const & ls, docstring const & lsa) : initial_value_(0), master_(mc), labelstring_(ls), labelstringappendix_(lsa) { @@ -76,7 +76,7 @@ bool Counter::read(Lexer & lex) case Lexer::LEX_UNDEF: lex.printError("Unknown counter tag `$$Token'"); continue; - default: + default: break; } switch (le) { @@ -190,7 +190,7 @@ Counters::Counters() : appendix_(false), subfloat_(false), longtable_(false) void Counters::newCounter(docstring const & newc, - docstring const & masterc, + docstring const & masterc, docstring const & ls, docstring const & lsa) { @@ -380,7 +380,7 @@ char hebrewCounter(int const n) // On the special cases, see http://mathworld.wolfram.com/RomanNumerals.html -// and for a list of roman numerals up to and including 3999, see +// and for a list of roman numerals up to and including 3999, see // http://www.research.att.com/~njas/sequences/a006968.txt. (Thanks to Joost // for this info.) docstring const romanCounter(int const n) @@ -389,25 +389,25 @@ docstring const romanCounter(int const n) "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX" }; - + static char const * const tens[9] = { "X", "XX", "XXX", "XL", "L", "LX", "LXX", "LXXX", "XC" }; - + static char const * const hunds[9] = { "C", "CC", "CCC", "CD", "D", "DC", "DCC", "DCCC", "CM" }; - - if (n > 1000 || n < 1) + + if (n > 1000 || n < 1) return from_ascii("??"); - + int val = n; string roman; switch (n) { //special cases - case 900: + case 900: roman = "CM"; break; case 400: @@ -503,7 +503,7 @@ docstring Counters::labelItem(docstring const & ctr, docstring Counters::theCounter(docstring const & counter, string const & lang) const { - CounterList::const_iterator it = counterList_.find(counter); + CounterList::const_iterator it = counterList_.find(counter); if (it == counterList_.end()) return from_ascii("#"); Counter const & ctr = it->second; @@ -520,7 +520,7 @@ docstring Counters::theCounter(docstring const & counter, } -docstring Counters::flattenLabelString(docstring const & counter, +docstring Counters::flattenLabelString(docstring const & counter, bool in_appendix, string const & lang, vector & callers) const @@ -534,8 +534,8 @@ docstring Counters::flattenLabelString(docstring const & counter, << endl; return from_ascii("??"); } - - CounterList::const_iterator it = counterList_.find(counter); + + CounterList::const_iterator it = counterList_.find(counter); if (it == counterList_.end()) return from_ascii("#"); Counter const & c = it->second; @@ -545,7 +545,7 @@ docstring Counters::flattenLabelString(docstring const & counter, callers.push_back(counter); if (ls.empty()) { if (!c.master().empty()) - ls = flattenLabelString(c.master(), in_appendix, lang, callers) + ls = flattenLabelString(c.master(), in_appendix, lang, callers) + from_ascii("."); callers.pop_back(); return ls + from_ascii("\\arabic{") + counter + "}"; @@ -558,7 +558,7 @@ docstring Counters::flattenLabelString(docstring const & counter, break; size_t const j = i + 4; size_t k = j; - while (k < ls.size() && lowercase(ls[k]) >= 'a' + while (k < ls.size() && lowercase(ls[k]) >= 'a' && lowercase(ls[k]) <= 'z') ++k; docstring const newc = ls.substr(j, k - j); @@ -587,7 +587,7 @@ docstring Counters::counterLabel(docstring const & format, break; size_t const j = i + 4; size_t k = j; - while (k < label.size
[LyX/master] Whitespace only
commit 8fb1aa51f8d14747bd21d9e113a8dd301a2f07dc Author: Jean-Marc Lasgouttes Date: Fri Jul 25 22:35:08 2014 +0200 Whitespace only diff --git a/src/BufferView.cpp b/src/BufferView.cpp index bc8162b..faa08f0 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -118,12 +118,12 @@ bool findNextInset(DocIterator & dit, vector const & codes, while (tmpdit) { Inset const * inset = tmpdit.nextInset(); if (inset) { - bool const valid_code = std::find(codes.begin(), codes.end(), + bool const valid_code = std::find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end(); InsetCommand const * ic = inset->asInsetCommand(); bool const same_or_no_contents = contents.empty() || (ic && (ic->getFirstNonOptParam() == contents)); - + if (valid_code && same_or_no_contents) { dit = tmpdit; return true; @@ -228,7 +228,7 @@ struct BufferView::Private Private(BufferView & bv): wh_(0), cursor_(bv), anchor_pit_(0), anchor_ypos_(0), inlineCompletionUniqueChars_(0), - last_inset_(0), clickable_inset_(false), + last_inset_(0), clickable_inset_(false), mouse_position_cache_(), bookmark_edit_position_(-1), gui_(0) {} @@ -325,9 +325,9 @@ BufferView::~BufferView() fp.pit = d->cursor_.bottom().pit(); fp.pos = d->cursor_.bottom().pos(); theSession().lastFilePos().save(buffer_.fileName(), fp); - + if (d->last_inset_) - d->last_inset_->setMouseHover(this, false); + d->last_inset_->setMouseHover(this, false); delete d; } @@ -498,7 +498,7 @@ void BufferView::updateScrollbar() d->scrollbarParameters_.page_step = height_; Text & t = buffer_.text(); - TextMetrics & tm = d->text_metrics_[&t]; + TextMetrics & tm = d->text_metrics_[&t]; LYXERR(Debug::GUI, " Updating scrollbar: height: " << t.paragraphs().size() @@ -658,7 +658,7 @@ void BufferView::setCursorFromScrollbar() case CUR_INSIDE: int const y = getPos(oldcur).y_; newy = min(last, max(y, first)); - if (y == newy) + if (y == newy) return; } // We reset the cursor because cursorStatus() does not @@ -778,7 +778,7 @@ bool BufferView::moveToPosition(pit_type bottom_pit, pos_type bottom_pos, // the bookmark. if (bottom_pit < int(buffer_.paragraphs().size())) { dit = doc_iterator_begin(&buffer_); - + dit.pit() = bottom_pit; dit.pos() = min(bottom_pos, dit.paragraph().size()); success = true; @@ -958,7 +958,7 @@ void BufferView::makeDocumentClass() void BufferView::updateDocumentClass(DocumentClassConstPtr olddc) { message(_("Converting document to new document class...")); - + StableDocIterator backcur(d->cursor_); ErrorList & el = buffer_.errorList("Class Switch"); cap::switchBetweenClasses( @@ -1222,7 +1222,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) Cursor & cur = d->cursor_; // Don't dispatch function that does not apply to internal buffers. - if (buffer_.isInternal() + if (buffer_.isInternal() && lyxaction.funcHasFlag(cmd.action(), LyXAction::NoInternal)) return; @@ -1246,7 +1246,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) << (unknown_tokens == 1 ? "" : "s")); } updateDocumentClass(olddc); - + // We are most certainly here because of a change in the document // It is then better to make sure that all dialogs are in sync with // current document settings. @@ -1254,7 +1254,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) dr.forceBufferUpdate(); break; } - + case LFUN_LAYOUT_MODULES_CLEAR: { cur.recordUndoFullDocument(); buffer_.params().clearLayoutModules(); @@ -1267,7 +1267,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) case LFUN_LAYOUT_MODULE_ADD: { BufferParams const & params = buffer_.params(); if (!params.layoutModuleCanBeAdded(argument)) { - LYXERR0("Module `" << argument << + LYXERR0("Module `" << argument <<
[LyX/master] whitespace again
commit 74c9165190133af19c95584e4922ed749db0f9fe Author: Stephan Witt Date: Mon Dec 29 01:28:24 2014 +0100 whitespace again diff --git a/src/support/tests/CMakeLists.txt b/src/support/tests/CMakeLists.txt index f392211..70a2ca7 100644 --- a/src/support/tests/CMakeLists.txt +++ b/src/support/tests/CMakeLists.txt @@ -16,10 +16,10 @@ macro(sources _program) target_link_libraries(${_program} support ${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY} ${ICONV_LIBRARY}) - lyx_target_link_libraries(${_program} Magic) - if(CYGWIN) - target_link_libraries(${_program} shlwapi) - endif() + lyx_target_link_libraries(${_program} Magic) + if(CYGWIN) + target_link_libraries(${_program} shlwapi) + endif() endmacro() file(GLOB test_sources ${TOP_SRC_DIR}/src/support/tests/${LYX_CPP_FILES})
[LyX/master] whitespace
commit 2fbeb662b37e8b61a833662559006f27414f40b5 Author: Stephan Witt Date: Mon Dec 29 00:12:33 2014 +0100 whitespace diff --git a/src/support/tests/CMakeLists.txt b/src/support/tests/CMakeLists.txt index 4e1ff5d..f392211 100644 --- a/src/support/tests/CMakeLists.txt +++ b/src/support/tests/CMakeLists.txt @@ -16,10 +16,10 @@ macro(sources _program) target_link_libraries(${_program} support ${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY} ${ICONV_LIBRARY}) -lyx_target_link_libraries(${_program} Magic) -if(CYGWIN) -target_link_libraries(${_program} shlwapi) -endif() + lyx_target_link_libraries(${_program} Magic) + if(CYGWIN) + target_link_libraries(${_program} shlwapi) + endif() endmacro() file(GLOB test_sources ${TOP_SRC_DIR}/src/support/tests/${LYX_CPP_FILES})
[LyX/master] whitespace
commit cb7ace91432cf0776c060f687df3c324969b73a6 Author: Georg Baum Date: Fri Dec 26 22:08:07 2014 +0100 whitespace diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp index 804be7a..4c27323 100644 --- a/src/insets/InsetArgument.cpp +++ b/src/insets/InsetArgument.cpp @@ -49,12 +49,14 @@ void InsetArgument::write(ostream & os) const InsetCollapsable::write(os); } + void InsetArgument::read(Lexer & lex) { lex >> name_; InsetCollapsable::read(lex); } + void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype) { Layout::LaTeXArgMap args = it.paragraph().layout().args(); @@ -64,7 +66,7 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype) args = it.inset().getLayout().args(); pass_thru_ = it.inset().getLayout().isPassThru(); } - + // Handle pre 2.1 ArgInsets (lyx2lyx cannot classify them) if (name_ == "999") { unsigned int const req = insetlayout ? it.inset().getLayout().requiredArgs() @@ -118,11 +120,13 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype) InsetCollapsable::updateBuffer(it, utype); } + void InsetArgument::setButtonLabel() { setLabel(labelstring_); } + docstring InsetArgument::toolTip(BufferView const & bv, int, int) const { if (isOpen(bv)) @@ -130,6 +134,7 @@ docstring InsetArgument::toolTip(BufferView const & bv, int, int) const return toolTipText(tooltip_ + from_ascii(":\n")); } + void InsetArgument::doDispatch(Cursor & cur, FuncRequest & cmd) { switch (cmd.action()) { @@ -157,7 +162,7 @@ void InsetArgument::doDispatch(Cursor & cur, FuncRequest & cmd) // with (inherited) pass_thru to avoid call for // fixParagraphsFont(), which does not play nicely with // inherited pass_thru (see #8471). - // FIXME: Once we have implemented genuine pass_thru + // FIXME: Once we have implemented genuine pass_thru // option for InsetArgument (not inherited pass_thru), // we should probably directly call // InsetCollapsable::doDispatch(cur, cmd) for that @@ -223,11 +228,13 @@ bool InsetArgument::getStatus(Cursor & cur, FuncRequest const & cmd, } } + string InsetArgument::contextMenuName() const { return "context-argument"; } + FontInfo InsetArgument::getFont() const { if (font_ != inherit_font) @@ -235,6 +242,7 @@ FontInfo InsetArgument::getFont() const return getLayout().font(); } + FontInfo InsetArgument::getLabelfont() const { if (labelfont_ != inherit_font) @@ -242,6 +250,7 @@ FontInfo InsetArgument::getLabelfont() const return getLayout().labelfont(); } + InsetLayout::InsetDecoration InsetArgument::decoration() const { InsetLayout::InsetDecoration dec = getLayout().decoration(); @@ -250,6 +259,7 @@ InsetLayout::InsetDecoration InsetArgument::decoration() const return dec == InsetLayout::DEFAULT ? InsetLayout::CLASSIC : dec; } + void InsetArgument::latexArgument(otexstream & os, OutputParams const & runparams_in, docstring const & ldelim, docstring const & rdelim, docstring const & presetarg) const
[LyX/master] Whitespace
commit 625cea15286f639e7861a22c5354dae258bee3e0 Author: Scott Kostyshak Date: Sun Dec 21 19:01:26 2014 -0500 Whitespace diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp index b2fbc69..3cc8f70 100644 --- a/src/insets/InsetCommand.cpp +++ b/src/insets/InsetCommand.cpp @@ -197,7 +197,7 @@ bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd, string const newtype = cmd.getArg(1); status.setEnabled(p_.isCompatibleCommand(p_.code(), newtype)); status.setOnOff(newtype == p_.getCmdName()); - } + } status.setEnabled(true); return true;
[LyX/master] Whitespace
commit 6da7ee1be170629aa6647aa8b2d6cf66ea928a9b Author: Scott Kostyshak Date: Sat Dec 20 15:03:40 2014 -0500 Whitespace diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp index 98f9775..468b847 100644 --- a/src/insets/InsetLayout.cpp +++ b/src/insets/InsetLayout.cpp @@ -42,7 +42,7 @@ InsetLayout::InsetLayout() : keepempty_(false), forceltr_(false), needprotect_(false), intoc_(false), spellcheck_(true), resetsfont_(false), display_(true), forcelocalfontswitch_(false) -{ +{ labelfont_.setColor(Color_error); }
[LyX/master] Whitespace
commit d5aaee1f6b9a95e8eb3ae7b1e28cb4d3f11085f7 Author: Georg Baum Date: Sun Dec 7 17:29:12 2014 +0100 Whitespace diff --git a/src/Encoding.cpp b/src/Encoding.cpp index 4a8faf1..1c74f0c 100644 --- a/src/Encoding.cpp +++ b/src/Encoding.cpp @@ -82,6 +82,7 @@ CharInfo::CharInfo( { } + Encoding::Encoding(string const & n, string const & l, string const & g, string const & i, bool f, bool u, Encoding::Package p) : name_(n), latexName_(l), guiName_(g), iconvName_(i), fixedwidth_(f), @@ -451,7 +452,7 @@ docstring Encodings::fromLaTeXCommand(docstring const & cmd, int cmdtype, || (tmp.size() == prefix + 1 && !isAlphaASCII(tmp[1]) && (prefix == 1 || !isAlphaASCII(tmp[2]))) - || k == cmdend + || k == cmdend || !isAlphaASCII(cmd[k]) || tmp[tmp.size() - 1] == '}' ) { @@ -660,7 +661,7 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile) if (!symbolslex.next(true)) break; string sflags = symbolslex.getString(); - + string tipashortcut; int flags = 0; diff --git a/src/Language.cpp b/src/Language.cpp index e6f7f9e..34ab1f0 100644 --- a/src/Language.cpp +++ b/src/Language.cpp @@ -120,7 +120,7 @@ bool Language::readLanguage(Lexer & lex) error = true; continue; - default: + default: break; } switch (static_cast(le)) {
[LyX/master] Whitespace.
commit be4646c8ac2e43e41ec913395e022388a213152f Author: Richard Heck Date: Wed Nov 12 00:01:45 2014 + Whitespace. diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 1a4d5f7..f41ce36 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -125,7 +125,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, InsetText * target_inset = cur.inset().asInsetText(); if (!target_inset) { InsetTabular * it = cur.inset().asInsetTabular(); - target_inset = it? it->cell(cur.idx())->asInsetText() : 0; + target_inset = it ? it->cell(cur.idx())->asInsetText() : 0; } LASSERT(target_inset, return PasteReturnValue(pit, pos, need_update)); @@ -170,7 +170,8 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, if (forcePlainLayout || parLayout == defaultLayout) par->setLayout(plainLayout); } - } else { // check if we need to reset from plain layout + } else { + // check if we need to reset from plain layout Layout const & defaultLayout = newDocClass->defaultLayout(); Layout const & plainLayout = newDocClass->plainLayout(); ParagraphList::iterator const end = insertion.end();