From 8ceb4f6b58df059f4b6b95240369a840653842ea Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 26 Jun 2020 00:04:31 +0200 Subject: [PATCH] Run codespell on src/frontends Command was: codespell -w -i 3 -S Makefile.in -L mathed,afe,tthe,ue,fro,uint,larg,alph,te,thes,alle,Claus,pres,pass-thru src/frontends/ --- src/frontends/Application.h | 6 +++--- src/frontends/FontMetrics.h | 4 ++-- src/frontends/Selection.h | 2 +- src/frontends/qt/ButtonPolicy.h | 2 +- src/frontends/qt/Dialog.h | 4 ++-- src/frontends/qt/GuiApplication.cpp | 10 ++++----- src/frontends/qt/GuiBibtex.h | 2 +- src/frontends/qt/GuiCharacter.cpp | 2 +- src/frontends/qt/GuiClipboard.cpp | 6 +++--- src/frontends/qt/GuiDocument.cpp | 30 +++++++++++++------------- src/frontends/qt/GuiGraphics.cpp | 2 +- src/frontends/qt/GuiLog.h | 2 +- src/frontends/qt/GuiPainter.cpp | 2 +- src/frontends/qt/GuiSearch.h | 4 ++-- src/frontends/qt/GuiSelectionManager.h | 2 +- src/frontends/qt/GuiTexinfo.cpp | 2 +- src/frontends/qt/GuiToolbar.cpp | 2 +- src/frontends/qt/GuiView.h | 2 +- src/frontends/qt/GuiWorkArea.cpp | 8 +++---- src/frontends/qt/InGuiThread.h | 2 +- src/frontends/qt/Menus.cpp | 2 +- src/frontends/qt/PanelStack.cpp | 2 +- src/frontends/qt/Validator.h | 4 ++-- src/frontends/qt/qt_helpers.cpp | 2 +- src/frontends/qt/qt_helpers.h | 2 +- src/frontends/qt/ui/CompareUi.ui | 4 ++-- src/tex2lyx/text.cpp | 2 +- 27 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/frontends/Application.h b/src/frontends/Application.h index af7663de37..49bf68ddd0 100644 --- a/src/frontends/Application.h +++ b/src/frontends/Application.h @@ -44,7 +44,7 @@ class Selection; /// The main application class /** There should be only one instance of this class. No Qt object -initialisation should be done before the instanciation of this class. +initialisation should be done before the instantiation of this class. Model/View/Controller separation at frontend level in qt frontend: @@ -101,7 +101,7 @@ initialisation should be done before the instanciation of this class. screen using the Painter. There can be only one Buffer displayed in a BufferView and it is set on construction. Ideally, a BufferView should not be able to change the contents of its associated Buffer. - A BufferView is instanciated and destroyed by a \c WorkArea; it is + A BufferView is instantiated and destroyed by a \c WorkArea; it is automatically destroyed by the parent WorkArea when its Buffer is closed. @@ -140,7 +140,7 @@ initialisation should be done before the instanciation of this class. widget. A GuiView is in charge of creating and closing a View for a given Buffer. In the qt specialisation, \c GuiView, the central widget is a tab - widget. Each tab is reverved to the visualisation of one Buffer and + widget. Each tab is reserved to the visualisation of one Buffer and contains one WorkArea. In the qt frontend, one GuiView thus contains multiple WorkAreas but this number can limited to one for another frontend. The idea is that the kernel should not know how a Buffer diff --git a/src/frontends/FontMetrics.h b/src/frontends/FontMetrics.h index 4472aa7008..d1fae1c94e 100644 --- a/src/frontends/FontMetrics.h +++ b/src/frontends/FontMetrics.h @@ -95,7 +95,7 @@ public: * direction of the string is forced, and the returned value * is from the left edge of the word, not from the start of the string. * \param rtl is true for right-to-left layout - * \param ws is the amount of extra inter-word space applied text justication. + * \param ws is the amount of extra inter-word space applied text justification. */ virtual int pos2x(docstring const & s, int pos, bool rtl, double ws) const = 0; /** @@ -104,7 +104,7 @@ public: * is from the left edge of the word, not from the start of the string. * the offset x is updated to match the closest position in the string. * \param rtl is true for right-to-left layout - * \param ws is the amount of extra inter-word space applied text justication. + * \param ws is the amount of extra inter-word space applied text justification. */ virtual int x2pos(docstring const & s, int & x, bool rtl, double ws) const = 0; /** diff --git a/src/frontends/Selection.h b/src/frontends/Selection.h index ac902ffc1e..10d16988f8 100644 --- a/src/frontends/Selection.h +++ b/src/frontends/Selection.h @@ -49,7 +49,7 @@ public: * Fill the X selection. * The format is plain text. * Does nothing on systems that don't have a selection. - * Since the X selection protocol is asyncronous this should never be + * Since the X selection protocol is asynchronous this should never be * called from the kernel. * If another application requests the current selection a * SelectionRequest XEvent will be triggered. The response of the diff --git a/src/frontends/qt/ButtonPolicy.h b/src/frontends/qt/ButtonPolicy.h index 298ec43629..769931df40 100644 --- a/src/frontends/qt/ButtonPolicy.h +++ b/src/frontends/qt/ButtonPolicy.h @@ -158,7 +158,7 @@ public: /** Defines the policy used by dialogs that are forced to support a button controller when they either don't have a use for one or are not ready to use one. This may be useful when testing a new button policy but wishing - to minimise problems to users by supplying an anything-goes policy via a + to minimize problems to users by supplying an anything-goes policy via a preprocessor directive. */ IgnorantPolicy diff --git a/src/frontends/qt/Dialog.h b/src/frontends/qt/Dialog.h index 5f958e79d0..08a80a3849 100644 --- a/src/frontends/qt/Dialog.h +++ b/src/frontends/qt/Dialog.h @@ -88,7 +88,7 @@ public: */ //@{ /// \param data is a string encoding of the data to be displayed. - /// It is passed to the Controller to be translated into a useable form. + /// It is passed to the Controller to be translated into a usable form. virtual void showData(std::string const & data); //@} @@ -127,7 +127,7 @@ public: /// Prepare dialog before view. void prepareView(); - /// Decide wether the dialog should grab thekeyboard focus when shown. + /// Decide whether the dialog should grab thekeyboard focus when shown. /// This method defaults to true, override if a different behaviour /// is wanted. virtual bool wantInitialFocus() const { return true; } diff --git a/src/frontends/qt/GuiApplication.cpp b/src/frontends/qt/GuiApplication.cpp index d2ff132bc1..4f14becad1 100644 --- a/src/frontends/qt/GuiApplication.cpp +++ b/src/frontends/qt/GuiApplication.cpp @@ -522,7 +522,7 @@ pair iconName(FuncRequest const & f, bool unknown, bool rtl) // next thing to try is function name alone names << lfunname; - // and finally maybe the unkown icon + // and finally maybe the unknown icon if (unknown) names << "unknown"; @@ -1782,7 +1782,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) actOnUpdatedPrefs(lyxrc_orig, lyxrc); // If the request comes from the minibuffer, then we can't reset - // the GUI, since that would destory the minibuffer itself and + // the GUI, since that would destroy the minibuffer itself and // cause a crash, since we are currently in one of the methods of // GuiCommandBuffer. See bug #8540. if (cmd.origin() != FuncRequest::COMMANDBUFFER) @@ -2211,7 +2211,7 @@ void GuiApplication::processKeySym(KeySymbol const & keysym, KeyModifier state) LYXERR(Debug::KEY, "action now set to [" << func.action() << ']'); } - // Dont remove this unless you know what you are doing. + // Don't remove this unless you know what you are doing. d->meta_fake_bit = NoModifier; // Can this happen now ? @@ -2386,7 +2386,7 @@ void GuiApplication::createView(int view_id) void GuiApplication::createView(QString const & geometry_arg, bool autoShow, int view_id) { - // release the keyboard which might have been grabed by the global + // release the keyboard which might have been grabbed by the global // menubar on Mac to catch shortcuts even without any GuiView. if (d->global_menubar_) d->global_menubar_->releaseKeyboard(); @@ -2877,7 +2877,7 @@ void GuiApplication::commitData(QSessionManager & sm) /** The implementation is required to avoid an application exit ** when session state save is triggered by session manager. ** The default implementation sends a close event to all - ** visible top level widgets when session managment allows + ** visible top level widgets when session management allows ** interaction. ** We are changing that to check the state of each buffer in all ** views and ask the users what to do if buffers are dirty. diff --git a/src/frontends/qt/GuiBibtex.h b/src/frontends/qt/GuiBibtex.h index 214ff854c8..d860e3f3fd 100644 --- a/src/frontends/qt/GuiBibtex.h +++ b/src/frontends/qt/GuiBibtex.h @@ -61,7 +61,7 @@ private: QStringList bibStyles() const; /// get the list of bib files QStringList bibFiles(bool const extension = true) const; - /// build filelists of all availabe bib/bst/cls/sty-files. done through + /// build filelists of all available bib/bst/cls/sty-files. done through /// kpsewhich and an external script, saved in *Files.lst void rescanBibStyles() const; /// do we use bibtopic (for sectioned bibliography)? diff --git a/src/frontends/qt/GuiCharacter.cpp b/src/frontends/qt/GuiCharacter.cpp index f06119a11c..06a007ca31 100644 --- a/src/frontends/qt/GuiCharacter.cpp +++ b/src/frontends/qt/GuiCharacter.cpp @@ -435,7 +435,7 @@ void GuiCharacter::change_adaptor() // to be really good here, we should set the combos to the values of // the current text, and make it appear as "no change" if the values - // stay the same between applys. Might be difficult though wrt to a + // stay the same between applies. Might be difficult though wrt to a // moved cursor - jbl slotApply(); } diff --git a/src/frontends/qt/GuiClipboard.cpp b/src/frontends/qt/GuiClipboard.cpp index 4ed44ea87a..7922187644 100644 --- a/src/frontends/qt/GuiClipboard.cpp +++ b/src/frontends/qt/GuiClipboard.cpp @@ -86,7 +86,7 @@ void CacheMimeData::update() LYXERR(Debug::CLIPBOARD, "Creating CacheMimeData object"); cached_formats_ = read_clipboard()->formats(); - // Qt times out after 5 seconds if it does not recieve a response. + // Qt times out after 5 seconds if it does not receive a response. if (current_time() - start_time > 3) { LYXERR0("No timely response from clipboard, perhaps process " << "holding clipboard is frozen?"); @@ -154,7 +154,7 @@ FileName GuiClipboard::getPastedGraphicsFileName(Cursor const & cur, LASSERT(!types.empty(), return FileName()); - // select prefered type if AnyGraphicsType was passed + // select preferred type if AnyGraphicsType was passed if (type == Clipboard::AnyGraphicsType) type = types.front(); @@ -189,7 +189,7 @@ FileName GuiClipboard::getPastedGraphicsFileName(Cursor const & cur, } while (filename.isReadableFile()); while (true) { - // create file type filter, putting the prefered on to the front + // create file type filter, putting the preferred on to the front QStringList filter; for (size_t i = 0; i != types.size(); ++i) { docstring s = bformat(_("%1$s Files"), typeNames[types[i]]) diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp index 32cc899dc2..bcf33c0770 100644 --- a/src/frontends/qt/GuiDocument.cpp +++ b/src/frontends/qt/GuiDocument.cpp @@ -357,7 +357,7 @@ void ModuleSelectionManager::updateDownPB() return; } - // determine whether immediately succeding element requires this one + // determine whether immediately succeeding element requires this one string const curmodname = getSelectedModel()->getIDString(curRow); string const nextmodname = getSelectedModel()->getIDString(curRow + 1); @@ -945,7 +945,7 @@ GuiDocument::GuiDocument(GuiView & lv) // language & quote - // this must preceed font, since fonts depend on this + // this must precede font, since fonts depend on this langModule = new UiWidget(this); connect(langModule->languageCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); @@ -2495,16 +2495,16 @@ void GuiDocument::updateFontOptions() if (tex_fonts) font = fontModule->fontsSansCO->itemData( fontModule->fontsSansCO->currentIndex()).toString(); - bool scaleable = providesScale(font); - fontModule->scaleSansSB->setEnabled(scaleable); - fontModule->scaleSansLA->setEnabled(scaleable); + bool scalable = providesScale(font); + fontModule->scaleSansSB->setEnabled(scalable); + fontModule->scaleSansLA->setEnabled(scalable); fontModule->fontSansOsfCB->setEnabled(providesOSF(font)); if (tex_fonts) font = fontModule->fontsTypewriterCO->itemData( fontModule->fontsTypewriterCO->currentIndex()).toString(); - scaleable = providesScale(font); - fontModule->scaleTypewriterSB->setEnabled(scaleable); - fontModule->scaleTypewriterLA->setEnabled(scaleable); + scalable = providesScale(font); + fontModule->scaleTypewriterSB->setEnabled(scalable); + fontModule->scaleTypewriterLA->setEnabled(scalable); fontModule->fontTypewriterOsfCB->setEnabled(providesOSF(font)); if (tex_fonts) font = fontModule->fontsRomanCO->itemData( @@ -2702,9 +2702,9 @@ void GuiDocument::sansChanged(int item) return; QString const font = fontModule->fontsSansCO->itemData(item).toString(); - bool const scaleable = providesScale(font); - fontModule->scaleSansSB->setEnabled(scaleable); - fontModule->scaleSansLA->setEnabled(scaleable); + bool const scalable = providesScale(font); + fontModule->scaleSansSB->setEnabled(scalable); + fontModule->scaleSansLA->setEnabled(scalable); fontModule->fontSansOsfCB->setEnabled(providesOSF(font)); updateExtraOpts(); } @@ -2716,9 +2716,9 @@ void GuiDocument::ttChanged(int item) return; QString const font = fontModule->fontsTypewriterCO->itemData(item).toString(); - bool scaleable = providesScale(font); - fontModule->scaleTypewriterSB->setEnabled(scaleable); - fontModule->scaleTypewriterLA->setEnabled(scaleable); + bool scalable = providesScale(font); + fontModule->scaleTypewriterSB->setEnabled(scalable); + fontModule->scaleTypewriterLA->setEnabled(scalable); fontModule->fontTypewriterOsfCB->setEnabled(providesOSF(font)); updateExtraOpts(); } @@ -4747,7 +4747,7 @@ void GuiDocument::matchBiblatexStyles() void GuiDocument::updateContents() { - // Nothing to do here as the document settings is not cursor dependant. + // Nothing to do here as the document settings is not cursor dependent. return; } diff --git a/src/frontends/qt/GuiGraphics.cpp b/src/frontends/qt/GuiGraphics.cpp index b6bbaeac3f..e0a1b20b32 100644 --- a/src/frontends/qt/GuiGraphics.cpp +++ b/src/frontends/qt/GuiGraphics.cpp @@ -195,7 +195,7 @@ GuiGraphics::GuiGraphics(GuiView & lv) connect(draftCB, SIGNAL(stateChanged(int)), this, SLOT(change_adaptor())); // FIXME: we should connect to clicked() when we move to Qt 4.2 because - // the toggled(bool) signal is also trigged when we update the widgets + // the toggled(bool) signal is also triggered when we update the widgets // (rgh-4/07) this isn't as much or a problem as it was, because we're now // using blockSignals() to keep from triggering that signal when we call // setChecked(). Note, too, that clicked() would get called whenever it diff --git a/src/frontends/qt/GuiLog.h b/src/frontends/qt/GuiLog.h index b6b6110a0a..ba4a479f5e 100644 --- a/src/frontends/qt/GuiLog.h +++ b/src/frontends/qt/GuiLog.h @@ -66,7 +66,7 @@ private: docstring title() const; /// put the log file into the ostream void getContents(std::ostream & ss) const; - /// go to the next occurence of the RegExp + /// go to the next occurrence of the RegExp void goTo(QRegExp const & exp) const; /// does the document after cursor position contain the RegExp? bool contains(QRegExp const & exp) const; diff --git a/src/frontends/qt/GuiPainter.cpp b/src/frontends/qt/GuiPainter.cpp index d255f507cb..b40078ed82 100644 --- a/src/frontends/qt/GuiPainter.cpp +++ b/src/frontends/qt/GuiPainter.cpp @@ -504,7 +504,7 @@ void GuiPainter::crossoutLines(FontInfo const & f, int x, int y, int width) // the definition of \xout in ulem.sty is // \def\xout{\bgroup \markoverwith{\hbox to.35em{\hss/\hss}}\ULon} - // Let's mimick it somewhat. + // Let's mimic it somewhat. double offset = max(0.35 * theFontMetrics(tmpf).em(), 1); for (int i = 0 ; i < iround(width / offset) ; ++i) text(x + iround(i * offset), y, '/', tmpf); diff --git a/src/frontends/qt/GuiSearch.h b/src/frontends/qt/GuiSearch.h index b565553074..a47825a25b 100644 --- a/src/frontends/qt/GuiSearch.h +++ b/src/frontends/qt/GuiSearch.h @@ -40,11 +40,11 @@ private: void dispatchParams() {} bool isBufferDependent() const { return true; } - /// Searches occurence of string + /// Searches occurrence of string void find(docstring const & search, bool casesensitive, bool matchword, bool forward); - /// Replaces occurence of string + /// Replaces occurrence of string void replace(docstring const & search, docstring const & replace, bool casesensitive, bool matchword, bool forward, bool all); diff --git a/src/frontends/qt/GuiSelectionManager.h b/src/frontends/qt/GuiSelectionManager.h index 926adc589f..4076991dfd 100644 --- a/src/frontends/qt/GuiSelectionManager.h +++ b/src/frontends/qt/GuiSelectionManager.h @@ -31,7 +31,7 @@ namespace frontend { * of items from a list of available items. Adapted from code originally * written for GuiCitationDialog. * Note that this is a not a QWidget, though it could be converted to - * one. Rather, the managed widgets---see constructor for descripton + * one. Rather, the managed widgets---see constructor for description * of them---should be created independently, and then passed to the * constructor. */ diff --git a/src/frontends/qt/GuiTexinfo.cpp b/src/frontends/qt/GuiTexinfo.cpp index 554b874095..d8f079f999 100644 --- a/src/frontends/qt/GuiTexinfo.cpp +++ b/src/frontends/qt/GuiTexinfo.cpp @@ -127,7 +127,7 @@ void GuiTexInfo::updateStyles(TexFileType type) QStringList flist = texFileList(filename); if (flist.empty()) { - // build filelists of all availabe bst/cls/sty-files. + // build filelists of all available bst/cls/sty-files. // Done through kpsewhich and an external script, // saved in *Files.lst rescanTexStyles(); diff --git a/src/frontends/qt/GuiToolbar.cpp b/src/frontends/qt/GuiToolbar.cpp index 6f644192d3..fbd24b4176 100644 --- a/src/frontends/qt/GuiToolbar.cpp +++ b/src/frontends/qt/GuiToolbar.cpp @@ -72,7 +72,7 @@ GuiToolbar::GuiToolbar(ToolbarInfo const & tbinfo, GuiView & owner) SLOT(setIconSize(QSize))); // This is used by QMainWindow::restoreState for proper main window state - // restauration. + // restoration. setObjectName(toqstr(tbinfo.name)); restoreSession(); } diff --git a/src/frontends/qt/GuiView.h b/src/frontends/qt/GuiView.h index 5bbac22bcc..ab600989ee 100644 --- a/src/frontends/qt/GuiView.h +++ b/src/frontends/qt/GuiView.h @@ -312,7 +312,7 @@ public: /// Update all visible dialogs. /** - * Check the status of all visible dialogs and disable or reenable + * Check the status of all visible dialogs and disable or re-enable * them as appropriate. * * Disabling is needed for example when a dialog is open and the diff --git a/src/frontends/qt/GuiWorkArea.cpp b/src/frontends/qt/GuiWorkArea.cpp index 424d22cc02..fa40a5aa10 100644 --- a/src/frontends/qt/GuiWorkArea.cpp +++ b/src/frontends/qt/GuiWorkArea.cpp @@ -380,7 +380,7 @@ void GuiWorkArea::setBuffer(Buffer & buffer) buffer.workAreaManager().add(this); // HACK: Prevents an additional redraw when the scrollbar pops up - // which regularily happens on documents with more than one page. + // which regularly happens on documents with more than one page. // The policy should be set to "Qt::ScrollBarAsNeeded" soon. // Since we have no geometry information yet, we assume that // a document needs a scrollbar if there is more then four @@ -595,7 +595,7 @@ void GuiWorkArea::Private::resizeBufferView() // Update scrollbars which might have changed due different // BufferView dimension. This is especially important when the // BufferView goes from zero-size to the real-size for the first time, - // as the scrollbar paramters are then set for the first time. + // as the scrollbar parameters are then set for the first time. updateScrollbar(); need_resize_ = false; @@ -1215,7 +1215,7 @@ void GuiWorkArea::Private::paintPreeditText(GuiPainter & pain) size_t const preedit_length = preedit_string_.length(); // get position of selection in input method. - // FIXME: isn't there a way to do this simplier? + // FIXME: isn't there a simpler way to do this? // rStart : cursor position in selected string in IM. size_t rStart = 0; // rLength : selected string length in IM. @@ -1364,7 +1364,7 @@ void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e) FuncRequest::KEYBOARD); dispatch(cmd); // FIXME: this is supposed to remove traces from preedit - // string. Can we avoid calling it explicitely? + // string. Can we avoid calling it explicitly? d->buffer_view_->updateMetrics(); } diff --git a/src/frontends/qt/InGuiThread.h b/src/frontends/qt/InGuiThread.h index 2b0d4dfe37..98014d6cbd 100644 --- a/src/frontends/qt/InGuiThread.h +++ b/src/frontends/qt/InGuiThread.h @@ -52,7 +52,7 @@ class InGuiThread : private IntoGuiThreadMover { public: - // please coverity by explicitly initalizing this variable. + // please coverity by explicitly initializing this variable. InGuiThread() : return_value_(R()) {} template diff --git a/src/frontends/qt/Menus.cpp b/src/frontends/qt/Menus.cpp index cb30e07536..2630670bb9 100644 --- a/src/frontends/qt/Menus.cpp +++ b/src/frontends/qt/Menus.cpp @@ -2205,7 +2205,7 @@ MenuDefinition Menus::Impl::mac_special_menu_; documented below). The above 3 steps are applied all the way up the parent window - chain until one of the above are satisifed. If all else fails a + chain until one of the above are satisfied. If all else fails a default menubar will be created, the default menubar on Qt/Mac is an empty menubar, however you can create a different default menubar by creating a parentless QMenuBar, the first one created diff --git a/src/frontends/qt/PanelStack.cpp b/src/frontends/qt/PanelStack.cpp index 243542d321..4b6b875c8b 100644 --- a/src/frontends/qt/PanelStack.cpp +++ b/src/frontends/qt/PanelStack.cpp @@ -220,7 +220,7 @@ void PanelStack::hideEvent(QHideEvent * event) { QWidget::hideEvent(event); - // Programatically hidden (not simply minimized by the user) + // Programmatically hidden (not simply minimized by the user) if (!event->spontaneous()) { resetSearch(); } diff --git a/src/frontends/qt/Validator.h b/src/frontends/qt/Validator.h index 22e8d484d3..bf77795918 100644 --- a/src/frontends/qt/Validator.h +++ b/src/frontends/qt/Validator.h @@ -41,7 +41,7 @@ class LyXRC; namespace frontend { /** A class to ascertain whether the data passed to the @c validate() - * member function can be interpretted as a GlueLength. + * member function can be interpreted as a GlueLength. */ class LengthValidator : public QValidator { @@ -85,7 +85,7 @@ LengthValidator * unsignedGlueLengthValidator(QLineEdit *); /** A class to ascertain whether the data passed to the @c validate() - * member function can be interpretted as a GlueLength or is @param autotext. + * member function can be interpreted as a GlueLength or is @param autotext. */ class LengthAutoValidator : public LengthValidator { diff --git a/src/frontends/qt/qt_helpers.cpp b/src/frontends/qt/qt_helpers.cpp index f8cb247179..26c0df0ffc 100644 --- a/src/frontends/qt/qt_helpers.cpp +++ b/src/frontends/qt/qt_helpers.cpp @@ -430,7 +430,7 @@ QString makeAbsPath(QString const & relpath, QString const & base) /** Given a string such as * " ... *.{abc,def} ", - * convert the csh-style brace expresions: + * convert the csh-style brace expressions: * " ... *.abc *.def ". * Requires no system support, so should work equally on Unix, Mac, Win32. */ diff --git a/src/frontends/qt/qt_helpers.h b/src/frontends/qt/qt_helpers.h index fdc6f3fafe..754b6bf913 100644 --- a/src/frontends/qt/qt_helpers.h +++ b/src/frontends/qt/qt_helpers.h @@ -163,7 +163,7 @@ QString browseRelToSub(QString const & filename, QString const & label2 = QString(), QString const & dir2 = QString()); -/** Build filelists of all availabe bst/cls/sty-files. Done through +/** Build filelists of all available bst/cls/sty-files. Done through * kpsewhich and an external script, saved in *Files.lst. * \param arg: cls, sty, bst, or bib, as required by TeXFiles.py. * Can be a list of these, too. diff --git a/src/frontends/qt/ui/CompareUi.ui b/src/frontends/qt/ui/CompareUi.ui index 7c84570fb7..31519323ce 100644 --- a/src/frontends/qt/ui/CompareUi.ui +++ b/src/frontends/qt/ui/CompareUi.ui @@ -48,7 +48,7 @@ - Specify the original version of the document here (comparation source) + Specify the original version of the document here (comparison source) true @@ -84,7 +84,7 @@ - Specify the modified version of the document here (comparation target) + Specify the modified version of the document here (comparison target) true diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp index 0d4db90e18..d1b35c431e 100644 --- a/src/tex2lyx/text.cpp +++ b/src/tex2lyx/text.cpp @@ -1310,7 +1310,7 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags, os << "use_makebox " << (inner_type == "makebox") << '\n'; if (outer_type == "mbox" || (outer_type == "fbox" && inner_type.empty())) os << "width \"\"\n"; - // for values like "1.5\width" LyX uses "1.5in" as width ad sets "width" as special + // for values like "1.5\width" LyX uses "1.5in" as width and sets "width" as special else if (contains(width_unit, '\\')) os << "width \"" << width_value << "in" << "\"\n"; else -- 2.39.5