Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UpdatePython2.7 #38

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open
11 changes: 9 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
language: python

python:
- 2.6
- 2.7


branches:
only:
- UpdatePython27

before_install:
- sudo apt-get remove chromium firefox mongodb-10gen
- sudo apt-get install texlive
Expand All @@ -12,7 +16,10 @@ before_install:
# - sudo apt-get install texlive

install:
- "pip install -r requirements.txt --use-mirrors"
- pip install docutils==0.12
- pip install pybtex
- pip install sphinx==1.3.1
- pip install sphinxcontrib-exceltable

script:
- make html && make html
Expand Down
16 changes: 16 additions & 0 deletions Abverz.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
:orphan:

.. only:: html or text

Stichwortverzeichniss
=====================

Kurze Übersicht über die im Bericht verwendeten Abkürzungen.

.. topic:: Your Topic Title

Subsequent indented lines comprise
the body of the topic, and are
interpreted as body elements.


13 changes: 5 additions & 8 deletions ch-intro/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ support all of the needs of a thesis writer. Many of the patches are not
appropriate for contributing directly to the upstream Sphinx repository, so
this is instead a separate project.

This sphinxtr output is available in several formats at:
http://jterrace.github.com/sphinxtr.

The source code for sphinxtr can be found at:
The orginal source code for sphinxtr can be found at:
https://github.com/jterrace/sphinxtr.

Installation
Expand Down Expand Up @@ -75,6 +72,9 @@ Changes

The following changes and additions have been made from vanilla Sphinx:

* 2017 Start on the python3.5/sphinx 1.4.3 version
* 2016 working Version(this version)

* A cross-format bibtex bibliography based on sphinx-natbib
* Tables that can go inside figures
* Changed table formatting to look pretty, like booktabs
Expand All @@ -86,8 +86,5 @@ The following changes and additions have been made from vanilla Sphinx:
* Numbered section references
* A singletext output that builds into a single text file, similar to singlehtml
* A subfigure environment
* Nov. 2015 adapting for Python 2.7

Documents Using sphinxtr
========================

* `Jeff Terrace's PhD Thesis <http://www.cs.princeton.edu/~jterrace/thesis/>`_
123 changes: 61 additions & 62 deletions conf.py
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
import sys, os
import os
import sys

# directory relative to this conf file
CURDIR = os.path.abspath(os.path.dirname(__file__))
# add custom extensions directory to python path
sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'extensions'))

# import the custom html and latex builders/translators/writers
import html_mods
import latex_mods

# If your documentation needs a minimal Sphinx version, state it here.
#needs_sphinx = '1.0'
# needs_sphinx = '1.0'

# import order is important here
extensions = [
'fix_equation_ref',
'sphinx.ext.mathjax',
'sphinx.ext.ifconfig',
'subfig',
'numfig',
'numsec',
'natbib',
'figtable',
'singlehtml_toc',
'singletext',
]
'fix_equation_ref',
'sphinx.ext.mathjax',
'sphinx.ext.ifconfig',
'subfig',
'numfig',
'numsec',
'natbib',
'figtable',
'singlehtml_toc',
'singletext', 'sphinxcontrib.exceltable'
]

# Add any paths that contain templates here, relative to this directory.
templates_path = ['templates']
templates_path = [ 'templates' ]

# The suffix of source filenames.
source_suffix = '.rst'
Expand All @@ -36,11 +35,11 @@
source_encoding = 'utf-8-sig'

# General information about the project.
project = u'The Sphinx Thesis Resource (sphinxtr)'
author = u'Jeff Terrace'
copyright = u'by %s, 2012.' % author
version = '0.1'
release = '0.1'
project = u'Bericht'
author = u'Me'
copyright = u'by %s, 2015.' % author
version = '0.2'
release = '0.2'

# Turns on numbered figures for HTML output
number_figures = True
Expand All @@ -58,11 +57,11 @@
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
exclude_patterns = [
'_build',
'tex',
'epilog.rst',
'README.rst',
]
'_build',
'tex',
'epilog.rst',
'README.rst',
]

# The master toctree document.
# Ideally, we wouldn't have to do this, but sphinx seems to have trouble with
Expand All @@ -76,12 +75,11 @@

# A string of reStructuredText that will be included at the end of
# every source file that is read.
rst_epilog = open(os.path.join(CURDIR, 'epilog.rst'),'r').read().decode('utf8')
rst_epilog = open(os.path.join(CURDIR, 'epilog.rst'), 'r').read().decode('utf8')

# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'


# -- Options for HTML output ---------------------------------------------------

# The theme to use for HTML and HTML Help pages. See the documentation for
Expand All @@ -91,52 +89,52 @@
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
#html_theme_options = {}
# html_theme_options = {}

# Add any paths that contain custom themes here, relative to this directory.
#html_theme_path = []
# html_theme_path = []

# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
html_title = "%s" % project

# A shorter title for the navigation bar. Default is the same as html_title.
html_short_title = "Someone's PhD Thesis"
html_short_title = "Report"

# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
#html_logo = None
# html_logo = None

# The name of an image file (within the static path) to use as favicon of the
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
#html_favicon = None
# html_favicon = None

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['static']
html_static_path = [ 'static' ]

# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
#html_last_updated_fmt = '%b %d, %Y'
# html_last_updated_fmt = '%b %d, %Y'

# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
#html_use_smartypants = True
# html_use_smartypants = True

# Custom sidebar templates, maps document names to template names.
template_files = ['localtoc.html', 'relations.html', 'sourcelink.html']
template_files = [ 'localtoc.html', 'relations.html', 'sourcelink.html' ]
if not tags.has('singlehtml'):
# only include search box for regular html, not single page html
template_files.append('searchbox.html')
html_sidebars = {
'**': template_files,
'**': template_files,
}

# Additional templates that should be rendered to pages, maps page names to
# template names.
#html_additional_pages = {}
# html_additional_pages = {}

# If false, no module index is generated.
html_domain_indices = False
Expand All @@ -145,24 +143,24 @@
html_use_index = False

# If true, the index is split into individual pages for each letter.
#html_split_index = False
# html_split_index = False

# If true, links to the reST sources are added to the pages.
#html_show_sourcelink = True
# html_show_sourcelink = True

# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
#html_show_sphinx = True
# html_show_sphinx = True

# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
#html_show_copyright = True
# html_show_copyright = True

# If true, an OpenSearch description file will be output, and all pages will
# contain a <link> tag referring to it. The value of this option must be the
# base URL from which the finished HTML is served.
#html_use_opensearch = ''
# html_use_opensearch = ''

# This is the file name suffix for HTML files (e.g. ".xhtml").
#html_file_suffix = None
# html_file_suffix = None

# supresses the last dot in section numbers
# changes "1. Introduction" -> "1 Introduction"
Expand Down Expand Up @@ -191,40 +189,40 @@

latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
'papersize': 'letterpaper',
'papersize': 'a4paper',

# * gets passed to \documentclass
# * default options are single sided, double spaced
# you can change them with these options:
# * twoside
# * singlespace
# * you might want to omit the list of tables (lot)
# if you use figtable without the :nofig: option
'classoptions': ',english,lof,lot',
'classoptions': ',ngerman,lof,lot',

# The font size ('10pt', '11pt' or '12pt').
'pointsize': '12pt',
'pointsize': '10pt',

# Additional stuff for the LaTeX preamble.
'preamble': ADDITIONAL_PREAMBLE,

# Additional footer
'footer': ADDITIONAL_FOOTER,

# disable font inclusion
'fontpkg': '',
'fontenc': '',

# disable fancychp
'fncychap': '',

# get rid of the sphinx wrapper class file
'wrapperclass': 'puthesis',

# override maketitle
'maketitle': '\makefrontmatter',
'tableofcontents': '',

# disable index printing
'printindex': '',
}
Expand All @@ -241,7 +239,7 @@
]

latex_docclass = {
'manual': 'puthesis',
'manual': '',
}

latex_additional_files = [
Expand All @@ -253,24 +251,25 @@
'tex/refstyle.bst',
'refs.bib',
'tex/ccicons.sty',
'img/Kopfzeile_neu.png'
]

# The name of an image file (relative to this directory) to place at the top of
# the title page.
#latex_logo = None
# latex_logo = None

# For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters.
latex_use_parts = False

# If true, show page references after internal links.
#latex_show_pagerefs = False
# latex_show_pagerefs = False

# If true, show URL addresses after external links.
#latex_show_urls = False
# latex_show_urls = False

# Documents to append as an appendix to all manuals.
#latex_appendices = []
# latex_appendices = []

# If false, no module index is generated.
latex_domain_indices = False
Empty file added extensions/__init__.py
Empty file.
Binary file added extensions/backports.zip
Binary file not shown.
Loading