Skip to content

Commit

Permalink
Survived the merge conflict fiasco.
Browse files Browse the repository at this point in the history
  • Loading branch information
@culler
culler committed Feb 27, 2024
1 parent 0e185c0 commit daf869d
Show file tree
Hide file tree
Showing 4 changed files with 229 additions and 1 deletion.
6 changes: 6 additions & 0 deletions build/pkgs/symengine/checksums.ini
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
tarball=symengine-VERSION.tar.gz
sha1=2dfee07108509963f3dbe3d9cad9de76d85e551f
md5=4074f3c76570bdc2ae9914edafa29eb6
cksum=3782541135
upstream_url=https://github.com/symengine/symengine/releases/download/vVERSION/symengine-VERSION.tar.gz

1 change: 1 addition & 0 deletions build/pkgs/symengine/package-version.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.11.2
3 changes: 2 additions & 1 deletion src/bin/sage
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ runpath_sh=$VERSION_DIR/local/var/lib/sage/runpath.sh
if [ -x "$runpath_sh" ]; then
. "$runpath_sh"
else
echo could not find $VERSION_DIR/local/var/lib/sage/runpath.sh
echo >&2 "Could not find runpath.sh."
echo >&2 "The SageMath symlink is probably misconfigured."
fi

# Check that the installation specific symlink points to this sage
Expand Down
220 changes: 220 additions & 0 deletions src/doc/en/website/templates/index_furo.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
{% extends "furo/page.html" %}

{% block htmltitle %}
<title>Sage Documentation{{ titlesuffix }}</title>
{% endblock %}

{%- block extrahead %}
<style type="text/css">
img.icon {
border: none;
}
a.pdf {
margin-left: 0.5em;
display: none;
}
table.contentstable {
align: center;
border-spacing: 20px;
}
table.contentstable span { {# issue #33600 comment:22 #}
border-spacing: initial;
}
</style>
{% endblock %}

{% block content %}
<h1>{{ docstitle|e }}</h1>
<p>
This is documentation for Sage {{ release }}.
</p>
{% block tables %}
<h2>
<strong>
Tutorials and FAQ
</strong>
</h2>
<table class="contentstable">
<tr valign="top">
<td width="50%">
<p class="biglink">
<a title="Download PDF" class="pdf" href="../../pdf/en/a_tour_of_sage/a_tour_of_sage.pdf">
<img class="icon" src="_static/pdf.png"></img>
</a>
<a class="biglink" href="a_tour_of_sage/index.html">
A Tour of Sage
</a>
<br>
<span class="linkdescr">
A one page introduction to Sage as a handy calculator.
</span>
</p>
</td>
<td width="50%">
<p class="biglink">
<a title="Download PDF" class="pdf" href="../../pdf/en/prep/prep_tutorials.pdf">
<img class="icon" src="_static/pdf.png"></img>
</a>
<a class="biglink" href="prep/index.html">
PREP Tutorials
</a>
<br>
<span class="linkdescr">
This set of tutorials takes the reader from very minimal
computer background to a good understanding of basic
undergraduate Sage functionality. It includes several
thematic "Quickstart" tutorials, and was originally
developed as professional development material for the MAA.
</span>
</p>
</td>
</tr>
<tr valign="top">
<td width="50%">
<p class="biglink">
<a title="Download PDF" class="pdf" href="../../pdf/en/tutorial/sage_tutorial.pdf">
<img class="icon" src="_static/pdf.png"></img>
</a>
<a class="biglink" href="tutorial/index.html">
Tutorial
</a>
<br>
<span class="linkdescr">
The best way to become familiar with Sage
in only a few hours.
</span>
</p>
</td>
<td width="50%">
<p class="biglink">
<a title="Download PDF" class="pdf" href="../../pdf/en/constructions/constructions.pdf">
<img class="icon" src="_static/pdf.png"></img>
</a>
<a class="biglink" href="constructions/index.html">
Constructions
</a>
<br>
<span class="linkdescr">
This document collects answers to some questions along the line "How
do I construct ... in Sage?" Try to find out how to see the Riemann zeta
function \(\zeta(s)\) along the line \(s=\frac{1}{2}+it\).
</span>
</p>
</td>
</tr>
<tr valign="top">
<td width="50%">
<p class="biglink">
<a title="Download PDF" class="pdf" href="../../pdf/en/thematic_tutorials/thematic_tutorials.pdf">
<img class="icon" src="_static/pdf.png"></img>
</a>
<a class="biglink" href="thematic_tutorials/index.html">
Thematic Tutorials
</a>
<br>
<span class="linkdescr">
A collection of in-depth tutorials on specific topics. These
thematic tutorials are designed to help you get started on
Sage functionalities relating to topics such as coding
theory, combinatorics, cryptography, functional programming,
group theory, linear programming, etc. If you feel
uncomfortable consulting the reference manual, you are
encouraged to browse through these thematic tutorials.
</span>
</p>
</td>
<td width="50%">
<p class="biglink">
<a title="Download PDF" class="pdf" href="../../pdf/en/faq/faq.pdf">
<img class="icon" src="_static/pdf.png"></img>
</a>
<a class="biglink" href="faq/index.html">
FAQ
</a>
<br>
<span class="linkdescr">
A collection of frequently asked questions, together with
answers to those questions. You are encouraged to read these
before asking questions on one of many Sage mailing lists.
</span>
</p>
</td>
</tr>
</table>
<h2>
<strong>
Comprehensive Reference Manual
</strong>
</h2>
<table class="contentstable" align="center" cellspacing="20">
<tr valign="top">
<td width="50%">
<p class="biglink">
<a title="Link to PDF" class="pdf" href="reference/index-pdf.html">
<img class="icon" src="_static/pdf.png"></img>
</a>
<a class="biglink" href="reference/index.html">
Reference Manual
</a>
<br>
<span class="linkdescr">
This is the reference manual for the Sage mathematics
software system. The reference manual contains many examples
that illustrate the usage of Sage. It consists primarily of
documentation that has been automatically generated from the
Sage source code. The examples are all tested with each
release of Sage, and should produce exactly the same output
as in this manual, except for line breaks.
</span>
</p>
</td>
<td width="50%">
</td>
</tr>
</table>
<h2>
<strong>
Installation and Developer Guides
</strong>
</h2>
<table class="contentstable" align="center" cellspacing="20">
<tr valign="top">
<td width="50%">
<p class="biglink">
<a title="Download PDF" class="pdf" href="../../pdf/en/installation/installation.pdf">
<img class="icon" src="_static/pdf.png"></img>
</a>
<a class="biglink" href="installation/index.html">
Installation Guide
</a>
<br>
<span class="linkdescr">
A guide on how to install Sage. You can install a Sage
source distribution or a binary distribution. Also covered
are topics relating to a system-wide installation of Sage,
and installing Sage for your own personal use.
</span>
</p>
</td>
<td width="50%">
<p class="biglink">
<a title="Download PDF" class="pdf" href="../../pdf/en/developer/developer.pdf">
<img class="icon" src="_static/pdf.png"></img>
</a>
<a class="biglink" href="developer/index.html">
Developer Guide
</a>
<br>
<span class="linkdescr">
This document describes guidelines and policies regarding
Sage development. It explains how to write programs using Sage,
how to modify and extend the core Sage libraries, and how to
modify Sage's documentation. It also discusses how to share
your new and modified code with other Sage users.
</span>
</p>
</td>
</tr>
</table>
{% endblock %}
{% endblock %}

0 comments on commit daf869d

Please sign in to comment.