Skip to content

Commit f69a258

Browse files
committed
Sync with the source at 7283443.
1 parent 6a61d82 commit f69a258

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

+13463
-2033
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: 25065b3f1e4876e6a8ac3bf33695363b
3+
config: b508facb6a88b41c4b4521f1ec2ecccb
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

NSFnugget.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11

22
<!DOCTYPE html>
33

4-
54
<html xmlns="http://www.w3.org/1999/xhtml">
65
<head>
76
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
8-
97
<title>Enabling new science in nanoscale structure characterization of complex materials &#8212; DiffPy documentation</title>
10-
118
<link rel="stylesheet" href="_static/basic.css" type="text/css" />
129
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1310
<link rel="stylesheet" href="_static/bootswatch-3.1.0/cerulean/bootstrap.min.css" type="text/css" />
1411
<link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
1512
<link rel="stylesheet" href="_static/diffpy-styles.css" type="text/css" />
16-
1713
<script type="text/javascript">
1814
var DOCUMENTATION_OPTIONS = {
1915
URL_ROOT: './',
@@ -41,7 +37,7 @@
4137
<meta name="apple-mobile-web-app-capable" content="yes">
4238

4339
</head>
44-
<body role="document">
40+
<body>
4541

4642
<div id="navbar" class="navbar navbar-inverse navbar-default navbar-fixed-top">
4743
<div class="container">

_static/basic.css

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Sphinx stylesheet -- basic theme.
66
*
7-
* :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
7+
* :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
88
* :license: BSD, see LICENSE for details.
99
*
1010
*/
@@ -332,6 +332,11 @@ table.docutils {
332332
border-collapse: collapse;
333333
}
334334

335+
table.align-center {
336+
margin-left: auto;
337+
margin-right: auto;
338+
}
339+
335340
table caption span.caption-number {
336341
font-style: italic;
337342
}
@@ -398,6 +403,13 @@ table.field-list td, table.field-list th {
398403
margin: 0;
399404
}
400405

406+
.field-name {
407+
-moz-hyphens: manual;
408+
-ms-hyphens: manual;
409+
-webkit-hyphens: manual;
410+
hyphens: manual;
411+
}
412+
401413
/* -- other body styles ----------------------------------------------------- */
402414

403415
ol.arabic {
@@ -438,10 +450,14 @@ dd {
438450
margin-left: 30px;
439451
}
440452

441-
dt:target, .highlighted {
453+
dt:target, span.highlighted {
442454
background-color: #fbe54e;
443455
}
444456

457+
rect.highlighted {
458+
fill: #fbe54e;
459+
}
460+
445461
dl.glossary dt {
446462
font-weight: bold;
447463
font-size: 1.1em;

_static/doctools.js

Lines changed: 40 additions & 16 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-2016 by the Sphinx team, see AUTHORS.
7+
* :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
88
* :license: BSD, see LICENSE for details.
99
*
1010
*/
@@ -45,7 +45,7 @@ jQuery.urlencode = encodeURIComponent;
4545
* it will always return arrays of strings for the value parts.
4646
*/
4747
jQuery.getQueryParameters = function(s) {
48-
if (typeof s == 'undefined')
48+
if (typeof s === 'undefined')
4949
s = document.location.search;
5050
var parts = s.substr(s.indexOf('?') + 1).split('&');
5151
var result = {};
@@ -66,29 +66,53 @@ jQuery.getQueryParameters = function(s) {
6666
* span elements with the given class name.
6767
*/
6868
jQuery.fn.highlightText = function(text, className) {
69-
function highlight(node) {
70-
if (node.nodeType == 3) {
69+
function highlight(node, addItems) {
70+
if (node.nodeType === 3) {
7171
var val = node.nodeValue;
7272
var pos = val.toLowerCase().indexOf(text);
7373
if (pos >= 0 && !jQuery(node.parentNode).hasClass(className)) {
74-
var span = document.createElement("span");
75-
span.className = className;
74+
var span;
75+
var isInSVG = jQuery(node).closest("body, svg, foreignObject").is("svg");
76+
if (isInSVG) {
77+
span = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
78+
} else {
79+
span = document.createElement("span");
80+
span.className = className;
81+
}
7682
span.appendChild(document.createTextNode(val.substr(pos, text.length)));
7783
node.parentNode.insertBefore(span, node.parentNode.insertBefore(
7884
document.createTextNode(val.substr(pos + text.length)),
7985
node.nextSibling));
8086
node.nodeValue = val.substr(0, pos);
87+
if (isInSVG) {
88+
var bbox = span.getBBox();
89+
var rect = document.createElementNS("http://www.w3.org/2000/svg", "rect");
90+
rect.x.baseVal.value = bbox.x;
91+
rect.y.baseVal.value = bbox.y;
92+
rect.width.baseVal.value = bbox.width;
93+
rect.height.baseVal.value = bbox.height;
94+
rect.setAttribute('class', className);
95+
var parentOfText = node.parentNode.parentNode;
96+
addItems.push({
97+
"parent": node.parentNode,
98+
"target": rect});
99+
}
81100
}
82101
}
83102
else if (!jQuery(node).is("button, select, textarea")) {
84103
jQuery.each(node.childNodes, function() {
85-
highlight(this);
104+
highlight(this, addItems);
86105
});
87106
}
88107
}
89-
return this.each(function() {
90-
highlight(this);
108+
var addItems = [];
109+
var result = this.each(function() {
110+
highlight(this, addItems);
91111
});
112+
for (var i = 0; i < addItems.length; ++i) {
113+
jQuery(addItems[i].parent).before(addItems[i].target);
114+
}
115+
return result;
92116
};
93117

94118
/*
@@ -131,21 +155,21 @@ var Documentation = {
131155
* i18n support
132156
*/
133157
TRANSLATIONS : {},
134-
PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; },
158+
PLURAL_EXPR : function(n) { return n === 1 ? 0 : 1; },
135159
LOCALE : 'unknown',
136160

137161
// gettext and ngettext don't access this so that the functions
138162
// can safely bound to a different name (_ = Documentation.gettext)
139163
gettext : function(string) {
140164
var translated = Documentation.TRANSLATIONS[string];
141-
if (typeof translated == 'undefined')
165+
if (typeof translated === 'undefined')
142166
return string;
143-
return (typeof translated == 'string') ? translated : translated[0];
167+
return (typeof translated === 'string') ? translated : translated[0];
144168
},
145169

146170
ngettext : function(singular, plural, n) {
147171
var translated = Documentation.TRANSLATIONS[singular];
148-
if (typeof translated == 'undefined')
172+
if (typeof translated === 'undefined')
149173
return (n == 1) ? singular : plural;
150174
return translated[Documentation.PLURALEXPR(n)];
151175
},
@@ -180,7 +204,7 @@ var Documentation = {
180204
* see: https://bugzilla.mozilla.org/show_bug.cgi?id=645075
181205
*/
182206
fixFirefoxAnchorBug : function() {
183-
if (document.location.hash)
207+
if (document.location.hash && $.browser.mozilla)
184208
window.setTimeout(function() {
185209
document.location.href += '';
186210
}, 10);
@@ -216,7 +240,7 @@ var Documentation = {
216240
var src = $(this).attr('src');
217241
var idnum = $(this).attr('id').substr(7);
218242
$('tr.cg-' + idnum).toggle();
219-
if (src.substr(-9) == 'minus.png')
243+
if (src.substr(-9) === 'minus.png')
220244
$(this).attr('src', src.substr(0, src.length-9) + 'plus.png');
221245
else
222246
$(this).attr('src', src.substr(0, src.length-8) + 'minus.png');
@@ -248,7 +272,7 @@ var Documentation = {
248272
var path = document.location.pathname;
249273
var parts = path.split(/\//);
250274
$.each(DOCUMENTATION_OPTIONS.URL_ROOT.split(/\//), function() {
251-
if (this == '..')
275+
if (this === '..')
252276
parts.pop();
253277
});
254278
var url = parts.join('/');

0 commit comments

Comments
 (0)