Merge pull request #2 from kpeeters/master

Sync with upstream

Author: cbehan

client_server/CMakeLists.txt

@@ -272,6 +272,6 @@ if(NOT MSVC)
 	 FILES
 	 ../man/man1/cadabra-server.1
 	 DESTINATION
-	 man/man1
+	 share/man/man1
 	 )
 endif()

core/CMakeLists.txt

@@ -420,6 +420,14 @@ if (MSVC AND NOT INSTALL_TARGETS_ONLY)
 	install_dlls_from("core")
 endif()
 
+add_custom_target(deduplicate
+                  COMMAND rm -f "\$(DESTDIR)${CMAKE_INSTALL_PREFIX}/man/man1/cadabra2.1"
+                  COMMAND rm -f "\$(DESTDIR)${CMAKE_INSTALL_PREFIX}/man/man1/cadabra2cadabra.1"
+                  COMMAND rm -f "\$(DESTDIR)${CMAKE_INSTALL_PREFIX}/man/man1/cadabra2html.1"
+                  COMMAND rm -f "\$(DESTDIR)${CMAKE_INSTALL_PREFIX}/man/man1/cadabra2python.1"
+                  COMMAND rm -f "\$(DESTDIR)${CMAKE_INSTALL_PREFIX}/man/man1/cadabra2-gtk.1"
+                  COMMAND rm -f "\$(DESTDIR)${CMAKE_INSTALL_PREFIX}/man/man1/cadabra-server.1")
+
 # manual pages
 if(NOT MSVC)
   install(
@@ -429,6 +437,6 @@ if(NOT MSVC)
 	 ../man/man1/cadabra2html.1
 	 ../man/man1/cadabra2python.1	 
 	 DESTINATION
-	 man/man1
+	 share/man/man1
 	 )
 endif()

core/cadabra2_defaults.py.in

@@ -13,8 +13,9 @@ import cadabra2
 from cadabra2 import *
 from importlib.machinery import PathFinder, ModuleSpec, SourceFileLoader
 from importlib.abc import MetaPathFinder
-from cdb_appdirs import user_config_dir
+from cdb_appdirs import user_config_dir, user_data_dir
 import datetime
+import atexit
 
 __cdbkernel__=cadabra2.__cdbkernel__
 import os
@@ -160,6 +161,22 @@ try:
 except ImportError:
     have_matplotlib=False
 
+def save_history(history_path):
+    try:
+        readline.write_history_file(history_path)
+    except:
+        pass
+
+try:
+    import readline
+    history_path = os.path.join(user_data_dir(), "cadabra_history")
+    if os.path.exists(history_path):
+        readline.read_history_file(history_path)
+        readline.set_history_length(1000)
+    atexit.register(save_history, history_path)
+except:
+    pass
+
 import io
 import base64
 

core/properties/PartialDerivative.cnb

@@ -1,5 +1,5 @@
 {
-	"cell_id" : 17591436373968656652,
+	"cell_id" : 5894066773150673170,
 	"cells" : 
 	[
 		{
@@ -95,6 +95,15 @@
 							"cell_id" : 9223372036854775820,
 							"cell_origin" : "server",
 							"cell_type" : "input_form",
+							"cells" : 
+							[
+								{
+									"cell_id" : 9223372036854775821,
+									"cell_origin" : "server",
+									"cell_type" : "input_form",
+									"source" : "\\partial(f g)"
+								}
+							],
 							"source" : "D(c d e)"
 						}
 					],
@@ -120,6 +129,12 @@
 							"cell_origin" : "server",
 							"cell_type" : "input_form",
 							"source" : "D(c) d e + c D(d) e + c d D(e)"
+						},
+						{
+							"cell_id" : 9223372036854775823,
+							"cell_origin" : "server",
+							"cell_type" : "input_form",
+							"source" : "g \\partial(f)"
 						}
 					],
 					"source" : "\\begin{dmath*}{}D{c} d e+c D{d} e+c d D{e}\\end{dmath*}"
@@ -166,51 +181,33 @@
 			"cells" : 
 			[
 				{
-					"cell_id" : 9223372036854775809,
+					"cell_id" : 9223372036854775817,
 					"cell_origin" : "server",
 					"cell_type" : "latex_view",
 					"source" : "\\begin{dmath*}{}\\text{Attached property Coordinate to~}\\tau.\\end{dmath*}"
 				},
 				{
-					"cell_id" : 9223372036854775810,
+					"cell_id" : 9223372036854775818,
 					"cell_origin" : "server",
 					"cell_type" : "latex_view",
 					"source" : "\\begin{dmath*}{}\\text{Attached property Derivative to~}\\partial{\\#}.\\end{dmath*}"
 				},
 				{
-					"cell_id" : 9223372036854775811,
+					"cell_id" : 9223372036854775819,
 					"cell_origin" : "server",
 					"cell_type" : "latex_view",
 					"source" : "\\begin{dmath*}{}\\text{Attached property Depends to~}f.\\end{dmath*}"
 				},
 				{
-					"cell_id" : 9223372036854775812,
+					"cell_id" : 9223372036854775820,
 					"cell_origin" : "server",
 					"cell_type" : "latex_view",
-					"cells" : 
-					[
-						{
-							"cell_id" : 9223372036854775813,
-							"cell_origin" : "server",
-							"cell_type" : "input_form",
-							"source" : "\\partial(f g)"
-						}
-					],
 					"source" : "\\begin{dmath*}{}\\partial\\left(f g\\right)\\end{dmath*}"
 				},
 				{
-					"cell_id" : 9223372036854775814,
+					"cell_id" : 9223372036854775822,
 					"cell_origin" : "server",
 					"cell_type" : "latex_view",
-					"cells" : 
-					[
-						{
-							"cell_id" : 9223372036854775815,
-							"cell_origin" : "server",
-							"cell_type" : "input_form",
-							"source" : "g \\partial(f)"
-						}
-					],
 					"source" : "\\begin{dmath*}{}g \\partial{f}\\end{dmath*}"
 				}
 			],

frontend/gtkmm/CMakeLists.txt

@@ -196,6 +196,6 @@ if(NOT MSVC)
 	 FILES
 	 ../../man/man1/cadabra2-gtk.1
 	 DESTINATION
-	 man/man1
+	 share/man/man1
 	 )
 endif()

libs/pybind11/CMakeLists.txt

@@ -119,6 +119,17 @@ if(NOT (CMAKE_VERSION VERSION_LESS 3.0))  # CMake >= 3.0
   target_link_libraries(embed INTERFACE pybind11::pybind11 $<BUILD_INTERFACE:${PYTHON_LIBRARIES}>)
 endif()
 
+if (NOT PYBIND_MASTER_PROJECT)
+  install(
+          CODE
+          "
+          if (EXISTS \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/man/man1/cadabra2.1\")
+            message(FATAL_ERROR \"The location of the Cadabra manual has changed since the last installation. Please remove the old files with make deduplicate.\")
+          endif()
+          "
+  )
+endif()
+
 if (PYBIND11_INSTALL)
   install(DIRECTORY ${PYBIND11_INCLUDE_DIR}/pybind11 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
   # GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".

web2/cadabra2/source/changelog.html

@@ -18,6 +18,7 @@ <h1>Change log</h1>
 <a name="master"></a>
 <h3>github master</h3>
 <ul>
+  <li>Save command-line history (Connor).</li>
   <li>Make imported notebooks use the default <tt>post_process</t> function.</li>
   <li>Make <tt>unwrap</tt> move scalars out of exterior (wedge)
   products, see <a href="https://cadabra.science/qa/1287/collecting-scalar-terms-expressions-with-differentialforms">this