Skip to content

Commit 2423f00

Browse files
author
Kasper Peeters
committed
Fix output of big-O symbol in html.
1 parent 9c47fb2 commit 2423f00

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@
22
all:
33
@echo -n "\nTo build Cadabra, \n\n mkdir build\n cd build\n cmake ..\n make\n\nThe other targets here are (for maintainer purposes only)\n\n tarball: build a tarball cadabra2-latest.tar.gz of current HEAD\n doc: generate doxygen docs in doc\n webup: build web pages/tutorials/man pages and upload to server\n updatesnoop: sync snoop repo\n packages: create deb/rpm packages on buildbot\n\nIf you need help, email [email protected]\n\n"
44

5-
.PHONY: doc tarball claybuild webup format packages updatesnoop
5+
.PHONY: doc tarball webbuild claybuild webup format packages updatesnoop
66

77
tarball:
88
git archive --format=tar --prefix=cadabra2-latest/ HEAD | gzip > ${HOME}/tmp/cadabra2-latest.tar.gz
99

1010
doc:
1111
doxygen config/Doxyfile
1212

13+
webbuild:
14+
cd build; make -f web2/Makefile
15+
1316
claybuild:
1417
cd web2/cadabra2/source; rm -Rf build; clay build
1518

16-
webup: claybuild
17-
cd build; make -f web2/Makefile
19+
webup: webbuild claybuild
1820
doxygen config/Doxyfile
1921
rsync -avz --chmod=+rx doxygen/ cadabra_web:/var/www/cadabra2/doxygen/
2022
cd web2/cadabra2/source; rsync -avz --chmod=+rx build/ cadabra_web:/var/www/cadabra2/; rsync -avz --chmod=+rx static/styles/ cadabra_web:/var/www/cadabra2/static/styles; rsync -avz --chmod=+rx static/fonts/ cadabra_web:/var/www/cadabra2/static/fonts; rsync -avz --chmod=+rx static/images/ cadabra_web:/var/www/cadabra2/static/images/; rsync -avz --chmod=+rx static/icons/ cadabra_web:/var/www/cadabra2/static/icons/; rsync -avz --chmod=+rx static/pdf/ cadabra_web:/var/www/cadabra2/static/pdf/; rsync -avz --chmod=+rx static/js/ cadabra_web:/var/www/cadabra2/static/js/; rsync -avz --chmod=+r static/robots.txt cadabra_web:/var/www/cadabra2

cmake/version.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(CADABRA_VERSION_MAJOR 2)
22
set(CADABRA_VERSION_MINOR 4)
33
set(CADABRA_VERSION_PATCH 1)
4-
set(CADABRA_VERSION_TWEAK 3)
4+
set(CADABRA_VERSION_TWEAK 4)
55
set(COPYRIGHT_YEARS "2001-2022")
66
math(EXPR SYSTEM_BITS "${CMAKE_SIZEOF_VOID_P} * 8")
77
find_program(GIT git PATHS ${GIT_DIR})

core/DataCell.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ std::string cadabra::latex_to_html(const std::string& str)
108108
std::regex tilde("~");
109109
std::regex less("<");
110110
std::regex greater(">");
111+
std::regex bigO(R"(\\bigO)");
111112
std::regex latex(R"(\\LaTeX\{\})");
112113
std::regex tex(R"(\\TeX\{\})");
113114
std::regex algorithm(R"(\\algorithm\{([^\}]*)\}\{([^\}]*)\})");
@@ -133,7 +134,8 @@ std::string cadabra::latex_to_html(const std::string& str)
133134
res = std::regex_replace(res, end_dmath, R"(\))");
134135
res = std::regex_replace(res, tilde, " ");
135136
res = std::regex_replace(res, less, "&lt;");
136-
res = std::regex_replace(res, tilde, "&gt;");
137+
res = std::regex_replace(res, greater, "&gt;");
138+
res = std::regex_replace(res, bigO, "{\\cal O}");
137139
res = std::regex_replace(res, begin_verbatim, "<pre class='output'>");
138140
res = std::regex_replace(res, end_verbatim, "</pre>");
139141
res = std::regex_replace(res, section, "<h1>$1</h1>");

web2/cadabra2/source/changelog.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ <h3>github master (2.4.1)</h3>
2020
<ul>
2121
<li>Add missing trig functions for display and passthrough to sympy (Oscar).</li>
2222
<li>Allow for index values to be specified as an integer range.</li>
23+
<li>New
24+
package <a href="/manual/cdb/sympy/calculus.html"><tt>cdb.sympy.calculus</tt></a>
25+
to make it easy to apply SymPy calculus functions on Cadabra
26+
expressions.</li>
27+
<li>New
28+
package <a href="/manual/cdb/graphics/plot.html"><tt>cdb.graphics.plot</tt></a>
29+
for easy plotting of functions of one or two variables.</li>
2330
</ul>
2431

2532
<h3>2.4.0 (released 25-Aug-2022)</h3>

0 commit comments

Comments
 (0)