add %c,%k1,%k2 to recognized maxima objects
Merge branch 'develop' into t/16007/ticket/16007

* develop: (1659 commits)
  Updated Sage version to 6.3.beta3
  Support default arguments when starting the notebook server Warn if starting fails
  Trac #13422: Reintroduce a warning (but not an error) when the user supplies too few ticks to disambiguate the plot scale.
  Trac 8828: fix two other LaTeX errors
  Trac 8828: \eps should be \epsilon
  proofreading and fixing doctest failures
  16420: little tweaks: use module_morphism, sum_of_monomials, ...
  Review tweaks for Young's lattice and RSK thematic tutorial.
  Trac #13422: Reviewer suggestions.
  trac #14953: Moving the .html to EXT_CODE and using DOCTEST_MODE
  16405: fixed trivial doctest failure and ReST indentation
  auto expand log scale to include at least two major ticks
  trac #16323: several fix + doc
  New section for algebraic combinatorics tutorial on Young's lattice and RSK
  fix libgap conversion of huge integers
  changes necessary for the updated gap_packages tarball, which includes GAP's AtlasRep package now - necessary to fix GAP's TomLib package, but also useful on its own
  trac #16323: DF -> difference_family, change errors and more doc
  Trac #14209 - Forget assumptions from earlier doctest
  Trac #14209 - verify Maxima fix for doing improper integral twice changing answer
  Trac #15386 - document that Maxima 5.33 fixes this limit
  ...
Merge branch 't/8734/ticket/8734-1' into t/16007/ticket/16007

* t/8734/ticket/8734-1:
  8734: doc cosmetics
  take back unrelated change
  8734: merge conflicts
  8734: rename private function, doctest it
  8734: fix doctests
  8734: more doctests fixed
  8734: one more maxima call adapted; more doctests fixed
  8734: more additions of _SAGE_VAR_ in doctests
  add even more cases to add _SAGE_VAR_; fix doctests
  fix and generalize missing_assumption(); resp. doctest adaptions
  two further maxima calls adapted; two more doctests fixed
  fix typo leading to error
  factor out missing assumption error handling; filter _SAGE_VAR_
  Trac #8734: Make sage variables unique in maxima.
16007: fix doctests; add documentation
16007: make doctest test intended case
16007: give advice how to use constants
16007: handle latexification of converted special maxima variable names
Merge branch 'develop' into t/16007/ticket/16007

* develop: (234 commits)
  Updated Sage version to 6.3.beta4
  upgrade ipython to version 2.1.0
  Changed to use centering with format().
  trailing whitespaces + python3 + simpler loops
  There, 3rrorz b3 pwnd.
  Stupid typo.
  Fix minor bug in table output.
  Marked some tableau.py tests as long.
  Fixed ascii art for entries not in {0, ..., 9}.
  Fixed citation.
  Removed non-ascii character.
  Improving documentation from talking with Miguel.
  Rewrote RAAG as Gap group and did some logic/pickling cleanup of FP groups.
  Fixes for table representation and better docstrings.
  #9107: improved description of Sphinx's patch nested.patch
  Implemented/fixed conventions for ascii art of tableaux.
  Fixing bad merge and added RAAG's to the catalog.
  Use git's push url in the Developer's Guide
  trac #10534: fix pickling
  Fix pickling test
  ...
16007: doctest latexification; move author info to top
Merge branch 'u/rws/ticket/8734-1' of trac.sagemath.org:sage into t/16007/ticket/16007

* 'u/rws/ticket/8734-1' of trac.sagemath.org:sage:
  8734: reraise in "other" cases with bare "raise"
  8734: adapt doctest to recent change of output
16007: fix documentation examples
Merge branch 'develop' into t/16007/ticket/16007

* develop: (165 commits)
  Updated Sage version to 6.3.beta5
  Added patch file to lrcalc.
  trac #16147: fix .abs() for elt of embedded number field
  document behaviour if system is inconsistent
  trac #16528: Broken doctest
  trac #16528: review
  trac #16535: n1 <= n2 in product decomp. + better doc
  trac #16503: Broken doc
  trac #16535: avoid calling recursive construction in OA(3,n)
  trac #16535: remove who_asked
  trac #16535: mv W. cons. to orthogonal_arrays_recursive.py
  Trac #16423: Table of MOLS from the handbook and comparison with Sage
  trac #16524: more comments in the doc
  trac #16503: Review
  trac #16524: move the cyclic difference set to the constructor
  Changed checksum.
  Update SPKG.txt and checksums.ini.
  trac #16528: OA(9,120)
  trac #16524: OA(9,135)
  Changed version number.
  ...
Merge branch 'u/rws/ticket/8734-1' of trac.sagemath.org:sage into t/16007/ticket/16007

* 'u/rws/ticket/8734-1' of trac.sagemath.org:sage:
  8734: remove superfluous code
Merge branch 't/8734/ticket/8734-1' into t/16007/ticket/16007

* t/8734/ticket/8734-1:
  6882: add symable rules for e,i,I; fix maxima_var; add doctests
  6882: correction to previous commit
  6882: do word search/replace for symtable keys
  6882: add rules for e, i, I

Conflicts:
	src/sage/calculus/calculus.py
Trac #16007: give solution constants of ODEs unique names

(this was reported as part of #6882)

... solving of ode y'=c*x is not correct, the free variable is messed up
with a parameter, see [http://groups.google.cz/group/sage-
devel/browse_thread/thread/e04cbc547095f2ac sage-devel] - thanks for
Yuri Karadzhov
{{{
sage: from sage.calculus.calculus import
symbolic_expression_from_maxima_string
sage: symbolic_expression_from_maxima_string('%c')
c
sage: c=var('c'); y=function('y',x); eq=diff(y,x)==c*x; eq
D[0](y)(x) == c*x
sage: desolve(eq,y,ivar=x)
1/2*c*x^2 + c
}}}
the answer should be something like 1/2*c*x^2^ + c1

The fix depends on closing #8734. The `c` variable that comes from Sage
can then be easily recognized, and the constant `c` should then be
renamed to `c1` or `_C1`.

URL: http://trac.sagemath.org/16007
Reported by: rws
Ticket author(s): Ralf Stephan
Reviewer(s): Nils Bruin, Karl-Dieter Crisman