Skip to content

Commit cfea157

Browse files
committed
Sync with the source at 544d2e6.
1 parent c582417 commit cfea157

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1794
-2856
lines changed

.buildinfo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: 06be21675cdea5cfbfe38a80b3f189f4
3+
config: 8b80050d9c0ef83a293b1c9c0ad338d4
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

_sources/api/diffpy.srfit.util.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@ diffpy.srfit.util package
44
Submodules
55
----------
66

7-
diffpy.srfit.util.abcport module
8-
--------------------------------
9-
10-
.. automodule:: diffpy.srfit.util.abcport
11-
:members:
12-
:undoc-members:
13-
:show-inheritance:
14-
157
diffpy.srfit.util.inpututils module
168
-----------------------------------
179

@@ -36,14 +28,6 @@ diffpy.srfit.util.observable module
3628
:undoc-members:
3729
:show-inheritance:
3830

39-
diffpy.srfit.util.ordereddict module
40-
------------------------------------
41-
42-
.. automodule:: diffpy.srfit.util.ordereddict
43-
:members:
44-
:undoc-members:
45-
:show-inheritance:
46-
4731
diffpy.srfit.util.tagmanager module
4832
-----------------------------------
4933

_sources/examples.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Examples
2727
.. _nppdfsas.py: examples/nppdfsas.html
2828
.. _interface.py: examples/interface.html
2929
.. _simplerecipe.py: examples/simplerecipe.html
30-
.. _anneal.py: examples/anneal.html
3130

3231

3332
Files
@@ -55,4 +54,3 @@ Files
5554
examples/nppdfsas.rst
5655
examples/interface.rst
5756
examples/simplerecipe.rst
58-
examples/anneal.rst

_sources/examples/anneal.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

_sources/index.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,8 @@ diffpy.sifit is developed and maintained by
4949

5050
.. literalinclude:: ../../../AUTHORS.txt
5151

52-
Part of the source code in *_abc.py* and *_ordereddict.py* was derived from
53-
Python 2.7 at http://www.python.org/download/source; while other code
54-
*observable.py* was derived from the 1.0 version of the Caltech "Pyre"
55-
project.
52+
The source code in *observable.py* was derived from the 1.0 version
53+
of the Caltech "Pyre" project.
5654

5755
======================================
5856
Installation

_static/basic.css

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Sphinx stylesheet -- basic theme.
66
*
7-
* :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
7+
* :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
88
* :license: BSD, see LICENSE for details.
99
*
1010
*/
@@ -52,6 +52,8 @@ div.sphinxsidebar {
5252
width: 230px;
5353
margin-left: -100%;
5454
font-size: 90%;
55+
word-wrap: break-word;
56+
overflow-wrap : break-word;
5557
}
5658

5759
div.sphinxsidebar ul {
@@ -83,10 +85,6 @@ div.sphinxsidebar #searchbox input[type="text"] {
8385
width: 170px;
8486
}
8587

86-
div.sphinxsidebar #searchbox input[type="submit"] {
87-
width: 30px;
88-
}
89-
9088
img {
9189
border: 0;
9290
max-width: 100%;
@@ -187,6 +185,13 @@ div.genindex-jumpbox {
187185

188186
/* -- general body styles --------------------------------------------------- */
189187

188+
div.body p, div.body dd, div.body li, div.body blockquote {
189+
-moz-hyphens: auto;
190+
-ms-hyphens: auto;
191+
-webkit-hyphens: auto;
192+
hyphens: auto;
193+
}
194+
190195
a.headerlink {
191196
visibility: hidden;
192197
}
@@ -489,6 +494,13 @@ pre {
489494
overflow-y: hidden; /* fixes display issues on Chrome browsers */
490495
}
491496

497+
span.pre {
498+
-moz-hyphens: none;
499+
-ms-hyphens: none;
500+
-webkit-hyphens: none;
501+
hyphens: none;
502+
}
503+
492504
td.linenos pre {
493505
padding: 5px 0px;
494506
border: 0;

_static/classic.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Sphinx stylesheet -- default theme.
66
*
7-
* :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
7+
* :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
88
* :license: BSD, see LICENSE for details.
99
*
1010
*/

_static/doctools.js

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Sphinx JavaScript utilities for all documentation.
66
*
7-
* :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
7+
* :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
88
* :license: BSD, see LICENSE for details.
99
*
1010
*/
@@ -124,6 +124,7 @@ var Documentation = {
124124
this.fixFirefoxAnchorBug();
125125
this.highlightSearchWords();
126126
this.initIndexTable();
127+
127128
},
128129

129130
/**
@@ -252,6 +253,29 @@ var Documentation = {
252253
});
253254
var url = parts.join('/');
254255
return path.substring(url.lastIndexOf('/') + 1, path.length - 1);
256+
},
257+
258+
initOnKeyListeners: function() {
259+
$(document).keyup(function(event) {
260+
var activeElementType = document.activeElement.tagName;
261+
// don't navigate when in search box or textarea
262+
if (activeElementType !== 'TEXTAREA' && activeElementType !== 'INPUT' && activeElementType !== 'SELECT') {
263+
switch (event.keyCode) {
264+
case 37: // left
265+
var prevHref = $('link[rel="prev"]').prop('href');
266+
if (prevHref) {
267+
window.location.href = prevHref;
268+
return false;
269+
}
270+
case 39: // right
271+
var nextHref = $('link[rel="next"]').prop('href');
272+
if (nextHref) {
273+
window.location.href = nextHref;
274+
return false;
275+
}
276+
}
277+
}
278+
});
255279
}
256280
};
257281

@@ -260,4 +284,4 @@ _ = Documentation.gettext;
260284

261285
$(document).ready(function() {
262286
Documentation.init();
263-
});
287+
});

_static/searchtools.js

Lines changed: 104 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
* searchtools.js_t
33
* ~~~~~~~~~~~~~~~~
44
*
5-
* Sphinx JavaScript utilties for the full-text search.
5+
* Sphinx JavaScript utilities for the full-text search.
66
*
7-
* :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
7+
* :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
88
* :license: BSD, see LICENSE for details.
99
*
1010
*/
@@ -226,6 +226,106 @@ var Scorer = {
226226
};
227227

228228

229+
230+
231+
232+
var splitChars = (function() {
233+
var result = {};
234+
var singles = [96, 180, 187, 191, 215, 247, 749, 885, 903, 907, 909, 930, 1014, 1648,
235+
1748, 1809, 2416, 2473, 2481, 2526, 2601, 2609, 2612, 2615, 2653, 2702,
236+
2706, 2729, 2737, 2740, 2857, 2865, 2868, 2910, 2928, 2948, 2961, 2971,
237+
2973, 3085, 3089, 3113, 3124, 3213, 3217, 3241, 3252, 3295, 3341, 3345,
238+
3369, 3506, 3516, 3633, 3715, 3721, 3736, 3744, 3748, 3750, 3756, 3761,
239+
3781, 3912, 4239, 4347, 4681, 4695, 4697, 4745, 4785, 4799, 4801, 4823,
240+
4881, 5760, 5901, 5997, 6313, 7405, 8024, 8026, 8028, 8030, 8117, 8125,
241+
8133, 8181, 8468, 8485, 8487, 8489, 8494, 8527, 11311, 11359, 11687, 11695,
242+
11703, 11711, 11719, 11727, 11735, 12448, 12539, 43010, 43014, 43019, 43587,
243+
43696, 43713, 64286, 64297, 64311, 64317, 64319, 64322, 64325, 65141];
244+
var i, j, start, end;
245+
for (i = 0; i < singles.length; i++) {
246+
result[singles[i]] = true;
247+
}
248+
var ranges = [[0, 47], [58, 64], [91, 94], [123, 169], [171, 177], [182, 184], [706, 709],
249+
[722, 735], [741, 747], [751, 879], [888, 889], [894, 901], [1154, 1161],
250+
[1318, 1328], [1367, 1368], [1370, 1376], [1416, 1487], [1515, 1519], [1523, 1568],
251+
[1611, 1631], [1642, 1645], [1750, 1764], [1767, 1773], [1789, 1790], [1792, 1807],
252+
[1840, 1868], [1958, 1968], [1970, 1983], [2027, 2035], [2038, 2041], [2043, 2047],
253+
[2070, 2073], [2075, 2083], [2085, 2087], [2089, 2307], [2362, 2364], [2366, 2383],
254+
[2385, 2391], [2402, 2405], [2419, 2424], [2432, 2436], [2445, 2446], [2449, 2450],
255+
[2483, 2485], [2490, 2492], [2494, 2509], [2511, 2523], [2530, 2533], [2546, 2547],
256+
[2554, 2564], [2571, 2574], [2577, 2578], [2618, 2648], [2655, 2661], [2672, 2673],
257+
[2677, 2692], [2746, 2748], [2750, 2767], [2769, 2783], [2786, 2789], [2800, 2820],
258+
[2829, 2830], [2833, 2834], [2874, 2876], [2878, 2907], [2914, 2917], [2930, 2946],
259+
[2955, 2957], [2966, 2968], [2976, 2978], [2981, 2983], [2987, 2989], [3002, 3023],
260+
[3025, 3045], [3059, 3076], [3130, 3132], [3134, 3159], [3162, 3167], [3170, 3173],
261+
[3184, 3191], [3199, 3204], [3258, 3260], [3262, 3293], [3298, 3301], [3312, 3332],
262+
[3386, 3388], [3390, 3423], [3426, 3429], [3446, 3449], [3456, 3460], [3479, 3481],
263+
[3518, 3519], [3527, 3584], [3636, 3647], [3655, 3663], [3674, 3712], [3717, 3718],
264+
[3723, 3724], [3726, 3731], [3752, 3753], [3764, 3772], [3774, 3775], [3783, 3791],
265+
[3802, 3803], [3806, 3839], [3841, 3871], [3892, 3903], [3949, 3975], [3980, 4095],
266+
[4139, 4158], [4170, 4175], [4182, 4185], [4190, 4192], [4194, 4196], [4199, 4205],
267+
[4209, 4212], [4226, 4237], [4250, 4255], [4294, 4303], [4349, 4351], [4686, 4687],
268+
[4702, 4703], [4750, 4751], [4790, 4791], [4806, 4807], [4886, 4887], [4955, 4968],
269+
[4989, 4991], [5008, 5023], [5109, 5120], [5741, 5742], [5787, 5791], [5867, 5869],
270+
[5873, 5887], [5906, 5919], [5938, 5951], [5970, 5983], [6001, 6015], [6068, 6102],
271+
[6104, 6107], [6109, 6111], [6122, 6127], [6138, 6159], [6170, 6175], [6264, 6271],
272+
[6315, 6319], [6390, 6399], [6429, 6469], [6510, 6511], [6517, 6527], [6572, 6592],
273+
[6600, 6607], [6619, 6655], [6679, 6687], [6741, 6783], [6794, 6799], [6810, 6822],
274+
[6824, 6916], [6964, 6980], [6988, 6991], [7002, 7042], [7073, 7085], [7098, 7167],
275+
[7204, 7231], [7242, 7244], [7294, 7400], [7410, 7423], [7616, 7679], [7958, 7959],
276+
[7966, 7967], [8006, 8007], [8014, 8015], [8062, 8063], [8127, 8129], [8141, 8143],
277+
[8148, 8149], [8156, 8159], [8173, 8177], [8189, 8303], [8306, 8307], [8314, 8318],
278+
[8330, 8335], [8341, 8449], [8451, 8454], [8456, 8457], [8470, 8472], [8478, 8483],
279+
[8506, 8507], [8512, 8516], [8522, 8525], [8586, 9311], [9372, 9449], [9472, 10101],
280+
[10132, 11263], [11493, 11498], [11503, 11516], [11518, 11519], [11558, 11567],
281+
[11622, 11630], [11632, 11647], [11671, 11679], [11743, 11822], [11824, 12292],
282+
[12296, 12320], [12330, 12336], [12342, 12343], [12349, 12352], [12439, 12444],
283+
[12544, 12548], [12590, 12592], [12687, 12689], [12694, 12703], [12728, 12783],
284+
[12800, 12831], [12842, 12880], [12896, 12927], [12938, 12976], [12992, 13311],
285+
[19894, 19967], [40908, 40959], [42125, 42191], [42238, 42239], [42509, 42511],
286+
[42540, 42559], [42592, 42593], [42607, 42622], [42648, 42655], [42736, 42774],
287+
[42784, 42785], [42889, 42890], [42893, 43002], [43043, 43055], [43062, 43071],
288+
[43124, 43137], [43188, 43215], [43226, 43249], [43256, 43258], [43260, 43263],
289+
[43302, 43311], [43335, 43359], [43389, 43395], [43443, 43470], [43482, 43519],
290+
[43561, 43583], [43596, 43599], [43610, 43615], [43639, 43641], [43643, 43647],
291+
[43698, 43700], [43703, 43704], [43710, 43711], [43715, 43738], [43742, 43967],
292+
[44003, 44015], [44026, 44031], [55204, 55215], [55239, 55242], [55292, 55295],
293+
[57344, 63743], [64046, 64047], [64110, 64111], [64218, 64255], [64263, 64274],
294+
[64280, 64284], [64434, 64466], [64830, 64847], [64912, 64913], [64968, 65007],
295+
[65020, 65135], [65277, 65295], [65306, 65312], [65339, 65344], [65371, 65381],
296+
[65471, 65473], [65480, 65481], [65488, 65489], [65496, 65497]];
297+
for (i = 0; i < ranges.length; i++) {
298+
start = ranges[i][0];
299+
end = ranges[i][1];
300+
for (j = start; j <= end; j++) {
301+
result[j] = true;
302+
}
303+
}
304+
return result;
305+
})();
306+
307+
function splitQuery(query) {
308+
var result = [];
309+
var start = -1;
310+
for (var i = 0; i < query.length; i++) {
311+
if (splitChars[query.charCodeAt(i)]) {
312+
if (start !== -1) {
313+
result.push(query.slice(start, i));
314+
start = -1;
315+
}
316+
} else if (start === -1) {
317+
start = i;
318+
}
319+
}
320+
if (start !== -1) {
321+
result.push(query.slice(start));
322+
}
323+
return result;
324+
}
325+
326+
327+
328+
229329
/**
230330
* Search Module
231331
*/
@@ -324,7 +424,7 @@ var Search = {
324424
var searchterms = [];
325425
var excluded = [];
326426
var hlterms = [];
327-
var tmp = query.split(/\s+/);
427+
var tmp = splitQuery(query);
328428
var objectterms = [];
329429
for (i = 0; i < tmp.length; i++) {
330430
if (tmp[i] !== "") {
@@ -623,7 +723,7 @@ var Search = {
623723
* helper function to return a node containing the
624724
* search summary for a given text. keywords is a list
625725
* of stemmed words, hlwords is the list of normal, unstemmed
626-
* words. the first one is used to find the occurance, the
726+
* words. the first one is used to find the occurrence, the
627727
* latter for highlighting it.
628728
*/
629729
makeSearchSummary : function(text, keywords, hlwords) {

_static/sidebar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* Once the browser is closed the cookie is deleted and the position
1717
* reset to the default (expanded).
1818
*
19-
* :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
19+
* :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
2020
* :license: BSD, see LICENSE for details.
2121
*
2222
*/

0 commit comments

Comments
 (0)