Merge remote-tracking branch 'open/master' into os-merge-b97af47

# Conflicts:
#	.idea/compiler.xml
#	docs/source/changelog.rst
#	docs/source/release-notes.rst
#	node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt
#	tools/bootstrapper/build.gradle
This commit is contained in:
Shams Asari
2018-06-25 11:38:30 +01:00
57 changed files with 1136 additions and 669 deletions

View File

@ -238,6 +238,14 @@ latex_documents = [('index', u'corda-developer-site.tex', u'Corda Developer Docu
# If false, no module index is generated.
# latex_domain_indices = True
_PREAMBLE = r"""
\usepackage[utf8]{inputenc}
\usepackage{pmboxdraw}
\DeclareUnicodeCharacter{2514}{\textSFii}
\DeclareUnicodeCharacter{251C}{\textSFviii}
\DeclareUnicodeCharacter{2705}{\checkmark}
"""
latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
# 'papersize': 'letterpaper',
@ -251,7 +259,9 @@ latex_elements = {
# Latex figure (float) alignment
# 'figure_align': 'htbp',
'maxlistdepth': 2000,
'maxlistdepth' : '2000',
'extraclassoptions': 'openany',
'preamble' : _PREAMBLE,
'extraclassoptions' : 'openany',
}