Changeset b609c34 in sasview for docs

Timestamp:

Mar 18, 2016 10:42:04 AM (9 years ago)

Author:

ajj

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

66f21cd

Parents:

cde9d7d (diff), fce0139 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into sasmodels-integration

Location:

docs/sphinx-docs/source

Files:

• conf.py (modified) (2 diffs)
• user/analysis.rst (added)
• user/tools.rst (added)
• user/user.rst (modified) (2 diffs)

docs/sphinx-docs/source/conf.py

@@ -201 +201 @@
 # -- Options for LaTeX output --------------------------------------------------
 
+LATEX_PREAMBLE=r"""
+\renewcommand{\AA}{\text{\r{A}}} % Allow \AA in math mode
+\usepackage[utf8]{inputenc}      % Allow unicode symbols in text
+\DeclareUnicodeCharacter {00B7} {\ensuremath{\cdot}}   % cdot
+\DeclareUnicodeCharacter {00B0} {\ensuremath{^\circ}}  % degrees
+\DeclareUnicodeCharacter {212B} {\AA}                  % Angstrom
+"""
 latex_elements = {
 # The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+'papersize': 'a4paper',
 
 # The font size ('10pt', '11pt' or '12pt').
@@ -209 +216 @@
 
 # Additional stuff for the LaTeX preamble.
-#'preamble': '',
+'preamble': LATEX_PREAMBLE
+
 }
 

docs/sphinx-docs/source/user/user.rst

@@ -8 +8 @@
 
    Model Documentation <models/model_functions>
+   
+   Tools <tools>
+   
+   Types of Analysis <analysis>
 
    Data Formats <sasgui/guiframe/data_formats_help>
@@ -14 +18 @@
    
    Plotting Data/Models <sasgui/guiframe/graph_help>
-   
-   Fitting Perspective <sasgui/perspectives/fitting/fitting>
-   
-   P(r) Inversion Perspective <sasgui/perspectives/pr/pr_help>
-   
-   Invariant Calculation Perspective <sasgui/perspectives/invariant/invariant_help>
-   
-   Data Operations Tool <sasgui/perspectives/calculator/data_operator_help>
       
-   Density/Volume Calculator Tool <sasgui/perspectives/calculator/density_calculator_help>
-   
-   Generic SANS Calculator Tool <sasgui/perspectives/calculator/sas_calculator_help>
-   
-   Image Viewer Tool <sasgui/perspectives/calculator/image_viewer_help>
-   
-   Kiessig Thickness Calculator Tool <sasgui/perspectives/calculator/kiessig_calculator_help>
-   
-   SLD Calculator Tool <sasgui/perspectives/calculator/sld_calculator_help>
-   
-   Slit Size Calculator Tool <sasgui/perspectives/calculator/slit_calculator_help>
-   
-   Q Resolution Estimator Tool <sasgui/perspectives/calculator/resolution_calculator_help>
-   
-   Python Shell Tool <sasgui/perspectives/calculator/python_shell_help>
-
    Test Data <../test/testdata_help.rst>