mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
Merge with 'stable'
Conflicts: CHANGES sphinx/__init__.py
This commit is contained in:
shimizukawa
commit
55a991e241
110
CHANGES
110
CHANGES
@ -16,62 +16,18 @@ Documentation
|
|||||||
-------------
|
-------------
|
||||||
|
|
||||||
|
|
||||||
Release 1.4 beta1 (released Mar 6, 2016)
|
Release 1.4.1 (in development)
|
||||||
========================================
|
==============================
|
||||||
|
|
||||||
Incompatible changes
|
|
||||||
--------------------
|
|
||||||
* #2327: `latex_use_parts` is deprecated now. Use `latex_toplevel_sectioning` instead.
|
|
||||||
* #2337: Use ``\url{URL}`` macro instead of ``\href{URL}{URL}`` in LaTeX writer.
|
|
||||||
* #1498: manpage writer: don't make whole of item in definition list bold if it includes strong node.
|
|
||||||
* #582: Remove hint message from quick search box for html output.
|
|
||||||
|
|
||||||
Features added
|
|
||||||
--------------
|
|
||||||
* #2308: Define ``\tablecontinued`` macro to redefine the style of continued label for
|
|
||||||
longtables.
|
|
||||||
* Select an image by similarity if multiple images are globbed by ``.. image:: filename.*``
|
|
||||||
* #1921: Support figure substitutions by :confval:`language` and :confval:`figure_language_filename`
|
|
||||||
* #2245: Add ``latex_elements["passoptionstopackages"]`` option to call PassOptionsToPackages
|
|
||||||
in early stage of preambles.
|
|
||||||
* #2340: Math extension: support alignment of multiple equations for MathJAX.
|
|
||||||
* #2338: Define ``\titleref`` macro to redefine the style of ``title-reference`` roles.
|
|
||||||
* Define ``\menuselection`` and ``\accelerator`` macros to redefine the style of `menuselection` roles.
|
|
||||||
* Define ``\crossref`` macro to redefine the style of references
|
|
||||||
* #2301: Texts in the classic html theme should be hyphenated.
|
|
||||||
* #2355: Define ``\termref`` macro to redefine the style of ``term`` roles.
|
|
||||||
* Add :confval:`suppress_warnings` to suppress arbitrary warning message (experimental)
|
|
||||||
* #2229: Fix no warning is given for unknown options
|
|
||||||
* #2327: Add `latex_toplevel_sectioning` to switch the top level sectioning of LaTeX document.
|
|
||||||
|
|
||||||
Bugs fixed
|
Bugs fixed
|
||||||
----------
|
----------
|
||||||
* Remove ``image/gif`` from supported_image_types of LaTeX writer (#2272)
|
|
||||||
* Fix ValueError is raised if LANGUAGE is empty string
|
|
||||||
* Fix unpack warning is shown when the directives generated from ``Sphinx.add_crossref_type`` is used
|
|
||||||
* The default highlight language is now ``default``. This means that source code
|
|
||||||
is highlighted as Python 3 (which is mostly a superset of Python 2) if possible.
|
|
||||||
To get the old behavior back, add ``highlight_language = "python"`` to conf.py.
|
|
||||||
* #2329: Refresh environment forcely if source directory has changed.
|
|
||||||
* #2331: Fix code-blocks are filled by block in dvi; remove ``xcdraw`` option from xcolor package
|
|
||||||
* Fix the confval type checker emits warnings if unicode is given to confvals which expects string value
|
|
||||||
* #2360: Fix numref in LaTeX output is broken
|
|
||||||
* #2361: Fix additional paragraphs inside the "compound" directive are indented
|
|
||||||
* #2364: Fix KeyError 'rootSymbol' on Sphinx upgrade from older version.
|
|
||||||
* #2348: Move amsmath and amssymb to before fontpkg on LaTeX writer.
|
|
||||||
* #2368: Ignore emacs lock files like ``.#foo.rst`` by default.
|
|
||||||
* #2262: literal_block and its caption has been separated by pagebreak in LaTeX output.
|
|
||||||
* #2319: Fix table counter is overrided by code-block's in LaTeX. Thanks to jfbu.
|
|
||||||
|
|
||||||
Documentation
|
|
||||||
-------------
|
|
||||||
|
|
||||||
Release 1.4 alpha1 (released Feb 14, 2016)
|
Release 1.4 (released Mar 28, 2016)
|
||||||
==========================================
|
===================================
|
||||||
|
|
||||||
Incompatible changes
|
Incompatible changes
|
||||||
--------------------
|
--------------------
|
||||||
|
|
||||||
* Drop ``PorterStemmer`` package support. Use ``PyStemmer`` instead of ``PorterStemmer``
|
* Drop ``PorterStemmer`` package support. Use ``PyStemmer`` instead of ``PorterStemmer``
|
||||||
to accelerate stemming.
|
to accelerate stemming.
|
||||||
* sphinx_rtd_theme has become optional. Please install it manually.
|
* sphinx_rtd_theme has become optional. Please install it manually.
|
||||||
@ -103,10 +59,14 @@ Incompatible changes
|
|||||||
``"MMMM dd, YYYY"`` is default format for `today_fmt` and `html_last_updated_fmt`.
|
``"MMMM dd, YYYY"`` is default format for `today_fmt` and `html_last_updated_fmt`.
|
||||||
However strftime format like ``"%B %d, %Y"`` is also supported for backward
|
However strftime format like ``"%B %d, %Y"`` is also supported for backward
|
||||||
compatibility until Sphinx-1.5. Later format will be disabled from Sphinx-1.5.
|
compatibility until Sphinx-1.5. Later format will be disabled from Sphinx-1.5.
|
||||||
|
* #2327: `latex_use_parts` is deprecated now. Use `latex_toplevel_sectioning` instead.
|
||||||
|
* #2337: Use ``\url{URL}`` macro instead of ``\href{URL}{URL}`` in LaTeX writer.
|
||||||
|
* #1498: manpage writer: don't make whole of item in definition list bold if it includes strong node.
|
||||||
|
* #582: Remove hint message from quick search box for html output.
|
||||||
|
* #2378: Sphinx now bundles newfloat.sty
|
||||||
|
|
||||||
Features added
|
Features added
|
||||||
--------------
|
--------------
|
||||||
|
|
||||||
* #2092: add todo directive support in napoleon package.
|
* #2092: add todo directive support in napoleon package.
|
||||||
* #1962: when adding directives, roles or nodes from an extension, warn if such
|
* #1962: when adding directives, roles or nodes from an extension, warn if such
|
||||||
an element is already present (built-in or added by another extension).
|
an element is already present (built-in or added by another extension).
|
||||||
@ -149,10 +109,24 @@ Features added
|
|||||||
* #1853: support custom text splitter on html search with ``language='ja'``.
|
* #1853: support custom text splitter on html search with ``language='ja'``.
|
||||||
* #2320: classifier of glossary terms can be used for index entries grouping key.
|
* #2320: classifier of glossary terms can be used for index entries grouping key.
|
||||||
The classifier also be used for translation. See also :ref:`glossary-directive`.
|
The classifier also be used for translation. See also :ref:`glossary-directive`.
|
||||||
|
* #2308: Define ``\tablecontinued`` macro to redefine the style of continued label for
|
||||||
|
longtables.
|
||||||
|
* Select an image by similarity if multiple images are globbed by ``.. image:: filename.*``
|
||||||
|
* #1921: Support figure substitutions by :confval:`language` and :confval:`figure_language_filename`
|
||||||
|
* #2245: Add ``latex_elements["passoptionstopackages"]`` option to call PassOptionsToPackages
|
||||||
|
in early stage of preambles.
|
||||||
|
* #2340: Math extension: support alignment of multiple equations for MathJAX.
|
||||||
|
* #2338: Define ``\titleref`` macro to redefine the style of ``title-reference`` roles.
|
||||||
|
* Define ``\menuselection`` and ``\accelerator`` macros to redefine the style of `menuselection` roles.
|
||||||
|
* Define ``\crossref`` macro to redefine the style of references
|
||||||
|
* #2301: Texts in the classic html theme should be hyphenated.
|
||||||
|
* #2355: Define ``\termref`` macro to redefine the style of ``term`` roles.
|
||||||
|
* Add :confval:`suppress_warnings` to suppress arbitrary warning message (experimental)
|
||||||
|
* #2229: Fix no warning is given for unknown options
|
||||||
|
* #2327: Add `latex_toplevel_sectioning` to switch the top level sectioning of LaTeX document.
|
||||||
|
|
||||||
Bugs fixed
|
Bugs fixed
|
||||||
----------
|
----------
|
||||||
|
|
||||||
* #1913: C++, fix assert bug for enumerators in next-to-global and global scope.
|
* #1913: C++, fix assert bug for enumerators in next-to-global and global scope.
|
||||||
* C++, fix parsing of 'signed char' and 'unsigned char' as types.
|
* C++, fix parsing of 'signed char' and 'unsigned char' as types.
|
||||||
* C++, add missing support for 'friend' functions.
|
* C++, add missing support for 'friend' functions.
|
||||||
@ -174,7 +148,29 @@ Bugs fixed
|
|||||||
* #2311: Fix sphinx.ext.inheritance_diagram raises AttributeError
|
* #2311: Fix sphinx.ext.inheritance_diagram raises AttributeError
|
||||||
* #2251: Line breaks in .rst files are transferred to .pot files in a wrong way.
|
* #2251: Line breaks in .rst files are transferred to .pot files in a wrong way.
|
||||||
* #794: Fix date formatting in latex output is not localized
|
* #794: Fix date formatting in latex output is not localized
|
||||||
|
* Remove ``image/gif`` from supported_image_types of LaTeX writer (#2272)
|
||||||
|
* Fix ValueError is raised if LANGUAGE is empty string
|
||||||
|
* Fix unpack warning is shown when the directives generated from ``Sphinx.add_crossref_type`` is used
|
||||||
|
* The default highlight language is now ``default``. This means that source code
|
||||||
|
is highlighted as Python 3 (which is mostly a superset of Python 2) if possible.
|
||||||
|
To get the old behavior back, add ``highlight_language = "python"`` to conf.py.
|
||||||
|
* #2329: Refresh environment forcely if source directory has changed.
|
||||||
|
* #2331: Fix code-blocks are filled by block in dvi; remove ``xcdraw`` option from xcolor package
|
||||||
|
* Fix the confval type checker emits warnings if unicode is given to confvals which expects string value
|
||||||
|
* #2360: Fix numref in LaTeX output is broken
|
||||||
|
* #2361: Fix additional paragraphs inside the "compound" directive are indented
|
||||||
|
* #2364: Fix KeyError 'rootSymbol' on Sphinx upgrade from older version.
|
||||||
|
* #2348: Move amsmath and amssymb to before fontpkg on LaTeX writer.
|
||||||
|
* #2368: Ignore emacs lock files like ``.#foo.rst`` by default.
|
||||||
|
* #2262: literal_block and its caption has been separated by pagebreak in LaTeX output.
|
||||||
|
* #2319: Fix table counter is overrided by code-block's in LaTeX. Thanks to jfbu.
|
||||||
|
* Fix unpack warning if combinated with 3rd party domain extensions.
|
||||||
|
* #1153: Fix figures in sidebar causes latex build error.
|
||||||
|
* #2358: Fix user-preamble could not override the tocdepth definition.
|
||||||
|
* #2358: Redece tocdepth if ``part`` or ``chapter`` is used for top_sectionlevel.
|
||||||
|
* #2351: Fix footnote spacing
|
||||||
|
* #2363: Fix ``toctree()`` in templates generates broken links in SingleHTMLBuilder.
|
||||||
|
* #2366: Fix empty hyperref is generated on toctree in HTML builder.
|
||||||
|
|
||||||
Documentation
|
Documentation
|
||||||
-------------
|
-------------
|
||||||
@ -182,18 +178,6 @@ Documentation
|
|||||||
* #1757: Fix for usage of :confval:`html_last_updated_fmt`. Thanks to Ralf Hemmecke.
|
* #1757: Fix for usage of :confval:`html_last_updated_fmt`. Thanks to Ralf Hemmecke.
|
||||||
|
|
||||||
|
|
||||||
Release 1.3.7 (in development)
|
|
||||||
==============================
|
|
||||||
|
|
||||||
Bugs fixed
|
|
||||||
----------
|
|
||||||
|
|
||||||
* #2358: Fix user-preamble could not override the tocdepth definition.
|
|
||||||
* #2358: Redece tocdepth if ``part`` or ``chapter`` is used for top_sectionlevel.
|
|
||||||
* #2351: Fix footnote spacing
|
|
||||||
* #2363: Fix ``toctree()`` in templates generates broken links in SingleHTMLBuilder.
|
|
||||||
|
|
||||||
|
|
||||||
Release 1.3.6 (released Feb 29, 2016)
|
Release 1.3.6 (released Feb 29, 2016)
|
||||||
=====================================
|
=====================================
|
||||||
|
|
||||||
|
|||||||
14
EXAMPLES
14
EXAMPLES
@ -9,7 +9,12 @@ be included, please mail to `the Google group
|
|||||||
I've grouped the list into sections to make it easier to find
|
I've grouped the list into sections to make it easier to find
|
||||||
interesting examples.
|
interesting examples.
|
||||||
|
|
||||||
Documentation using the default theme
|
Documentation using the alabaster theme
|
||||||
|
---------------------------------------
|
||||||
|
|
||||||
|
* PyLangAcq: http://pylangacq.org/
|
||||||
|
|
||||||
|
Documentation using the classic theme
|
||||||
-------------------------------------
|
-------------------------------------
|
||||||
|
|
||||||
* APSW: http://apidoc.apsw.googlecode.com/hg/index.html
|
* APSW: http://apidoc.apsw.googlecode.com/hg/index.html
|
||||||
@ -54,6 +59,7 @@ Documentation using the default theme
|
|||||||
* python-apt: http://apt.alioth.debian.org/python-apt-doc/
|
* python-apt: http://apt.alioth.debian.org/python-apt-doc/
|
||||||
* PyUblas: https://documen.tician.de/pyublas/
|
* PyUblas: https://documen.tician.de/pyublas/
|
||||||
* Quex: http://quex.sourceforge.net/doc/html/main.html
|
* Quex: http://quex.sourceforge.net/doc/html/main.html
|
||||||
|
* Ring programming language: http://ring-lang.sourceforge.net/doc/index.html
|
||||||
* Scapy: http://www.secdev.org/projects/scapy/doc/
|
* Scapy: http://www.secdev.org/projects/scapy/doc/
|
||||||
* Segway: http://noble.gs.washington.edu/proj/segway/doc/1.1.0/segway.html
|
* Segway: http://noble.gs.washington.edu/proj/segway/doc/1.1.0/segway.html
|
||||||
* SimPy: http://simpy.readthedocs.org/en/latest/
|
* SimPy: http://simpy.readthedocs.org/en/latest/
|
||||||
@ -62,11 +68,12 @@ Documentation using the default theme
|
|||||||
* z3c: http://www.ibiblio.org/paulcarduner/z3ctutorial/
|
* z3c: http://www.ibiblio.org/paulcarduner/z3ctutorial/
|
||||||
|
|
||||||
|
|
||||||
Documentation using a customized version of the default theme
|
Documentation using a customized version of the classic theme
|
||||||
-------------------------------------------------------------
|
-------------------------------------------------------------
|
||||||
|
|
||||||
* Advanced Generic Widgets:
|
* Advanced Generic Widgets:
|
||||||
http://xoomer.virgilio.it/infinity77/AGW_Docs/index.html
|
http://xoomer.virgilio.it/infinity77/AGW_Docs/index.html
|
||||||
|
* Arb: http://fredrikj.net/arb/
|
||||||
* Bazaar: http://doc.bazaar.canonical.com/en/
|
* Bazaar: http://doc.bazaar.canonical.com/en/
|
||||||
* CakePHP: http://book.cakephp.org/2.0/en/index.html
|
* CakePHP: http://book.cakephp.org/2.0/en/index.html
|
||||||
* Chaco: http://docs.enthought.com/chaco/
|
* Chaco: http://docs.enthought.com/chaco/
|
||||||
@ -121,9 +128,11 @@ Documentation using another builtin theme
|
|||||||
-----------------------------------------
|
-----------------------------------------
|
||||||
|
|
||||||
* C/C++ Development with Eclipse: http://eclipsebook.in/ (agogo)
|
* C/C++ Development with Eclipse: http://eclipsebook.in/ (agogo)
|
||||||
|
* ESWP3 (http://eswp3.org) (sphinx_rtd_theme)
|
||||||
* Jinja: http://jinja.pocoo.org/ (scrolls)
|
* Jinja: http://jinja.pocoo.org/ (scrolls)
|
||||||
* jsFiddle: http://doc.jsfiddle.net/ (nature)
|
* jsFiddle: http://doc.jsfiddle.net/ (nature)
|
||||||
* libLAS: http://www.liblas.org/ (nature)
|
* libLAS: http://www.liblas.org/ (nature)
|
||||||
|
* Linguistica: http://linguistica-uchicago.github.io/lxa5/ (sphinx_rtd_theme)
|
||||||
* MPipe: http://vmlaker.github.io/mpipe/ (sphinx13)
|
* MPipe: http://vmlaker.github.io/mpipe/ (sphinx13)
|
||||||
* pip: https://pip.pypa.io/en/latest/ (sphinx_rtd_theme)
|
* pip: https://pip.pypa.io/en/latest/ (sphinx_rtd_theme)
|
||||||
* Pyramid web framework:
|
* Pyramid web framework:
|
||||||
@ -157,6 +166,7 @@ Documentation using a custom theme/integrated in a site
|
|||||||
* Flask-OpenID: http://pythonhosted.org/Flask-OpenID/
|
* Flask-OpenID: http://pythonhosted.org/Flask-OpenID/
|
||||||
* Gameduino: http://excamera.com/sphinx/gameduino/
|
* Gameduino: http://excamera.com/sphinx/gameduino/
|
||||||
* GeoServer: http://docs.geoserver.org/
|
* GeoServer: http://docs.geoserver.org/
|
||||||
|
* GHC - Glasgow Haskell Compiler: http://downloads.haskell.org/~ghc/master/users-guide/
|
||||||
* Glashammer: http://glashammer.org/
|
* Glashammer: http://glashammer.org/
|
||||||
* Istihza (Turkish Python documentation project): http://belgeler.istihza.com/py2/
|
* Istihza (Turkish Python documentation project): http://belgeler.istihza.com/py2/
|
||||||
* Lasso: http://lassoguide.com/
|
* Lasso: http://lassoguide.com/
|
||||||
|
|||||||
@ -1063,13 +1063,18 @@ class BuildEnvironment:
|
|||||||
entries = self.indexentries[docname] = []
|
entries = self.indexentries[docname] = []
|
||||||
for node in document.traverse(addnodes.index):
|
for node in document.traverse(addnodes.index):
|
||||||
try:
|
try:
|
||||||
for type, value, tid, main, index_key in node['entries']:
|
for entry in node['entries']:
|
||||||
split_index_msg(type, value)
|
split_index_msg(entry[0], entry[1])
|
||||||
except ValueError as exc:
|
except ValueError as exc:
|
||||||
self.warn_node(exc, node)
|
self.warn_node(exc, node)
|
||||||
node.parent.remove(node)
|
node.parent.remove(node)
|
||||||
else:
|
else:
|
||||||
entries.extend(node['entries'])
|
for entry in node['entries']:
|
||||||
|
if len(entry) == 5:
|
||||||
|
# Since 1.4: new index structure including index_key (5th column)
|
||||||
|
entries.append(entry)
|
||||||
|
else:
|
||||||
|
entries.append(entry + (None,))
|
||||||
|
|
||||||
def note_citations_from(self, docname, document):
|
def note_citations_from(self, docname, document):
|
||||||
for node in document.traverse(nodes.citation):
|
for node in document.traverse(nodes.citation):
|
||||||
|
|||||||
737
sphinx/texinputs/newfloat.sty
Normal file
737
sphinx/texinputs/newfloat.sty
Normal file
@ -0,0 +1,737 @@
|
|||||||
|
%%
|
||||||
|
%% This is file `newfloat.sty',
|
||||||
|
%% generated with the docstrip utility.
|
||||||
|
%%
|
||||||
|
%% The original source files were:
|
||||||
|
%%
|
||||||
|
%% newfloat.dtx (with options: `package')
|
||||||
|
%%
|
||||||
|
%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
|
||||||
|
%%
|
||||||
|
%% http://sourceforge.net/projects/latex-caption/
|
||||||
|
%%
|
||||||
|
%% --------------------------------------------------------------------------
|
||||||
|
%%
|
||||||
|
%% This work may be distributed and/or modified under the
|
||||||
|
%% conditions of the LaTeX Project Public License, either version 1.3
|
||||||
|
%% of this license or (at your option) any later version.
|
||||||
|
%% The latest version of this license is in
|
||||||
|
%% http://www.latex-project.org/lppl.txt
|
||||||
|
%% and version 1.3 or later is part of all distributions of LaTeX
|
||||||
|
%% version 2003/12/01 or later.
|
||||||
|
%%
|
||||||
|
%% This work has the LPPL maintenance status "maintained".
|
||||||
|
%%
|
||||||
|
%% This Current Maintainer of this work is Axel Sommerfeldt.
|
||||||
|
%%
|
||||||
|
%% This work consists of the files
|
||||||
|
%% CHANGELOG, README, SUMMARY, caption.ins,
|
||||||
|
%% caption.dtx, caption2.dtx, caption3.dtx,
|
||||||
|
%% bicaption.dtx, ltcaption.dtx, subcaption.dtx,
|
||||||
|
%% newfloat.dtx, and totalcount.dtx
|
||||||
|
%% the derived files
|
||||||
|
%% caption.sty, caption2.sty, caption3.sty,
|
||||||
|
%% bicaption.sty, ltcaption.sty, subcaption.sty,
|
||||||
|
%% newfloat.sty, and totalcount.sty
|
||||||
|
%% and the user manuals
|
||||||
|
%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
|
||||||
|
%%
|
||||||
|
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
|
||||||
|
\def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${%
|
||||||
|
\def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }}
|
||||||
|
\caption@tempa $Id: newfloat.dtx 109 2015-09-17 09:29:07Z sommerfeldt $
|
||||||
|
\ProvidesPackage{newfloat}[\caption@tempa v1.1-\caption@tempb Defining new floating environments (AR)]
|
||||||
|
\newcommand*\newfloat@Info[1]{%
|
||||||
|
\PackageInfo{newfloat}{#1}}
|
||||||
|
\newcommand*\newfloat@InfoNoLine[1]{%
|
||||||
|
\newfloat@Info{#1\@gobble}}
|
||||||
|
\newcommand*\newfloat@Error[1]{%
|
||||||
|
\PackageError{newfloat}{#1}\newfloat@eh}
|
||||||
|
\newcommand*\newfloat@eh{%
|
||||||
|
If you do not understand this error, please take a closer look\MessageBreak
|
||||||
|
at the documentation of the `newfloat' package.\MessageBreak\@ehc}
|
||||||
|
\RequirePackage{keyval}[1997/11/10]
|
||||||
|
\newcommand*\newfloat@def[2]{%
|
||||||
|
\newfloat@ifundefined{#1}{%
|
||||||
|
\@namedef{#1}{#2}}}
|
||||||
|
\newcommand*\newfloat@let[2]{%
|
||||||
|
\newfloat@ifundefined{#1}{%
|
||||||
|
\expandafter\let\csname #1\endcsname#2}}
|
||||||
|
\newcommand*\newfloat@ifundefined[2]{%
|
||||||
|
\@ifundefined{#1}{#2}{%
|
||||||
|
\newfloat@Info{%
|
||||||
|
\expandafter\string\csname#1\endcsname\space is already defined}}}
|
||||||
|
\newcommand*\DeclareFloatingEnvironment{%
|
||||||
|
\@testopt\@DeclareFloatingEnvironment{}}
|
||||||
|
\@onlypreamble\DeclareFloatingEnvironment
|
||||||
|
\def\@DeclareFloatingEnvironment[#1]#2{%
|
||||||
|
\newfloat@Info{New float `#2' with options `#1'}%
|
||||||
|
\newfloat@ifundefined{c@#2}{\newcounter{#2}}%
|
||||||
|
\ifdefined\c@float@type % from float package
|
||||||
|
\expandafter\edef\csname ftype@#2\endcsname{\the\value{float@type}}%
|
||||||
|
\addtocounter{float@type}{\value{float@type}}%
|
||||||
|
\else\ifdefined\c@newflo@tctr % from memoir document class
|
||||||
|
\expandafter\edef\csname ftype@#2\endcsname{\the\c@newflo@tctr}%
|
||||||
|
\advance\c@newflo@tctr \c@newflo@tctr
|
||||||
|
\else
|
||||||
|
\ifdefined\newfloat@ftype \else
|
||||||
|
\newcount\newfloat@ftype
|
||||||
|
\newfloat@ftype=8\relax
|
||||||
|
\fi
|
||||||
|
\expandafter\xdef\csname ftype@#2\endcsname{\the\newfloat@ftype}%
|
||||||
|
\advance\newfloat@ftype\newfloat@ftype
|
||||||
|
\fi\fi
|
||||||
|
\newfloat@Info{float type `#2'=\@nameuse{ftype@#2}}%
|
||||||
|
\newfloat@def{fnum@#2}%
|
||||||
|
{\@nameuse{#2name}\nobreakspace\@nameuse{the#2}\@nameuse{autodot}}%
|
||||||
|
\newfloat@capitalize\newfloat@Type{#2}%
|
||||||
|
\newfloat@let{#2name}{\newfloat@Type}%
|
||||||
|
\newfloat@def{fleg#2}{\@nameuse{#2name}}% legend naming (memoir)
|
||||||
|
\newfloat@ifundefined{flegtoc#2}{\@namedef{flegtoc#2}##1{}}%
|
||||||
|
\ifcsname @tufte@float\endcsname
|
||||||
|
\newenvironment{#2}[1][htbp]%
|
||||||
|
{\begin{@tufte@float}[##1]{#2}{}}%
|
||||||
|
{\end{@tufte@float}}%
|
||||||
|
\newenvironment{#2*}[1][htbp]%
|
||||||
|
{\begin{@tufte@float}[##1]{#2}{star}}%
|
||||||
|
{\end{@tufte@float}}%
|
||||||
|
\else
|
||||||
|
\newenvironment{#2}{\@float{#2}}{\end@float}%
|
||||||
|
\newenvironment{#2*}{\@dblfloat{#2}}{\end@dblfloat}%
|
||||||
|
\fi
|
||||||
|
\newfloat@def{listof#2}{\newfloat@listof{#2}}%
|
||||||
|
\newfloat@def{listof#2s}{\@nameuse{listof#2}}%
|
||||||
|
\newfloat@def{listof#2es}{\@nameuse{listof#2s}}%
|
||||||
|
\newfloat@def{newfloat@listof#2@hook}{}%
|
||||||
|
\ifdefined\l@figure
|
||||||
|
\newfloat@let{l@#2}{\l@figure}%
|
||||||
|
\else
|
||||||
|
\newfloat@def{l@#2}{\@dottedtocline{1}{1.5em}{2.3em}}%
|
||||||
|
\fi
|
||||||
|
\edef\newfloat@tempa{List of \newfloat@Type s}%
|
||||||
|
\newfloat@let{list#2name}{\newfloat@tempa}%
|
||||||
|
\expandafter\let\csname fst@#2\endcsname\@undefined
|
||||||
|
\newfloat@ifundefined{fps@#2}{\newfloat@setplacement{#2}{tbp}}%
|
||||||
|
\newfloat@ifundefined{ext@#2}{\newfloat@setfileext{#2}{lo#2}}%
|
||||||
|
\newfloat@setoptions*{#2}{#1}%
|
||||||
|
\@expandtwoargs\newfloat@announce{#2}{\@nameuse{ext@#2}}%
|
||||||
|
\@ifnextchar[\newfloat@DFE@setname\relax}
|
||||||
|
\@onlypreamble\@DeclareFloatingEnvironment
|
||||||
|
\def\newfloat@DFE@setname[#1]{%
|
||||||
|
\KV@@newfloat@name{#1}%
|
||||||
|
\@ifnextchar[\newfloat@DFE@setlistname\relax}
|
||||||
|
\@onlypreamble\newfloat@DFE@setname
|
||||||
|
\def\newfloat@DFE@setlistname[#1]{%
|
||||||
|
\KV@@newfloat@listname{#1}}
|
||||||
|
\@onlypreamble\newfloat@DFE@setlistname
|
||||||
|
\newcommand*\newfloat@capitalize[2]{%
|
||||||
|
\edef\newfloat@tempa{\gdef\noexpand#1{\@car#2\@nil}}%
|
||||||
|
\uppercase\expandafter{\newfloat@tempa}%
|
||||||
|
\edef\newfloat@tempa{%
|
||||||
|
\noexpand\g@addto@macro\noexpand#1{\@cdr#2\@nil}}%
|
||||||
|
\newfloat@tempa}
|
||||||
|
\newcommand*\newfloat@listof[1]{%
|
||||||
|
\@expandtwoargs\newfloat@list@of{#1}{\@nameuse{ext@#1}}}
|
||||||
|
\newcommand*\newfloat@list@of[2]{%
|
||||||
|
\begingroup
|
||||||
|
\expandafter\let\expandafter\listfigurename\csname list#1name\endcsname
|
||||||
|
\def\ext@figure{#2}%
|
||||||
|
\let\newfloat@starttoc\@starttoc
|
||||||
|
\def\@starttoc##1{\newfloat@starttoc{#2}}%
|
||||||
|
\let\newfloat@listoftoc\listoftoc
|
||||||
|
\def\listoftoc##1{\newfloat@listoftoc{#2}}%
|
||||||
|
\@nameuse{newfloat@listof#1@hook}%
|
||||||
|
\listoffigures
|
||||||
|
\endgroup}
|
||||||
|
\newcommand*\newfloat@setoptions{%
|
||||||
|
\@ifstar
|
||||||
|
{\newfloat@@setoptions\@firstofone}%
|
||||||
|
{\newfloat@@setoptions\@gobble}}
|
||||||
|
\newcommand*\newfloat@@setoptions[3]{%
|
||||||
|
\let\newfloat@within@value\@undefined
|
||||||
|
\let\newfloat@chapterlistsgaps@value\@undefined
|
||||||
|
#1{\KV@@newfloat@within\newfloat@within@default}% set default value for new floats
|
||||||
|
\def\newfloat@type{#2}%
|
||||||
|
\setkeys{@newfloat}{#3}%
|
||||||
|
\ifx\newfloat@within@value\@undefined \else
|
||||||
|
\newfloat@setoption{within}\newfloat@within@value
|
||||||
|
\fi
|
||||||
|
\ifx\newfloat@chapterlistsgaps@value\@undefined \else
|
||||||
|
\newfloat@setoption{chapterlistsgaps}\newfloat@chapterlistsgaps@value
|
||||||
|
\fi}
|
||||||
|
\newcommand*\newfloat@within@default{%
|
||||||
|
\ifcsname c@chapter\endcsname chapter\else none\fi}
|
||||||
|
\@onlypreamble\newfloat@within@default
|
||||||
|
\newcommand*\newfloat@setoption[1]{%
|
||||||
|
\edef\caption@tempa{\noexpand\@nameuse{newfloat@set#1}{\newfloat@type}}%
|
||||||
|
\caption@tempa}
|
||||||
|
\newcommand*\newfloat@setfileext[2]{%
|
||||||
|
\@namedef{ext@#1}{#2}}
|
||||||
|
\define@key{@newfloat}{fileext}{%
|
||||||
|
\newfloat@setoption{fileext}{#1}}
|
||||||
|
\newcommand*\newfloat@setlistname[2]{%
|
||||||
|
\@namedef{list#1name}{#2}}
|
||||||
|
\define@key{@newfloat}{listname}{%
|
||||||
|
\newfloat@setoption{listname}{#1}}
|
||||||
|
\newcommand*\newfloat@setname[2]{%
|
||||||
|
\newfloat@@setname{#1}{#2}%
|
||||||
|
\begingroup
|
||||||
|
\ifcsname languagename\endcsname
|
||||||
|
\ifcsname captions\languagename\endcsname
|
||||||
|
\expandafter\g@addto@macro\csname captions\languagename\endcsname
|
||||||
|
{\newfloat@@setname{#1}{#2}}%
|
||||||
|
\fi
|
||||||
|
\fi
|
||||||
|
\endgroup}
|
||||||
|
%%\AtBeginDocument{\let\newfloat@setname\newfloat@@setname}
|
||||||
|
\newcommand*\newfloat@@setname[2]{%
|
||||||
|
\@namedef{#1name}{#2}}
|
||||||
|
\define@key{@newfloat}{name}{%
|
||||||
|
\newfloat@setoption{name}{#1}}
|
||||||
|
\newcommand*\newfloat@setplacement[2]{%
|
||||||
|
\@namedef{fps@#1}{#2}}
|
||||||
|
\define@key{@newfloat}{placement}{%
|
||||||
|
\newfloat@setoption{placement}{#1}}
|
||||||
|
\newcommand*\newfloat@setwithin[2]{%
|
||||||
|
\ifcsname c@chapter\endcsname
|
||||||
|
\@removefromreset{#1}{chapter}%
|
||||||
|
\fi
|
||||||
|
\@removefromreset{#1}{section}%
|
||||||
|
\edef\@tempa{#2}%
|
||||||
|
\ifx\@tempa\@empty
|
||||||
|
\def\@tempa{none}%
|
||||||
|
\fi
|
||||||
|
\def\@tempb{none}%
|
||||||
|
\ifx\@tempa\@tempb
|
||||||
|
\ifcsname c@chapter\endcsname
|
||||||
|
\@chapterlistsgap@off{#1}%
|
||||||
|
\fi
|
||||||
|
\newfloat@@setwithin{#1}{}{}%
|
||||||
|
\else
|
||||||
|
\def\@tempb{chapter}%
|
||||||
|
\ifx\@tempa\@tempb
|
||||||
|
\@addtoreset{#1}{chapter}%
|
||||||
|
\@chapterlistsgap@on{#1}%
|
||||||
|
\newfloat@@setwithin{#1}{\ifnum\c@chapter>\z@ \thechapter.\fi}{\theHchapter.}%
|
||||||
|
\else
|
||||||
|
\def\@tempb{section}%
|
||||||
|
\ifx\@tempa\@tempb
|
||||||
|
\@addtoreset{#1}{section}%
|
||||||
|
\ifcsname c@chapter\endcsname
|
||||||
|
\@addtoreset{#1}{chapter}%
|
||||||
|
\@chapterlistsgap@on{#1}%
|
||||||
|
\newfloat@@setwithin{#1}{\thesection.}{\theHsection.}%
|
||||||
|
\else
|
||||||
|
\newfloat@@setwithin{#1}{\ifnum\c@section>\z@ \thesection.\fi}{\theHsection.}%
|
||||||
|
\fi
|
||||||
|
\else
|
||||||
|
\newfloat@Error{Invalid value `#2' for option `within'}%
|
||||||
|
\fi
|
||||||
|
\fi
|
||||||
|
\fi}
|
||||||
|
\newcommand*\newfloat@@setwithin[3]{%
|
||||||
|
\global\@namedef{the#1}{#2\arabic{#1}}%
|
||||||
|
\global\@namedef{theH#1}{#3\arabic{#1}}}
|
||||||
|
\define@key{@newfloat}{within}{%
|
||||||
|
\def\newfloat@within@value{#1}}
|
||||||
|
\newcommand*\newfloat@setwithout[1]{%
|
||||||
|
\newfloat@setwithin{#1}{none}}
|
||||||
|
\define@key{@newfloat}{without}[]{%
|
||||||
|
\def\newfloat@within@value{none}}
|
||||||
|
\newcommand*\newfloat@setchapterlistsgaps[2]{%
|
||||||
|
\edef\@tempa{#2}%
|
||||||
|
\def\@tempb{off}%
|
||||||
|
\ifx\@tempa\@tempb
|
||||||
|
\@chapterlistsgap@off{#1}%
|
||||||
|
\else
|
||||||
|
\def\@tempb{on}%
|
||||||
|
\ifx\@tempa\@tempb
|
||||||
|
\@chapterlistsgap@on{#1}%
|
||||||
|
\else
|
||||||
|
\newfloat@Error{Invalid value `#2' for option `chapterlistsgaps'}%
|
||||||
|
\fi
|
||||||
|
\fi}
|
||||||
|
\define@key{@newfloat}{chapterlistsgaps}{%
|
||||||
|
\def\newfloat@chapterlistsgaps@value{#1}}
|
||||||
|
\providecommand*\@removefromreset[2]{{%
|
||||||
|
\expandafter\let\csname c@#1\endcsname\@removefromreset
|
||||||
|
\def\@elt##1{%
|
||||||
|
\expandafter\ifx\csname c@##1\endcsname\@removefromreset
|
||||||
|
\else
|
||||||
|
\noexpand\@elt{##1}%
|
||||||
|
\fi}%
|
||||||
|
\expandafter\xdef\csname cl@#2\endcsname{%
|
||||||
|
\csname cl@#2\endcsname}}}
|
||||||
|
\newcommand*\newfloat@announce[2]{%
|
||||||
|
\@cons\newfloat@list{{#1}}%
|
||||||
|
\@cons\newfloat@@list{{#1}}%
|
||||||
|
\newfloat@ifundefined{newfloat@ext@#2}{%
|
||||||
|
\@namedef{newfloat@ext@#2}{#1}%
|
||||||
|
\ifcsname c@lofdepth\endcsname
|
||||||
|
\newfloat@ifundefined{c@#2depth}{%
|
||||||
|
\newcounter{#2depth}%
|
||||||
|
\setcounter{#2depth}{1}}%
|
||||||
|
\fi
|
||||||
|
\ifcsname addtotoclist\endcsname
|
||||||
|
\addtotoclist[float]{#2}%
|
||||||
|
\newfloat@def{listof#2name}{\@nameuse{list#1name}}%
|
||||||
|
\fi
|
||||||
|
}%
|
||||||
|
\ifcsname contentsuse\endcsname
|
||||||
|
\contentsuse{#1}{#2}%
|
||||||
|
\fi
|
||||||
|
\newfloat@hook{#1}}
|
||||||
|
\@onlypreamble\newfloat@announce
|
||||||
|
\newcommand*\newfloat@@list{}
|
||||||
|
\newcommand*\SetupFloatingEnvironment[1]{%
|
||||||
|
\newfloat@addtolist{#1}%
|
||||||
|
\newfloat@setoptions{#1}}
|
||||||
|
\newcommand\ForEachFloatingEnvironment{%
|
||||||
|
\@ifstar
|
||||||
|
{\@ForEachFloatingEnvironment\@gobble}%
|
||||||
|
{\@ForEachFloatingEnvironment\@iden}}
|
||||||
|
\newcommand\@ForEachFloatingEnvironment[2]{%
|
||||||
|
\def\@elt##1{#2}%
|
||||||
|
\newfloat@list
|
||||||
|
\let\@elt\relax
|
||||||
|
#1{\newfloat@addtohook{#2}}}
|
||||||
|
\providecommand\newfloat@addtohook[1]{%
|
||||||
|
\toks@=\expandafter{\newfloat@hook{##1}#1}%
|
||||||
|
\edef\@tempa{\def\noexpand\newfloat@hook####1{\the\toks@}}%
|
||||||
|
\@tempa}
|
||||||
|
\providecommand*\newfloat@hook[1]{}
|
||||||
|
\newcommand\PrepareListOf[1]{%
|
||||||
|
\expandafter\g@addto@macro\csname newfloat@listof#1@hook\endcsname}
|
||||||
|
\@onlypreamble\PrepareListOf
|
||||||
|
\newcommand*\newfloat@list{}
|
||||||
|
\newcommand*\newfloat@addtolist[1]{%
|
||||||
|
\newfloat@ifinlist{#1}{}{%
|
||||||
|
\ifcsname ext@#1\endcsname
|
||||||
|
\@cons\newfloat@list{{#1}}%
|
||||||
|
\@namedef{newfloat@ext@\@nameuse{ext@#1}}{#1}%
|
||||||
|
\newfloat@let{@ifchapterlistsgap@#1}{\@iden}%
|
||||||
|
\else
|
||||||
|
\newfloat@Error{`#1' does not seem to be a floating environment}%
|
||||||
|
\fi}}
|
||||||
|
\newcommand*\newfloat@ifinlist[1]{%
|
||||||
|
\let\next\@secondoftwo
|
||||||
|
\begingroup
|
||||||
|
\expandafter\let\csname c@#1\endcsname\newfloat@ifinlist
|
||||||
|
\def\@elt##1{%
|
||||||
|
\expandafter\ifx\csname c@##1\endcsname\newfloat@ifinlist
|
||||||
|
\global\let\next\@firstoftwo
|
||||||
|
\fi}%
|
||||||
|
\newfloat@list
|
||||||
|
\endgroup
|
||||||
|
\next}
|
||||||
|
\ifcsname ext@figure\endcsname
|
||||||
|
\newfloat@addtolist{figure}
|
||||||
|
\fi
|
||||||
|
\ifcsname ext@table\endcsname
|
||||||
|
\newfloat@addtolist{table}
|
||||||
|
\fi
|
||||||
|
\ifcsname @chapter\endcsname
|
||||||
|
\providecommand*\@chapterlistsgap{10\p@}%
|
||||||
|
\providecommand*\@addchapterlistsgap[2]{%
|
||||||
|
\@nameuse{@ifchapterlistsgap@#1}{% if switched on
|
||||||
|
\@@addchapterlistsgap{#1}{#2}}}
|
||||||
|
\providecommand*\@@addchapterlistsgap[2]{%
|
||||||
|
\@ifundefined{@addchapterlistsgap@#2}{% only once per extension
|
||||||
|
\@namedef{@addchapterlistsgap@#2}{#1}%
|
||||||
|
\@@@addchapterlistsgap{#2}}{}}
|
||||||
|
\providecommand*\@@@addchapterlistsgap[1]{%
|
||||||
|
\ifdim \@chapterlistsgap>\z@
|
||||||
|
\addtocontents{#1}{\protect\addvspace{\@chapterlistsgap}}%
|
||||||
|
\fi}
|
||||||
|
\providecommand*\@addchapterlistsgaps{%
|
||||||
|
\begingroup
|
||||||
|
\def\@elt##1{%
|
||||||
|
\@expandtwoargs\@addchapterlistsgap{##1}{\@nameuse{ext@##1}}}%
|
||||||
|
\newfloat@list
|
||||||
|
\endgroup}
|
||||||
|
\providecommand*\@chapterlistsgap@off[1]{%
|
||||||
|
\expandafter\let\csname @ifchapterlistsgap@#1\endcsname\@gobble
|
||||||
|
\ifcsname unsettoc\endcsname
|
||||||
|
\@expandtwoargs\unsettoc{\@nameuse{ext@#1}}{chapteratlist}%
|
||||||
|
\fi}
|
||||||
|
\providecommand*\@chapterlistsgap@on[1]{%
|
||||||
|
\expandafter\let\csname @ifchapterlistsgap@#1\endcsname\@iden
|
||||||
|
\ifcsname setuptoc\endcsname
|
||||||
|
\@expandtwoargs\setuptoc{\@nameuse{ext@#1}}{chapteratlist}%
|
||||||
|
\fi}
|
||||||
|
\fi
|
||||||
|
\define@key{newfloat}{chapterlistsgap}{%
|
||||||
|
\renewcommand*\@chapterlistsgap{#1}}
|
||||||
|
\define@key{newfloat}{within}{%
|
||||||
|
\def\newfloat@within@default{#1}% set new default value
|
||||||
|
\def\@elt##1{\newfloat@setwithin{##1}{#1}}%
|
||||||
|
\newfloat@list
|
||||||
|
\let\@elt\relax}
|
||||||
|
\define@key{newfloat}{without}[]{%
|
||||||
|
\KV@newfloat@within{none}}
|
||||||
|
\def\@elt#1{%
|
||||||
|
\define@key{newfloat}{#1name}{%
|
||||||
|
\newfloat@setname{#1}{##1}}%
|
||||||
|
\define@key{newfloat}{list#1name}{%
|
||||||
|
\newfloat@setname{list#1}{##1}}%
|
||||||
|
\define@key{newfloat}{#1within}{%
|
||||||
|
\newfloat@setwithin{#1}{##1}}%
|
||||||
|
\define@key{newfloat}{#1without}[]{%
|
||||||
|
\newfloat@setwithout{#1}}%
|
||||||
|
}%
|
||||||
|
\newfloat@list
|
||||||
|
\let\@elt\relax
|
||||||
|
\define@key{newfloat}{planb}[true]{%
|
||||||
|
\def\@tempa{#1}%
|
||||||
|
\def\@tempb{false}%
|
||||||
|
\ifx\@tempa\@tempb
|
||||||
|
\let\newfloat@ifplanb\@gobble
|
||||||
|
\else
|
||||||
|
\def\@tempb{true}%
|
||||||
|
\ifx\@tempa\@tempb
|
||||||
|
\let\newfloat@ifplanb\@iden
|
||||||
|
\else
|
||||||
|
\newfloat@Error{Invalid value `#1' for option `planb'}%
|
||||||
|
\fi
|
||||||
|
\fi}
|
||||||
|
\define@key{newfloat}{planb-fileext}{%
|
||||||
|
\newfloat@Info{Setting Plan B file extension to `#1'}
|
||||||
|
\xdef\newfloat@addtocontents@ext{#1}}
|
||||||
|
|
||||||
|
\let\@tempc\relax
|
||||||
|
\@expandtwoargs\setkeys{newfloat}{planb,\@ptionlist{\@currname.\@currext}}%
|
||||||
|
\AtEndOfPackage{\let\@unprocessedoptions\relax}
|
||||||
|
\newcommand*\newfloatsetup{\setkeys{newfloat}}
|
||||||
|
\newcommand\newfloat@replace@chapter[2]{%
|
||||||
|
\begingroup
|
||||||
|
\let\if@twocolumn\iffalse
|
||||||
|
\let\if@mainmatter\iffalse
|
||||||
|
\let\if@thema\iffalse
|
||||||
|
\def\@tempa[##1]##2{#1}%
|
||||||
|
\ifx\@tempa\@chapter
|
||||||
|
\gdef\@chapter[##1]##2{#2}%
|
||||||
|
\global\let\newfloat@replace@chapter\@gobbletwo
|
||||||
|
\else\ifx\@tempa\Hy@org@chapter
|
||||||
|
\gdef\Hy@org@chapter[##1]##2{#2}%
|
||||||
|
\global\let\newfloat@replace@chapter\@gobbletwo
|
||||||
|
\fi\fi
|
||||||
|
\endgroup}
|
||||||
|
\ifcsname @chapter\endcsname \else
|
||||||
|
\let\newfloat@replace@chapter\@gobbletwo
|
||||||
|
\fi
|
||||||
|
\newfloat@replace@chapter{%
|
||||||
|
\ifnum \c@secnumdepth >\m@ne
|
||||||
|
\refstepcounter{chapter}%
|
||||||
|
\typeout{\@chapapp\space\thechapter.}%
|
||||||
|
\addcontentsline{toc}{chapter}%
|
||||||
|
{\protect\numberline{\thechapter}#1}%
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{#1}%
|
||||||
|
\fi
|
||||||
|
\chaptermark{#1}%
|
||||||
|
\addtocontents{lof}{\protect\addvspace{10\p@}}%
|
||||||
|
\addtocontents{lot}{\protect\addvspace{10\p@}}%
|
||||||
|
\if@twocolumn
|
||||||
|
\@topnewpage[\@makechapterhead{#2}]%
|
||||||
|
\else
|
||||||
|
\@makechapterhead{#2}%
|
||||||
|
\@afterheading
|
||||||
|
\fi
|
||||||
|
}{%
|
||||||
|
\ifnum \c@secnumdepth >\m@ne
|
||||||
|
\refstepcounter{chapter}%
|
||||||
|
\typeout{\@chapapp\space\thechapter.}%
|
||||||
|
\addcontentsline{toc}{chapter}%
|
||||||
|
{\protect\numberline{\thechapter}#1}%
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{#1}%
|
||||||
|
\fi
|
||||||
|
\chaptermark{#1}%
|
||||||
|
\@addchapterlistsgaps
|
||||||
|
\if@twocolumn
|
||||||
|
\@topnewpage[\@makechapterhead{#2}]%
|
||||||
|
\else
|
||||||
|
\@makechapterhead{#2}%
|
||||||
|
\@afterheading
|
||||||
|
\fi}
|
||||||
|
\newfloat@replace@chapter{%
|
||||||
|
\ifnum \c@secnumdepth >\m@ne
|
||||||
|
\if@mainmatter
|
||||||
|
\refstepcounter{chapter}%
|
||||||
|
\typeout{\@chapapp\space\thechapter.}%
|
||||||
|
\addcontentsline{toc}{chapter}%
|
||||||
|
{\protect\numberline{\thechapter}#1}%
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{#1}%
|
||||||
|
\fi
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{#1}%
|
||||||
|
\fi
|
||||||
|
\chaptermark{#1}%
|
||||||
|
\addtocontents{lof}{\protect\addvspace{10\p@}}%
|
||||||
|
\addtocontents{lot}{\protect\addvspace{10\p@}}%
|
||||||
|
\if@twocolumn
|
||||||
|
\@topnewpage[\@makechapterhead{#2}]%
|
||||||
|
\else
|
||||||
|
\@makechapterhead{#2}%
|
||||||
|
\@afterheading
|
||||||
|
\fi
|
||||||
|
}{%
|
||||||
|
\ifnum \c@secnumdepth >\m@ne
|
||||||
|
\if@mainmatter
|
||||||
|
\refstepcounter{chapter}%
|
||||||
|
\typeout{\@chapapp\space\thechapter.}%
|
||||||
|
\addcontentsline{toc}{chapter}%
|
||||||
|
{\protect\numberline{\thechapter}#1}%
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{#1}%
|
||||||
|
\fi
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{#1}%
|
||||||
|
\fi
|
||||||
|
\chaptermark{#1}%
|
||||||
|
\@addchapterlistsgaps
|
||||||
|
\if@twocolumn
|
||||||
|
\@topnewpage[\@makechapterhead{#2}]%
|
||||||
|
\else
|
||||||
|
\@makechapterhead{#2}%
|
||||||
|
\@afterheading
|
||||||
|
\fi}
|
||||||
|
\newfloat@replace@chapter{%
|
||||||
|
\refstepcounter{chapter}%
|
||||||
|
\ifnum\c@secnumdepth<\z@ \let\@secnumber\@empty
|
||||||
|
\else \let\@secnumber\thechapter \fi
|
||||||
|
\typeout{\chaptername\space\@secnumber}%
|
||||||
|
\def\@toclevel{0}%
|
||||||
|
\ifx\chaptername\appendixname \@tocwriteb\tocappendix{chapter}{#2}%
|
||||||
|
\else \@tocwriteb\tocchapter{chapter}{#2}\fi
|
||||||
|
\chaptermark{#1}%
|
||||||
|
\addtocontents{lof}{\protect\addvspace{10\p@}}%
|
||||||
|
\addtocontents{lot}{\protect\addvspace{10\p@}}%
|
||||||
|
\@makechapterhead{#2}\@afterheading
|
||||||
|
}{%
|
||||||
|
\refstepcounter{chapter}%
|
||||||
|
\ifnum\c@secnumdepth<\z@ \let\@secnumber\@empty
|
||||||
|
\else \let\@secnumber\thechapter \fi
|
||||||
|
\typeout{\chaptername\space\@secnumber}%
|
||||||
|
\def\@toclevel{0}%
|
||||||
|
\ifx\chaptername\appendixname \@tocwriteb\tocappendix{chapter}{#2}%
|
||||||
|
\else \@tocwriteb\tocchapter{chapter}{#2}\fi
|
||||||
|
\chaptermark{#1}%
|
||||||
|
\@addchapterlistsgaps
|
||||||
|
\@makechapterhead{#2}\@afterheading}
|
||||||
|
\@ifpackageloaded{tocbasic}{%
|
||||||
|
\let\newfloat@replace@chapter\@gobbletwo}{}
|
||||||
|
\ifcsname insertchapterspace\endcsname
|
||||||
|
\renewcommand*\insertchapterspace{\@addchapterlistsgaps}
|
||||||
|
\let\newfloat@replace@chapter\@gobbletwo
|
||||||
|
\fi
|
||||||
|
\newfloat@replace@chapter{%
|
||||||
|
\ifnum \c@secnumdepth >\m@ne
|
||||||
|
\refstepcounter{chapter}%
|
||||||
|
\typeout{\@chapapp\space\thechapter.}%
|
||||||
|
\addcontentsline{toc}{chapter}%
|
||||||
|
{\protect\numberline{\thechapter}\toc@font0 #1}%
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{\toc@font0 #1}%
|
||||||
|
\fi
|
||||||
|
\chaptermark{#1}%
|
||||||
|
\addtocontents{lof}{\protect\addvspace{10\p@}}%
|
||||||
|
\addtocontents{lot}{\protect\addvspace{10\p@}}%
|
||||||
|
\if@twocolumn
|
||||||
|
\@topnewpage[\@makechapterhead{#2}]%
|
||||||
|
\else
|
||||||
|
\@makechapterhead{#2}%
|
||||||
|
\@afterheading
|
||||||
|
\fi
|
||||||
|
}{%
|
||||||
|
\ifnum \c@secnumdepth >\m@ne
|
||||||
|
\refstepcounter{chapter}%
|
||||||
|
\typeout{\@chapapp\space\thechapter.}%
|
||||||
|
\addcontentsline{toc}{chapter}%
|
||||||
|
{\protect\numberline{\thechapter}\toc@font0 #1}%
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{\toc@font0 #1}%
|
||||||
|
\fi
|
||||||
|
\chaptermark{#1}%
|
||||||
|
\@addchapterlistsgaps
|
||||||
|
\if@twocolumn
|
||||||
|
\@topnewpage[\@makechapterhead{#2}]%
|
||||||
|
\else
|
||||||
|
\@makechapterhead{#2}%
|
||||||
|
\@afterheading
|
||||||
|
\fi}
|
||||||
|
% boek(3).cls [2004/06/07 v2.1a NTG LaTeX document class]
|
||||||
|
\newfloat@replace@chapter{%
|
||||||
|
\ifnum \c@secnumdepth >\m@ne
|
||||||
|
\if@mainmatter
|
||||||
|
\refstepcounter{chapter}%
|
||||||
|
\typeout{\@chapapp\space\thechapter.}%
|
||||||
|
\addcontentsline{toc}{chapter}%
|
||||||
|
{\protect\numberline{\thechapter}\toc@font0 #1}%
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{\toc@font0 #1}%
|
||||||
|
\fi
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{\toc@font0 #1}%
|
||||||
|
\fi
|
||||||
|
\chaptermark{#1}%
|
||||||
|
\addtocontents{lof}{\protect\addvspace{10\p@}}%
|
||||||
|
\addtocontents{lot}{\protect\addvspace{10\p@}}%
|
||||||
|
\if@twocolumn
|
||||||
|
\@topnewpage[\@makechapterhead{#2}]%
|
||||||
|
\else
|
||||||
|
\@makechapterhead{#2}%
|
||||||
|
\@afterheading
|
||||||
|
\fi
|
||||||
|
}{%
|
||||||
|
\ifnum \c@secnumdepth >\m@ne
|
||||||
|
\if@mainmatter
|
||||||
|
\refstepcounter{chapter}%
|
||||||
|
\typeout{\@chapapp\space\thechapter.}%
|
||||||
|
\addcontentsline{toc}{chapter}%
|
||||||
|
{\protect\numberline{\thechapter}\toc@font0 #1}%
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{\toc@font0 #1}%
|
||||||
|
\fi
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{\toc@font0 #1}%
|
||||||
|
\fi
|
||||||
|
\chaptermark{#1}%
|
||||||
|
\@addchapterlistsgaps
|
||||||
|
\if@twocolumn
|
||||||
|
\@topnewpage[\@makechapterhead{#2}]%
|
||||||
|
\else
|
||||||
|
\@makechapterhead{#2}%
|
||||||
|
\@afterheading
|
||||||
|
\fi}
|
||||||
|
\newfloat@replace@chapter{%
|
||||||
|
\ifnum \c@secnumdepth >\m@ne
|
||||||
|
\if@mainmatter
|
||||||
|
\refstepcounter{chapter}%
|
||||||
|
\typeout{\chaptername\space\thechapter.}
|
||||||
|
\if@thema
|
||||||
|
\ifx\@shortauthor\@empty
|
||||||
|
\addcontentsline{toc}{chapter}{%
|
||||||
|
\protect\numberline{\thechapter.}#1}%
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{%
|
||||||
|
\protect\numberline{\thechapter.}%
|
||||||
|
\@shortauthor\hfill\mbox{}\vskip\normallineskip #1}%
|
||||||
|
\fi
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{%
|
||||||
|
\protect\numberline{\thechapter.}#1}%
|
||||||
|
\fi
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{#1}
|
||||||
|
\fi
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{#1}
|
||||||
|
\fi
|
||||||
|
\chaptermark{#1}
|
||||||
|
\addtocontents{lof}{\protect\addvspace{10pt}}
|
||||||
|
\addtocontents{lot}{\protect\addvspace{10pt}}
|
||||||
|
\if@twocolumn
|
||||||
|
\@topnewpage[\@makechapterhead{#2}]
|
||||||
|
\else
|
||||||
|
\@makechapterhead{#2}
|
||||||
|
\@afterheading
|
||||||
|
\fi
|
||||||
|
}{%
|
||||||
|
\ifnum \c@secnumdepth >\m@ne
|
||||||
|
\if@mainmatter
|
||||||
|
\refstepcounter{chapter}%
|
||||||
|
\typeout{\chaptername\space\thechapter.}%
|
||||||
|
\if@thema
|
||||||
|
\ifx\@shortauthor\@empty
|
||||||
|
\addcontentsline{toc}{chapter}{%
|
||||||
|
\protect\numberline{\thechapter.}#1}%
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{%
|
||||||
|
\protect\numberline{\thechapter.}%
|
||||||
|
\@shortauthor\hfill\mbox{}\vskip\normallineskip #1}%
|
||||||
|
\fi
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{%
|
||||||
|
\protect\numberline{\thechapter.}#1}%
|
||||||
|
\fi
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{#1}%
|
||||||
|
\fi
|
||||||
|
\else
|
||||||
|
\addcontentsline{toc}{chapter}{#1}%
|
||||||
|
\fi
|
||||||
|
\chaptermark{#1}%
|
||||||
|
\@addchapterlistsgaps
|
||||||
|
\if@twocolumn
|
||||||
|
\@topnewpage[\@makechapterhead{#2}]%
|
||||||
|
\else
|
||||||
|
\@makechapterhead{#2}%
|
||||||
|
\@afterheading
|
||||||
|
\fi}
|
||||||
|
\ifx\newfloat@replace@chapter\@gobbletwo \else
|
||||||
|
\newfloat@InfoNoLine{%
|
||||||
|
Unsupported document class, or \noexpand\@chapter\MessageBreak
|
||||||
|
was already redefined by another package}
|
||||||
|
\newfloat@InfoNoLine{\string\@chapter\space=\space\meaning\@chapter}
|
||||||
|
\newfloat@InfoNoLine{\string\Hy@org@chapter\space=\space\meaning\Hy@org@chapter}
|
||||||
|
\newfloat@ifplanb{%
|
||||||
|
\newfloat@InfoNoLine{Trying Plan B..}%
|
||||||
|
\let\newfloat@addtocontents@ORI\addtocontents
|
||||||
|
\long\def\addtocontents#1#2{%
|
||||||
|
\newfloat@addtocontents{#1}{#2}#2\addvspace\newfloat@nil}%
|
||||||
|
\long\def\newfloat@addtocontents#1#2#3\addvspace#4\newfloat@nil{%
|
||||||
|
\def\newfloat@tempa{#4}%
|
||||||
|
\ifx\newfloat@tempa\@empty
|
||||||
|
\newfloat@addtocontents@ORI{#1}{#2}%
|
||||||
|
\else
|
||||||
|
\ifx\newfloat@addtocontents@ext\@undefined
|
||||||
|
\newfloat@Info{Setting Plan B file extension to `#1'...}%
|
||||||
|
\xdef\newfloat@addtocontents@ext{#1}%
|
||||||
|
\fi
|
||||||
|
\edef\newfloat@tempa{#1}%
|
||||||
|
\ifx\newfloat@tempa\newfloat@addtocontents@ext
|
||||||
|
\begingroup
|
||||||
|
\let\addtocontents\newfloat@addtocontents@ORI
|
||||||
|
\@addchapterlistsgaps
|
||||||
|
\endgroup
|
||||||
|
\fi
|
||||||
|
\fi}}
|
||||||
|
\fi
|
||||||
|
\newcommand\newfloat@ForEachNew[2][newfloat@@list]{%
|
||||||
|
\AtBeginDocument{%
|
||||||
|
\ifcsname#1\endcsname
|
||||||
|
\def\@elt##1{#2}%
|
||||||
|
\newfloat@@list
|
||||||
|
\let\@elt\relax
|
||||||
|
\fi}}%
|
||||||
|
\@onlypreamble\newfloat@ForEachNew
|
||||||
|
%% \begin{macrocode}
|
||||||
|
\newfloat@ForEachNew[float@exts]{%
|
||||||
|
\@nameuse{@ifchapterlistsgap@#1}{% if switched on
|
||||||
|
\let\float@do=\relax
|
||||||
|
\edef\@tempa{%
|
||||||
|
\noexpand\float@exts{\the\float@exts\float@do{\@nameuse{ext@#1}}}}%
|
||||||
|
\@tempa}}
|
||||||
|
\newfloat@ForEachNew[FP@floatBegin]{%
|
||||||
|
\newcounter{FP@#1C}%
|
||||||
|
\newenvironment{FP#1}{\FP@floatBegin{#1}}{\FP@floatEnd}}
|
||||||
|
\providecommand*\ext@lstlisting{lol}%
|
||||||
|
\newfloat@ForEachNew[@rotfloat]{%
|
||||||
|
\newenvironment{sideways#1}{\@rotfloat{#1}}{\end@rotfloat}%
|
||||||
|
\newenvironment{sideways#1*}{\@rotdblfloat{#1}}{\end@rotdblfloat}}
|
||||||
|
\newcommand*\newfloat@For@SC[2]{%
|
||||||
|
\def#1{b}% = \sidecaptionvpos{#2}{b} (v1.6)
|
||||||
|
\newenvironment{SC#2}%
|
||||||
|
{\SC@float[#1]{#2}}{\endSC@float}%
|
||||||
|
\newenvironment{SC#2*}%
|
||||||
|
{\SC@dblfloat[#1]{#2}}{\endSC@dblfloat}}
|
||||||
|
\@onlypreamble\newfloat@For@SC
|
||||||
|
\newfloat@ForEachNew[SC@float]{%
|
||||||
|
\expandafter\newfloat@For@SC\csname SC@#1@vpos\endcsname{#1}}
|
||||||
|
\newfloat@ForEachNew[wrapfloat]{%
|
||||||
|
\newenvironment{wrap#1}{\wrapfloat{#1}}{\endwrapfloat}}
|
||||||
|
\endinput
|
||||||
|
%%
|
||||||
|
%% End of file `newfloat.sty'.
|
||||||
@ -197,7 +197,7 @@ class HTMLTranslator(BaseTranslator):
|
|||||||
else:
|
else:
|
||||||
atts['class'] += ' external'
|
atts['class'] += ' external'
|
||||||
if 'refuri' in node:
|
if 'refuri' in node:
|
||||||
atts['href'] = node['refuri']
|
atts['href'] = node['refuri'] or '#'
|
||||||
if self.settings.cloak_email_addresses and \
|
if self.settings.cloak_email_addresses and \
|
||||||
atts['href'].startswith('mailto:'):
|
atts['href'].startswith('mailto:'):
|
||||||
atts['href'] = self.cloak_mailto(atts['href'])
|
atts['href'] = self.cloak_mailto(atts['href'])
|
||||||
|
|||||||
@ -322,6 +322,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
|
|||||||
self.in_container_literal_block = 0
|
self.in_container_literal_block = 0
|
||||||
self.in_term = 0
|
self.in_term = 0
|
||||||
self.in_merged_cell = 0
|
self.in_merged_cell = 0
|
||||||
|
self.in_minipage = 0
|
||||||
self.first_document = 1
|
self.first_document = 1
|
||||||
self.this_is_the_title = 1
|
self.this_is_the_title = 1
|
||||||
self.literal_whitespace = 0
|
self.literal_whitespace = 0
|
||||||
@ -703,10 +704,12 @@ class LaTeXTranslator(nodes.NodeVisitor):
|
|||||||
self.body.append('}')
|
self.body.append('}')
|
||||||
|
|
||||||
def visit_topic(self, node):
|
def visit_topic(self, node):
|
||||||
|
self.in_minipage = 1
|
||||||
self.body.append('\\setbox0\\vbox{\n'
|
self.body.append('\\setbox0\\vbox{\n'
|
||||||
'\\begin{minipage}{0.95\\linewidth}\n')
|
'\\begin{minipage}{0.95\\linewidth}\n')
|
||||||
|
|
||||||
def depart_topic(self, node):
|
def depart_topic(self, node):
|
||||||
|
self.in_minipage = 0
|
||||||
self.body.append('\\end{minipage}}\n'
|
self.body.append('\\end{minipage}}\n'
|
||||||
'\\begin{center}\\setlength{\\fboxsep}{5pt}'
|
'\\begin{center}\\setlength{\\fboxsep}{5pt}'
|
||||||
'\\shadowbox{\\box0}\\end{center}\n')
|
'\\shadowbox{\\box0}\\end{center}\n')
|
||||||
@ -1410,6 +1413,14 @@ class LaTeXTranslator(nodes.NodeVisitor):
|
|||||||
(node['align'] == 'right' and 'r' or 'l',
|
(node['align'] == 'right' and 'r' or 'l',
|
||||||
node['width']))
|
node['width']))
|
||||||
self.context.append(ids + '\\end{wrapfigure}\n')
|
self.context.append(ids + '\\end{wrapfigure}\n')
|
||||||
|
elif self.in_minipage:
|
||||||
|
if ('align' not in node.attributes or
|
||||||
|
node.attributes['align'] == 'center'):
|
||||||
|
self.body.append('\n\\begin{center}')
|
||||||
|
self.context.append('\\end{center}\n')
|
||||||
|
else:
|
||||||
|
self.body.append('\n\\begin{flush%s}' % node.attributes['align'])
|
||||||
|
self.context.append('\\end{flush%s}\n' % node.attributes['align'])
|
||||||
else:
|
else:
|
||||||
if ('align' not in node.attributes or
|
if ('align' not in node.attributes or
|
||||||
node.attributes['align'] == 'center'):
|
node.attributes['align'] == 'center'):
|
||||||
@ -1436,8 +1447,10 @@ class LaTeXTranslator(nodes.NodeVisitor):
|
|||||||
self.body.append('\\needspace{\\literalblockneedspace}')
|
self.body.append('\\needspace{\\literalblockneedspace}')
|
||||||
self.body.append('\\vspace{\\literalblockcaptiontopvspace}%')
|
self.body.append('\\vspace{\\literalblockcaptiontopvspace}%')
|
||||||
self.body.append('\n\\SphinxSetupCaptionForVerbatim{literal-block}{')
|
self.body.append('\n\\SphinxSetupCaptionForVerbatim{literal-block}{')
|
||||||
return
|
elif self.in_minipage and isinstance(node.parent, nodes.figure):
|
||||||
self.body.append('\\caption{')
|
self.body.append('\\captionof{figure}{')
|
||||||
|
else:
|
||||||
|
self.body.append('\\caption{')
|
||||||
|
|
||||||
def depart_caption(self, node):
|
def depart_caption(self, node):
|
||||||
self.body.append('}')
|
self.body.append('}')
|
||||||
|
|||||||
@ -209,7 +209,7 @@ HTML_XPATH = {
|
|||||||
(".//a[@href='#c.SphinxType']", ''),
|
(".//a[@href='#c.SphinxType']", ''),
|
||||||
(".//a[@href='#c.sphinx_global']", ''),
|
(".//a[@href='#c.sphinx_global']", ''),
|
||||||
# test global TOC created by toctree()
|
# test global TOC created by toctree()
|
||||||
(".//ul[@class='current']/li[@class='toctree-l1 current']/a[@href='']",
|
(".//ul[@class='current']/li[@class='toctree-l1 current']/a[@href='#']",
|
||||||
'Testing object descriptions'),
|
'Testing object descriptions'),
|
||||||
(".//li[@class='toctree-l1']/a[@href='markup.html']",
|
(".//li[@class='toctree-l1']/a[@href='markup.html']",
|
||||||
'Testing various markup'),
|
'Testing various markup'),
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user