texmacs.cpp (TeXmacs-2.1.1-src) | : | texmacs.cpp (TeXmacs-2.1.2-src) | ||
---|---|---|---|---|
skipping to change at line 479 | skipping to change at line 479 | |||
exec_delayed (scheme_cmd (cmd)); | exec_delayed (scheme_cmd (cmd)); | |||
} | } | |||
if ((s == "-c") || (s == "-convert")) i+=2; | if ((s == "-c") || (s == "-convert")) i+=2; | |||
else if ((s == "-b") || (s == "-initialize-buffer") || | else if ((s == "-b") || (s == "-initialize-buffer") || | |||
(s == "-fn") || (s == "-font") || | (s == "-fn") || (s == "-font") || | |||
(s == "-i") || (s == "-initialize") || | (s == "-i") || (s == "-initialize") || | |||
(s == "-g") || (s == "-geometry") || | (s == "-g") || (s == "-geometry") || | |||
(s == "-x") || (s == "-execute") || | (s == "-x") || (s == "-execute") || | |||
(s == "-log-file") || | (s == "-log-file") || | |||
(s == "-build-manual") || | (s == "-build-manual") || | |||
(s == "-reference-suite") || (s == "-test-suite")) {} | (s == "-reference-suite") || (s == "-test-suite")) {i++;} | |||
} | } | |||
if (install_status == 1) { | if (install_status == 1) { | |||
if (DEBUG_STD) debug_boot << "Loading welcome message...\n"; | if (DEBUG_STD) debug_boot << "Loading welcome message...\n"; | |||
string cmd= "(load-help-article \"about/welcome/new-welcome\")"; | string cmd= "(load-help-article \"about/welcome/new-welcome\")"; | |||
// FIXME: force to load welcome message into new window | // FIXME: force to load welcome message into new window | |||
exec_delayed (scheme_cmd (cmd)); | exec_delayed (scheme_cmd (cmd)); | |||
} | } | |||
else if (install_status == 2) { | else if (install_status == 2) { | |||
if (DEBUG_STD) debug_boot << "Loading upgrade message...\n"; | if (DEBUG_STD) debug_boot << "Loading upgrade message...\n"; | |||
url u= "tmfs://help/plain/tm/doc/about/changes/changes-recent.en.tm"; | url u= "tmfs://help/plain/tm/doc/about/changes/changes-recent.en.tm"; | |||
skipping to change at line 667 | skipping to change at line 667 | |||
#ifdef OS_MINGW | #ifdef OS_MINGW | |||
nowide::args a(argc,argv); // Fix arguments - make them UTF-8 | nowide::args a(argc,argv); // Fix arguments - make them UTF-8 | |||
#endif | #endif | |||
original_path= get_env ("PATH"); | original_path= get_env ("PATH"); | |||
boot_hacks (); | boot_hacks (); | |||
windows_delayed_refresh (1000000000); | windows_delayed_refresh (1000000000); | |||
immediate_options (argc, argv); | immediate_options (argc, argv); | |||
load_user_preferences (); | load_user_preferences (); | |||
string theme= get_user_preference ("gui theme", "default"); | string theme= get_user_preference ("gui theme", "default"); | |||
#ifdef OS_MACOS | #if defined(OS_MACOS) && !defined(__arm64__) | |||
if (theme == "default") theme= ""; | if (theme == "default") theme= ""; | |||
#else | #else | |||
if (theme == "default") theme= "light"; | if (theme == "default") theme= "light"; | |||
#endif | #endif | |||
if (theme == "light") | if (theme == "light") | |||
tm_style_sheet= "$TEXMACS_PATH/misc/themes/standard-light.css"; | tm_style_sheet= "$TEXMACS_PATH/misc/themes/standard-light.css"; | |||
else if (theme == "dark") | else if (theme == "dark") | |||
tm_style_sheet= "$TEXMACS_PATH/misc/themes/standard-dark.css"; | tm_style_sheet= "$TEXMACS_PATH/misc/themes/standard-dark.css"; | |||
else if (theme != "") | else if (theme != "") | |||
tm_style_sheet= theme; | tm_style_sheet= theme; | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |