Skip to content

Commit 310cb01

Browse files
committed
Update doc
1 parent 58a97f6 commit 310cb01

4 files changed

Lines changed: 36 additions & 21 deletions

File tree

doc/manual/source/conf.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import sys, os
66
import time
77
import sphinx_py3doc_enhanced_theme
8+
89
# Requires sphinx >= 0.6
910

1011
# If extensions (or modules to document with autodoc) are in another directory,
@@ -50,6 +51,7 @@
5051
# built documents.
5152
sys.path.insert(0, os.path.abspath('../../..'))
5253
from setup import versiondata
54+
5355
fullversion = versiondata.get('DEFAULT', 'version')
5456
# The short X.Y version.
5557
version = ''.join(fullversion.split('.post')[:1])
@@ -111,8 +113,10 @@
111113
# documentation.
112114
#
113115
html_theme_options = {
114-
'collapsiblesidebar' : 'true',
115-
'navigation_with_keys' : 'true',
116+
'collapsiblesidebar': 'true',
117+
'navigation_with_keys': 'true',
118+
'body_min_width': '400px',
119+
'body_max_width': '800px',
116120
}
117121

118122
# Add any paths that contain custom themes here, relative to this directory.
@@ -183,18 +187,17 @@
183187
# Output file base name for HTML help builder.
184188
htmlhelp_basename = 'pyobjcrystdoc'
185189

186-
187190
# -- Options for LaTeX output --------------------------------------------------
188191

189192
latex_elements = {
190-
# The paper size ('letterpaper' or 'a4paper').
191-
# 'papersize': 'letterpaper',
193+
# The paper size ('letterpaper' or 'a4paper').
194+
# 'papersize': 'letterpaper',
192195

193-
# The font size ('10pt', '11pt' or '12pt').
194-
# 'pointsize': '10pt',
196+
# The font size ('10pt', '11pt' or '12pt').
197+
# 'pointsize': '10pt',
195198

196-
# Additional stuff for the LaTeX preamble.
197-
# 'preamble': '',
199+
# Additional stuff for the LaTeX preamble.
200+
# 'preamble': '',
198201
}
199202

200203
# Grouping the document tree into LaTeX files. List of tuples

doc/manual/source/examples/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ tested in parallel to determine which one is correct. The solutions
3939
can then be compared and displayed individually.
4040

4141
:doc:`Quantitative phase analysis (QPA) <Quantitative-phase-analysis>`
42-
______________________________________________________________________
42+
======================================================================
4343

4444
Example of QPA based on the data available from the `1999 Round Robin
4545
<https://www.iucr.org/__data/iucr/powder/QARR/samples.htm>`_,

doc/manual/source/index.rst

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Crystallographic Library
1212
Authors
1313
================
1414

15-
pyobjcryst was written as part of the DANSE_ open-source project by
15+
`pyobjcryst` was written as part of the DANSE_ open-source project by
1616
Christopher Farrow, Pavol Juhás, and Simon J.L. Billinge.
1717
The sources are now maintained as a part of the DiffPy-CMI complex
1818
modeling initiative at the Brookhaven National Laboratory.
@@ -23,30 +23,42 @@ global optimisation and least squares algorithms (see the
2323
:doc:`examples/index`) are provided by Vincent Favre-Nicolin (ESRF).
2424

2525
For a complete list of contributors, see
26-
https://github.com/diffpy/pyobjcryst/graphs/contributors.
26+
https://github.com/diffpy/pyobjcryst/graphs/contributors and
27+
https://github.com/diffpy/libobjcryst/graphs/contributors.
2728

2829
.. _DANSE: http://danse.us/
2930

3031
======================================
3132
Installation
3233
======================================
3334

35+
`pyobjcryst` and `libobjcryst` conda packages can be easily installed under
36+
Linux and macOS using channel `conda-forge` or `diffpy` channels,
37+
e.g.:
38+
39+
* `conda install -c diffpy libobjcryst pyobjcryst`
40+
* `conda install -c conda-forge libobjcryst pyobjcryst`
41+
3442
See the `README <https://github.com/diffpy/pyobjcryst#requirements>`_
35-
file included with the distribution.
43+
file included with the distribution for more details.
3644

3745
======================================
3846
Usage
3947
======================================
4048

41-
pyobjcryst can be used in different ways:
49+
`pyobjcryst` can be used in different ways:
4250

43-
* as a backend library to manage crystal structures description in an application
51+
* **as a backend library** to manage crystal structures description in an application
4452
like `DiffPy-CMI <https://www.diffpy.org/products/diffpycmi/index.html>`_
45-
* in python scripts or notebooks, allowing to display crystal structures,
46-
index and refine powder diffraction patterns, solve crystal structures
47-
from diffraction data using global optimisation algorithms, etc.. The
48-
functionality is similar to what is available in `Fox <http://fox.vincefn.net>`_.
49-
See the :doc:`examples/index`:
53+
* **in python scripts or notebooks**, allowing to:
54+
55+
* display crystal structures,
56+
* index and refine powder diffraction patterns
57+
* solve crystal structures from diffraction data using global optimisation algorithms
58+
* etc..
59+
60+
The functionality is similar to what is available in `Fox <http://fox.vincefn.net>`_.
61+
See the ** :doc:`examples/index` **:
5062
5163
* :doc:`3D Crystal structure display <examples/crystal_3d_widget>`
5264
* :doc:`Solving the cimetidine structure from its powder pattern <examples/structure-solution-powder-cimetidine>`

src/pyobjcryst/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
1818
Objects are wrapped according to their header file in the ObjCryst source.
1919
20-
See the online ObjCryst++ documentation (http://vincefn.net/ObjCryst/).
20+
See the online ObjCryst++ documentation (https://vincefn.net/ObjCryst/).
2121
2222
Modules
2323

0 commit comments

Comments
 (0)