# HG changeset patch
# User J. H. Palmieri <palmieri@math.washington.edu>
# Date 1341870592 18000
# Node ID 6001a19d4d66495e9f041de7a02e6687eda4974f
# Parent 3f48741a1b5a1b7db7221bae133e5dd5fea8bfbe
Use mathjax by default.
In sageenv, set SAGE_DOC_MATHJAX to be "True", so MathJax is used
by default.
diff git a/Makefile b/Makefile
a

b

doc: dochtml 
50  50  dochtml: build 
51  51  $(PIPE) "./sage docbuild nopdflinks all html $(SAGE_DOCBUILD_OPTS) 2>&1" "tee a dochtml.log" 
52  52  
53   dochtmljsmath: build 
 53  dochtmlmathjax: build 
54  54  $(PIPE) "./sage docbuild nopdflinks all html j $(SAGE_DOCBUILD_OPTS) 2>&1" "tee a dochtml.log" 
55  55  
 56  # Keep target 'dochtmljsmath' for backwards compatibility. 
 57  dochtmljsmath: dochtmlmathjax 
 58  
56  59  docpdf: build 
57  60  $(PIPE) "./sage docbuild all pdf $(SAGE_DOCBUILD_OPTS) 2>&1" "tee a docpdf.log" 
58  61  
… 
… 
install: 
165  168  
166  169  
167  170  .PHONY: all build buildserial start install \ 
168   doc dochtml dochtmljsmath docpdf \ 
 171  doc dochtml dochtmljsmath dochtmlmathjax docpdf \ 
169  172  docclean clean distclean \ 
170  173  test check testoptional testall testlong testoptionallong testallong \ 
171  174  ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong 
diff git a/spkg/bin/sageenv b/spkg/bin/sageenv
a

b

if [ "${MAKEFLAGS__unset__}" != "__unse 
557  557  fi 
558  558  export MAKE 
559  559  
 560  # When building documentation, use MathJax by default. To turn it off, 
 561  # set SAGE_DOC_MATHJAX to be "no" or "False". 
 562  if [ 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 
 571  fi 
560  572  
561  573  # You can set environment variables in $SAGE_RC_FILE 
562  574  # (by default, this is the file $DOT_SAGE/sagerc). For example, 