update pygments

docs/src/_static/css/scs_theme.css

@@ -76,11 +76,11 @@ body {
 
 /* Link Styling */
 a,a:visited, a:focus {
-  color: rgb(46, 118, 176);  /* Light blue*/
+  color: rgb(46, 118, 176);  /* Light blue */
   text-decoration: none;
 }
 a:hover, a:active {
-  color: rgb(0, 32, 72);  /*  blue*/
+  color: rgb(0, 32, 72);  /*  blue */
   text-decoration: none;
 }
 

docs/src/conf.py

@@ -43,7 +43,9 @@
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
-pygments_style = 'sphinx'
+
+#pygments_style = 'sphinx'
+pygments_style = 'default'
 
 #html_sidebars = {
 #   '**': [
@@ -56,22 +58,23 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 
-html_theme = 'alabaster'
-# html_theme = 'sphinx_rtd_theme'
+# html_theme = 'alabaster'
+html_theme = 'sphinx_rtd_theme'
 html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 def setup(app):
     app.add_css_file('css/scs_theme.css')
 
-#html_logo = '_static/scs_logo_transparent.png'
+html_logo = '_static/scs_logo_transparent.png'
 html_favicon = '_static/favicon.ico'
 html_theme_options = {
-    'github_banner': True,
-    'github_user': 'cvxgrp',
-    'github_repo': 'scs',
-    'logo': 'scs_logo_transparent.png',
-    'logo_name': False,
-    'github_button': False,
+    'logo_only': True,
+    #'github_banner': True,
+    #'github_user': 'cvxgrp',
+    #'github_repo': 'scs',
+    #'logo': 'scs_logo_transparent.png',
+    #'logo_name': False,
+    #'github_button': False,
     #'github_type': 'star',
     'analytics_id': 'UA-203326834-1',
 }

docs/src/examples/c.rst

@@ -22,3 +22,5 @@ compile the code using:
 Then run the code yielding output
 
 .. literalinclude:: qp.c.out
+   :language: none
+

docs/src/examples/matlab.rst

@@ -16,4 +16,5 @@ run the code yielding output
 .. matlab -r "run ~/git/scs/docs/src/examples/qp.m;exit"
 
 .. literalinclude:: qp.m.out
+   :language: none
 

docs/src/examples/python.rst

@@ -16,3 +16,5 @@ run the code yielding output
 .. python qp.py > qp.py.out
 
 .. literalinclude:: qp.py.out
+   :language: none
+

docs/src/examples/qp.c

@@ -2,7 +2,6 @@
 
 /* Set up and solve basic qp */
 int main(int argc, char **argv) {
-
   /* Set up the problem data */
   /* A and P must be in compressed sparse column format */
   double P_x[3] = {3., -1., 2.}; /* Upper triangular of P only */
@@ -11,7 +10,7 @@ int main(int argc, char **argv) {
   double A_x[4] = {-1., 1., 1., 1.};
   int A_i[4] = {0, 1, 0, 2};
   int A_p[3] = {0, 2, 4};
-  double b[3] = {-1., 0.3, -0.5,};
+  double b[3] = {-1., 0.3, -0.5};
   double c[2] = {-1., -1.};
   /* data shape */
   int n = 2;
@@ -29,8 +28,8 @@ int main(int argc, char **argv) {
   d->n = n;
   d->b = b;
   d->c = c;
-  d->A = &(ScsMatrix) {A_x, A_i, A_p, m, n};
-  d->P = &(ScsMatrix) {P_x, P_i, P_p, n, n};
+  d->A = &(ScsMatrix){A_x, A_i, A_p, m, n};
+  d->P = &(ScsMatrix){P_x, P_i, P_p, n, n};
 
   /* Cone */
   k->l = m;
@@ -39,8 +38,8 @@ int main(int argc, char **argv) {
   scs_set_default_settings(stgs);
 
   /* Modify tolerances */
-  stgs->eps_abs=1e-9;
-  stgs->eps_rel=1e-9;
+  stgs->eps_abs = 1e-9;
+  stgs->eps_rel = 1e-9;
 
   /* Solve! */
   int exitflag = scs(d, k, stgs, sol, info);
@@ -56,7 +55,7 @@ int main(int argc, char **argv) {
   for (int i = 0; i < n; ++i) {
     printf("x[%i] = %4f\n", i, sol->x[i]);
   }
-  
+
   /* Print dual solution y */
   printf("Optimal dual vector y*:\n");
   for (int i = 0; i < m; ++i) {

docs/src/examples/qp.py

@@ -1,10 +1,10 @@
+import scipy
 import scs
 import numpy as np
-from scipy import sparse
 
 # Set up the problem data
-P = sparse.csc_matrix([[3., -1.], [-1., 2.]])
-A = sparse.csc_matrix([[-1., 1.], [1., 0.], [0., 1.]])
+P = scipy.sparse.csc_matrix([[3., -1.], [-1., 2.]])
+A = scipy.sparse.csc_matrix([[-1., 1.], [1., 0.], [0., 1.]])
 b = np.array([-1, 0.3, -0.5])
 c = np.array([-1., -1.])