Mercurial > octave

changeset 32683:d338695e2823 bytecode-interpreter

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge default to bytecode-interpreter
author Arun Giridhar <arungiridhar@gmail.com>
date Wed, 03 Jan 2024 10:59:52 -0500
parents 1c4eab6f4d20 (current diff) f030e572b715 (diff)
children ac71ac0d6522
files doc/interpreter/doccheck/mk_undocumented_list test/Makefile.am
diffstat 17 files changed, 411 insertions(+), 350 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/basics.txi	Sun Dec 31 20:29:18 2023 -0500
+++ b/doc/interpreter/basics.txi	Wed Jan 03 10:59:52 2024 -0500
@@ -145,6 +145,11 @@
 commands in the system or user startup files that use the
 @code{info_program} function.
 
+@item  --init-trace
+@cindex @sortas{options, Octave command --init-trace} @ @ @code{--init-trace}
+Print the name of each configuration as it is read and executed during
+initialization.
+
 @item  --interactive
 @itemx -i
 @cindex @sortas{options, Octave command --interactive} @ @ @code{--interactive}
@@ -169,26 +174,37 @@
 @cindex @sortas{options, Octave command -H} @ @ @code{-H}
 Disable recording of command-line history.
 
-@item --no-init-file
-@cindex @sortas{options, Octave command --no-init-file} @ @ @code{--no-init-file}
-@cindex @sortas{octaverc ~/.octaverc} @code{~/.octaverc}
-@cindex @sortas{octaverc .octaverc} @code{.octaverc}
-Don't read the initialization files @file{~/.octaverc} and @file{.octaverc}.
+@item  --no-init-all
+@itemx --norc
+@itemx -f
+@cindex @sortas{options, Octave command --no-init-all} @ @ @code{--no-init-all}
+@cindex @sortas{options, Octave command --norc} @ @ @code{--norc}
+@cindex @sortas{options, Octave command -f} @ @ @code{-f}
+Don't read any of the system or user initialization files at startup.
+This is equivalent to using both of the options @option{--no-site-file}
+and @option{--no-init-user}.
 
 @item --no-init-path
 @cindex @sortas{options, Octave command --no-init-path} @ @ @code{--no-init-path}
 Don't initialize the search path for function files to include default
 locations.
 
+@item --no-init-site
+@cindex @sortas{options, Octave command --no-init-site} @ @ @code{--no-init-site}
+@cindex site startup file
+Don't read the site-wide @file{octaverc} initialization files.
+
+@item --no-init-user
+@cindex @sortas{options, Octave command --no-init-user} @ @ @code{--no-init-user}
+@cindex @sortas{octaverc ~/.octaverc} @code{~/.octaverc}
+@cindex @sortas{octaverc .octaverc} @code{.octaverc}
+Don't read the user initialization files @file{~/.octaverc} and
+@file{.octaverc}.
+
 @item --no-line-editing
 @cindex @sortas{options, Octave command --no-line-editing} @ @ @code{--no-line-editing}
 Disable command-line editing.
 
-@item --no-site-file
-@cindex @sortas{options, Octave command --no-site-file} @ @ @code{--no-site-file}
-@cindex site startup file
-Don't read the site-wide @file{octaverc} initialization files.
-
 @item  --no-window-system
 @itemx -W
 @cindex @sortas{options, Octave command --no-window-system} @ @ @code{--no-window-system}
@@ -196,14 +212,6 @@
 Disable use of a windowing system including graphics.  This forces a
 strictly terminal-only environment.
 
-@item  --norc
-@itemx -f
-@cindex @sortas{options, Octave command --norc} @ @ @code{--norc}
-@cindex @sortas{options, Octave command -f} @ @ @code{-f}
-Don't read any of the system or user initialization files at startup.
-This is equivalent to using both of the options @option{--no-init-file}
-and @option{--no-site-file}.
-
 @item  --path @var{path}
 @itemx -p @var{path}
 @cindex @sortas{options, Octave command --path} @ @ @code{--path @var{path}}
@@ -219,11 +227,11 @@
 Go to interactive mode after @option{--eval} or reading from a file
 named on the command line.
 
-@item  --silent
-@itemx --quiet
+@item  --quiet
+@itemx --silent
 @itemx -q
+@cindex @sortas{options, Octave command --quiet} @ @ @code{--quiet}
 @cindex @sortas{options, Octave command --silent} @ @ @code{--silent}
-@cindex @sortas{options, Octave command --quiet} @ @ @code{--quiet}
 @cindex @sortas{options, Octave command -q} @ @ @code{-q}
 Don't print the usual greeting and version message at startup.
 
@@ -277,12 +285,6 @@
 that works in Octave but not @sc{matlab} (@pxref{XREFwarning,,warning},
 @ref{XREFwarning_ids,,warning_ids}).
 
-@item  --verbose
-@itemx -V
-@cindex @sortas{options, Octave command --verbose} @ @ @code{--verbose}
-@cindex @sortas{options, Octave command -V} @ @ @code{-V}
-Turn on verbose output.
-
 @item  --version
 @itemx -v
 @cindex @sortas{options, Octave command --version} @ @ @code{--version}
@@ -388,7 +390,7 @@
 
 A message will be displayed as each of the startup files is read if you
 invoke Octave with the @option{--verbose} option but without the
-@option{--silent} option.
+@option{--quiet} option.
 
 The startup files are always processed in the system's locale charset
 (independent of the m-file encoding that is set, for example, in the GUI
--- a/doc/interpreter/doccheck/mk_undocumented_list	Sun Dec 31 20:29:18 2023 -0500
+++ b/doc/interpreter/doccheck/mk_undocumented_list	Wed Jan 03 10:59:52 2024 -0500
@@ -34,7 +34,7 @@
 ################################################################################
 # Get a list from Octave of all visible functions
 @octave_output = <<`_END_OCT_SCRIPT_`;
-../../run-octave --norc --silent --no-history --eval '\
+../../run-octave --norc --quiet --no-history --eval '\
   funclist = vertcat (__list_functions__ , __builtins__); \
   funclist = funclist(! strncmp (funclist, \"meta.\", 5)) \
   disp ("#!-separator-!#") \
--- a/doc/interpreter/graphics_properties.mk	Sun Dec 31 20:29:18 2023 -0500
+++ b/doc/interpreter/graphics_properties.mk	Wed Jan 03 10:59:52 2024 -0500
@@ -11,7 +11,7 @@
 
 define gen-propdoc-texi
   rm -f $@-t $@ && \
-  $(top_builddir)/run-octave -disable-asan --norc --silent --no-history --path $(srcdir)/interpreter --eval "genpropdoc ('$(1)');" > $@-t && \
+  $(top_builddir)/run-octave -disable-asan --norc --quiet --no-history --path $(srcdir)/interpreter --eval "genpropdoc ('$(1)');" > $@-t && \
   mv $@-t $@
 endef
 
--- a/doc/interpreter/images.awk	Sun Dec 31 20:29:18 2023 -0500
+++ b/doc/interpreter/images.awk	Wed Jan 03 10:59:52 2024 -0500
@@ -54,7 +54,7 @@
 
     for (j = 2; j <= NF; j++) {
       printf ("%s%s.%s: %s%s\n", dir, $j, ext, dir, script);
-      printf ("\t$(AM_V_GEN)$(SHELL) run-octave -disable-asan --norc --silent --no-history --path $(abs_top_srcdir)/%s --eval \"%s ('%s', '%s', '%s');\"\n",
+      printf ("\t$(AM_V_GEN)$(SHELL) run-octave -disable-asan --norc --quiet --no-history --path $(abs_top_srcdir)/%s --eval \"%s ('%s', '%s', '%s');\"\n",
               dir, basename, dir, $j, ext);
     }
   }
--- a/doc/interpreter/module.mk	Sun Dec 31 20:29:18 2023 -0500
+++ b/doc/interpreter/module.mk	Wed Jan 03 10:59:52 2024 -0500
@@ -26,7 +26,7 @@
 
 define gen-propdoc-texi
   rm -f $@-t $@ && \
-  $(SHELL) run-octave -disable-asan --norc --silent --no-history --path $(srcdir)/doc/interpreter --eval "genpropdoc ('$(1)');" > $@-t && \
+  $(SHELL) run-octave -disable-asan --norc --quiet --no-history --path $(srcdir)/doc/interpreter --eval "genpropdoc ('$(1)');" > $@-t && \
   mv $@-t $@
 endef
 
--- a/etc/NEWS.10.md	Sun Dec 31 20:29:18 2023 -0500
+++ b/etc/NEWS.10.md	Wed Jan 03 10:59:52 2024 -0500
@@ -9,6 +9,12 @@
   * `-g` for `--gui`
   * `-G` for `--no-gui`
 
+- Three long form options have been introduced for clarity.
+  * `--no-init-user` : Don't read user configuration files ~/.octaverc or
+    .octaverc files at startup.
+  * `--no-init-site` : Don't read site-wide configuration files at startup.
+  * `--no-init-all` : Don't read any configuration files at startup.
+
 ### Graphical User Interface
 
 ### Graphics backend
@@ -49,13 +55,18 @@
         symbol_record_rep::unmark_as_variable | symbol_record_rep::unmark_variable
         symbol_record::mark_as_variable       | symbol_record::mark_variable
         symbol_record::unmark_as_variable     | symbol_record::unmark_variable
+        interpreter::verbose                  | interpreter::init_trace
+        cmdline_options::verbose              | cmdline_options::init_trace
 
-- A new method `rwdata ()` provides direct read/write access (a pointer) to the
+  - A new method `rwdata ()` provides direct read/write access (a pointer) to the
 data in a liboctave `Array` object (or its derived classes such as `Matrix`).
 Historically, the method `fortran_vec ()` provided this access, but the name
 is unclear, and it is recommended to use `rwdata ()` in any new code.  There
 are no plans to deprecate `fortran_vec`.
 
+  - The `--verbose`,`-V` command-line option has been deprecated.  Use
+`--init-trace` to print the configuration files executed during initialization.
+
 The following features were deprecated in Octave 8 and have been removed
 from Octave 10.
 
--- a/libinterp/corefcn/graphics.cc	Sun Dec 31 20:29:18 2023 -0500
+++ b/libinterp/corefcn/graphics.cc	Wed Jan 03 10:59:52 2024 -0500
@@ -139,270 +139,270 @@
 static Matrix
 viridis_colormap ()
 {
-  // The values below have been produced by viridis (64)(:)
-  // It would be nice to be able to feval the
-  // viridis function but since there is a static property object that includes
-  // a colormap_property object, we need to initialize this before main is
-  // even called, so calling an interpreted function is not possible.
+  // The values below have been produced by "viridis ()(:)".
+  // It would be nice to be able to feval the  viridis function but since there
+  // is a static property object that includes a colormap_property object, we
+  // need to initialize this before main() is even called, so calling an
+  // interpreted function is not possible.
 
   const double cmapv[] =
   {
-    0.26700401, 0.00487433, 0.32941519,
-    0.26851048, 0.00960483, 0.33542652,
-    0.26994384, 0.01462494, 0.34137895,
-    0.27130489, 0.01994186, 0.34726862,
-    0.27259384, 0.02556309, 0.35309303,
-    0.27380934, 0.03149748, 0.35885256,
-    0.27495242, 0.03775181, 0.36454323,
-    0.27602238, 0.04416723, 0.37016418,
-    0.27701840, 0.05034437, 0.37571452,
-    0.27794143, 0.05632444, 0.38119074,
-    0.27879067, 0.06214536, 0.38659204,
-    0.27956550, 0.06783587, 0.39191723,
-    0.28026658, 0.07341724, 0.39716349,
-    0.28089358, 0.07890703, 0.40232944,
-    0.28144581, 0.08431970, 0.40741404,
-    0.28192358, 0.08966622, 0.41241521,
-    0.28232739, 0.09495545, 0.41733086,
-    0.28265633, 0.10019576, 0.42216032,
-    0.28291049, 0.10539345, 0.42690202,
-    0.28309095, 0.11055307, 0.43155375,
-    0.28319704, 0.11567966, 0.43611482,
-    0.28322882, 0.12077701, 0.44058404,
-    0.28318684, 0.12584799, 0.44496000,
-    0.28307200, 0.13089477, 0.44924127,
-    0.28288389, 0.13592005, 0.45342734,
-    0.28262297, 0.14092556, 0.45751726,
-    0.28229037, 0.14591233, 0.46150995,
-    0.28188676, 0.15088147, 0.46540474,
-    0.28141228, 0.15583425, 0.46920128,
-    0.28086773, 0.16077132, 0.47289909,
-    0.28025468, 0.16569272, 0.47649762,
-    0.27957399, 0.17059884, 0.47999675,
-    0.27882618, 0.17549020, 0.48339654,
-    0.27801236, 0.18036684, 0.48669702,
-    0.27713437, 0.18522836, 0.48989831,
-    0.27619376, 0.19007447, 0.49300074,
-    0.27519116, 0.19490540, 0.49600488,
-    0.27412802, 0.19972086, 0.49891131,
-    0.27300596, 0.20452049, 0.50172076,
-    0.27182812, 0.20930306, 0.50443413,
-    0.27059473, 0.21406899, 0.50705243,
-    0.26930756, 0.21881782, 0.50957678,
-    0.26796846, 0.22354911, 0.51200840,
-    0.26657984, 0.22826210, 0.51434870,
-    0.26514450, 0.23295593, 0.51659930,
-    0.26366320, 0.23763078, 0.51876163,
-    0.26213801, 0.24228619, 0.52083736,
-    0.26057103, 0.24692170, 0.52282822,
-    0.25896451, 0.25153685, 0.52473609,
-    0.25732244, 0.25613040, 0.52656332,
-    0.25564519, 0.26070284, 0.52831152,
-    0.25393498, 0.26525384, 0.52998273,
-    0.25219404, 0.26978306, 0.53157905,
-    0.25042462, 0.27429024, 0.53310261,
-    0.24862899, 0.27877509, 0.53455561,
-    0.24681140, 0.28323662, 0.53594093,
-    0.24497208, 0.28767547, 0.53726018,
-    0.24311324, 0.29209154, 0.53851561,
-    0.24123708, 0.29648471, 0.53970946,
-    0.23934575, 0.30085494, 0.54084398,
-    0.23744138, 0.30520222, 0.54192140,
-    0.23552606, 0.30952657, 0.54294396,
-    0.23360277, 0.31382773, 0.54391424,
-    0.23167350, 0.31810580, 0.54483444,
-    0.22973926, 0.32236127, 0.54570633,
-    0.22780192, 0.32659432, 0.54653200,
-    0.22586330, 0.33080515, 0.54731353,
-    0.22392515, 0.33499400, 0.54805291,
-    0.22198915, 0.33916114, 0.54875211,
-    0.22005691, 0.34330688, 0.54941304,
-    0.21812995, 0.34743154, 0.55003755,
-    0.21620971, 0.35153548, 0.55062743,
-    0.21429757, 0.35561907, 0.55118440,
-    0.21239477, 0.35968273, 0.55171011,
-    0.21050310, 0.36372671, 0.55220646,
-    0.20862342, 0.36775151, 0.55267486,
-    0.20675628, 0.37175775, 0.55311653,
-    0.20490257, 0.37574589, 0.55353282,
-    0.20306309, 0.37971644, 0.55392505,
-    0.20123854, 0.38366989, 0.55429441,
-    0.19942950, 0.38760678, 0.55464205,
-    0.19763650, 0.39152762, 0.55496905,
-    0.19585993, 0.39543297, 0.55527637,
-    0.19410009, 0.39932336, 0.55556494,
-    0.19235719, 0.40319934, 0.55583559,
-    0.19063135, 0.40706148, 0.55608907,
-    0.18892259, 0.41091033, 0.55632606,
-    0.18723083, 0.41474645, 0.55654717,
-    0.18555593, 0.41857040, 0.55675292,
-    0.18389763, 0.42238275, 0.55694377,
-    0.18225561, 0.42618405, 0.55712010,
-    0.18062949, 0.42997486, 0.55728221,
-    0.17901879, 0.43375572, 0.55743035,
-    0.17742298, 0.43752720, 0.55756466,
-    0.17584148, 0.44128981, 0.55768526,
-    0.17427363, 0.44504410, 0.55779216,
-    0.17271876, 0.44879060, 0.55788532,
-    0.17117615, 0.45252980, 0.55796464,
-    0.16964573, 0.45626209, 0.55803034,
-    0.16812641, 0.45998802, 0.55808199,
-    0.16661710, 0.46370813, 0.55811913,
-    0.16511703, 0.46742290, 0.55814141,
-    0.16362543, 0.47113278, 0.55814842,
-    0.16214155, 0.47483821, 0.55813967,
-    0.16066467, 0.47853961, 0.55811466,
-    0.15919413, 0.48223740, 0.55807280,
-    0.15772933, 0.48593197, 0.55801347,
-    0.15626973, 0.48962370, 0.55793600,
-    0.15481488, 0.49331293, 0.55783967,
-    0.15336445, 0.49700003, 0.55772371,
-    0.15191820, 0.50068529, 0.55758733,
-    0.15047605, 0.50436904, 0.55742968,
-    0.14903918, 0.50805136, 0.55725050,
-    0.14760731, 0.51173263, 0.55704861,
-    0.14618026, 0.51541316, 0.55682271,
-    0.14475863, 0.51909319, 0.55657181,
-    0.14334327, 0.52277292, 0.55629491,
-    0.14193527, 0.52645254, 0.55599097,
-    0.14053599, 0.53013219, 0.55565893,
-    0.13914708, 0.53381201, 0.55529773,
-    0.13777048, 0.53749213, 0.55490625,
-    0.13640850, 0.54117264, 0.55448339,
-    0.13506561, 0.54485335, 0.55402906,
-    0.13374299, 0.54853458, 0.55354108,
-    0.13244401, 0.55221637, 0.55301828,
-    0.13117249, 0.55589872, 0.55245948,
-    0.12993270, 0.55958162, 0.55186354,
-    0.12872938, 0.56326503, 0.55122927,
-    0.12756771, 0.56694891, 0.55055551,
-    0.12645338, 0.57063316, 0.54984110,
-    0.12539383, 0.57431754, 0.54908564,
-    0.12439474, 0.57800205, 0.54828740,
-    0.12346281, 0.58168661, 0.54744498,
-    0.12260562, 0.58537105, 0.54655722,
-    0.12183122, 0.58905521, 0.54562298,
-    0.12114807, 0.59273889, 0.54464114,
-    0.12056501, 0.59642187, 0.54361058,
-    0.12009154, 0.60010387, 0.54253043,
-    0.11973756, 0.60378459, 0.54139999,
-    0.11951163, 0.60746388, 0.54021751,
-    0.11942341, 0.61114146, 0.53898192,
-    0.11948255, 0.61481702, 0.53769219,
-    0.11969858, 0.61849025, 0.53634733,
-    0.12008079, 0.62216081, 0.53494633,
-    0.12063824, 0.62582833, 0.53348834,
-    0.12137972, 0.62949242, 0.53197275,
-    0.12231244, 0.63315277, 0.53039808,
-    0.12344358, 0.63680899, 0.52876343,
-    0.12477953, 0.64046069, 0.52706792,
-    0.12632581, 0.64410744, 0.52531069,
-    0.12808703, 0.64774881, 0.52349092,
-    0.13006688, 0.65138436, 0.52160791,
-    0.13226797, 0.65501363, 0.51966086,
-    0.13469183, 0.65863619, 0.51764880,
-    0.13733921, 0.66225157, 0.51557101,
-    0.14020991, 0.66585927, 0.51342680,
-    0.14330291, 0.66945881, 0.51121549,
-    0.14661640, 0.67304968, 0.50893644,
-    0.15014782, 0.67663139, 0.50658890,
-    0.15389405, 0.68020343, 0.50417217,
-    0.15785146, 0.68376525, 0.50168574,
-    0.16201598, 0.68731632, 0.49912906,
-    0.16638320, 0.69085611, 0.49650163,
-    0.17094840, 0.69438405, 0.49380294,
-    0.17570671, 0.69789960, 0.49103252,
-    0.18065314, 0.70140222, 0.48818938,
-    0.18578266, 0.70489133, 0.48527326,
-    0.19109018, 0.70836635, 0.48228395,
-    0.19657063, 0.71182668, 0.47922108,
-    0.20221902, 0.71527175, 0.47608431,
-    0.20803045, 0.71870095, 0.47287330,
-    0.21400015, 0.72211371, 0.46958774,
-    0.22012381, 0.72550945, 0.46622638,
-    0.22639690, 0.72888753, 0.46278934,
-    0.23281498, 0.73224735, 0.45927675,
-    0.23937390, 0.73558828, 0.45568838,
-    0.24606968, 0.73890972, 0.45202405,
-    0.25289851, 0.74221104, 0.44828355,
-    0.25985676, 0.74549162, 0.44446673,
-    0.26694127, 0.74875084, 0.44057284,
-    0.27414922, 0.75198807, 0.43660090,
-    0.28147681, 0.75520266, 0.43255207,
-    0.28892102, 0.75839399, 0.42842626,
-    0.29647899, 0.76156142, 0.42422341,
-    0.30414796, 0.76470433, 0.41994346,
-    0.31192534, 0.76782207, 0.41558638,
-    0.31980860, 0.77091403, 0.41115215,
-    0.32779580, 0.77397953, 0.40664011,
-    0.33588539, 0.77701790, 0.40204917,
-    0.34407411, 0.78002855, 0.39738103,
-    0.35235985, 0.78301086, 0.39263579,
-    0.36074053, 0.78596419, 0.38781353,
-    0.36921420, 0.78888793, 0.38291438,
-    0.37777892, 0.79178146, 0.37793850,
-    0.38643282, 0.79464415, 0.37288606,
-    0.39517408, 0.79747541, 0.36775726,
-    0.40400101, 0.80027461, 0.36255223,
-    0.41291350, 0.80304099, 0.35726893,
-    0.42190813, 0.80577412, 0.35191009,
-    0.43098317, 0.80847343, 0.34647607,
-    0.44013691, 0.81113836, 0.34096730,
-    0.44936763, 0.81376835, 0.33538426,
-    0.45867362, 0.81636288, 0.32972749,
-    0.46805314, 0.81892143, 0.32399761,
-    0.47750446, 0.82144351, 0.31819529,
-    0.48702580, 0.82392862, 0.31232133,
-    0.49661536, 0.82637633, 0.30637661,
-    0.50627130, 0.82878621, 0.30036211,
-    0.51599182, 0.83115784, 0.29427888,
-    0.52577622, 0.83349064, 0.28812650,
-    0.53562110, 0.83578452, 0.28190832,
-    0.54552440, 0.83803918, 0.27562602,
-    0.55548397, 0.84025437, 0.26928147,
-    0.56549760, 0.84242990, 0.26287683,
-    0.57556297, 0.84456561, 0.25641457,
-    0.58567772, 0.84666139, 0.24989748,
-    0.59583934, 0.84871722, 0.24332878,
-    0.60604528, 0.85073310, 0.23671214,
-    0.61629283, 0.85270912, 0.23005179,
-    0.62657923, 0.85464543, 0.22335258,
-    0.63690157, 0.85654226, 0.21662012,
-    0.64725685, 0.85839991, 0.20986086,
-    0.65764197, 0.86021878, 0.20308229,
-    0.66805369, 0.86199932, 0.19629307,
-    0.67848868, 0.86374211, 0.18950326,
-    0.68894351, 0.86544779, 0.18272455,
-    0.69941463, 0.86711711, 0.17597055,
-    0.70989842, 0.86875092, 0.16925712,
-    0.72039115, 0.87035015, 0.16260273,
-    0.73088902, 0.87191584, 0.15602894,
-    0.74138803, 0.87344918, 0.14956101,
-    0.75188414, 0.87495143, 0.14322828,
-    0.76237342, 0.87642392, 0.13706449,
-    0.77285183, 0.87786808, 0.13110864,
-    0.78331535, 0.87928545, 0.12540538,
-    0.79375994, 0.88067763, 0.12000532,
-    0.80418159, 0.88204632, 0.11496505,
-    0.81457634, 0.88339329, 0.11034678,
-    0.82494028, 0.88472036, 0.10621724,
-    0.83526959, 0.88602943, 0.10264590,
-    0.84556056, 0.88732243, 0.09970219,
-    0.85580960, 0.88860134, 0.09745186,
-    0.86601325, 0.88986815, 0.09595277,
-    0.87616824, 0.89112487, 0.09525046,
-    0.88627146, 0.89237353, 0.09537439,
-    0.89632002, 0.89361614, 0.09633538,
-    0.90631121, 0.89485467, 0.09812496,
-    0.91624212, 0.89609127, 0.10071680,
-    0.92610579, 0.89732977, 0.10407067,
-    0.93590444, 0.89857040, 0.10813094,
-    0.94563626, 0.89981500, 0.11283773,
-    0.95529972, 0.90106534, 0.11812832,
-    0.96489353, 0.90232311, 0.12394051,
-    0.97441665, 0.90358991, 0.13021494,
-    0.98386829, 0.90486726, 0.13689671,
-    0.99324789, 0.90615657, 0.14393620
+    0.26700401, 0.26851048, 0.26994384,
+    0.27130489, 0.27259384, 0.27380934,
+    0.27495242, 0.27602238, 0.27701840,
+    0.27794143, 0.27879067, 0.27956550,
+    0.28026658, 0.28089358, 0.28144581,
+    0.28192358, 0.28232739, 0.28265633,
+    0.28291049, 0.28309095, 0.28319704,
+    0.28322882, 0.28318684, 0.28307200,
+    0.28288389, 0.28262297, 0.28229037,
+    0.28188676, 0.28141228, 0.28086773,
+    0.28025468, 0.27957399, 0.27882618,
+    0.27801236, 0.27713437, 0.27619376,
+    0.27519116, 0.27412802, 0.27300596,
+    0.27182812, 0.27059473, 0.26930756,
+    0.26796846, 0.26657984, 0.26514450,
+    0.26366320, 0.26213801, 0.26057103,
+    0.25896451, 0.25732244, 0.25564519,
+    0.25393498, 0.25219404, 0.25042462,
+    0.24862899, 0.24681140, 0.24497208,
+    0.24311324, 0.24123708, 0.23934575,
+    0.23744138, 0.23552606, 0.23360277,
+    0.23167350, 0.22973926, 0.22780192,
+    0.22586330, 0.22392515, 0.22198915,
+    0.22005691, 0.21812995, 0.21620971,
+    0.21429757, 0.21239477, 0.21050310,
+    0.20862342, 0.20675628, 0.20490257,
+    0.20306309, 0.20123854, 0.19942950,
+    0.19763650, 0.19585993, 0.19410009,
+    0.19235719, 0.19063135, 0.18892259,
+    0.18723083, 0.18555593, 0.18389763,
+    0.18225561, 0.18062949, 0.17901879,
+    0.17742298, 0.17584148, 0.17427363,
+    0.17271876, 0.17117615, 0.16964573,
+    0.16812641, 0.16661710, 0.16511703,
+    0.16362543, 0.16214155, 0.16066467,
+    0.15919413, 0.15772933, 0.15626973,
+    0.15481488, 0.15336445, 0.15191820,
+    0.15047605, 0.14903918, 0.14760731,
+    0.14618026, 0.14475863, 0.14334327,
+    0.14193527, 0.14053599, 0.13914708,
+    0.13777048, 0.13640850, 0.13506561,
+    0.13374299, 0.13244401, 0.13117249,
+    0.12993270, 0.12872938, 0.12756771,
+    0.12645338, 0.12539383, 0.12439474,
+    0.12346281, 0.12260562, 0.12183122,
+    0.12114807, 0.12056501, 0.12009154,
+    0.11973756, 0.11951163, 0.11942341,
+    0.11948255, 0.11969858, 0.12008079,
+    0.12063824, 0.12137972, 0.12231244,
+    0.12344358, 0.12477953, 0.12632581,
+    0.12808703, 0.13006688, 0.13226797,
+    0.13469183, 0.13733921, 0.14020991,
+    0.14330291, 0.14661640, 0.15014782,
+    0.15389405, 0.15785146, 0.16201598,
+    0.16638320, 0.17094840, 0.17570671,
+    0.18065314, 0.18578266, 0.19109018,
+    0.19657063, 0.20221902, 0.20803045,
+    0.21400015, 0.22012381, 0.22639690,
+    0.23281498, 0.23937390, 0.24606968,
+    0.25289851, 0.25985676, 0.26694127,
+    0.27414922, 0.28147681, 0.28892102,
+    0.29647899, 0.30414796, 0.31192534,
+    0.31980860, 0.32779580, 0.33588539,
+    0.34407411, 0.35235985, 0.36074053,
+    0.36921420, 0.37777892, 0.38643282,
+    0.39517408, 0.40400101, 0.41291350,
+    0.42190813, 0.43098317, 0.44013691,
+    0.44936763, 0.45867362, 0.46805314,
+    0.47750446, 0.48702580, 0.49661536,
+    0.50627130, 0.51599182, 0.52577622,
+    0.53562110, 0.54552440, 0.55548397,
+    0.56549760, 0.57556297, 0.58567772,
+    0.59583934, 0.60604528, 0.61629283,
+    0.62657923, 0.63690157, 0.64725685,
+    0.65764197, 0.66805369, 0.67848868,
+    0.68894351, 0.69941463, 0.70989842,
+    0.72039115, 0.73088902, 0.74138803,
+    0.75188414, 0.76237342, 0.77285183,
+    0.78331535, 0.79375994, 0.80418159,
+    0.81457634, 0.82494028, 0.83526959,
+    0.84556056, 0.85580960, 0.86601325,
+    0.87616824, 0.88627146, 0.89632002,
+    0.90631121, 0.91624212, 0.92610579,
+    0.93590444, 0.94563626, 0.95529972,
+    0.96489353, 0.97441665, 0.98386829,
+    0.99324789, 0.00487433, 0.00960483,
+    0.01462494, 0.01994186, 0.02556309,
+    0.03149748, 0.03775181, 0.04416723,
+    0.05034437, 0.05632444, 0.06214536,
+    0.06783587, 0.07341724, 0.07890703,
+    0.08431970, 0.08966622, 0.09495545,
+    0.10019576, 0.10539345, 0.11055307,
+    0.11567966, 0.12077701, 0.12584799,
+    0.13089477, 0.13592005, 0.14092556,
+    0.14591233, 0.15088147, 0.15583425,
+    0.16077132, 0.16569272, 0.17059884,
+    0.17549020, 0.18036684, 0.18522836,
+    0.19007447, 0.19490540, 0.19972086,
+    0.20452049, 0.20930306, 0.21406899,
+    0.21881782, 0.22354911, 0.22826210,
+    0.23295593, 0.23763078, 0.24228619,
+    0.24692170, 0.25153685, 0.25613040,
+    0.26070284, 0.26525384, 0.26978306,
+    0.27429024, 0.27877509, 0.28323662,
+    0.28767547, 0.29209154, 0.29648471,
+    0.30085494, 0.30520222, 0.30952657,
+    0.31382773, 0.31810580, 0.32236127,
+    0.32659432, 0.33080515, 0.33499400,
+    0.33916114, 0.34330688, 0.34743154,
+    0.35153548, 0.35561907, 0.35968273,
+    0.36372671, 0.36775151, 0.37175775,
+    0.37574589, 0.37971644, 0.38366989,
+    0.38760678, 0.39152762, 0.39543297,
+    0.39932336, 0.40319934, 0.40706148,
+    0.41091033, 0.41474645, 0.41857040,
+    0.42238275, 0.42618405, 0.42997486,
+    0.43375572, 0.43752720, 0.44128981,
+    0.44504410, 0.44879060, 0.45252980,
+    0.45626209, 0.45998802, 0.46370813,
+    0.46742290, 0.47113278, 0.47483821,
+    0.47853961, 0.48223740, 0.48593197,
+    0.48962370, 0.49331293, 0.49700003,
+    0.50068529, 0.50436904, 0.50805136,
+    0.51173263, 0.51541316, 0.51909319,
+    0.52277292, 0.52645254, 0.53013219,
+    0.53381201, 0.53749213, 0.54117264,
+    0.54485335, 0.54853458, 0.55221637,
+    0.55589872, 0.55958162, 0.56326503,
+    0.56694891, 0.57063316, 0.57431754,
+    0.57800205, 0.58168661, 0.58537105,
+    0.58905521, 0.59273889, 0.59642187,
+    0.60010387, 0.60378459, 0.60746388,
+    0.61114146, 0.61481702, 0.61849025,
+    0.62216081, 0.62582833, 0.62949242,
+    0.63315277, 0.63680899, 0.64046069,
+    0.64410744, 0.64774881, 0.65138436,
+    0.65501363, 0.65863619, 0.66225157,
+    0.66585927, 0.66945881, 0.67304968,
+    0.67663139, 0.68020343, 0.68376525,
+    0.68731632, 0.69085611, 0.69438405,
+    0.69789960, 0.70140222, 0.70489133,
+    0.70836635, 0.71182668, 0.71527175,
+    0.71870095, 0.72211371, 0.72550945,
+    0.72888753, 0.73224735, 0.73558828,
+    0.73890972, 0.74221104, 0.74549162,
+    0.74875084, 0.75198807, 0.75520266,
+    0.75839399, 0.76156142, 0.76470433,
+    0.76782207, 0.77091403, 0.77397953,
+    0.77701790, 0.78002855, 0.78301086,
+    0.78596419, 0.78888793, 0.79178146,
+    0.79464415, 0.79747541, 0.80027461,
+    0.80304099, 0.80577412, 0.80847343,
+    0.81113836, 0.81376835, 0.81636288,
+    0.81892143, 0.82144351, 0.82392862,
+    0.82637633, 0.82878621, 0.83115784,
+    0.83349064, 0.83578452, 0.83803918,
+    0.84025437, 0.84242990, 0.84456561,
+    0.84666139, 0.84871722, 0.85073310,
+    0.85270912, 0.85464543, 0.85654226,
+    0.85839991, 0.86021878, 0.86199932,
+    0.86374211, 0.86544779, 0.86711711,
+    0.86875092, 0.87035015, 0.87191584,
+    0.87344918, 0.87495143, 0.87642392,
+    0.87786808, 0.87928545, 0.88067763,
+    0.88204632, 0.88339329, 0.88472036,
+    0.88602943, 0.88732243, 0.88860134,
+    0.88986815, 0.89112487, 0.89237353,
+    0.89361614, 0.89485467, 0.89609127,
+    0.89732977, 0.89857040, 0.89981500,
+    0.90106534, 0.90232311, 0.90358991,
+    0.90486726, 0.90615657, 0.32941519,
+    0.33542652, 0.34137895, 0.34726862,
+    0.35309303, 0.35885256, 0.36454323,
+    0.37016418, 0.37571452, 0.38119074,
+    0.38659204, 0.39191723, 0.39716349,
+    0.40232944, 0.40741404, 0.41241521,
+    0.41733086, 0.42216032, 0.42690202,
+    0.43155375, 0.43611482, 0.44058404,
+    0.44496000, 0.44924127, 0.45342734,
+    0.45751726, 0.46150995, 0.46540474,
+    0.46920128, 0.47289909, 0.47649762,
+    0.47999675, 0.48339654, 0.48669702,
+    0.48989831, 0.49300074, 0.49600488,
+    0.49891131, 0.50172076, 0.50443413,
+    0.50705243, 0.50957678, 0.51200840,
+    0.51434870, 0.51659930, 0.51876163,
+    0.52083736, 0.52282822, 0.52473609,
+    0.52656332, 0.52831152, 0.52998273,
+    0.53157905, 0.53310261, 0.53455561,
+    0.53594093, 0.53726018, 0.53851561,
+    0.53970946, 0.54084398, 0.54192140,
+    0.54294396, 0.54391424, 0.54483444,
+    0.54570633, 0.54653200, 0.54731353,
+    0.54805291, 0.54875211, 0.54941304,
+    0.55003755, 0.55062743, 0.55118440,
+    0.55171011, 0.55220646, 0.55267486,
+    0.55311653, 0.55353282, 0.55392505,
+    0.55429441, 0.55464205, 0.55496905,
+    0.55527637, 0.55556494, 0.55583559,
+    0.55608907, 0.55632606, 0.55654717,
+    0.55675292, 0.55694377, 0.55712010,
+    0.55728221, 0.55743035, 0.55756466,
+    0.55768526, 0.55779216, 0.55788532,
+    0.55796464, 0.55803034, 0.55808199,
+    0.55811913, 0.55814141, 0.55814842,
+    0.55813967, 0.55811466, 0.55807280,
+    0.55801347, 0.55793600, 0.55783967,
+    0.55772371, 0.55758733, 0.55742968,
+    0.55725050, 0.55704861, 0.55682271,
+    0.55657181, 0.55629491, 0.55599097,
+    0.55565893, 0.55529773, 0.55490625,
+    0.55448339, 0.55402906, 0.55354108,
+    0.55301828, 0.55245948, 0.55186354,
+    0.55122927, 0.55055551, 0.54984110,
+    0.54908564, 0.54828740, 0.54744498,
+    0.54655722, 0.54562298, 0.54464114,
+    0.54361058, 0.54253043, 0.54139999,
+    0.54021751, 0.53898192, 0.53769219,
+    0.53634733, 0.53494633, 0.53348834,
+    0.53197275, 0.53039808, 0.52876343,
+    0.52706792, 0.52531069, 0.52349092,
+    0.52160791, 0.51966086, 0.51764880,
+    0.51557101, 0.51342680, 0.51121549,
+    0.50893644, 0.50658890, 0.50417217,
+    0.50168574, 0.49912906, 0.49650163,
+    0.49380294, 0.49103252, 0.48818938,
+    0.48527326, 0.48228395, 0.47922108,
+    0.47608431, 0.47287330, 0.46958774,
+    0.46622638, 0.46278934, 0.45927675,
+    0.45568838, 0.45202405, 0.44828355,
+    0.44446673, 0.44057284, 0.43660090,
+    0.43255207, 0.42842626, 0.42422341,
+    0.41994346, 0.41558638, 0.41115215,
+    0.40664011, 0.40204917, 0.39738103,
+    0.39263579, 0.38781353, 0.38291438,
+    0.37793850, 0.37288606, 0.36775726,
+    0.36255223, 0.35726893, 0.35191009,
+    0.34647607, 0.34096730, 0.33538426,
+    0.32972749, 0.32399761, 0.31819529,
+    0.31232133, 0.30637661, 0.30036211,
+    0.29427888, 0.28812650, 0.28190832,
+    0.27562602, 0.26928147, 0.26287683,
+    0.25641457, 0.24989748, 0.24332878,
+    0.23671214, 0.23005179, 0.22335258,
+    0.21662012, 0.20986086, 0.20308229,
+    0.19629307, 0.18950326, 0.18272455,
+    0.17597055, 0.16925712, 0.16260273,
+    0.15602894, 0.14956101, 0.14322828,
+    0.13706449, 0.13110864, 0.12540538,
+    0.12000532, 0.11496505, 0.11034678,
+    0.10621724, 0.10264590, 0.09970219,
+    0.09745186, 0.09595277, 0.09525046,
+    0.09537439, 0.09633538, 0.09812496,
+    0.10071680, 0.10407067, 0.10813094,
+    0.11283773, 0.11812832, 0.12394051,
+    0.13021494, 0.13689671, 0.14393620,
   };
 
   // It would be nice if Matrix had a ctor allowing to do the
@@ -412,6 +412,18 @@
   return cmap;
 }
 
+/*
+## Test default colormap returns as 256 color viridis
+%!test
+%! hf = figure ("visible", "off");
+%! unwind_protect
+%!   hax = axes ("parent", hf);
+%!   assert (get (hax, "colormap"), viridis (256), eps);   
+%! unwind_protect_cleanup
+%!   delete (hf);
+%! end_unwind_protect
+*/
+
 static double
 default_screendepth ()
 {
--- a/libinterp/corefcn/interpreter.cc	Sun Dec 31 20:29:18 2023 -0500
+++ b/libinterp/corefcn/interpreter.cc	Wed Jan 03 10:59:52 2024 -0500
@@ -455,8 +455,8 @@
     m_gh_manager (nullptr),
     m_interactive (false),
     m_read_site_files (true),
-    m_read_init_files (m_app_context != nullptr),
-    m_verbose (false),
+    m_read_user_files (m_app_context != nullptr),
+    m_init_trace (false),
     m_traditional (false),
     m_inhibit_startup_message (false),
     m_load_path_initialized (false),
@@ -1100,8 +1100,8 @@
 interpreter::execute_startup_files ()
 {
   bool read_site_files = m_read_site_files;
-  bool read_init_files = m_read_init_files;
-  bool verbose = m_verbose;
+  bool read_user_files = m_read_user_files;
+  bool trace = m_init_trace;
   bool inhibit_startup_message = m_inhibit_startup_message;
 
   if (m_app_context)
@@ -1109,12 +1109,12 @@
       const cmdline_options& options = m_app_context->options ();
 
       read_site_files = options.read_site_files ();
-      read_init_files = options.read_init_files ();
-      verbose = options.verbose_flag ();
+      read_user_files = options.read_user_files ();
+      trace = options.init_trace ();
       inhibit_startup_message = options.inhibit_startup_message ();
     }
 
-  verbose = (verbose && ! inhibit_startup_message);
+  trace = (trace && ! inhibit_startup_message);
 
   bool require_file = false;
 
@@ -1130,19 +1130,19 @@
       // $(prefix)/share/octave/$(version)/m/octaverc (if it exists).
 
       int status = safe_source_file (config::local_site_defaults_file (),
-                                     context, verbose, require_file);
+                                     context, trace, require_file);
 
       if (status)
         exit_status = status;
 
       status = safe_source_file (config::site_defaults_file (),
-                                 context, verbose, require_file);
+                                 context, trace, require_file);
 
       if (status)
         exit_status = status;
     }
 
-  if (read_init_files)
+  if (read_user_files)
     {
       // Try to execute commands from the Matlab compatible startup.m file
       // if it exists anywhere in the load path when starting Octave.
@@ -1179,7 +1179,7 @@
 
       if (! cfg_rc.empty ())
         {
-          int status = safe_source_file (cfg_rc, context, verbose,
+          int status = safe_source_file (cfg_rc, context, trace,
                                          require_file);
 
           if (status)
@@ -1205,7 +1205,7 @@
 
       if (! home_rc.empty ())
         {
-          int status = safe_source_file (home_rc, context, verbose,
+          int status = safe_source_file (home_rc, context, trace,
                                          require_file);
 
           if (status)
@@ -1229,7 +1229,7 @@
           if (local_rc.empty ())
             local_rc = sys::env::make_absolute (initfile);
 
-          int status = safe_source_file (local_rc, context, verbose,
+          int status = safe_source_file (local_rc, context, trace,
                                          require_file);
 
           if (status)
@@ -1237,7 +1237,7 @@
         }
     }
 
-  if (m_interactive && verbose)
+  if (m_interactive && trace)
     std::cout << std::endl;
 
   return exit_status;
--- a/libinterp/corefcn/interpreter.h	Sun Dec 31 20:29:18 2023 -0500
+++ b/libinterp/corefcn/interpreter.h	Wed Jan 03 10:59:52 2024 -0500
@@ -177,14 +177,26 @@
     m_read_site_files = flag;
   }
 
+  void read_user_files (bool flag)
+  {
+    m_read_user_files = flag;
+  }
+
+  OCTAVE_DEPRECATED (10, "interpreter::read_init_files is deprecated, use read_user_files")
   void read_init_files (bool flag)
   {
-    m_read_init_files = flag;
+    read_user_files (flag);
   }
 
+  void init_trace (bool flag)
+  {
+    m_init_trace = flag;
+  }
+
+  OCTAVE_DEPRECATED (10, "interpreter::verbose is deprecated, use init_trace")
   void verbose (bool flag)
   {
-    m_verbose = flag;
+    init_trace (flag);
   }
 
   void traditional (bool flag)
@@ -638,9 +650,9 @@
 
   bool m_read_site_files;
 
-  bool m_read_init_files;
+  bool m_read_user_files;
 
-  bool m_verbose;
+  bool m_init_trace;
 
   bool m_traditional;
 
--- a/libinterp/octave.cc	Sun Dec 31 20:29:18 2023 -0500
+++ b/libinterp/octave.cc	Wed Jan 03 10:59:52 2024 -0500
@@ -98,7 +98,7 @@
           break;
 
         case 'V':
-          m_verbose_flag = true;
+          m_init_trace = true;
           break;
 
         // FIXME: Disabled debug option for parser 2023-12-29.
@@ -119,7 +119,7 @@
           break;
 
         case 'f':
-          m_read_init_files = false;
+          m_read_user_files = false;
           m_read_site_files = false;
           break;
 
@@ -192,8 +192,8 @@
           m_forced_line_editing = m_line_editing = true;
           break;
 
-        case NO_INIT_FILE_OPTION:
-          m_read_init_files = false;
+        case NO_INIT_USER_OPTION:
+          m_read_user_files = false;
           break;
 
         case NO_INIT_PATH_OPTION:
@@ -204,7 +204,7 @@
           m_line_editing = false;
           break;
 
-        case NO_SITE_FILE_OPTION:
+        case NO_INIT_SITE_OPTION:
           m_read_site_files = false;
           break;
 
@@ -256,12 +256,16 @@
   m.assign ("no_window_system", no_window_system ());
   m.assign ("persist", persist ());
   m.assign ("read_history_file", read_history_file ());
-  m.assign ("read_init_files", read_init_files ());
+  // FIXME: read_init_files deprecated in Octave 10 in favor of read_user_files
+  m.assign ("read_init_files", read_user_files ());
+  m.assign ("read_user_files", read_user_files ());
   m.assign ("read_site_files", read_site_files ());
   m.assign ("server", server ());
   m.assign ("set_initial_path", set_initial_path ());
   m.assign ("traditional", traditional ());
-  m.assign ("verbose_flag", verbose_flag ());
+  m.assign ("init_trace", init_trace ());
+  // FIXME: --verbose deprecated in Octave 10.  Remove in Octave 12.
+  m.assign ("verbose", init_trace ());
   m.assign ("code_to_eval", code_to_eval ());
   m.assign ("command_line_path", string_vector (command_line_path ()));
   m.assign ("docstrings_file", docstrings_file ());
@@ -469,12 +473,12 @@
 For example, if you invoked Octave using the command
 
 @example
-octave --no-line-editing --silent
+octave --no-line-editing --quiet
 @end example
 
 @noindent
 @code{argv} would return a cell array of strings with the elements
-@option{--no-line-editing} and @option{--silent}.
+@option{--no-line-editing} and @option{--quiet}.
 
 If you write an executable Octave script, @code{argv} will return the list
 of arguments passed to the script.  @xref{Executable Octave Programs}, for
--- a/libinterp/octave.h	Sun Dec 31 20:29:18 2023 -0500
+++ b/libinterp/octave.h	Wed Jan 03 10:59:52 2024 -0500
@@ -67,12 +67,17 @@
   bool no_window_system () const { return m_no_window_system; }
   bool persist () const { return m_persist; }
   bool read_history_file () const { return m_read_history_file; }
-  bool read_init_files () const { return m_read_init_files; }
   bool read_site_files () const { return m_read_site_files; }
+  bool read_user_files () const { return m_read_user_files; }
+  OCTAVE_DEPRECATED (10, "cmdline_options::read_init_files is deprecated, use read_user_files")
+  bool read_init_files () const { return m_read_user_files; }
   bool server () const { return m_server; }
   bool set_initial_path () const { return m_set_initial_path; }
   bool traditional () const { return m_traditional; }
-  bool verbose_flag () const { return m_verbose_flag; }
+
+  OCTAVE_DEPRECATED (10, "cmdline_options::verbose is deprecated, use init_trace")
+  bool verbose () const { return m_init_trace; }
+  bool init_trace () const { return m_init_trace; }
   std::string code_to_eval () const { return m_code_to_eval; }
   std::list<std::string> command_line_path () const
   { return m_command_line_path; }
@@ -99,12 +104,18 @@
   void no_window_system (bool arg) { m_no_window_system = arg; }
   void persist (bool arg) { m_persist = arg; }
   void read_history_file (bool arg) { m_read_history_file = arg; }
-  void read_init_files (bool arg) { m_read_init_files = arg; }
+  // FIXME: Alias for read_user_files() introduced in Octave 10.
+  // Remove at some point in the future.
   void read_site_files (bool arg) { m_read_site_files = arg; }
+  void read_user_files (bool arg) { m_read_user_files = arg; }
+  OCTAVE_DEPRECATED (10, "cmdline_options::read_init_files is deprecated, use read_user_files")
+  void read_init_files (bool arg) { read_user_files (arg); }
   void server (bool arg) { m_server = arg; }
   void set_initial_path (bool arg) { m_set_initial_path = arg; }
   void traditional (bool arg) { m_traditional = arg; }
-  void verbose_flag (bool arg) { m_verbose_flag = arg; }
+  OCTAVE_DEPRECATED (10, "cmdline_options::verbose is deprecated, use init_trace")
+  void verbose (bool arg) { m_init_trace = arg; }
+  void init_trace (bool arg) { m_init_trace = arg; }
   void code_to_eval (const std::string& arg) { m_code_to_eval = arg; }
   void command_line_path (const std::list<std::string>& arg)
   { m_command_line_path = arg; }
@@ -163,11 +174,11 @@
   bool m_read_history_file = true;
 
   // TRUE means we read ~/.octaverc and ./.octaverc.
-  // (--norc; --no-init-file; -f)
-  bool m_read_init_files = true;
+  // (--no-init-user; --no-init-file; --norc; -f)
+  bool m_read_user_files = true;
 
   // TRUE means we read the site-wide octaverc files.
-  // (--norc; --no-site-file; -f)
+  // (--no-init-site; --no-site-file; --norc; -f)
   bool m_read_site_files = true;
 
   // If TRUE, start the command server.
@@ -182,9 +193,10 @@
   // (--traditional)
   bool m_traditional = false;
 
-  // If TRUE, print verbose info in some cases.
-  // (--verbose; -V)
-  bool m_verbose_flag = false;
+  // If TRUE, print trace of files read during initialization
+  // (--init-trace, --verbose; -V)
+  // FIXME: --verbose and -V will eventually be deprecated and removed.
+  bool m_init_trace = false;
 
   // The code to evaluate at startup
   // (--eval CODE)
--- a/libinterp/options.h	Sun Dec 31 20:29:18 2023 -0500
+++ b/libinterp/options.h	Wed Jan 03 10:59:52 2024 -0500
@@ -46,10 +46,10 @@
 #define INFO_PROG_OPTION 7
 #define LINE_EDITING_OPTION 8
 #define NO_GUI_LIBS_OPTION 9
-#define NO_INIT_FILE_OPTION 10
+#define NO_INIT_USER_OPTION 10
 #define NO_INIT_PATH_OPTION 11
 #define NO_LINE_EDITING_OPTION 12
-#define NO_SITE_FILE_OPTION 13
+#define NO_INIT_SITE_OPTION 13
 #define PERSIST_OPTION 14
 #define SERVER_OPTION 15
 #define TEXI_MACROS_FILE_OPTION 16
@@ -81,16 +81,23 @@
   { "info-file",                octave_required_arg, nullptr, INFO_FILE_OPTION },
   // Option for developers, not displayed in help
   { "info-program",             octave_required_arg, nullptr, INFO_PROG_OPTION },
+  // Option for developers, not displayed in help
+  { "init-trace",               octave_no_arg,       nullptr, 'V' },
   { "interactive",              octave_no_arg,       nullptr, 'i' },
   { "line-editing",             octave_no_arg,       nullptr, LINE_EDITING_OPTION },
   { "no-gui",                   octave_no_arg,       nullptr, 'G' },
   // Option for developers, not displayed in help
   { "no-gui-libs",              octave_no_arg,       nullptr, NO_GUI_LIBS_OPTION },
   { "no-history",               octave_no_arg,       nullptr, 'H' },
-  { "no-init-file",             octave_no_arg,       nullptr, NO_INIT_FILE_OPTION },
+  { "no-init-all",              octave_no_arg,       nullptr, 'f' },
+  // Alias for --no-init-user, not displayed in help
+  { "no-init-file",             octave_no_arg,       nullptr, NO_INIT_USER_OPTION },
   { "no-init-path",             octave_no_arg,       nullptr, NO_INIT_PATH_OPTION },
+  { "no-init-user",             octave_no_arg,       nullptr, NO_INIT_PATH_OPTION },
   { "no-line-editing",          octave_no_arg,       nullptr, NO_LINE_EDITING_OPTION },
-  { "no-site-file",             octave_no_arg,       nullptr, NO_SITE_FILE_OPTION },
+  { "no-init-site",             octave_no_arg,       nullptr, NO_INIT_SITE_OPTION },
+  // Alias for --no-init-site, not displayed in help
+  { "no-site-file",             octave_no_arg,       nullptr, NO_INIT_SITE_OPTION },
   { "no-window-system",         octave_no_arg,       nullptr, 'W' },
   { "norc",                     octave_no_arg,       nullptr, 'f' },
   { "path",                     octave_required_arg, nullptr, 'p' },
@@ -101,6 +108,7 @@
   // Option for developers, not displayed in help
   { "texi-macros-file",         octave_required_arg, nullptr, TEXI_MACROS_FILE_OPTION },
   { "traditional",              octave_no_arg,       nullptr, TRADITIONAL_OPTION },
+  // Alias for --init-trace, not displayed in help, eventually will be deprecated
   { "verbose",                  octave_no_arg,       nullptr, 'V' },
   { "version",                  octave_no_arg,       nullptr, 'v' },
   { nullptr,                    0,                   nullptr, 0 }
--- a/libinterp/usage.h	Sun Dec 31 20:29:18 2023 -0500
+++ b/libinterp/usage.h	Wed Jan 03 10:59:52 2024 -0500
@@ -36,11 +36,10 @@
 static const char *usage_string =
   "octave [-GHVWefghiqvx] [--echo-commands] [--eval CODE]\n\
        [--experimental-terminal-widget] [--gui] [--help] [--interactive]\n\
-       [--line-editing] [--no-gui] [--no-history] [--no-init-file]\n\
-       [--no-init-path] [--no-line-editing] [--no-site-file]\n\
-       [--no-window-system] [--norc] [--path path] [--persist] [--server]\n\
-       [--silent] [--traditional] [--verbose]\n\
-       [--version] [file]";
+       [--line-editing] [--no-gui] [--no-history] [--no-init-all]\n\
+       [--no-init-path] [--no-init-site] [--no-init-user]\n\
+       [--no-line-editing] [--no-window-system] [--path path] [--persist]\n\
+       [--quiet] [--server] [--traditional] [--version] [file]";
 
 // Usage message with extra help.
 
@@ -69,18 +68,18 @@
   --line-editing          Force readline use for command-line editing.\n\
   --no-gui, -G            Disable the graphical user interface.\n\
   --no-history, -H        Don't save commands to the history list\n\
-  --no-init-file          Don't read the ~/.octaverc or .octaverc files.\n\
+  --no-init-all, --norc, -f\n\
+                          Don't read any initialization files.\n\
   --no-init-path          Don't initialize function search path.\n\
+  --no-init-site          Don't read the site-wide octaverc files.\n\
+  --no-init-user          Don't read the ~/.octaverc or .octaverc files.\n\
   --no-line-editing       Don't use readline for command-line editing.\n\
-  --no-site-file          Don't read the site-wide octaverc file.\n\
   --no-window-system, -W  Disable window system, including graphics.\n\
-  --norc, -f              Don't read any initialization files.\n\
   --path PATH, -p PATH    Add PATH to head of function search path.\n\
   --persist               Go interactive after --eval or reading from FILE.\n\
   --server                Enter server mode at startup.\n\
-  --silent, --quiet, -q   Don't print message at startup.\n\
+  --quiet, --silent, -q   Don't print message at startup.\n\
   --traditional           Set variables for closer MATLAB compatibility.\n\
-  --verbose, -V           Enable verbose output in some cases.\n\
   --version, -v           Print version number and exit.\n\
 \n\
   FILE                    Execute commands from FILE.  Exit when done\n\
--- a/scripts/module.mk	Sun Dec 31 20:29:18 2023 -0500
+++ b/scripts/module.mk	Wed Jan 03 10:59:52 2024 -0500
@@ -151,7 +151,7 @@
 	    ! $(GREP) -q -E '^  *\<function\>' $$m || continue; \
 	    ! (echo $$m | $(GREP) -q __splinefit__.m) || continue; \
 	    echo "source ('$$m');"; \
-	  done ) | $(SHELL) run-octave --norc --silent --no-history
+	  done ) | $(SHELL) run-octave --norc --quiet --no-history
 .PHONY: check-missing-semicolon
 
 ## Include m-files in list of sources when building tag files.
--- a/src/main.in.cc	Sun Dec 31 20:29:18 2023 -0500
+++ b/src/main.in.cc	Wed Jan 03 10:59:52 2024 -0500
@@ -363,7 +363,7 @@
           break;
 
         case 'q':
-          // options "--silent" or "--quiet"
+          // options "--quiet" or "--silent"
           warn_display = false;
           new_argv[k++] = argv[old_optind];
           break;
--- a/src/mkoctfile.in.cc	Sun Dec 31 20:29:18 2023 -0500
+++ b/src/mkoctfile.in.cc	Wed Jan 03 10:59:52 2024 -0500
@@ -516,7 +516,7 @@
   "\n"
   "  -v, --verbose           Echo commands as they are executed.\n"
   "\n"
-  "  --silent                Ignored.  Intended to suppress output from\n"
+  "  --quiet                 Ignored.  Intended to suppress output from\n"
   "                          compiler steps.\n"
   "\n"
   "  FILE                    Compile or link FILE.  Recognized file types are:\n"
@@ -799,7 +799,8 @@
         {
           verbose = true;
         }
-      else if (arg == "-silent" ||  arg == "--silent")
+      else if (arg == "-silent" || arg == "--silent"
+               || arg == "-quiet" || arg == "--quiet")
         {
           // Ignored for now.
         }
--- a/test/Makefile.am	Sun Dec 31 20:29:18 2023 -0500
+++ b/test/Makefile.am	Wed Jan 03 10:59:52 2024 -0500
@@ -132,7 +132,7 @@
 # run-octave (optional-prepare-commands)
 
 define run-octave-tests
-  ( $(SHELL) ../run-octave $(RUN_OCTAVE_OPTIONS) --no-init-file --silent \
+  ( $(SHELL) ../run-octave $(RUN_OCTAVE_OPTIONS) --no-init-file --quiet  \
       --no-history -p $(abs_top_builddir)/test/mex \
       $(abs_top_srcdir)/test/fntests.m $(abs_top_srcdir)/test "$(1)" ) && \
   if $(AM_V_P); then \