commit ef9360d60599acac9e0b7de0f379b9c28a866fbe
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Wed May 14 18:02:52 2025 +0200
Mac OS X is no more
The right name has been macOS for a long time.
What is not changed (yet):
- the packaging code
- the desperately obsolete INSTALL.MacOSX file
- The non-english documentation
---
CMakeLists.txt | 4 +-
config/qt.m4 | 2 +-
lib/CREDITS | 4 +-
lib/doc/Additional.lyx | 97 ++++++++------------------------------
lib/doc/UserGuide.lyx | 10 +++-
lib/generate_contributions.py | 4 +-
lib/symbols | 2 +-
src/AspellChecker.cpp | 2 +-
src/CMakeLists.txt | 2 +-
src/frontends/KeySymbol.h | 2 +-
src/frontends/qt/GuiClipboard.cpp | 4 +-
src/frontends/qt/GuiFontLoader.cpp | 2 +-
src/mathed/MathSupport.cpp | 2 +-
src/support/docstream.cpp | 4 +-
src/tex2lyx/tex2lyx.cpp | 2 +-
15 files changed, 46 insertions(+), 97 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9146484942..8efdfaeca5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -458,7 +458,7 @@ if (LYX_PACKAGE_RELEASE MATCHES "UNDEFINED")
endif()
# Set the programs (lyx, tex2lyx, etc.) suffix
-# When building an OS X bundle, we will append
+# When building a macOS bundle, we will append
# the suffix only to the bundle, not to the programs
set(PROGRAM_SUFFIX "")
if(LYX_PROGRAM_SUFFIX AND NOT (APPLE AND LYX_BUNDLE))
@@ -1294,7 +1294,7 @@ if(ENABLE_DIST)
add_custom_target(git-archive DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/${DIST_NAME})
endif()
-# Last directory to be included so that the fixup code (OS X)
+# Last directory to be included so that the fixup code (macOS)
# can be run last
add_subdirectory(development/cmake/post_install)
diff --git a/config/qt.m4 b/config/qt.m4
index 93b8575ad3..59ca971996 100644
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -290,7 +290,7 @@ AC_DEFUN([QT_DO_PKG_CONFIG],
fi
PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH
dnl Actually, the values of QT_LIB and QT_CORE_LIB can be completely
- dnl wrong on OS X, where everything goes to --libs-only-other.
+ dnl wrong on macOS, where everything goes to --libs-only-other.
dnl As a quick workaround, let us assign better values. A better patch
dnl exists for next cycle.
QT_CORE_LIB=$QT_CORE_LIBS
diff --git a/lib/CREDITS b/lib/CREDITS
index 9bddefacf5..179fa1b32d 100644
--- a/lib/CREDITS
+++ b/lib/CREDITS
@@ -164,7 +164,7 @@
Polish translation
@bRonald Florence
@iE-mail: ron () 18james ! com
- Maintainer of the OS X port(s)
+ Initial maintainer of the OS X port(s)
@bJosé Ramom Flores d'as Seixas
@iE-mail: fa2ramon () usc ! es
Galician documentation and localization
@@ -708,7 +708,7 @@
updates to the Scientific Word bindings
@bStephan Witt
@iE-mail: stephan.witt () beusen ! de
- support for CVS revision control, native spell checker interface for Mac OS
+ support for CVS revision control, native spell checker interface for macOS
@bJürgen Womser-Schütz
@iE-mail: jws1954 () gmx ! de
Improvements to the Include File dialog
diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx
index 390d5f9f11..b519aed9ce 100644
--- a/lib/doc/Additional.lyx
+++ b/lib/doc/Additional.lyx
@@ -1,5 +1,5 @@
#LyX 2.5 created this file. For more info see https://www.lyx.org/
-\lyxformat 630
+\lyxformat 640
\begin_document
\begin_header
\save_transient_properties true
@@ -104,11 +104,19 @@ initials
\paperorientation portrait
\suppress_date false
\justification true
-\use_refstyle 0
+\crossref_package prettyref
\use_formatted_ref 0
\use_minted 0
\use_lineno 0
-\notefontcolor #0000ff
+\customcolor lyxnotefontcolor 0000ff
+\backgroundcolor none
+\fontcolor none
+\notefontcolor lyxnotefontcolor
+\boxbgcolor red
+\table_border_color default
+\table_odd_row_color default
+\table_even_row_color default
+\table_alt_row_colors_start 1
\index Index
\shortcut idx
\color #008000
@@ -135,7 +143,9 @@ initials
\html_be_strict true
\docbook_table_output 0
\docbook_mathml_prefix 1
+\docbook_mathml_version 0
\author -584632292 "Richard Kimberly Heck"
+\author -495245474 "Jean-Marc Lasgouttes"
\author 5863208 "ab"
\end_header
@@ -846,20 +856,17 @@ status open
\begin_layout Plain Layout
-
\backslash
begin{tabular}{ll}
\end_layout
\begin_layout Plain Layout
-
\backslash
begin{minipage}{5cm}
\end_layout
\begin_layout Plain Layout
-
This is an example of a minipage environment.
You can put nearly everything in it,
even (non-floating) figures and tables.
@@ -868,67 +875,57 @@ This is an example of a minipage environment.
\begin_layout Plain Layout
-
\backslash
end{minipage}
\end_layout
\begin_layout Plain Layout
-
&
\end_layout
\begin_layout Plain Layout
-
\backslash
begin{minipage}{5cm}
\end_layout
\begin_layout Plain Layout
-
\backslash
begin{verbatim}
\end_layout
\begin_layout Plain Layout
-
\backslash
begin{minipage}{5cm}
\end_layout
\begin_layout Plain Layout
-
This ...
\end_layout
\begin_layout Plain Layout
-
\backslash
end{minipage}
\end_layout
\begin_layout Plain Layout
-
\backslash
end{verbatim}
\end_layout
\begin_layout Plain Layout
-
\backslash
end{minipage}
\end_layout
\begin_layout Plain Layout
-
\backslash
end{tabular}
\end_layout
@@ -1885,7 +1882,6 @@ For more information,
status open
\begin_layout Plain Layout
-
https://texfaq.org/FAQ-overfull
\end_layout
@@ -2394,7 +2390,6 @@ Books
status collapsed
\begin_layout Plain Layout
-
https://www.ams.org/publications/authors/tex/amslatex
\end_layout
@@ -2435,7 +2430,6 @@ The AMS \SpecialChar LaTeX
status open
\begin_layout Plain Layout
-
https://www.ams.org
\end_layout
@@ -2446,7 +2440,6 @@ https://www.ams.org
status open
\begin_layout Plain Layout
-
https://www.ctan.org/tex-archive/macros/latex/required/amsmath
\end_layout
@@ -3501,7 +3494,6 @@ Requirements for Japanese Text Layout
status collapsed
\begin_layout Plain Layout
-
https://www.w3.org/TR/jlreq/?lang=en
\end_layout
@@ -3563,7 +3555,6 @@ Japanese Article (JLReq Class)
status collapsed
\begin_layout Plain Layout
-
https://mirrors.ctan.org/macros/jptex/latex/jlreq/jlreq.pdf
\end_layout
@@ -5228,7 +5219,6 @@ aa.cls
status collapsed
\begin_layout Plain Layout
-
https://www.aanda.org/for-authors/latex-issues/texnical-background-information
\end_layout
@@ -6098,7 +6088,6 @@ AAS\SpecialChar TeX
status collapsed
\begin_layout Plain Layout
-
https://journals.aas.org/aastex-package-for-manuscript-preparation/
\end_layout
@@ -7483,7 +7472,6 @@ All you need to do is install Rev\SpecialChar TeX
status collapsed
\begin_layout Plain Layout
-
https://journals.aps.org/revtex
\end_layout
@@ -7788,7 +7776,6 @@ sn-jnl.cls
status collapsed
\begin_layout Plain Layout
-
https://www.springernature.com/gp/authors/campaigns/latex-author-support
\end_layout
@@ -7865,7 +7852,6 @@ You are invited to send suggestions to
status collapsed
\begin_layout Plain Layout
-
lyx-de...@lists.lyx.org
\end_layout
@@ -7893,7 +7879,6 @@ status collapsed
\begin_layout Plain Layout
-
\backslash
\end_layout
@@ -7932,7 +7917,6 @@ status collapsed
\begin_layout Plain Layout
-
\backslash
\end_layout
@@ -7944,7 +7928,6 @@ status collapsed
status collapsed
\begin_layout Plain Layout
-
CTAN:/macros/latex/memoir/memman.pdf
\end_layout
@@ -8201,7 +8184,6 @@ status collapsed
\begin_layout Plain Layout
-
\backslash
\end_layout
@@ -8213,7 +8195,6 @@ status collapsed
status collapsed
\begin_layout Plain Layout
-
CTAN:/macros/latex/memoir/memman.pdf
\end_layout
@@ -14712,7 +14693,6 @@ status collapsed
status collapsed
\begin_layout Plain Layout
-
label=
\backslash
#
@@ -14746,7 +14726,6 @@ status collapsed
status collapsed
\begin_layout Plain Layout
-
label=
\backslash
Alph{enumi}.
@@ -14782,7 +14761,6 @@ status collapsed
status collapsed
\begin_layout Plain Layout
-
label=
\backslash
bfseries{
@@ -14814,7 +14792,6 @@ status collapsed
status collapsed
\begin_layout Plain Layout
-
label=
\backslash
emph{
@@ -14917,7 +14894,6 @@ status open
\begin_layout Plain Layout
-
\backslash
renewcommand{
\backslash
@@ -15015,7 +14991,6 @@ status open
\begin_layout Plain Layout
-
\backslash
renewcommand{
\backslash
@@ -15042,7 +15017,6 @@ status collapsed
status collapsed
\begin_layout Plain Layout
-
label=
\backslash
arabic{enumi}.
@@ -15153,7 +15127,6 @@ status open
status collapsed
\begin_layout Plain Layout
-
start=4
\end_layout
@@ -15180,7 +15153,6 @@ Lists
status collapsed
\begin_layout Plain Layout
-
!
\end_layout
@@ -15225,7 +15197,6 @@ status open
status collapsed
\begin_layout Plain Layout
-
nolistsep
\end_layout
@@ -15265,7 +15236,6 @@ status collapsed
status collapsed
\begin_layout Plain Layout
-
!
\end_layout
@@ -15307,7 +15277,6 @@ status open
status collapsed
\begin_layout Plain Layout
-
labelindent=
\backslash
parindent,
@@ -15341,7 +15310,6 @@ Lists
status collapsed
\begin_layout Plain Layout
-
!
\end_layout
@@ -15416,7 +15384,6 @@ status collapsed
status collapsed
\begin_layout Plain Layout
-
labelindent=0pt,
labelsep=1cm,
font=
@@ -15468,7 +15435,6 @@ status collapsed
status collapsed
\begin_layout Plain Layout
-
!
\end_layout
@@ -15644,7 +15610,6 @@ it depends on R >= 2.14.1.
status collapsed
\begin_layout Plain Layout
-
https://yihui.name/knitr
\end_layout
@@ -17408,7 +17373,6 @@ status collapsed
status collapsed
\begin_layout Plain Layout
-
!
\end_layout
@@ -17628,7 +17592,6 @@ status open
status open
\begin_layout Plain Layout
-
3
\end_layout
@@ -17913,7 +17876,6 @@ status collapsed
\begin_layout Plain Layout
-
\backslash
subsubsection{
\end_layout
@@ -17925,7 +17887,6 @@ This is a subsubsection heading as a preface
status collapsed
\begin_layout Plain Layout
-
}
\end_layout
@@ -18056,7 +18017,6 @@ status collapsed
\begin_layout Plain Layout
-
\backslash
baselineskip
\end_layout
@@ -18165,7 +18125,6 @@ status open
\begin_layout Plain Layout
-
\backslash
setlength{
\backslash
@@ -18248,7 +18207,6 @@ status collapsed
\begin_layout Plain Layout
-
\backslash
setlength{
\backslash
@@ -18368,7 +18326,6 @@ status collapsed
\begin_layout Plain Layout
-
\backslash
columnbreak{}
\end_layout
@@ -18482,7 +18439,6 @@ status open
\begin_layout Plain Layout
-
\backslash
setlength{
\backslash
@@ -18535,7 +18491,6 @@ status collapsed
\begin_layout Plain Layout
-
\backslash
setlength{
\backslash
@@ -18594,7 +18549,6 @@ status open
\begin_layout Plain Layout
-
\backslash
setlength{
\backslash
@@ -18819,7 +18773,6 @@ status open
\begin_layout Plain Layout
-
\backslash
setlength{
\backslash
@@ -18828,7 +18781,6 @@ columnsep}{1cm}
\begin_layout Plain Layout
-
\backslash
renewcommand{
\backslash
@@ -18971,7 +18923,6 @@ status collapsed
\begin_layout Plain Layout
-
\backslash
setlength{
\backslash
@@ -18980,7 +18931,6 @@ columnseprule}{0pt}
\begin_layout Plain Layout
-
\backslash
renewcommand{
\backslash
@@ -20510,7 +20460,6 @@ See
status open
\begin_layout Plain Layout
-
https://www.ctan.org/tex-archive/macros/latex/contrib/custom-bib
\end_layout
@@ -20576,7 +20525,6 @@ Available from
status open
\begin_layout Plain Layout
-
https://www.ctan.org/tex-archive/macros/latex/contrib/bibtopic
\end_layout
@@ -21768,7 +21716,6 @@ status open
\begin_layout Plain Layout
-
\backslash
let
\backslash
@@ -21788,7 +21735,6 @@ status open
\begin_layout Plain Layout
-
\backslash
renewcommand
\backslash
@@ -21876,7 +21822,6 @@ status open
\begin_layout Plain Layout
-
\backslash
(
\backslash
@@ -21943,7 +21888,6 @@ status open
\begin_layout Plain Layout
-
\backslash
renewcommand
\backslash
@@ -24281,7 +24225,13 @@ echo $a
\end_layout
\begin_layout Subsection
-AppleScript (Mac OS X)
+AppleScript (
+\change_deleted -495245474 1747237678
+Mac OS X
+\change_inserted -495245474 1747237680
+macOS
+\change_unchanged
+)
\end_layout
\begin_layout Standard
@@ -27810,7 +27760,6 @@ More information about CVS can be found here
status collapsed
\begin_layout Plain Layout
-
https://www.nongnu.org/cvs/
\end_layout
@@ -27821,7 +27770,6 @@ https://www.nongnu.org/cvs/
status collapsed
\begin_layout Plain Layout
-
https://cvs.nongnu.org/
\end_layout
@@ -28962,7 +28910,6 @@ status collapsed
status open
\begin_layout Plain Layout
-
https://svnbook.red-bean.com/en/1.2/svn.advanced.locking.html
\end_layout
@@ -29708,7 +29655,6 @@ status collapsed
status collapsed
\begin_layout Plain Layout
-
https://www.chiark.greenend.org.uk/~sgtatham/putty/download.html
\end_layout
@@ -29905,7 +29851,6 @@ status collapsed
status collapsed
\begin_layout Plain Layout
-
https://svnbook.red-bean.com/en/1.4/svn.advanced.props.file-portability.html
\end_layout
@@ -30585,7 +30530,6 @@ Literate Programming FAQ
status open
\begin_layout Plain Layout
-
http://www.literateprogramming.com/lpfaq.pdf
\end_layout
@@ -30668,7 +30612,6 @@ Noweb home page
status collapsed
\begin_layout Plain Layout
-
https://www.cs.tufts.edu/~nr/noweb/
\end_layout
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 71aebc4fbd..3a37e2aba4 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -1608,10 +1608,16 @@ Special
PDF
\begin_inset Foot
-status collapsed
+status open
\begin_layout Plain Layout
-OS X only
+
+\change_inserted -495245474 1747237609
+macOS
+\change_deleted -495245474 1747237605
+OS X
+\change_unchanged
+ only
\end_layout
\end_inset
diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index e2b7427b74..cb3924ac98 100755
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -774,7 +774,7 @@ contributors = [
"Re: The LyX licence --- a gentle nudge",
"m=111262821108510",
"31 March 2005",
- "Maintainer of the OS X port(s)"),
+ "Initial maintainer of the Mac OS X port(s)"),
contributor("José Ramom Flores d'as Seixas",
"fa2ramon () usc ! es",
@@ -2262,7 +2262,7 @@ contributors = [
"Re: The LyX licence",
"m=110909031824764",
"22 February 2005",
- "support for CVS revision control, native spell checker
interface for Mac OS"),
+ "support for CVS revision control, native spell checker
interface for macOS"),
contributor("Jürgen Womser-Schütz",
"jws1954 () gmx ! de",
diff --git a/lib/symbols b/lib/symbols
index aac3ee3b6c..689bd0d203 100644
--- a/lib/symbols
+++ b/lib/symbols
@@ -1231,7 +1231,7 @@ lyxsurd cmsy 112 0 mathord √
\def\surd{^\lyxsurd} mathord
√
\def\textdegree{\text{°}} textmode ° textcomp,amstext,lyxmathsym
else
-# FIXME: These don't work on OS X, since the Symbol font uses a different
+# FIXME: These don't work on macOS, since the Symbol font uses a different
# encoding and is therefore disabled in FontLoader::available().
cong lyxsymbol 64 0 mathrel ≅
surd lyxsymbol 214 0 mathord √
diff --git a/src/AspellChecker.cpp b/src/AspellChecker.cpp
index 42bc52277f..496d009c33 100644
--- a/src/AspellChecker.cpp
+++ b/src/AspellChecker.cpp
@@ -268,7 +268,7 @@ AspellSpeller * AspellChecker::Private::addSpeller(Language
const * lang)
// conversion in theory, but if this is used it expects all
// char const * arguments to be a cast from uint const *, and it
// seems that this uint is not compatible with our char_type on some
- // platforms (cygwin, OS X). Therefore we use utf-8, that does
+ // platforms (cygwin, macOS). Therefore we use utf-8, that does
// always work.
aspell_config_replace(m.config, "encoding", "utf-8");
if (lyxrc.spellchecker_accept_compound)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b89ecee2f6..df0191a8ae 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -190,7 +190,7 @@ if(LYX_BUNDLE)
foreach(_i RANGE ${OSX_BUNDLE_LAST_INDEX})
list(GET OSX_BUNDLE_FILES ${_i} _file)
list(GET OSX_BUNDLE_DIRS ${_i} _directory)
- # Sets the location of the file into the OS X bundle
+ # Sets the location of the file into the macOS bundle
set_source_files_properties("${_file}" PROPERTIES
MACOSX_PACKAGE_LOCATION "${_directory}")
endforeach()
diff --git a/src/frontends/KeySymbol.h b/src/frontends/KeySymbol.h
index 7e67536aa5..9f4faafe06 100644
--- a/src/frontends/KeySymbol.h
+++ b/src/frontends/KeySymbol.h
@@ -57,7 +57,7 @@ public:
/**
* Return a string describing the KeySym with modifier mod.
* Use the native UI format when \c forgui is true.
- * i.e. (translated and with special characters for Mac OS X)
+ * i.e. (translated and with special characters for macOS)
*/
docstring const print(KeyModifier mod, bool forgui, bool untranslated =
false) const;
diff --git a/src/frontends/qt/GuiClipboard.cpp
b/src/frontends/qt/GuiClipboard.cpp
index 43a0aecf9a..3012233652 100644
--- a/src/frontends/qt/GuiClipboard.cpp
+++ b/src/frontends/qt/GuiClipboard.cpp
@@ -527,11 +527,11 @@ bool GuiClipboard::isInternal() const
// ownsClipboard() is also true for stuff coming from dialogs, e.g.
// the preamble dialog. This does only work on X11 and Windows, since
- // ownsClipboard() is hardwired to return false on OS X.
+ // ownsClipboard() is hardwired to return false on macOS.
if (hasInternal())
return qApp->clipboard()->ownsClipboard();
- // We are running on OS X: Check whether clipboard data is from
+ // We are running on macOS: Check whether clipboard data is from
// ourself by comparing its checksum with the stored one.
QByteArray const ar = cache_.data(lyxMimeType());
string const data(ar.data(), ar.size());
diff --git a/src/frontends/qt/GuiFontLoader.cpp
b/src/frontends/qt/GuiFontLoader.cpp
index 0b482fbe79..ee76554797 100644
--- a/src/frontends/qt/GuiFontLoader.cpp
+++ b/src/frontends/qt/GuiFontLoader.cpp
@@ -367,7 +367,7 @@ bool FontLoader::available(FontInfo const & f)
// glyphs as the original PostScript Symbol font, but it uses a
different
// encoding (see
https://en.wikipedia.org/wiki/Symbol_(typeface)#cite_note-2).
// Since we expect the font specific encoding of the original
- // PostScript Symbol font, we can't use the one provided on OS X.
+ // PostScript Symbol font, we can't use the one provided on macOS.
// See also the discussion in bug 7954.
if (f.family() == SYMBOL_FAMILY)
return false;
diff --git a/src/mathed/MathSupport.cpp b/src/mathed/MathSupport.cpp
index 4d23bf7d0c..78ef885564 100644
--- a/src/mathed/MathSupport.cpp
+++ b/src/mathed/MathSupport.cpp
@@ -953,7 +953,7 @@ fontinfo fontinfos[] = {
// LyX internal usage
{"lyxtex", inh_family, inh_series,
UP_SHAPE, Color_latex},
- // FIXME: The following two don't work on OS X, since the Symbol font
+ // FIXME: The following two don't work on macOS, since the Symbol font
// uses a different encoding, and is therefore disabled in
// FontLoader::available().
{"lyxsymbol", SYMBOL_FAMILY, inh_series,
diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp
index 3376341bec..8371d738fe 100644
--- a/src/support/docstream.cpp
+++ b/src/support/docstream.cpp
@@ -396,7 +396,7 @@ odocstream & operator<<(odocstream & os, SetEnc const & e)
// "iostreams: Does imbue() need to be called before open()?"
// in comp.std.c++.
// Currently it seems to work with gcc and MSVC, but not with
- // clang on OS X.
+ // clang on macOS.
// Avoid imbueing with the same encoding again if possible.
if (facet.encoding() == e.encoding)
return os;
@@ -426,7 +426,7 @@ idocstream & operator<<(idocstream & is, SetEnc const & e)
// "iostreams: Does imbue() need to be called before open()?"
// in comp.std.c++.
// Currently it seems to work with gcc and MSVC, but not with
- // clang on OS X.
+ // clang on macOS.
// Avoid imbueing with the same encoding again if possible.
if (facet.encoding() == e.encoding)
return is;
diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp
index 01c5078c48..94ad69ab5f 100644
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -1014,7 +1014,7 @@ bool tex2lyx(FileName const & infilename, ostream & os,
string encoding,
// This is used until an encoding command is found.
// For child documents use the encoding of the master, else try to
// detect it from the preamble, since setting an encoding of an open
- // fstream does currently not work on OS X.
+ // fstream does currently not work on macOS.
// Always start with ISO-8859-1, (formerly known by its latex name
// latin1), since ISO-8859-1 does not cause an iconv error if the
// actual encoding is different (bug 7509).
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs
