Add LaTeXString object to wrap strings which should display typeset with LaTeX on capable frontends.

Author: Kasper Peeters

core/CMakeLists.txt

@@ -188,18 +188,19 @@ set(PROPERTY_SRC_FILES
 #   )
 
 set(MODULE_SRC_FILES
-	pythoncdb/py_ntensor.cc
-   pythoncdb/py_algorithms.cc
-   pythoncdb/py_ex.cc
-   pythoncdb/py_globals.cc
-   pythoncdb/py_helpers.cc
-   pythoncdb/py_kernel.cc
-   pythoncdb/py_module.cc
-   pythoncdb/py_packages.cc
-   pythoncdb/py_progress.cc
-   pythoncdb/py_properties.cc
-   pythoncdb/py_stopwatch.cc
-   pythoncdb/py_tableau.cc
+  pythoncdb/py_media.cc
+  pythoncdb/py_ntensor.cc
+  pythoncdb/py_algorithms.cc
+  pythoncdb/py_ex.cc
+  pythoncdb/py_globals.cc
+  pythoncdb/py_helpers.cc
+  pythoncdb/py_kernel.cc
+  pythoncdb/py_module.cc
+  pythoncdb/py_packages.cc
+  pythoncdb/py_progress.cc
+  pythoncdb/py_properties.cc
+  pythoncdb/py_stopwatch.cc
+  pythoncdb/py_tableau.cc
 )
 
 set(LOCAL_SRC_FILES
@@ -230,6 +231,7 @@ set(LOCAL_SRC_FILES
    IndexClassifier.cc
    Kernel.cc
    Linear.cc
+   Media.cc
    Parser.cc
    PreClean.cc
    PreProcessor.cc

core/Media.cc

@@ -0,0 +1,12 @@
+
+#include "Media.hh"
+
+LaTeXString::LaTeXString(const std::string& s)
+   : content(s)
+	{
+	}
+
+std::string LaTeXString::latex() const
+	{
+	return content;
+	}

core/Media.hh

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <string>
+
+class LaTeXString {
+	public:
+		LaTeXString(const std::string& );
+		
+		std::string latex() const;
+	private:
+		std::string content;
+};

core/cadabra2_defaults.py.in

@@ -282,6 +282,16 @@ def display(obj, delay_send=False):
         else:
             server.send(unicode(obj), "plain", 0, False)
 
+    elif isinstance(obj, LaTeXString):
+        if server.handles('latex_view'):
+            ret = mopen+obj._latex_()+mclose
+            if delay_send:
+                return ret
+            else:
+                server.send(ret , "latex_view", 0, False)
+        else:
+            server.send(unicode(obj), "plain", 0, False)
+            
     elif isinstance(obj, Property):
         if server.handles('latex_view'):
             ret = mopen+obj._latex_()+mclose

core/pythoncdb/py_media.cc

@@ -0,0 +1,14 @@
+#include <pybind11/pybind11.h>
+#include "Media.hh"
+
+namespace py = pybind11;
+
+namespace cadabra {
+	void init_media(py::module& m)
+		{
+   	py::class_<LaTeXString>(m, "LaTeXString")
+			.def(py::init<std::string>())
+			.def("_latex_", &LaTeXString::latex)
+			;
+		}
+}

core/pythoncdb/py_media.hh

@@ -0,0 +1,7 @@
+#pragma once
+
+namespace cadabra {
+
+	void init_media(pybind11::module& m);
+
+}

core/pythoncdb/py_module.cc

@@ -10,6 +10,7 @@
 #include "py_stopwatch.hh"
 #include "py_tableau.hh"
 #include "py_ntensor.hh"
+#include "py_media.hh"
 
 #include "Kernel.hh"
 
@@ -35,6 +36,7 @@ namespace cadabra {
 		init_kernel(m);
 		init_progress_monitor(m);
 		init_ntensor(m);
+		init_media(m);
 		init_stopwatch(m);
 		init_ex(m);
 		init_tableau(m);