Ticket #13143: trac_13143-root.v2.patch

File trac_13143-root.v2.patch, 1.9 KB (added by jhpalmieri, 9 years ago)

root repo

  • Makefile

    # HG changeset patch
    # User J. H. Palmieri <palmieri@math.washington.edu>
    # Date 1341870592 18000
    # Node ID 6001a19d4d66495e9f041de7a02e6687eda4974f
    # Parent  3f48741a1b5a1b7db7221bae133e5dd5fea8bfbe
    Use mathjax by default.
    In sage-env, set SAGE_DOC_MATHJAX to be "True", so MathJax is used
    by default.
    
    diff --git a/Makefile b/Makefile
    a b doc: doc-html 
    5050doc-html: build
    5151        $(PIPE) "./sage --docbuild --no-pdf-links all html $(SAGE_DOCBUILD_OPTS) 2>&1" "tee -a dochtml.log"
    5252
    53 doc-html-jsmath: build
     53doc-html-mathjax: build
    5454        $(PIPE) "./sage --docbuild --no-pdf-links all html -j $(SAGE_DOCBUILD_OPTS) 2>&1" "tee -a dochtml.log"
    5555
     56# Keep target 'doc-html-jsmath' for backwards compatibility.
     57doc-html-jsmath: doc-html-mathjax
     58
    5659doc-pdf: build
    5760        $(PIPE) "./sage --docbuild all pdf $(SAGE_DOCBUILD_OPTS) 2>&1" "tee -a docpdf.log"
    5861
    install: 
    165168
    166169
    167170.PHONY: all build build-serial start install \
    168         doc doc-html doc-html-jsmath doc-pdf \
     171        doc doc-html doc-html-jsmath doc-html-mathjax doc-pdf \
    169172        doc-clean clean distclean \
    170173        test check testoptional testall testlong testoptionallong testallong \
    171174        ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong
  • spkg/bin/sage-env

    diff --git a/spkg/bin/sage-env b/spkg/bin/sage-env
    a b if [ "${MAKEFLAGS-__unset__}" != "__unse 
    557557fi
    558558export MAKE
    559559
     560# When building documentation, use MathJax by default. To turn it off,
     561# set SAGE_DOC_MATHJAX to be "no" or "False".
     562if [ -z "$SAGE_DOC_MATHJAX" ]; then
     563    # For backwards compatibility, we use the value of SAGE_DOC_JSMATH
     564    # if it is set.
     565    if [ -n "$SAGE_DOC_JSMATH" ]; then
     566        SAGE_DOC_MATHJAX="$SAGE_DOC_JSMATH"
     567    else
     568        SAGE_DOC_MATHJAX="True"
     569    fi
     570    export SAGE_DOC_MATHJAX
     571fi
    560572
    561573# You can set environment variables in $SAGE_RC_FILE
    562574# (by default, this is the file $DOT_SAGE/sagerc).  For example,