Skip to content

Commit d7016f3

Browse files
committed
minor tweaks when testing w/MDhelp
1 parent d955ee5 commit d7016f3

File tree

5 files changed

+32
-25
lines changed

5 files changed

+32
-25
lines changed

MDhelp/docs/index.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<!--- Don't change the HTML version of this file; edit the .md version -->
2+
<a name="HelpIntro"></a>
23
# Help for GSAS-II
34

45
This and the subsequent web pages provide documentation for the
@@ -14,18 +15,24 @@ window and in other locations of the program.
1415
An index on the topics covered in these help pages is given below.
1516

1617
1. [Tutorials](./preface.md)
17-
2. [GSAS-II GUI Organization](./applicationwindow.md)
18+
2. [GSAS-II Window Organization](./applicationwindow.md)
1819
1. [Data Tree](./applicationwindow.md#Data_tree)
1920
2. [Data Window](./applicationwindow.md#Data_frame)
2021
3. [Graphics Window](./applicationwindow.md#Plots)
2122
4. [Console Window](./applicationwindow.md#Console)
2223
3. [Main menu contents](./mainmenu.md)
2324
4. Data tree entries and their use ([overview](./datatree.md))
2425
1. [Universal data tree](./commontreeitems.md) items
26+
* [Notebook](./commontreeitems.md#Notebook)
27+
* [Controls and settings](./commontreeitems.md#Controls)
28+
* [Covariance and fit results](./commontreeitems.md#Covariance)
29+
* [Constraints](./commontreeitems.md#Constraints)
30+
* [Restraints](./commontreeitems.md#Restraints)
31+
* [Rigid Bodies](./commontreeitems.md#Rigidbodies)
2532
0. [Sequential results](./sequential.md)
2633
0. [Cluster Analysis](./cluster.md)
2734
2. [Phase Data Tree items (overview)](./phaseoverview.md)
28-
* [General Phase tab](./phasegeneral.md)
35+
* [General Phase tab](./phasegeneral.md)
2936
* [Data Phase tab](./phasedata.md)
3037
* [Atoms Phase tab](./phaseatoms.md)
3138
* [Draw Options tab](./phasedrawopts.md)

MDhelp/docs/powder.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--- Don't change the HTML version of this file; edit the .md version -->
2-
<a name="PWDR"></a>
2+
<a name="PWDR_overview"></a>
33
# Overview on **PWDR** data tree entries: Powder Diffraction
44

55
This is where to find information on the Tree item in GSAS-II associated with powder diffraction (labeled PWDR) and its associated subitems. Note that GSAS-II uses the label of "histogram" for datasets of any type (single-crystal, powder,...) Powder diffraction histograms are added to a project using the Import/"Powder Data" menu items. After data are read, if there are phases present, you will be offered a chance to link the imported histograms to the previously imported phase(s). Likewise, if phase(s) are imported after histograms you will also be asked to link the new phase(s) to existing histograms. It is also possible to add histograms to a phase later by selecting that phase in the data tree and then selecting the "Data" tab and finally using the "Edit Phase"/"Add powder histograms" menu command. Note that there is no limit to the number of histograms that can be included in a GSAS-II project (other than as limited by available computer memory) and histograms that are not linked to at least one phase are ignored in refinements.

MDhelp/docs/powderparent.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!--- Don't change the HTML version of this file; edit the .md version -->
22
<a name="PWDR_parent"></a>
3+
<a name="PWDR"></a>
34
# **PWDR** parent data tree (Powder Diffraction)
45

56
When a powder diffraction dataset (prefix 'PWDR') is selected from the data tree or for most of the subdata tree items, the dataset is plotted. The observed data points are shown as blue crosses and where fit, the calculated pattern is shown as a green line; the background is shown as red line. The difference curve is shown as a cyan line. These colors can be changed through [configuration variables](./others.md#config) `Obs_color`, `Calc_color`, `Diff_color`, and `Bkg_color`.
Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ nav:
88
- Data tree items:
99
- Data tree overview: datatree.md
1010
- Universal items: commontreeitems.md
11+
- Sequential results: sequential.md
12+
- Cluster Analysis: cluster.md
1113
- Phases:
1214
- Phase overview: phaseoverview.md
1315
- General tab: phasegeneral.md
@@ -42,8 +44,7 @@ nav:
4244
- PDF: pairdistribution.md
4345
- Small Angle (SASD): smallanglescattering.md
4446
- Reflectometry (REFD): reflectometry.md
45-
- Sequential results: sequential.md
46-
- Cluster Analysis: cluster.md
47+
- Powder Peaks (PKS): peaks.md
4748

4849
# - Powder peaks (PKS): powderpeak.md
4950

@@ -57,21 +58,15 @@ theme:
5758
logo: images/gsas2.png
5859

5960
plugins:
60-
#- with-pdf:
61-
- to-pdf:
62-
author: Brian H. Toby and Robert B. Von Dreele
63-
enabled_if_env: ENABLE_PDF_EXPORT
64-
cover_title: GSAS-II Help information
65-
cover_subtitle: A compilation of HTML pages into PDF
66-
copyright: From https://advancedphotonsource.github.io/GSAS-II-tutorials/help/
67-
#back_cover: true
68-
output_path: GSASII-help.pdf
69-
# exclude_pages:
70-
# - Contents
71-
# - index.md
72-
render_js: true
73-
headless_chrome_path: /usr/bin/google-chrome-stable
74-
pdf_engine: chromium
61+
# - to-pdf:
62+
# author: Brian H. Toby and Robert B. Von Dreele
63+
# enabled_if_env: ENABLE_PDF_EXPORT
64+
# cover_title: GSAS-II Help information
65+
# cover_subtitle: A compilation of HTML pages into PDF
66+
# copyright: From https://advancedphotonsource.github.io/GSAS-II-tutorials/help/
67+
# output_path: GSASII-help.pdf
68+
# render_js: true
69+
# headless_chrome_path: /usr/bin/google-chrome-stable
7570
- i18n:
7671
docs_structure: suffix
7772
languages:
@@ -93,11 +88,7 @@ markdown_extensions:
9388
extra_javascript:
9489
- javascripts/mathjax.js
9590
- https://unpkg.com/mathjax@3/es5/tex-mml-chtml.js
96-
97-
98-
#extra_javascript:
9991
# - https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML
100-
# - https://unpkg.com/mathjax@3/es5/tex-mml-chtml.js # MathJax library from CDN
10192

10293
#local build settings from https://www.mkdocs.org/user-guide/deploying-your-docs/#local-files
10394

webdocs/documentation.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,15 @@ The GSAS-II GUI provides context-based help via several web files that are
2727
distributed with the program, as well as can be `viewed here
2828
<help/gsasII-index.html>`_. These help pages are not always complete,
2929
but do provide information on how different sections of the program
30-
work.
30+
work.
31+
32+
The help documentation is in the process of being reformatted and updated. The
33+
`new help pages can be viewed here<help-test/>`_ as web pages or
34+
`here as a PDF document
35+
<https://advancedphotonsource.github.io/GSAS-II-tutorials/docs/GSASII-help.pdf>`_.
36+
These files are now based in MarkDown (simple text) input files found
37+
`in GitHub<https://github.com/AdvancedPhotonSource/GSAS-II-tutorials/tree/main/MDhelp>`_.
38+
Comments, corrections, additions and issue reports are most welcome.
3139

3240
.. index:: Source code documentation
3341

0 commit comments

Comments
 (0)