Using Mogan and GNU TeXmacs on the same PC

CMakeLists.txt

@@ -717,14 +717,14 @@ add_subdirectory (TeXmacs)
 ### --------------------------------------------------------------------
 
 if (APPLE)
-  install (FILES packages/macos/TeXmacs.icns DESTINATION ${CMAKE_INSTALL_PREFIX})
+  install (FILES packages/macos/Xmacs.icns DESTINATION ${CMAKE_INSTALL_PREFIX})
   install (FILES packages/macos/TeXmacs-document.icns DESTINATION ${CMAKE_INSTALL_PREFIX})
   install (DIRECTORY src/Plugins/Cocoa/English.lproj DESTINATION ${CMAKE_INSTALL_PREFIX})
   install (DIRECTORY src/Plugins/Cocoa/zh_CN.lproj DESTINATION ${CMAKE_INSTALL_PREFIX})
 endif (APPLE)
 
 if (NOT WIN32)
-  install (FILES ${TEXMACS_BINARY_DIR}/misc/scripts/texmacs
+  install (FILES ${TEXMACS_BINARY_DIR}/misc/scripts/xmacs
                  ${TEXMACS_BINARY_DIR}/misc/scripts/fig2ps
                  misc/scripts/tm_gs
           DESTINATION bin

README.md

@@ -1,18 +1 @@
-# GNU TeXmacs
-[![Join the chat at https://gitter.im/texmacs/Lobby](https://badges.gitter.im/texmacs/Lobby.svg)](https://gitter.im/texmacs/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-[GNU TeXmacs](https://texmacs.org) is a free wysiwyw (what you see is what you want) editing platform with special features for scientists. The software aims to provide a unified and user friendly framework for editing structured documents with different types of content (text, graphics, mathematics, interactive content, etc.). The rendering engine uses high-quality typesetting algorithms so as to produce professionally looking documents, which can either be printed out or presented from a laptop.
-
-The software includes a text editor with support for mathematical formulas, a small technical picture editor and a tool for making presentations from a laptop. Moreover, TeXmacs can be used as an interface for many external systems for computer algebra, numerical analysis, statistics, etc. New presentation styles can be written by the user and new features can be added to the editor using the Scheme extension language. A native spreadsheet and tools for collaborative authoring are planned for later.
-
-TeXmacs runs on all major Unix platforms and Windows. Documents can be saved in TeXmacs, Xml or Scheme format and printed as Postscript or Pdf files. Converters exist for TeX/LaTeX and Html/Mathml. 
-
-## Documentation
-GNU TeXmacs is self-documented. You may browse the manual in the `Help` menu or browse the online [one](https://www.texmacs.org/tmweb/manual/web-manual.en.html).
-
-For developer, see [this](./COMPILE) to compile the project.
-
-## Contributing
-Please report any [new bugs](https://www.texmacs.org/tmweb/contact/bugs.en.html) and [suggestions](https://www.texmacs.org/tmweb/contact/wishes.en.html) to us. It is also possible to [subscribe](https://www.texmacs.org/tmweb/help/tmusers.en.html) to the <texmacs-users@texmacs.org> mailing list in order to get or give help from or to other TeXmacs users.
-
-You may contribute patches for TeXmacs using the [patch manager](http://savannah.gnu.org/patch/?group=texmacs) on Savannah or using the [pull request](https://github.com/texmacs/texmacs/pulls) on Github. Since we are using SVN on Savannah, PRs won't be directly accepted on Github. We will `git apply` the patch into SVN repo if the PR is accepted. And we will close the PR and change the title to `[SVN] xxx` after applying the PR.
+# Mogan Editor

TeXmacs/doc/about/xmacs/welcome.en.tm

@@ -0,0 +1,18 @@
+<TeXmacs|1.99.18>
+
+<style|<tuple|tmdoc|chinese|old-spacing|old-dots|old-lengths>>
+
+<\body>
+  <tmdoc-title|Welcome to <name|Xmacs>>
+
+  Please read the Chinese welcome document:
+  <hlink|\<#6B22\>\<#8FCE\>\<#4F7F\>\<#7528\><name|Xmacs>|welcome.zh.tm>.
+
+  Detailed release notes are available on
+  <hlink|Github|https://github.com/XmacsLabs/Xmacs/releases>.
+
+  <tmdoc-copyright|2020\U2021|<name|Xmacs> Labs>
+</body>
+
+<initial|<\collection>
+</collection>>

TeXmacs/doc/about/xmacs/welcome.zh.tm

@@ -0,0 +1,90 @@
+<TeXmacs|2.1>
+
+<style|<tuple|tmdoc|chinese|old-spacing|old-dots|old-lengths>>
+
+<\body>
+  <\hide-preamble>
+    <assign|xmacs-version|v2021.2-alpha2>
+  </hide-preamble>
+
+  <tmdoc-title|\<#6B22\>\<#8FCE\>\<#4F7F\>\<#7528\><name|Xmacs>
+  <value|xmacs-version>>
+
+  <name|Xmacs>\<#884D\>\<#751F\>\<#81EA\>GNU
+  <TeXmacs>\<#3002\>\<#4E0E\><TeXmacs>\<#6709\>\<#4EE5\>\<#4E0B\>\<#533A\>\<#522B\>\<#FF1A\>
+
+  <\itemize>
+    <item>\<#6E90\>\<#4EE3\>\<#7801\>\<#FF1A\><name|Xmacs>\<#4F1A\>\<#57FA\>\<#4E8E\>\<#67D0\>\<#4E00\>\<#4E2A\>\<#7248\>\<#672C\>\<#7684\><TeXmacs>\<#5B9A\>\<#5236\>\<#FF0C\>\<#9075\>\<#5FAA\>GPL
+    v3\<#5F00\>\<#6E90\>\<#534F\>\<#8BAE\>\<#FF0C\>\<#6BD4\>\<#5982\>\<#60A8\>\<#73B0\>\<#5728\>\<#6B63\>\<#5728\>\<#4F7F\>\<#7528\>\<#7684\><name|Xmacs>
+    <value|xmacs-version>\<#57FA\>\<#4E8E\><TeXmacs> <TeXmacs-version>
+
+    <item>\<#754C\>\<#9762\>\<#FF1A\>\<#4F7F\>\<#7528\>Qt
+    5\<#800C\>\<#975E\>Qt 4
+
+    <item>\<#4F1A\>\<#5458\>\<#670D\>\<#52A1\>:
+    \<#6682\>\<#65F6\>\<#4E2D\>\<#6B62\>\<#FF0C\>\<#60A8\>\<#4ECD\>\<#53EF\>\<#4EE5\>\<#901A\>\<#8FC7\>\<#6350\>\<#8D60\>\<#7B49\>\<#65B9\>\<#5F0F\>\<#652F\>\<#6301\><name|Xmacs>\<#5B9E\>\<#9A8C\>\<#5BA4\>
+  </itemize>
+
+  <section|\<#7279\>\<#6027\>\<#4E00\>\<#89C8\>>
+
+  <\itemize>
+    <item><strong|\<#5B8C\>\<#5168\>\<#517C\>\<#5BB9\>GNU <TeXmacs>
+    v<TeXmacs-version>\<#FF0C\>\<#5185\>\<#5D4C\>Guile 3.0.7>
+
+    <item><strong|\<#754C\>\<#9762\>\<#FF1A\>\<#4F7F\>\<#7528\>Qt
+    5.15.2\<#6784\>\<#5EFA\>>
+
+    <item>\<#754C\>\<#9762\>\<#FF1A\>\<#652F\>\<#6301\>\<#9F20\>\<#6807\>\<#6EDA\>\<#8F6E\>\<#653E\>\<#5927\>\<#548C\>\<#7F29\>\<#5C0F\>
+
+    <item><strong|\<#754C\>\<#9762\>\<#FF1A\><menu|Tools|Miscellaneous|Show
+    key presses>\<#652F\>\<#6301\>\<#663E\>\<#793A\>\<#4E2D\>\<#6587\>\<#8F93\>\<#5165\>>
+
+    <item><strong|\<#7F16\>\<#8F91\>\<#FF1A\>\<#4E34\>\<#65F6\>\<#89E3\>\<#51B3\>\<#4E86\>Windows\<#5E73\>\<#53F0\>\<#8F93\>\<#5165\>\<#6CD5\>\<#968F\>\<#673A\>\<#63D0\>\<#4EA4\>\<#82F1\>\<#6587\>\<#5B57\>\<#6BCD\>\<#7684\>\<#95EE\>\<#9898\>>
+
+    <item>\<#7248\>\<#672C\>\<#FF1A\><menu|version|history>\<#652F\>\<#6301\>\<#67E5\>\<#770B\>\<#91CD\>\<#547D\>\<#540D\>\<#8FC7\>\<#540E\>\<#7684\>\<#6587\>\<#4EF6\>\<#5386\>\<#53F2\>\<#8BB0\>\<#5F55\>
+
+    <item><strong|\<#63D2\>\<#4EF6\>\<#FF1A\>\<#5185\>\<#7F6E\>Quiver\<#63D2\>\<#4EF6\>\<#FF0C\>\<#652F\>\<#6301\>\<#76F4\>\<#63A5\>\<#7C98\>\<#8D34\>Quiver\<#5E73\>\<#53F0\>\<#5BFC\>\<#51FA\>\<#7684\><LaTeX>\<#7ED8\>\<#5236\>\<#4EA4\>\<#6362\>\<#56FE\>>
+
+    <item>\<#63D2\>\<#4EF6\>\<#FF1A\>\<#81EA\>\<#52A8\>\<#68C0\>\<#6D4B\>gnuplot\<#FF0C\>Asymptote\<#548C\>Graphviz\<#7684\>\<#4E8C\>\<#8FDB\>\<#5236\>\<#6587\>\<#4EF6\>
+
+    <item>\<#63D2\>\<#4EF6\>\<#FF1A\>\<#81EA\>\<#52A8\>\<#68C0\>\<#6D4B\>Octave
+    6.x\<#FF0C\>\<#5E76\>\<#4FEE\>\<#590D\>Octave\<#63D2\>\<#4EF6\>\<#65E0\>\<#6CD5\>\<#542F\>\<#52A8\>\<#7684\>\<#95EE\>\<#9898\>
+
+    <item>\<#63D2\>\<#4EF6\>\<#FF1A\>\<#5B8C\>\<#6210\>SageMath\<#63D2\>\<#4EF6\>\<#5728\>Windows\<#5E73\>\<#53F0\>\<#7684\>\<#9002\>\<#914D\>
+
+    <item>\<#63D2\>\<#4EF6\>\<#FF1A\>\<#5B8C\>\<#6210\>Eukleides\<#63D2\>\<#4EF6\>\<#5728\>Windows\<#5E73\>\<#53F0\>\<#7684\>\<#9002\>\<#914D\>
+
+    <item>\<#4E2D\>\<#6587\>\<#FF1A\>\<#672C\>\<#5730\>\<#6587\>\<#4EF6\>\<#94FE\>\<#63A5\>\<#652F\>\<#6301\>\<#4E2D\>\<#6587\>\<#6587\>\<#4EF6\>\<#540D\>
+
+    <item>\<#4E2D\>\<#6587\>\<#FF1A\>\<#5728\>\<#4F7F\>\<#7528\>\<#4E2D\>\<#6587\>\<#4F5C\>\<#4E3A\>\<#6587\>\<#6863\>\<#8BED\>\<#8A00\>\<#65F6\>\<#FF0C\>\<#4E0D\>\<#81EA\>\<#52A8\>\<#7FFB\>\<#8BD1\>\<#7B97\>\<#6CD5\>\<#548C\>\<#4F2A\>\<#4EE3\>\<#7801\>\<#4E2D\>\<#7684\>\<#5173\>\<#952E\>\<#5B57\>
+
+    <item><strong|\<#754C\>\<#9762\>\<#FF1A\>\<#6539\>\<#5584\>SVG\<#652F\>\<#6301\>>
+  </itemize>
+
+  \<#4EE5\>\<#4E0A\>\<#7279\>\<#6027\>\<#4E2D\>\<#FF0C\>\<#672A\>\<#52A0\>\<#7C97\>\<#7684\>\<#7279\>\<#6027\>\<#FF0C\>\<#8868\>\<#793A\>\<#5DF2\>\<#7ECF\>\<#5C06\>\<#6539\>\<#8FDB\>\<#63D0\>\<#4EA4\>\<#5E76\>\<#5408\>\<#5E76\>\<#81F3\><TeXmacs>\<#5B98\>\<#65B9\>\<#5F00\>\<#6E90\>\<#7248\>\<#672C\>\<#FF0C\>\<#80FD\>\<#591F\>\<#5728\>\<#4E0B\>\<#4E00\>\<#4E2A\>\<#7248\>\<#672C\>\<#4E2D\>\<#4F7F\>\<#7528\>\<#3002\>
+
+  <section|\<#7279\>\<#6027\>\<#8BF4\>\<#660E\>>
+
+  Xmacs <value|xmacs-version>\<#6682\>\<#65F6\>\<#53EA\>\<#53D1\>\<#5E03\>Windows\<#5E73\>\<#53F0\>\<#5B89\>\<#88C5\>\<#5305\>\<#FF0C\>\<#4EE5\>\<#4F9B\>\<#7528\>\<#6237\>\<#6D4B\>\<#8BD5\>GNU
+  <TeXmacs> 2.1\<#7684\>\<#65B0\>\<#529F\>\<#80FD\>\<#FF0C\>\<#5E76\>\<#7EE7\>\<#7EED\>\<#4F7F\>\<#7528\>Xmacs\<#4E4B\>\<#524D\>\<#63D0\>\<#4F9B\>\<#7684\>\<#989D\>\<#5916\>\<#529F\>\<#80FD\>\<#3002\>
+
+  <paragraph|SageMath\<#63D2\>\<#4EF6\>>
+
+  \<#5728\>Windows\<#5E73\>\<#53F0\>\<#5B89\>\<#88C5\>SageMath\<#7684\>\<#65F6\>\<#5019\>\<#FF0C\>\<#8BF7\>\<#4F7F\>\<#7528\>\<#7BA1\>\<#7406\>\<#5458\>\<#6743\>\<#9650\>\<#FF0C\>\<#4E3A\>\<#6240\>\<#6709\>\<#7528\>\<#6237\>\<#5B89\>\<#88C5\>\<#3002\>
+
+  <section|\<#4F1A\>\<#5458\>\<#670D\>\<#52A1\>>
+
+  \<#6682\>\<#65F6\>\<#4E2D\>\<#6B62\>\<#3002\>\<#6211\>\<#4EEC\>\<#4ECD\>\<#65E7\>\<#63A5\>\<#53D7\>\<#6350\>\<#6B3E\>\<#FF0C\>\<#5C0F\>\<#989D\>\<#6350\>\<#8D60\>\<#8BF7\>\<#901A\>\<#8FC7\>Gitee\<#FF0C\>\<#5E73\>\<#53F0\>\<#4F1A\>\<#6536\>\<#53D6\>\<#5C0F\>\<#90E8\>\<#5206\>\<#624B\>\<#7EED\>\<#8D39\>\<#3002\>\<#5927\>\<#989D\>\<#6350\>\<#8D60\>\<#8BF7\>\<#8054\>\<#7CFB\>\<#5FAE\>\<#4FE1\>\<#53F7\>XmacsLabs\<#548C\>\<#5FAE\>\<#4FE1\>\<#516C\>\<#4F17\>\<#53F7\>Xmacs\<#3002\>
+
+  <section|\<#8054\>\<#7CFB\>\<#6211\>\<#4EEC\>>
+
+  <\big-table|<tabular|<tformat|<cwith|1|1|1|-1|cell-background|#ffa>|<cwith|2|-1|1|-1|cell-halign|c>|<table|<row|<cell|\<#6E20\>\<#9053\>>|<cell|\<#5907\>\<#6CE8\>>>|<row|<cell|\<#90AE\>\<#7BB1\>>|<cell|sadhen@zoho.com.cn>>|<row|<cell|\<#5FAE\>\<#4FE1\>\<#516C\>\<#4F17\>\<#53F7\>>|<cell|Xmacs>>|<row|<cell|\<#5FAE\>\<#4FE1\>\<#53F7\>>|<cell|XmacsLabs>>|<row|<cell|GNU
+  <TeXmacs>\<#4E2D\>\<#6587\>\<#793E\>\<#533A\>QQ\<#7FA4\>>|<cell|934456971>>>>>>
+    \<#8054\>\<#7CFB\>\<#65B9\>\<#5F0F\>
+  </big-table>
+
+  <tmdoc-copyright|2020-2021<strong|>|<name|Xmacs> Labs>
+</body>
+
+<initial|<\collection>
+</collection>>

TeXmacs/progs/doc/help-menu.scm

@@ -30,6 +30,9 @@
        (load-help-article (string-append name))))))
 
 (menu-bind help-menu
+  (when (url-exists-in-help? "about/xmacs/welcome.zh.tm")
+        ("Xmacs" (load-help-buffer "about/xmacs/welcome"))
+        ---)
   (when (url-exists-in-help? "about/welcome/new-welcome.en.tm")
 	("Welcome" (load-help-article "about/welcome/new-welcome"))
 	("Getting started" (load-help-article "about/welcome/start"))

misc/CMakeLists.txt

@@ -1,4 +1,4 @@
-configure_file(scripts/texmacs.in ${TEXMACS_BINARY_DIR}/misc/scripts/texmacs @ONLY)
+configure_file(scripts/texmacs.in ${TEXMACS_BINARY_DIR}/misc/scripts/xmacs @ONLY)
 configure_file(scripts/fig2ps.in ${TEXMACS_BINARY_DIR}/misc/scripts/fig2ps @ONLY)
 configure_file(man/texmacs.1.in ${TEXMACS_SOURCE_DIR}/misc/man/texmacs.1 @ONLY)
 

misc/scripts/texmacs.in

@@ -35,4 +35,4 @@ PATH="$TEXMACS_BIN_PATH/bin:$PATH"
 @CONFIG_LIB_PATH@="$TEXMACS_BIN_PATH/lib${@CONFIG_LIB_PATH@+":$@CONFIG_LIB_PATH@"}"
 export PATH @CONFIG_LIB_PATH@
 
-exec texmacs.bin "$@" < /dev/null
+exec xmacs.bin "$@" < /dev/null

packages/macos/Info.plist.in

@@ -26,15 +26,15 @@
       </dict>
     </array>
     <key>CFBundleExecutable</key>
-    <string>TeXmacs</string>
+    <string>Xmacs</string>
     <key>CFBundleIconFile</key>
-    <string>TeXmacs</string>
+    <string>Xmacs</string>
     <key>CFBundleIdentifier</key>
-    <string>org.texmacs.TeXmacs</string>
+    <string>net.xmacs.Xmacs</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>
-    <string>TeXmacs</string>
+    <string>Xmacs</string>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
@@ -60,6 +60,6 @@
     <key>NSRequiresAquaSystemAppearance</key>
     <string>true</string>
     <key>NSHumanReadableCopyright</key>
-    <string>Copyright © 1998-2019 Joris van der Hoeven and others</string>
+    <string>Copyright © 2020-2021 Xmacs Labs</string>
   </dict>
 </plist>

packages/macos/icon.sh

@@ -0,0 +1,79 @@
+#!/bin/bash
+# Creates an icns file from a source image
+
+src_image="$1"
+if [ -z "$1" ]; then
+    echo "No source image was passed to this script"
+    exit 1
+fi
+
+icns_name="$2"
+if [ -z "$2" ]; then
+    icns_name="iconbuilder"
+fi
+
+if [ "${src_image:(-3)}" != "png" ]; then
+    echo "Source image is not a PNG, making a converted copy..."
+    /usr/bin/sips -s format png "$src_image" --out "${src_image}.png"
+    if [ $? -ne 0 ]; then
+        echo "The source image could not be converted to PNG format."
+        exit 1
+    fi
+    src_image="${src_image}.png"
+fi
+
+iconset_path="./${icns_name}.iconset"
+if [ -e "$iconset_path" ]; then
+    /bin/rm -r "$iconset_path"
+    if [ $? -ne 0 ]; then
+        echo "There is a pre-existing file/dir $iconset_path the could not be deleted"
+        exit 1
+    fi
+fi
+
+/bin/mkdir "$iconset_path"
+
+icon_file_list=(
+    "icon_16x16.png"
+    "icon_16x16@2x.png"
+    "icon_32x32.png"
+    "icon_32x32@2x.png"
+    "icon_128x128.png"
+    "icon_128x128@2x.png"
+    "icon_256x256.png"
+    "icon_256x256@2x.png"
+    "icon_512x512.png"
+    "icon_512x512@2x.png"
+    )
+
+icon_size=(
+    '16'
+    '32'
+    '32'
+    '64'
+    '128'
+    '256'
+    '256'
+    '512'
+    '512'
+    '1024'
+    )
+
+counter=0    
+for a in ${icon_file_list[@]}; do
+    icon="${iconset_path}/${a}"
+    /bin/cp "$src_image" "$icon"
+    icon_size=${icon_size[$counter]}
+    /usr/bin/sips -z $icon_size $icon_size "$icon"
+    counter=$(($counter + 1))
+done
+
+echo "Creating .icns file from $iconset_path"
+/usr/bin/iconutil -c icns "$iconset_path"
+if [ $? -ne 0 ]; then
+    echo "There was an error creating the .icns file"
+    exit 1
+fi
+
+echo "Done"
+exit 0

src/CMakeLists.txt

@@ -3,11 +3,11 @@
 ### --------------------------------------------------------------------
 
 if (APPLE)
-  set (TeXmacs_binary_name "TeXmacs")
+  set (TeXmacs_binary_name "Xmacs")
 elseif (WIN32)
-  set (TeXmacs_binary_name "texmacs")
+  set (TeXmacs_binary_name "xmacs")
 else (APPLE)
-  set (TeXmacs_binary_name "texmacs.bin")
+  set (TeXmacs_binary_name "xmacs.bin")
 endif (APPLE)
 
 add_library(texmacs_body STATIC ${TeXmacs_All_SRCS})

src/Texmacs/Texmacs/texmacs.cpp

@@ -571,12 +571,12 @@ immediate_options (int argc, char** argv) {
   {
     if (get_env ("HOME") == "")
         set_env ("HOME", get_env("USERPROFILE"));
-    set_env ("TEXMACS_HOME_PATH", get_env ("APPDATA") * "\\TeXmacs");
+    set_env ("TEXMACS_HOME_PATH", get_env ("APPDATA") * "\\Xmacs");
 	}
 #elif defined(OS_HAIKU)
-    set_env ("TEXMACS_HOME_PATH", get_env ("HOME") * "/config/settings/TeXmacs");
+    set_env ("TEXMACS_HOME_PATH", get_env ("HOME") * "/config/settings/Xmacs");
 #else
-    set_env ("TEXMACS_HOME_PATH", get_env ("HOME") * "/.TeXmacs");
+    set_env ("TEXMACS_HOME_PATH", get_env ("HOME") * "/.Xmacs");
 #endif
   if (get_env ("TEXMACS_HOME_PATH") == "") return;
   for (int i=1; i<argc; i++) {
@@ -695,7 +695,7 @@ main (int argc, char** argv) {
 #endif
   TeXmacs_init_paths (argc, argv);
 #ifdef QTTEXMACS
-  qtmapp->set_window_icon("/misc/images/texmacs-512.png");
+  qtmapp->set_window_icon("/misc/images/xmacs-512.png");
 #endif
   //cout << "Bench  ] Started TeXmacs\n";
   the_et     = tuple ();