diff --git a/LICENSE.md b/LICENSE.md index 855108e0..0b6deffc 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -55,16 +55,6 @@ license, which is reproduced below: > OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE > SOFTWARE. -## Google Code Prettify ## - -Google Code Prettify is distributed under the Apache License 2.0, which is -included with this package. - -Copyright (c) 2006 Google Inc. - -The source code for Google Code Prettify is available at: -https://code.google.com/p/google-code-prettify/ - ## Jasmine ## Jasmine is distributed under the MIT license, which is reproduced above. @@ -82,23 +72,3 @@ Copyright (c) 2010 Adam Abrons and Misko Hevery (http://getangular.com). The source code for jasmine-node is available at: https://github.com/mhevery/jasmine-node - -## Open Sans ## - -Open Sans is distributed under the Apache License 2.0, which is -included with this package. - -Copyright (c) 2010-2011, Google Inc. - -This typeface, including the complete set of variations, are available at: -http://www.google.com/fonts/specimen/Open+Sans - -## Tomorrow Theme for Google Code Prettify ## - -The Tomorrow Theme for Google Code Prettify is distributed under the MIT -license, which is reproduced above. - -Copyright (c) 2016 Yoshihide Jimbo. - -The source code for the Tomorrow Theme is available at: -https://github.com/jmblog/color-themes-for-google-code-prettify diff --git a/cli.js b/cli.js index fe0e6a0d..e2e5a373 100644 --- a/cli.js +++ b/cli.js @@ -413,43 +413,37 @@ module.exports = (() => { }; cli.generateDocs = () => { - const path = require('jsdoc/path'); const resolver = require('jsdoc/tutorial/resolver'); - const taffy = require('taffydb').taffy; + let template; - env.opts.template = (() => { - const publish = env.opts.template || 'templates/default'; - const templatePath = path.getResourcePath(publish); - - // if we didn't find the template, keep the user-specified value so the error message is - // useful - return templatePath || env.opts.template; - })(); + env.opts.template = env.opts.template || '@jsdoc/template-original'; try { - template = require(`${env.opts.template}/publish`); + template = require(env.opts.template); } catch (e) { logger.fatal(`Unable to load template: ${e.message}` || e); } - // templates should include a publish.js file that exports a "publish" function + // templates should export a "publish" function if (template.publish && typeof template.publish === 'function') { let publishPromise; logger.info('Generating output files...'); publishPromise = template.publish( - taffy(props.docs), - env.opts, - resolver.root + { + doclets: props.docs, + tutorials: resolver.root + }, + env.opts ); return Promise.resolve(publishPromise); } else { - logger.fatal(`${env.opts.template} does not export a "publish" function. Global "publish" functions are no longer supported.`); + logger.fatal(`${env.opts.template} does not export a "publish" function.`); } return Promise.resolve(); diff --git a/lib/jsdoc/util/templateHelper.js b/lib/jsdoc/util/templateHelper.js index c3eeea96..e7f152e8 100644 --- a/lib/jsdoc/util/templateHelper.js +++ b/lib/jsdoc/util/templateHelper.js @@ -21,6 +21,8 @@ const containers = ['class', 'module', 'external', 'namespace', 'mixin', 'interf let tutorials; +// TODO(hegemonic): update helper functions that expect a TaffyDB object + /** Sets tutorials map. @param {jsdoc.tutorial.Tutorial} root - Root tutorial node. */ diff --git a/package-lock.json b/package-lock.json index 76495fed..35a450b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -133,6 +133,27 @@ "@jsdoc/syntax": { "version": "file:packages/jsdoc-syntax" }, + "@jsdoc/template-original": { + "version": "file:packages/jsdoc-template-original", + "requires": { + "code-prettify": "^0.1.0", + "open-sans-fonts": "^1.5.0", + "taffydb": "2.6.2" + }, + "dependencies": { + "code-prettify": { + "version": "0.1.0", + "bundled": true + }, + "open-sans-fonts": { + "version": "1.5.0", + "bundled": true + } + } + }, + "@jsdoc/template-silent": { + "version": "file:packages/jsdoc-template-silent" + }, "@lerna/add": { "version": "3.10.6", "resolved": "https://registry.npmjs.org/@lerna/add/-/add-3.10.6.tgz", diff --git a/package.json b/package.json index c61f6db9..ec74bbe7 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,10 @@ }, "dependencies": { "@babel/parser": "~7.2.3", - "@jsdoc/logger": "file:./packages/jsdoc-logger", - "@jsdoc/syntax": "file:./packages/jsdoc-syntax", + "@jsdoc/logger": "file:packages/jsdoc-logger", + "@jsdoc/syntax": "file:packages/jsdoc-syntax", + "@jsdoc/template-original": "file:packages/jsdoc-template-original", + "@jsdoc/template-silent": "file:packages/jsdoc-template-silent", "bluebird": "~3.5.0", "catharsis": "~0.8.9", "escape-string-regexp": "~1.0.5", @@ -27,8 +29,7 @@ "marked": "~0.6.0", "mkdirp": "~0.5.1", "requizzle": "~0.2.1", - "strip-json-comments": "~2.0.1", - "taffydb": "2.6.2" + "strip-json-comments": "~2.0.1" }, "devDependencies": { "ajv": "~6.7.0", @@ -47,11 +48,6 @@ "bin": { "jsdoc": "./jsdoc.js" }, - "greenkeeper": { - "ignore": [ - "taffydb" - ] - }, "bugs": "https://github.com/jsdoc3/jsdoc/issues", "author": { "name": "Michael Mathews", diff --git a/packages/jsdoc-template-original/README.md b/packages/jsdoc-template-original/README.md new file mode 100644 index 00000000..e6acd19c --- /dev/null +++ b/packages/jsdoc-template-original/README.md @@ -0,0 +1,11 @@ +# @jsdoc/template-original + +An updated version of JSDoc 3's original template. + +## Installing the package + +Using npm: + +```shell +npm install --save @jsdoc/template-original +``` diff --git a/templates/default/publish.js b/packages/jsdoc-template-original/index.js similarity index 90% rename from templates/default/publish.js rename to packages/jsdoc-template-original/index.js index 6bae0a6e..cd6ecb36 100644 --- a/templates/default/publish.js +++ b/packages/jsdoc-template-original/index.js @@ -5,14 +5,29 @@ const helper = require('jsdoc/util/templateHelper'); const logger = require('@jsdoc/logger'); const path = require('jsdoc/path'); const taffy = require('taffydb').taffy; -const template = require('jsdoc/template'); -const util = require('util'); +const Template = require('./lib/template'); const htmlsafe = helper.htmlsafe; const linkto = helper.linkto; const resolveAuthorLinks = helper.resolveAuthorLinks; const hasOwnProp = Object.prototype.hasOwnProperty; +const FONT_NAMES = [ + 'OpenSans-Bold', + 'OpenSans-BoldItalic', + 'OpenSans-Italic', + 'OpenSans-Light', + 'OpenSans-LightItalic', + 'OpenSans-Regular' +]; +const PRETTIFIER_CSS_FILES = [ + 'tomorrow.min.css' +]; +const PRETTIFIER_SCRIPT_FILES = [ + 'lang-css.js', + 'prettify.js' +]; + let data; let view; @@ -100,8 +115,7 @@ function updateItemName(item) { } if (attributes && attributes.length) { - itemName = util.format( '%s%s', itemName, - attributes.join(', ') ); + itemName = `${itemName}${attributes.join(', ')}`; } return itemName; @@ -127,7 +141,7 @@ function buildAttribsString(attribs) { let attribsString = ''; if (attribs && attribs.length) { - attribsString = htmlsafe( util.format('(%s) ', attribs.join(', ')) ); + attribsString = htmlsafe(`(${attribs.join(', ')}) `); } return attribsString; @@ -146,7 +160,7 @@ function addNonParamAttributes(items) { function addSignatureParams(f) { const params = f.params ? addParamAttributes(f.params) : []; - f.signature = util.format( '%s(%s)', (f.signature || ''), params.join(', ') ); + f.signature = `${f.signature || ''}(${params.join(', ')})`; } function addSignatureReturns(f) { @@ -175,7 +189,7 @@ function addSignatureReturns(f) { returnTypes = addNonParamAttributes(source); } if (returnTypes.length) { - returnTypesString = util.format( ' → %s{%s}', attribsString, returnTypes.join('|') ); + returnTypesString = ` → ${attribsString}{${returnTypes.join('|')}}`; } f.signature = `${f.signature || ''}${returnTypesString}`; @@ -191,7 +205,7 @@ function addAttribs(f) { const attribs = helper.getAttribs(f); const attribsString = buildAttribsString(attribs); - f.attribs = util.format('%s', attribsString); + f.attribs = `${attribsString}`; } function shortenPaths(files, commonPrefix) { @@ -391,11 +405,10 @@ function buildNav(members) { } /** - @param {TAFFY} taffyData See . + @param {object} data @param {object} opts - @param {Tutorial} tutorials */ -exports.publish = (taffyData, opts, tutorials) => { +exports.publish = ({doclets, tutorials}, opts) => { let classes; let conf; let externals; @@ -419,13 +432,13 @@ exports.publish = (taffyData, opts, tutorials) => { let staticFileScanner; let templatePath; - data = taffyData; + data = taffy(doclets); conf = env.conf.templates || {}; conf.default = conf.default || {}; - templatePath = path.normalize(opts.template); - view = new template.Template( path.join(templatePath, 'tmpl') ); + templatePath = path.dirname(require.resolve(opts.template)); + view = new Template(path.join(templatePath, 'tmpl')); // claim some special filenames in advance, so the All-Powerful Overseer of Filename Uniqueness // doesn't try to hand them out later @@ -495,17 +508,52 @@ exports.publish = (taffyData, opts, tutorials) => { } fs.mkPath(outdir); - // copy the template's static files to outdir + // copy the template's built-in static files to outdir fromDir = path.join(templatePath, 'static'); staticFiles = fs.ls(fromDir, 3); staticFiles.forEach(fileName => { - const toDir = fs.toDir( fileName.replace(fromDir, outdir) ); + const toDir = fs.toDir(fileName.replace(fromDir, outdir)); fs.mkPath(toDir); fs.copyFileSync(fileName, toDir); }); + // copy the fonts used by the template to outdir + staticFiles = fs.ls(path.join(templatePath, 'node_modules/open-sans-fonts/open-sans'), 3); + + staticFiles.forEach(fileName => { + const toDir = path.join(outdir, 'fonts'); + + if (FONT_NAMES.includes(path.parse(fileName).name)) { + fs.mkPath(toDir); + fs.copyFileSync(fileName, toDir); + } + }); + + // copy the prettify script to outdir + PRETTIFIER_SCRIPT_FILES.forEach(fileName => { + const toDir = path.join(outdir, 'scripts'); + + fs.copyFileSync( + path.join(templatePath, 'node_modules/code-prettify/loader', fileName), + toDir + ); + }); + + // copy the prettify CSS to outdir + PRETTIFIER_CSS_FILES.forEach(fileName => { + const toDir = path.join(outdir, 'styles'); + + fs.copyFileSync( + path.join( + templatePath, 'node_modules/color-themes-for-google-code-prettify/dist/themes', + fileName + ), + toDir + ); + }); + // copy user-specified static files to outdir if (conf.default.staticFiles) { // The canonical property name is `include`. We accept `paths` for backwards compatibility diff --git a/lib/jsdoc/template.js b/packages/jsdoc-template-original/lib/template.js similarity index 50% rename from lib/jsdoc/template.js rename to packages/jsdoc-template-original/lib/template.js index 00ebaa49..ae224174 100644 --- a/lib/jsdoc/template.js +++ b/packages/jsdoc-template-original/lib/template.js @@ -1,47 +1,40 @@ /** - * Wrapper for underscore's template utility to allow loading templates from files. - * @module jsdoc/template + * Wrapper for `_.template` to load templates from files. */ const _ = require('lodash'); const fs = require('jsdoc/fs'); const path = require('path'); /** - * Underscore template helper. + * Template wrapper. */ class Template { /** - * @param {string} filepath - Templates directory. + * @param {string} filepath - The directory that contains `.tmpl` files. */ constructor(filepath) { this.path = filepath; this.layout = null; this.cache = {}; - // override default template tag settings - this.settings = { - evaluate: /<\?js([\s\S]+?)\?>/g, - interpolate: /<\?js=([\s\S]+?)\?>/g, - escape: /<\?js~([\s\S]+?)\?>/g - }; } /** - * Loads template from given file. + * Load a template from a given file. + * * @param {string} file - Template filename. - * @return {function} Returns template closure. + * @returns {function} A template function. */ load(file) { return _.template(fs.readFileSync(file, 'utf8'), null, this.settings); } /** - * Renders template using given data. - * - * This is low-level function, for rendering full templates use {@link Template.render()}. + * Render the given data with the specified template partial. * + * @private * @param {string} file - Template filename. - * @param {object} data - Template variables (doesn't have to be object, but passing variables dictionary is best way and most common use). - * @return {string} Rendered template. + * @param {object} data - Template variables. + * @return {string} Rendered data. */ partial(file, data) { file = path.resolve(this.path, file); @@ -56,13 +49,11 @@ class Template { } /** - * Renders template with given data. - * - * This method automaticaly applies layout if set. + * Render the given data with the specified template. * * @param {string} file - Template filename. - * @param {object} data - Template variables (doesn't have to be object, but passing variables dictionary is best way and most common use). - * @return {string} Rendered template. + * @param {object} data - Template variables. + * @return {string} Rendered data. */ render(file, data) { // main content @@ -77,4 +68,5 @@ class Template { return content; } } -exports.Template = Template; + +module.exports = Template; diff --git a/packages/jsdoc-template-original/package-lock.json b/packages/jsdoc-template-original/package-lock.json new file mode 100644 index 00000000..c021581f --- /dev/null +++ b/packages/jsdoc-template-original/package-lock.json @@ -0,0 +1,23 @@ +{ + "name": "@jsdoc/template-original", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "code-prettify": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/code-prettify/-/code-prettify-0.1.0.tgz", + "integrity": "sha1-RocMyMGlDQm61TmzOpg9vUqjSx4=" + }, + "color-themes-for-google-code-prettify": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/color-themes-for-google-code-prettify/-/color-themes-for-google-code-prettify-2.0.4.tgz", + "integrity": "sha1-3urPZX/WhXaGR1TU5IbXjf2x54Q=" + }, + "open-sans-fonts": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/open-sans-fonts/-/open-sans-fonts-1.5.0.tgz", + "integrity": "sha512-NvjD5sh6wnuKRCuYRbgy/Gf/ykQWeemJxUb+MM3YKpdTiTdLtrmSJy0rGntA+RivaGIWjpe689d9wR3GfiGdiQ==" + } + } +} diff --git a/packages/jsdoc-template-original/package.json b/packages/jsdoc-template-original/package.json new file mode 100644 index 00000000..ff98db99 --- /dev/null +++ b/packages/jsdoc-template-original/package.json @@ -0,0 +1,34 @@ +{ + "name": "@jsdoc/template-original", + "version": "1.0.0", + "description": "An updated version of JSDoc 3's original template.", + "main": "index.js", + "repository": { + "type": "git", + "url": "https://github.com/jsdoc3/jsdoc" + }, + "keywords": [ + "jsdoc", + "template" + ], + "author": { + "name": "Jeff Williams", + "email": "jeffrey.l.williams@gmail.com" + }, + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/jsdoc3/jsdoc/issues" + }, + "homepage": "https://github.com/jsdoc3/jsdoc#readme", + "dependencies": { + "code-prettify": "^0.1.0", + "color-themes-for-google-code-prettify": "^2.0.4", + "open-sans-fonts": "^1.5.0", + "taffydb": "2.6.2" + }, + "greenkeeper": { + "ignore": [ + "taffydb" + ] + } +} diff --git a/templates/default/static/scripts/linenumber.js b/packages/jsdoc-template-original/static/scripts/linenumber.js similarity index 96% rename from templates/default/static/scripts/linenumber.js rename to packages/jsdoc-template-original/static/scripts/linenumber.js index 4354785c..bdc5b4a8 100644 --- a/templates/default/static/scripts/linenumber.js +++ b/packages/jsdoc-template-original/static/scripts/linenumber.js @@ -1,4 +1,4 @@ -/*global document */ +/* global document */ (() => { const source = document.getElementsByClassName('prettyprint source linenums'); let i = 0; diff --git a/templates/default/static/styles/jsdoc-default.css b/packages/jsdoc-template-original/static/styles/jsdoc-default.css similarity index 72% rename from templates/default/static/styles/jsdoc-default.css rename to packages/jsdoc-template-original/static/styles/jsdoc-default.css index 7d1729dc..9ecc3faf 100644 --- a/templates/default/static/styles/jsdoc-default.css +++ b/packages/jsdoc-template-original/static/styles/jsdoc-default.css @@ -2,26 +2,60 @@ font-family: 'Open Sans'; font-weight: normal; font-style: normal; - src: url('../fonts/OpenSans-Regular-webfont.eot'); - src: - local('Open Sans'), - local('OpenSans'), - url('../fonts/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/OpenSans-Regular-webfont.woff') format('woff'), - url('../fonts/OpenSans-Regular-webfont.svg#open_sansregular') format('svg'); + src: url('../fonts/OpenSans-Regular.woff2') format('woff2'), + url('../fonts/OpenSans-Regular.woff') format('woff'), + url('../fonts/OpenSans-Regular.ttf') format('truetype'), + url('../fonts/OpenSans-Regular.svg#OpenSansRegular') format('svg'); +} + +@font-face { + font-family: 'Open Sans'; + font-weight: bold; + font-style: normal; + src: url('../fonts/OpenSans-Bold.woff2') format('woff2'), + url('../fonts/OpenSans-Bold.woff') format('woff'), + url('../fonts/OpenSans-Bold.ttf') format('truetype'), + url('../fonts/OpenSans-Bold.svg#OpenSansBold') format('svg'); +} + +@font-face { + font-family: 'Open Sans'; + font-weight: normal; + font-style: italic; + src: url('../fonts/OpenSans-Italic.woff2') format('woff2'), + url('../fonts/OpenSans-Italic.woff') format('woff'), + url('../fonts/OpenSans-Italic.ttf') format('truetype'), + url('../fonts/OpenSans-Italic.svg#OpenSansItalic') format('svg'); +} + +@font-face { + font-family: 'Open Sans'; + font-weight: bold; + font-style: italic; + src: url('../fonts/OpenSans-BoldItalic.woff2') format('woff2'), + url('../fonts/OpenSans-BoldItalic.woff') format('woff'), + url('../fonts/OpenSans-BoldItalic.ttf') format('truetype'), + url('../fonts/OpenSans-BoldItalic.svg#OpenSansBoldItalic') format('svg'); } @font-face { font-family: 'Open Sans Light'; font-weight: normal; font-style: normal; - src: url('../fonts/OpenSans-Light-webfont.eot'); - src: - local('Open Sans Light'), - local('OpenSans Light'), - url('../fonts/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/OpenSans-Light-webfont.woff') format('woff'), - url('../fonts/OpenSans-Light-webfont.svg#open_sanslight') format('svg'); + src: url('../fonts/OpenSans-Light.woff2') format('woff2'), + url('../fonts/OpenSans-Light.woff') format('woff'), + url('../fonts/OpenSans-Light.ttf') format('truetype'), + url('../fonts/OpenSans-Light.svg#OpenSansLight') format('svg'); +} + +@font-face { + font-family: 'Open Sans Light'; + font-weight: normal; + font-style: italic; + src: url('../fonts/OpenSans-LightItalic.woff2') format('woff2'), + url('../fonts/OpenSans-LightItalic.woff') format('woff'), + url('../fonts/OpenSans-LightItalic.ttf') format('truetype'), + url('../fonts/OpenSans-LightItalic.svg#OpenSansLightItalic') format('svg'); } html diff --git a/packages/jsdoc-template-original/tmpl/augments.tmpl b/packages/jsdoc-template-original/tmpl/augments.tmpl new file mode 100644 index 00000000..74b32c63 --- /dev/null +++ b/packages/jsdoc-template-original/tmpl/augments.tmpl @@ -0,0 +1,10 @@ +<% + var data = obj; + var self = this; +%> + +<% if (data.augments && data.augments.length) { %> + +<% } %> diff --git a/packages/jsdoc-template-original/tmpl/container.tmpl b/packages/jsdoc-template-original/tmpl/container.tmpl new file mode 100644 index 00000000..8d2f4711 --- /dev/null +++ b/packages/jsdoc-template-original/tmpl/container.tmpl @@ -0,0 +1,196 @@ +<% + var self = this; + var isGlobalPage; + + docs.forEach(function(doc, i) { +%> + +<% + // we only need to check this once + if (typeof isGlobalPage === 'undefined') { + isGlobalPage = (doc.kind === 'globalobj'); + } +%> +<% if (doc.kind === 'mainpage' || (doc.kind === 'package')) { %> + <%= self.partial('mainpage.tmpl', doc) %> +<% } else if (doc.kind === 'source') { %> + <%= self.partial('source.tmpl', doc) %> +<% } else { %> + +
+ +
+ <% if (!doc.longname || doc.kind !== 'module') { %> +

<% if (doc.attribs) { %><%= doc.attribs %><% } + if (doc.ancestors && doc.ancestors.length) { %> + <%= doc.ancestors.join('') %><% + } + %><%= doc.name %><% + if (doc.variation) { %> + <%= doc.variation %><% } + if (doc.signature && !doc.hideconstructor) { %><%= doc.signature %><% } %>

+ <% if (doc.classdesc) { %> +
<%= doc.classdesc %>
+ <% } %> + <% } else if (doc.kind === 'module' && doc.modules) { %> + <% doc.modules.forEach(function(module) { %> + <% if (module.classdesc) { %> +
<%= module.classdesc %>
+ <% } %> + <% }) %> + <% } %> +
+ +
+
+ <% if (doc.kind === 'module' && doc.modules) { %> + <% if (doc.description) { %> +
<%= doc.description %>
+ <% } %> + + <% doc.modules.forEach(function(module) { %> + <%= self.partial('method.tmpl', module) %> + <% }) %> + <% } else if (doc.kind === 'class' || (doc.kind === 'namespace' && doc.signature)) { %> + <%= self.partial('method.tmpl', doc) %> + <% } else { %> + <% if (doc.description) { %> +
<%= doc.description %>
+ <% } %> + + <%= self.partial('details.tmpl', doc) %> + + <% if (doc.examples && doc.examples.length) { %> +

Example<%= doc.examples.length > 1? 's':'' %>

+ <%= self.partial('examples.tmpl', doc.examples) %> + <% } %> + <% } %> +
+ + <% if (doc.augments && doc.augments.length) { %> +

Extends

+ + <%= self.partial('augments.tmpl', doc) %> + <% } %> + + <% if (doc.requires && doc.requires.length) { %> +

Requires

+ +
    <% doc.requires.forEach(function(r) { %> +
  • <%= self.linkto(r, r) %>
    • + <% }); %>
+ <% } %> + + <% + var classes = self.find({kind: 'class', memberof: doc.longname}); + if (!isGlobalPage && classes && classes.length) { + %> +

Classes

+ +
<% classes.forEach(function(c) { %> +
<%= self.linkto(c.longname, c.name) %>
+
<% if (c.summary) { %><%= c.summary %><% } %>
+ <% }); %>
+ <% } %> + + <% + var interfaces = self.find({kind: 'interface', memberof: doc.longname}); + if (!isGlobalPage && interfaces && interfaces.length) { + %> +

Interfaces

+ +
<% interfaces.forEach(function(i) { %> +
<%= self.linkto(i.longname, i.name) %>
+
<% if (i.summary) { %><%= i.summary %><% } %>
+ <% }); %>
+ <% } %> + + <% + var mixins = self.find({kind: 'mixin', memberof: doc.longname}); + if (!isGlobalPage && mixins && mixins.length) { + %> +

Mixins

+ +
<% mixins.forEach(function(m) { %> +
<%= self.linkto(m.longname, m.name) %>
+
<% if (m.summary) { %><%= m.summary %><% } %>
+ <% }); %>
+ <% } %> + + <% + var namespaces = self.find({kind: 'namespace', memberof: doc.longname}); + if (!isGlobalPage && namespaces && namespaces.length) { + %> +

Namespaces

+ +
<% namespaces.forEach(function(n) { %> +
<%= self.linkto(n.longname, n.name) %>
+
<% if (n.summary) { %><%= n.summary %><% } %>
+ <% }); %>
+ <% } %> + + <% + var members = self.find({kind: 'member', memberof: isGlobalPage ? {isUndefined: true} : doc.longname}); + + // symbols that are assigned to module.exports are not globals, even though they're not a memberof anything + if (isGlobalPage && members && members.length && members.forEach) { + members = members.filter(function(m) { + return m.longname && m.longname.indexOf('module:') !== 0; + }); + } + if (members && members.length && members.forEach) { + %> +

Members

+ + <% members.forEach(function(p) { %> + <%= self.partial('members.tmpl', p) %> + <% }); %> + <% } %> + + <% + var methods = self.find({kind: 'function', memberof: isGlobalPage ? {isUndefined: true} : doc.longname}); + if (methods && methods.length && methods.forEach) { + %> +

Methods

+ + <% methods.forEach(function(m) { %> + <%= self.partial('method.tmpl', m) %> + <% }); %> + <% } %> + + <% + var typedefs = self.find({kind: 'typedef', memberof: isGlobalPage ? {isUndefined: true} : doc.longname}); + if (typedefs && typedefs.length && typedefs.forEach) { + %> +

Type Definitions

+ + <% typedefs.forEach(function(e) { + if (e.signature) { + %> + <%= self.partial('method.tmpl', e) %> + <% + } + else { + %> + <%= self.partial('members.tmpl', e) %> + <% + } + }); %> + <% } %> + + <% + var events = self.find({kind: 'event', memberof: isGlobalPage ? {isUndefined: true} : doc.longname}); + if (events && events.length && events.forEach) { + %> +

Events

+ + <% events.forEach(function(e) { %> + <%= self.partial('method.tmpl', e) %> + <% }); %> + <% } %> +
+ +
+<% } %> + +<% }); %> diff --git a/packages/jsdoc-template-original/tmpl/details.tmpl b/packages/jsdoc-template-original/tmpl/details.tmpl new file mode 100644 index 00000000..da8cb5de --- /dev/null +++ b/packages/jsdoc-template-original/tmpl/details.tmpl @@ -0,0 +1,143 @@ +<% +var data = obj; +var self = this; +var defaultObjectClass = ''; + +// Check if the default value is an object or array; if so, apply code highlighting +if (data.defaultvalue && (data.defaultvaluetype === 'object' || data.defaultvaluetype === 'array')) { + data.defaultvalue = "
" + data.defaultvalue + "
"; + defaultObjectClass = ' class="object-value"'; +} +%> +<% + var properties = data.properties; + if (properties && properties.length && properties.forEach && !data.hideconstructor) { +%> + +
Properties:
+ + <%= this.partial('properties.tmpl', data) %> + +<% } %> + +
+ + <% if (data.version) {%> +
Version:
+
  • <%= version %>
+ <% } %> + + <% if (data.since) {%> +
Since:
+
  • <%= since %>
+ <% } %> + + <% if (data.inherited && data.inherits && !data.overrides) { %> +
Inherited From:
+
  • + <%= this.linkto(data.inherits, this.htmlsafe(data.inherits)) %> +
+ <% } %> + + <% if (data.overrides) { %> +
Overrides:
+
  • + <%= this.linkto(data.overrides, this.htmlsafe(data.overrides)) %> +
+ <% } %> + + <% if (data.implementations && data.implementations.length) { %> +
Implementations:
+
    + <% data.implementations.forEach(function(impl) { %> +
  • <%= self.linkto(impl, self.htmlsafe(impl)) %>
    • + <% }); %> +
+ <% } %> + + <% if (data.implements && data.implements.length) { %> +
Implements:
+
    + <% data.implements.forEach(function(impl) { %> +
  • <%= self.linkto(impl, self.htmlsafe(impl)) %>
    • + <% }); %> +
+ <% } %> + + <% if (data.mixes && data.mixes.length) { %> +
Mixes In:
+ +
    + <% data.mixes.forEach(function(a) { %> +
  • <%= self.linkto(a, a) %>
    • + <% }); %> +
+ <% } %> + + <% if (data.deprecated) { %> +
Deprecated:
<% + if (data.deprecated === true) { %>
  • Yes
<% } + else { %>
  • <%= data.deprecated %>
<% } + %> + <% } %> + + <% if (data.author && author.length) {%> +
Author:
+
+
    <% author.forEach(function(a) { %> +
  • <%= self.resolveAuthorLinks(a) %>
    • + <% }); %>
+
+ <% } %> + + <% if (data.copyright) {%> +
Copyright:
+
  • <%= copyright %>
+ <% } %> + + <% if (data.license) {%> +
License:
+
  • <%= license %>
+ <% } %> + + <% if (data.defaultvalue) {%> +
Default Value:
+
    + ><%= data.defaultvalue %> +
+ <% } %> + + <% if (data.meta && self.outputSourceFiles) {%> +
Source:
+
  • + <%= self.linkto(meta.shortpath) %>, <%= self.linkto(meta.shortpath, 'line ' + meta.lineno, null, 'line' + meta.lineno) %> +
+ <% } %> + + <% if (data.tutorials && tutorials.length) {%> +
Tutorials:
+
+
    <% tutorials.forEach(function(t) { %> +
  • <%= self.tutoriallink(t) %>
    • + <% }); %>
+
+ <% } %> + + <% if (data.see && see.length) {%> +
See:
+
+
    <% see.forEach(function(s) { %> +
  • <%= self.linkto(s) %>
    • + <% }); %>
+
+ <% } %> + + <% if (data.todo && todo.length) {%> +
To Do:
+
+
    <% todo.forEach(function(t) { %> +
  • <%= t %>
    • + <% }); %>
+
+ <% } %> +
diff --git a/packages/jsdoc-template-original/tmpl/example.tmpl b/packages/jsdoc-template-original/tmpl/example.tmpl new file mode 100644 index 00000000..7765d2f3 --- /dev/null +++ b/packages/jsdoc-template-original/tmpl/example.tmpl @@ -0,0 +1,2 @@ +<% var data = obj; %> +
<%= data %>
diff --git a/packages/jsdoc-template-original/tmpl/examples.tmpl b/packages/jsdoc-template-original/tmpl/examples.tmpl new file mode 100644 index 00000000..eda9c86c --- /dev/null +++ b/packages/jsdoc-template-original/tmpl/examples.tmpl @@ -0,0 +1,13 @@ +<% + var data = obj; + var self = this; + + data.forEach(function(example) { + if (example.caption) { + %> +

<%= example.caption %>

+ <% } %> + 
<%= self.htmlsafe(example.code) %>
+<% + }); +%> diff --git a/packages/jsdoc-template-original/tmpl/exceptions.tmpl b/packages/jsdoc-template-original/tmpl/exceptions.tmpl new file mode 100644 index 00000000..77e3b244 --- /dev/null +++ b/packages/jsdoc-template-original/tmpl/exceptions.tmpl @@ -0,0 +1,32 @@ +<% + var data = obj; +%> +<% if (data.description && data.type && data.type.names) { %> +
+
+
+ <%= data.description %> +
+
+
+
+
+
+ Type +
+
+ <%= this.partial('type.tmpl', data.type.names) %> +
+
+
+
+
+<% } else { %> +
+ <% if (data.description) { %> + <%= data.description %> + <% } else if (data.type && data.type.names) { %> + <%= this.partial('type.tmpl', data.type.names) %> + <% } %> +
+<% } %> diff --git a/templates/default/tmpl/layout.tmpl b/packages/jsdoc-template-original/tmpl/layout.tmpl similarity index 60% rename from templates/default/tmpl/layout.tmpl rename to packages/jsdoc-template-original/tmpl/layout.tmpl index 8a9a6b96..a2e78db9 100644 --- a/templates/default/tmpl/layout.tmpl +++ b/packages/jsdoc-template-original/tmpl/layout.tmpl @@ -2,14 +2,14 @@ - JSDoc: <?js= title ?> + JSDoc: <%= title %> - + @@ -17,19 +17,19 @@
-

+

<%= title %>

- + <%= content %>

diff --git a/packages/jsdoc-template-original/tmpl/mainpage.tmpl b/packages/jsdoc-template-original/tmpl/mainpage.tmpl new file mode 100644 index 00000000..7e8590eb --- /dev/null +++ b/packages/jsdoc-template-original/tmpl/mainpage.tmpl @@ -0,0 +1,14 @@ +<% +var data = obj; +var self = this; +%> + +<% if (data.kind === 'package') { %> +

<%= data.name %> <%= data.version %>

+<% } %> + +<% if (data.readme) { %> +
+
<%= data.readme %>
+
+<% } %> diff --git a/packages/jsdoc-template-original/tmpl/members.tmpl b/packages/jsdoc-template-original/tmpl/members.tmpl new file mode 100644 index 00000000..84d9446b --- /dev/null +++ b/packages/jsdoc-template-original/tmpl/members.tmpl @@ -0,0 +1,38 @@ +<% +var data = obj; +var self = this; +%> +

<%= data.attribs + name + (data.signature ? data.signature : '') %>

+ +<% if (data.summary) { %> +

<%= summary %>

+<% } %> + +<% if (data.description) { %> +
+ <%= data.description %> +
+<% } %> + +<% if (data.type && data.type.names) {%> +
Type:
+ +<% } %> + +<%= this.partial('details.tmpl', data) %> + +<% if (data.fires && fires.length) { %> +
Fires:
+ +<% } %> + +<% if (data.examples && examples.length) { %> +
Example<%= examples.length > 1? 's':'' %>
+ <%= this.partial('examples.tmpl', examples) %> +<% } %> diff --git a/packages/jsdoc-template-original/tmpl/method.tmpl b/packages/jsdoc-template-original/tmpl/method.tmpl new file mode 100644 index 00000000..2be295b7 --- /dev/null +++ b/packages/jsdoc-template-original/tmpl/method.tmpl @@ -0,0 +1,131 @@ +<% +var data = obj; +var self = this; +%> +<% if (data.kind !== 'module' && !data.hideconstructor) { %> + <% if (data.kind === 'class' && data.classdesc) { %> +

Constructor

+ <% } %> + + <% if (data.kind !== 'namespace') { %> +

<%= data.attribs + (kind === 'class' ? 'new ' : '') + + name + (data.signature || '') %>

+ <% } %> + + <% if (data.summary) { %> +

<%= summary %>

+ <% } %> +<% } %> + +<% if (data.kind !== 'module' && data.description && !data.hideconstructor) { %> +
+ <%= data.description %> +
+<% } %> + +<% if (data.augments && data.alias && data.alias.indexOf('module:') === 0) { %> +
Extends:
+ <%= self.partial('augments.tmpl', data) %> +<% } %> + +<% if (kind === 'event' && data.type && data.type.names) {%> +
Type:
+ +<% } %> + +<% if (data['this']) { %> +
This:
+ +<% } %> + +<% if (data.params && params.length && !data.hideconstructor) { %> +
Parameters:
+ <%= this.partial('params.tmpl', params) %> +<% } %> + +<%= this.partial('details.tmpl', data) %> + +<% if (data.kind !== 'module' && data.requires && data.requires.length) { %> +
Requires:
+ +<% } %> + +<% if (data.fires && fires.length) { %> +
Fires:
+ +<% } %> + +<% if (data.listens && listens.length) { %> +
Listens to Events:
+ +<% } %> + +<% if (data.listeners && listeners.length) { %> +
Listeners of This Event:
+ +<% } %> + +<% if (data.modifies && modifies.length) {%> +
Modifies:
+<% if (modifies.length > 1) { %><% } else { + modifies.forEach(function(m) { %> + <%= self.partial('modifies.tmpl', m) %> + <% }); +} } %> + +<% if (data.exceptions && exceptions.length) { %> +
Throws:
+<% if (exceptions.length > 1) { %><% } else { + exceptions.forEach(function(r) { %> + <%= self.partial('exceptions.tmpl', r) %> + <% }); +} } %> + +<% if (data.returns && returns.length) { %> +
Returns:
+<% if (returns.length > 1) { %><% } else { + returns.forEach(function(r) { %> + <%= self.partial('returns.tmpl', r) %> + <% }); +} } %> + +<% if (data.yields && yields.length) { %> +
Yields:
+<% if (yields.length > 1) { %><% } else { + yields.forEach(function(r) { %> + <%= self.partial('returns.tmpl', r) %> + <% }); +} } %> + +<% if (data.examples && examples.length) { %> +
Example<%= examples.length > 1? 's':'' %>
+ <%= this.partial('examples.tmpl', examples) %> +<% } %> diff --git a/packages/jsdoc-template-original/tmpl/modifies.tmpl b/packages/jsdoc-template-original/tmpl/modifies.tmpl new file mode 100644 index 00000000..472af189 --- /dev/null +++ b/packages/jsdoc-template-original/tmpl/modifies.tmpl @@ -0,0 +1,14 @@ +<% +var data = obj || {}; +%> + +<% if (data.type && data.type.names) {%> +
+
+ Type +
+
+ <%= this.partial('type.tmpl', data.type.names) %> +
+
+<% } %> diff --git a/templates/default/tmpl/params.tmpl b/packages/jsdoc-template-original/tmpl/params.tmpl similarity index 65% rename from templates/default/tmpl/params.tmpl rename to packages/jsdoc-template-original/tmpl/params.tmpl index 1fb4049c..0f358735 100644 --- a/templates/default/tmpl/params.tmpl +++ b/packages/jsdoc-template-original/tmpl/params.tmpl @@ -1,4 +1,4 @@ - +%> - + <% if (params.hasName) {%> - + <% } %> - + <% if (params.hasAttributes) {%> - + <% } %> - + <% if (params.hasDefault) {%> - + <% } %> - + %> - - - + <% if (params.hasName) {%> + + <% } %> - + <% if (params.hasAttributes) {%> - + <% } %> - + <% if (params.hasDefault) {%> - + <% } %> - + <%= self.partial('params.tmpl', param.subparams) %> + <% } %> - + <% }); %>
NameTypeAttributesDefaultDescription
<%= param.name %> - - - + <% if (param.type && param.type.names) {%> + <%= self.partial('type.tmpl', param.type.names) %> + <% } %> - + <% if (param.optional) { %> <optional>
- + <% } %> - + <% if (param.nullable) { %> <nullable>
- + <% } %> - + <% if (param.variable) { %> <repeatable>
- + <% } %> 		- - - + <% if (typeof param.defaultvalue !== 'undefined') { %> + <%= self.htmlsafe(param.defaultvalue) %> + <% } %> + <%= param.description %><% if (param.subparams) { %>
Properties
- -
diff --git a/templates/default/tmpl/properties.tmpl b/packages/jsdoc-template-original/tmpl/properties.tmpl similarity index 60% rename from templates/default/tmpl/properties.tmpl rename to packages/jsdoc-template-original/tmpl/properties.tmpl index 40e09097..e23d10ea 100644 --- a/templates/default/tmpl/properties.tmpl +++ b/packages/jsdoc-template-original/tmpl/properties.tmpl @@ -1,4 +1,4 @@ - +%> - + <% if (props.hasName) {%> - + <% } %> - + <% if (props.hasAttributes) {%> - + <% } %> - + <% if (props.hasDefault) {%> - + <% } %> - + %> - - - + <% if (props.hasName) {%> + + <% } %> - + <% if (props.hasAttributes) {%> - + <% } %> - + <% if (props.hasDefault) {%> - + <% } %> - + - + <% }); %>
NameTypeAttributesDefaultDescription
<%= prop.name %> - - - + <% if (prop.type && prop.type.names) {%> + <%= self.partial('type.tmpl', prop.type.names) %> + <% } %> - + <% if (prop.optional) { %> <optional>
- + <% } %> - + <% if (prop.nullable) { %> <nullable>
- + <% } %> 		- - - + <% if (typeof prop.defaultvalue !== 'undefined') { %> + <%= self.htmlsafe(prop.defaultvalue) %> + <% } %> -
Properties
- 		<%= prop.description %><% if (prop.subprops) { %> +
Properties
<%= self.partial('properties.tmpl', prop) %> + <% } %>
diff --git a/packages/jsdoc-template-original/tmpl/returns.tmpl b/packages/jsdoc-template-original/tmpl/returns.tmpl new file mode 100644 index 00000000..79ec1f21 --- /dev/null +++ b/packages/jsdoc-template-original/tmpl/returns.tmpl @@ -0,0 +1,19 @@ +<% +var data = obj || {}; +if (data.description) { +%> +
+ <%= description %> +
+<% } %> + +<% if (data.type && data.type.names) {%> +
+
+ Type +
+
+ <%= this.partial('type.tmpl', data.type.names) %> +
+
+<% } %> diff --git a/packages/jsdoc-template-original/tmpl/source.tmpl b/packages/jsdoc-template-original/tmpl/source.tmpl new file mode 100644 index 00000000..54f18540 --- /dev/null +++ b/packages/jsdoc-template-original/tmpl/source.tmpl @@ -0,0 +1,8 @@ +<% + var data = obj; +%> +
+
+ 
<%= data.code %>
+
+
diff --git a/packages/jsdoc-template-original/tmpl/tutorial.tmpl b/packages/jsdoc-template-original/tmpl/tutorial.tmpl new file mode 100644 index 00000000..b228f181 --- /dev/null +++ b/packages/jsdoc-template-original/tmpl/tutorial.tmpl @@ -0,0 +1,19 @@ +
+ +
+ <% if (children.length > 0) { %> +
    <% + var self = this; + children.forEach(function(t) { %> +
  • <%= self.tutoriallink(t.name) %>
    • + <% }); %>
+ <% } %> + +

<%= header %>

+
+ +
+ <%= content %> +
+ +
diff --git a/packages/jsdoc-template-original/tmpl/type.tmpl b/packages/jsdoc-template-original/tmpl/type.tmpl new file mode 100644 index 00000000..dc665ac1 --- /dev/null +++ b/packages/jsdoc-template-original/tmpl/type.tmpl @@ -0,0 +1,7 @@ +<% + var data = obj; + var self = this; + data.forEach(function(name, i) { %> +<%= self.linkto(name, self.htmlsafe(name)) %> +<% if (i < data.length-1) { %>|<% } %> +<% }); %> diff --git a/packages/jsdoc-template-silent/README.md b/packages/jsdoc-template-silent/README.md new file mode 100644 index 00000000..1d85521d --- /dev/null +++ b/packages/jsdoc-template-silent/README.md @@ -0,0 +1,28 @@ +# @jsdoc/template-silent + +A JSDoc template that generates no output. + +Why would that be useful? Primarily for running JSDoc as a linter to check for +syntax errors and unrecognized tags in documentation comments. + +## Installing the package + +Using npm: + +```shell +npm install --save @jsdoc/template-silent +``` + +## Using the package + +The following command exits with a non-zero exit code if any errors are +encountered. It writes nothing to disk, and the only output it produces is any +error messages written to `stderr`: + + jsdoc myscript.js -t templates/silent -a all --pedantic + +To get warnings about tags that JSDoc does not recognize, create a configuration +file called `conf.json` that sets `"allowUnknownTags": false`, then run the +following command: + + jsdoc myscript.js -t templates/silent -a all -c conf.json --pedantic diff --git a/packages/jsdoc-template-silent/index.js b/packages/jsdoc-template-silent/index.js new file mode 100644 index 00000000..f988f4e5 --- /dev/null +++ b/packages/jsdoc-template-silent/index.js @@ -0,0 +1,2 @@ +/* eslint-disable no-empty-function */ +exports.publish = () => {}; diff --git a/packages/jsdoc-template-silent/package.json b/packages/jsdoc-template-silent/package.json new file mode 100644 index 00000000..2123fc01 --- /dev/null +++ b/packages/jsdoc-template-silent/package.json @@ -0,0 +1,23 @@ +{ + "name": "@jsdoc/template-silent", + "version": "1.0.0", + "description": "A JSDoc template that generates no output.", + "main": "index.js", + "repository": { + "type": "git", + "url": "https://github.com/jsdoc3/jsdoc" + }, + "keywords": [ + "jsdoc", + "template" + ], + "author": { + "name": "Jeff Williams", + "email": "jeffrey.l.williams@gmail.com" + }, + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/jsdoc3/jsdoc/issues" + }, + "homepage": "https://github.com/jsdoc3/jsdoc#readme" +} diff --git a/templates/README.md b/templates/README.md deleted file mode 100644 index 7424e741..00000000 --- a/templates/README.md +++ /dev/null @@ -1,27 +0,0 @@ -To create or use your own template: - -1. Create a folder with the same name as your template (for example, `mycooltemplate`). -2. Within the template folder, create a file named `publish.js`. This file must be a CommonJS module that exports a method named `publish`. - -For example: - -````javascript -/** @module publish */ - -/** - * Generate documentation output. - * - * @param {TAFFY} data - A TaffyDB collection representing - * all the symbols documented in your code. - * @param {object} opts - An object with options information. - */ -exports.publish = function(data, opts) { - // do stuff here to generate your output files -}; -```` - -To invoke JSDoc 3 with your own template, use the `-t` command line option, and specify the path to your template folder: - -```` -./jsdoc mycode.js -t /path/to/mycooltemplate -```` diff --git a/templates/default/README.md b/templates/default/README.md deleted file mode 100644 index 1946bef5..00000000 --- a/templates/default/README.md +++ /dev/null @@ -1,12 +0,0 @@ -The default template for JSDoc 3 uses: [the Taffy Database library](http://taffydb.com/) and the [Underscore Template library](http://underscorejs.org/). - - -## Generating Typeface Fonts - -The default template uses the [OpenSans](https://www.google.com/fonts/specimen/Open+Sans) typeface. The font files can be regenerated as follows: - -1. Open the [OpenSans page at Font Squirrel](). -2. Click on the 'Webfont Kit' tab. -3. Either leave the subset drop-down as 'Western Latin (Default)', or, if we decide we need more glyphs, than change it to 'No Subsetting'. -4. Click the 'DOWNLOAD @FONT-FACE KIT' button. -5. For each typeface variant we plan to use, copy the 'eot', 'svg' and 'woff' files into the 'templates/default/static/fonts' directory. diff --git a/templates/default/static/fonts/OpenSans-Bold-webfont.eot b/templates/default/static/fonts/OpenSans-Bold-webfont.eot deleted file mode 100644 index 5d20d916..00000000 Binary files a/templates/default/static/fonts/OpenSans-Bold-webfont.eot and /dev/null differ diff --git a/templates/default/static/fonts/OpenSans-Bold-webfont.svg b/templates/default/static/fonts/OpenSans-Bold-webfont.svg deleted file mode 100644 index 3ed7be4b..00000000 --- a/templates/default/static/fonts/OpenSans-Bold-webfont.svg +++ /dev/null @@ -1,1830 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/default/static/fonts/OpenSans-Bold-webfont.woff b/templates/default/static/fonts/OpenSans-Bold-webfont.woff deleted file mode 100644 index 1205787b..00000000 Binary files a/templates/default/static/fonts/OpenSans-Bold-webfont.woff and /dev/null differ diff --git a/templates/default/static/fonts/OpenSans-BoldItalic-webfont.eot b/templates/default/static/fonts/OpenSans-BoldItalic-webfont.eot deleted file mode 100644 index 1f639a15..00000000 Binary files a/templates/default/static/fonts/OpenSans-BoldItalic-webfont.eot and /dev/null differ diff --git a/templates/default/static/fonts/OpenSans-BoldItalic-webfont.svg b/templates/default/static/fonts/OpenSans-BoldItalic-webfont.svg deleted file mode 100644 index 6a2607b9..00000000 --- a/templates/default/static/fonts/OpenSans-BoldItalic-webfont.svg +++ /dev/null @@ -1,1830 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/default/static/fonts/OpenSans-BoldItalic-webfont.woff b/templates/default/static/fonts/OpenSans-BoldItalic-webfont.woff deleted file mode 100644 index ed760c06..00000000 Binary files a/templates/default/static/fonts/OpenSans-BoldItalic-webfont.woff and /dev/null differ diff --git a/templates/default/static/fonts/OpenSans-Italic-webfont.eot b/templates/default/static/fonts/OpenSans-Italic-webfont.eot deleted file mode 100644 index 0c8a0ae0..00000000 Binary files a/templates/default/static/fonts/OpenSans-Italic-webfont.eot and /dev/null differ diff --git a/templates/default/static/fonts/OpenSans-Italic-webfont.svg b/templates/default/static/fonts/OpenSans-Italic-webfont.svg deleted file mode 100644 index e1075dcc..00000000 --- a/templates/default/static/fonts/OpenSans-Italic-webfont.svg +++ /dev/null @@ -1,1830 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/default/static/fonts/OpenSans-Italic-webfont.woff b/templates/default/static/fonts/OpenSans-Italic-webfont.woff deleted file mode 100644 index ff652e64..00000000 Binary files a/templates/default/static/fonts/OpenSans-Italic-webfont.woff and /dev/null differ diff --git a/templates/default/static/fonts/OpenSans-Light-webfont.eot b/templates/default/static/fonts/OpenSans-Light-webfont.eot deleted file mode 100644 index 14868406..00000000 Binary files a/templates/default/static/fonts/OpenSans-Light-webfont.eot and /dev/null differ diff --git a/templates/default/static/fonts/OpenSans-Light-webfont.svg b/templates/default/static/fonts/OpenSans-Light-webfont.svg deleted file mode 100644 index 11a472ca..00000000 --- a/templates/default/static/fonts/OpenSans-Light-webfont.svg +++ /dev/null @@ -1,1831 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/default/static/fonts/OpenSans-Light-webfont.woff b/templates/default/static/fonts/OpenSans-Light-webfont.woff deleted file mode 100644 index e7860748..00000000 Binary files a/templates/default/static/fonts/OpenSans-Light-webfont.woff and /dev/null differ diff --git a/templates/default/static/fonts/OpenSans-LightItalic-webfont.eot b/templates/default/static/fonts/OpenSans-LightItalic-webfont.eot deleted file mode 100644 index 8f445929..00000000 Binary files a/templates/default/static/fonts/OpenSans-LightItalic-webfont.eot and /dev/null differ diff --git a/templates/default/static/fonts/OpenSans-LightItalic-webfont.svg b/templates/default/static/fonts/OpenSans-LightItalic-webfont.svg deleted file mode 100644 index 431d7e35..00000000 --- a/templates/default/static/fonts/OpenSans-LightItalic-webfont.svg +++ /dev/null @@ -1,1835 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/default/static/fonts/OpenSans-LightItalic-webfont.woff b/templates/default/static/fonts/OpenSans-LightItalic-webfont.woff deleted file mode 100644 index 43e8b9e6..00000000 Binary files a/templates/default/static/fonts/OpenSans-LightItalic-webfont.woff and /dev/null differ diff --git a/templates/default/static/fonts/OpenSans-Regular-webfont.eot b/templates/default/static/fonts/OpenSans-Regular-webfont.eot deleted file mode 100644 index 6bbc3cf5..00000000 Binary files a/templates/default/static/fonts/OpenSans-Regular-webfont.eot and /dev/null differ diff --git a/templates/default/static/fonts/OpenSans-Regular-webfont.svg b/templates/default/static/fonts/OpenSans-Regular-webfont.svg deleted file mode 100644 index 25a39523..00000000 --- a/templates/default/static/fonts/OpenSans-Regular-webfont.svg +++ /dev/null @@ -1,1831 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/default/static/fonts/OpenSans-Regular-webfont.woff b/templates/default/static/fonts/OpenSans-Regular-webfont.woff deleted file mode 100644 index e231183d..00000000 Binary files a/templates/default/static/fonts/OpenSans-Regular-webfont.woff and /dev/null differ diff --git a/templates/default/static/scripts/prettify/Apache-License-2.0.txt b/templates/default/static/scripts/prettify/Apache-License-2.0.txt deleted file mode 100644 index d6456956..00000000 --- a/templates/default/static/scripts/prettify/Apache-License-2.0.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/templates/default/static/scripts/prettify/lang-css.js b/templates/default/static/scripts/prettify/lang-css.js deleted file mode 100644 index 041e1f59..00000000 --- a/templates/default/static/scripts/prettify/lang-css.js +++ /dev/null @@ -1,2 +0,0 @@ -PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\f\r ]+/,null," \t\r\n "]],[["str",/^"(?:[^\n\f\r"\\]|\\(?:\r\n?|\n|\f)|\\[\S\s])*"/,null],["str",/^'(?:[^\n\f\r'\\]|\\(?:\r\n?|\n|\f)|\\[\S\s])*'/,null],["lang-css-str",/^url\(([^"')]*)\)/i],["kwd",/^(?:url|rgb|!important|@import|@page|@media|@charset|inherit)(?=[^\w-]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*)\s*:/i],["com",/^\/\*[^*]*\*+(?:[^*/][^*]*\*+)*\//],["com", -/^(?:<\!--|--\>)/],["lit",/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],["lit",/^#[\da-f]{3,6}/i],["pln",/^-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*/i],["pun",/^[^\s\w"']+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[["kwd",/^-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[["str",/^[^"')]+/]]),["css-str"]); diff --git a/templates/default/static/scripts/prettify/prettify.js b/templates/default/static/scripts/prettify/prettify.js deleted file mode 100644 index eef5ad7e..00000000 --- a/templates/default/static/scripts/prettify/prettify.js +++ /dev/null @@ -1,28 +0,0 @@ -var q=null;window.PR_SHOULD_USE_CONTINUATION=!0; -(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return a}function h(a){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a= -[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;ci[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a){for(var f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m), -l=[],p={},d=0,g=e.length;d=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/, -q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/, -q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ | $/g, -"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a), -a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e} -for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a,m){if(!a||!A.hasOwnProperty(a))a=/^\s*=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"], -"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"], -H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"], -J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+ -I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]), -["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css", -/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}), -["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes", -hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p=0){var k=k.match(g),f,b;if(b= -!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}p - - -
    -
    • -
- diff --git a/templates/default/tmpl/container.tmpl b/templates/default/tmpl/container.tmpl deleted file mode 100644 index 1b940040..00000000 --- a/templates/default/tmpl/container.tmpl +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - -
- -
- -

- -

- -
- - - - -
- - - -
- -
-
- - -
- - - - - - - - - -
- - - - - -

Example 1? 's':'' ?>

- - - -
- - -

Extends

- - - - - -

Requires

- -
    -
    • -
- - - -

Classes

- -
-
-
-
- - - -

Interfaces

- -
-
-
-
- - - -

Mixins

- -
-
-
-
- - - -

Namespaces

- -
-
-
-
- - - -

Members

- - - - - - - -

Methods

- - - - - - - -

Type Definitions

- - - - - - - - - -

Events

- - - - - -
- -
- - - diff --git a/templates/default/tmpl/details.tmpl b/templates/default/tmpl/details.tmpl deleted file mode 100644 index 4a5bd49f..00000000 --- a/templates/default/tmpl/details.tmpl +++ /dev/null @@ -1,143 +0,0 @@ -" + data.defaultvalue + ""; - defaultObjectClass = ' class="object-value"'; -} -?> - - -
Properties:
- - - - - -
- - -
Version:
-
- - - -
Since:
-
- - - -
Inherited From:
-
  • - -
- - - -
Overrides:
-
  • - -
- - - -
Implementations:
-
    - -
    • - -
- - - -
Implements:
-
    - -
    • - -
- - - -
Mixes In:
- -
    - -
    • - -
- - - -
Deprecated:
  • Yes
- - - -
Author:
-
-
    -
    • -
-
- - - -
Copyright:
-
- - - -
License:
-
- - - -
Default Value:
-
    - > -
- - - -
Source:
-
  • - , -
- - - -
Tutorials:
-
-
    -
    • -
-
- - - -
See:
-
-
    -
    • -
-
- - - -
To Do:
-
-
    -
    • -
-
- -
diff --git a/templates/default/tmpl/example.tmpl b/templates/default/tmpl/example.tmpl deleted file mode 100644 index e87caa5b..00000000 --- a/templates/default/tmpl/example.tmpl +++ /dev/null @@ -1,2 +0,0 @@ - -
diff --git a/templates/default/tmpl/examples.tmpl b/templates/default/tmpl/examples.tmpl deleted file mode 100644 index 04d975e9..00000000 --- a/templates/default/tmpl/examples.tmpl +++ /dev/null @@ -1,13 +0,0 @@ - -

- -
- \ No newline at end of file diff --git a/templates/default/tmpl/exceptions.tmpl b/templates/default/tmpl/exceptions.tmpl deleted file mode 100644 index 9cef6c7d..00000000 --- a/templates/default/tmpl/exceptions.tmpl +++ /dev/null @@ -1,32 +0,0 @@ - - -
-
-
- -
-
-
-
-
-
- Type -
-
- -
-
-
-
-
- -
- - - - - -
- diff --git a/templates/default/tmpl/mainpage.tmpl b/templates/default/tmpl/mainpage.tmpl deleted file mode 100644 index 64e9e594..00000000 --- a/templates/default/tmpl/mainpage.tmpl +++ /dev/null @@ -1,14 +0,0 @@ - - - -

- - - -
-
-
- diff --git a/templates/default/tmpl/members.tmpl b/templates/default/tmpl/members.tmpl deleted file mode 100644 index 154c17b6..00000000 --- a/templates/default/tmpl/members.tmpl +++ /dev/null @@ -1,38 +0,0 @@ - -

- - -

- - - -
- -
- - - -
Type:
-
    -
  • - -
    • -
- - - - - -
Fires:
-
    -
    • -
- - - -
Example 1? 's':'' ?>
- - diff --git a/templates/default/tmpl/method.tmpl b/templates/default/tmpl/method.tmpl deleted file mode 100644 index 0125fe29..00000000 --- a/templates/default/tmpl/method.tmpl +++ /dev/null @@ -1,131 +0,0 @@ - - - -

Constructor

- - - -

- - - -

- - - - -
- -
- - - -
Extends:
- - - - -
Type:
-
    -
  • - -
    • -
- - - -
This:
-
- - - -
Parameters:
- - - - - - -
Requires:
-
    -
    • -
- - - -
Fires:
-
    -
    • -
- - - -
Listens to Events:
-
    -
    • -
- - - -
Listeners of This Event:
-
    -
    • -
- - - -
Modifies:
- 1) { ?>
    -
    • -
- - - - -
Throws:
- 1) { ?>
    -
    • -
- - - - -
Returns:
- 1) { ?>
    -
    • -
- - - - -
Yields:
- 1) { ?>
    -
    • -
- - - - -
Example 1? 's':'' ?>
- - diff --git a/templates/default/tmpl/modifies.tmpl b/templates/default/tmpl/modifies.tmpl deleted file mode 100644 index 16ccbf8d..00000000 --- a/templates/default/tmpl/modifies.tmpl +++ /dev/null @@ -1,14 +0,0 @@ - - - -
-
- Type -
-
- -
-
- diff --git a/templates/default/tmpl/returns.tmpl b/templates/default/tmpl/returns.tmpl deleted file mode 100644 index d0704592..00000000 --- a/templates/default/tmpl/returns.tmpl +++ /dev/null @@ -1,19 +0,0 @@ - -
- -
- - - -
-
- Type -
-
- -
-
- \ No newline at end of file diff --git a/templates/default/tmpl/source.tmpl b/templates/default/tmpl/source.tmpl deleted file mode 100644 index e559b5d1..00000000 --- a/templates/default/tmpl/source.tmpl +++ /dev/null @@ -1,8 +0,0 @@ - -
-
-
-
-
\ No newline at end of file diff --git a/templates/default/tmpl/tutorial.tmpl b/templates/default/tmpl/tutorial.tmpl deleted file mode 100644 index 88a0ad52..00000000 --- a/templates/default/tmpl/tutorial.tmpl +++ /dev/null @@ -1,19 +0,0 @@ -
- -
- 0) { ?> -
    -
    • -
- - -

-
- -
- -
- -
diff --git a/templates/default/tmpl/type.tmpl b/templates/default/tmpl/type.tmpl deleted file mode 100644 index ec2c6c0d..00000000 --- a/templates/default/tmpl/type.tmpl +++ /dev/null @@ -1,7 +0,0 @@ - - -| - \ No newline at end of file diff --git a/templates/haruki/README.md b/templates/haruki/README.md deleted file mode 100644 index ee6d36f1..00000000 --- a/templates/haruki/README.md +++ /dev/null @@ -1,39 +0,0 @@ -OVERVIEW -======== - -JSDoc 3 Haruki is an experimental template optimised for use with publishing processes that consume either JSON or XML. Whereas the default JSDoc template outputs an HTML representation of your API, Haruki will output a JSON, or optionally an XML, representation. - -Currently Haruki only supports a subset of the tags supported by the default template. Those are: - - * @name - * @desc - * @type - * @namespace - * @method (or @function) - * @member (or @var) - * @class - * @mixin - * @event - * @param - * @returns - * @throws - * @example - * @access (like @private or @public) - -This limited support set is intentional, as it is meant to be a usable set that could be shared with either JavaScript or PHP documentation -- another experimental tool, named "Vonnegut", can produce Haruki compatible JSON from PHPDoc tags. - -Note: `@link`s will appear in the output untransformed, there is no way to know at this stage what the file layout of your output will eventually be. It is assumed that whatever process emits the final output file/s will transform `@link` tags at that point. - -USAGE -===== - - ./jsdoc myscript.js -t templates/haruki -d console -q format=xml - -The results of this command will appear in `stdout` and can be piped into other tools for further processing. - -MORE -===== - -If you are interested in Haruki, you are encouraged to discuss your questions or ideas on the JSDoc-Users mailing list and fork/contribute to this project. - -For more information contact Michael Mathews at . \ No newline at end of file diff --git a/templates/haruki/publish.js b/templates/haruki/publish.js deleted file mode 100644 index 47aa6061..00000000 --- a/templates/haruki/publish.js +++ /dev/null @@ -1,224 +0,0 @@ -/* eslint-disable indent, no-nested-ternary, space-infix-ops */ -/** - @overview Builds a tree-like JSON string from the doclet data. - @version 0.0.3 - @example - ./jsdoc scratch/jsdoc_test.js -t templates/haruki -d console -q format=xml -*/ -const xml = require('js2xmlparser'); - -const hasOwnProp = Object.prototype.hasOwnProperty; - -function graft(parentNode, childNodes, parentLongname) { - childNodes - .filter(({memberof}) => memberof === parentLongname) - .forEach(element => { - let i; - let len; - let thisClass; - let thisEvent; - let thisFunction; - let thisMixin; - let thisNamespace; - - if (element.kind === 'namespace') { - if (!parentNode.namespaces) { - parentNode.namespaces = []; - } - - thisNamespace = { - 'name': element.name, - 'description': element.description || '', - 'access': element.access || '', - 'virtual': Boolean(element.virtual) - }; - - parentNode.namespaces.push(thisNamespace); - - graft(thisNamespace, childNodes, element.longname); - } - else if (element.kind === 'mixin') { - if (!parentNode.mixins) { - parentNode.mixins = []; - } - - thisMixin = { - 'name': element.name, - 'description': element.description || '', - 'access': element.access || '', - 'virtual': Boolean(element.virtual) - }; - - parentNode.mixins.push(thisMixin); - - graft(thisMixin, childNodes, element.longname); - } - else if (element.kind === 'function') { - if (!parentNode.functions) { - parentNode.functions = []; - } - - thisFunction = { - 'name': element.name, - 'access': element.access || '', - 'virtual': Boolean(element.virtual), - 'description': element.description || '', - 'parameters': [], - 'examples': [] - }; - - parentNode.functions.push(thisFunction); - - if (element.returns) { - thisFunction.returns = { - 'type': element.returns[0].type? (element.returns[0].type.names.length === 1? element.returns[0].type.names[0] : element.returns[0].type.names) : '', - 'description': element.returns[0].description || '' - }; - } - - if (element.examples) { - for (i = 0, len = element.examples.length; i < len; i++) { - thisFunction.examples.push(element.examples[i]); - } - } - - if (element.params) { - for (i = 0, len = element.params.length; i < len; i++) { - thisFunction.parameters.push({ - 'name': element.params[i].name, - 'type': element.params[i].type? (element.params[i].type.names.length === 1? element.params[i].type.names[0] : element.params[i].type.names) : '', - 'description': element.params[i].description || '', - 'default': hasOwnProp.call(element.params[i], 'defaultvalue') ? element.params[i].defaultvalue : '', - 'optional': typeof element.params[i].optional === 'boolean'? element.params[i].optional : '', - 'nullable': typeof element.params[i].nullable === 'boolean'? element.params[i].nullable : '' - }); - } - } - } - else if (element.kind === 'member') { - if (!parentNode.properties) { - parentNode.properties = []; - } - parentNode.properties.push({ - 'name': element.name, - 'access': element.access || '', - 'virtual': Boolean(element.virtual), - 'description': element.description || '', - 'type': element.type? (element.type.length === 1? element.type[0] : element.type) : '' - }); - } - - else if (element.kind === 'event') { - if (!parentNode.events) { - parentNode.events = []; - } - - thisEvent = { - 'name': element.name, - 'access': element.access || '', - 'virtual': Boolean(element.virtual), - 'description': element.description || '', - 'parameters': [], - 'examples': [] - }; - - parentNode.events.push(thisEvent); - - if (element.returns) { - thisEvent.returns = { - 'type': element.returns.type ? (element.returns.type.names.length === 1 ? element.returns.type.names[0] : element.returns.type.names) : '', - 'description': element.returns.description || '' - }; - } - - if (element.examples) { - for (i = 0, len = element.examples.length; i < len; i++) { - thisEvent.examples.push(element.examples[i]); - } - } - - if (element.params) { - for (i = 0, len = element.params.length; i < len; i++) { - thisEvent.parameters.push({ - 'name': element.params[i].name, - 'type': element.params[i].type? (element.params[i].type.names.length === 1? element.params[i].type.names[0] : element.params[i].type.names) : '', - 'description': element.params[i].description || '', - 'default': hasOwnProp.call(element.params[i], 'defaultvalue') ? element.params[i].defaultvalue : '', - 'optional': typeof element.params[i].optional === 'boolean'? element.params[i].optional : '', - 'nullable': typeof element.params[i].nullable === 'boolean'? element.params[i].nullable : '' - }); - } - } - } - else if (element.kind === 'class') { - if (!parentNode.classes) { - parentNode.classes = []; - } - - thisClass = { - 'name': element.name, - 'description': element.classdesc || '', - 'extends': element.augments || [], - 'access': element.access || '', - 'virtual': Boolean(element.virtual), - 'fires': element.fires || '', - 'constructor': { - 'name': element.name, - 'description': element.description || '', - 'parameters': [ - ], - 'examples': [] - } - }; - - parentNode.classes.push(thisClass); - - if (element.examples) { - for (i = 0, len = element.examples.length; i < len; i++) { - thisClass.constructor.examples.push(element.examples[i]); - } - } - - if (element.params) { - for (i = 0, len = element.params.length; i < len; i++) { - thisClass.constructor.parameters.push({ - 'name': element.params[i].name, - 'type': element.params[i].type? (element.params[i].type.names.length === 1? element.params[i].type.names[0] : element.params[i].type.names) : '', - 'description': element.params[i].description || '', - 'default': hasOwnProp.call(element.params[i], 'defaultvalue') ? element.params[i].defaultvalue : '', - 'optional': typeof element.params[i].optional === 'boolean'? element.params[i].optional : '', - 'nullable': typeof element.params[i].nullable === 'boolean'? element.params[i].nullable : '' - }); - } - } - - graft(thisClass, childNodes, element.longname); - } - }); -} - -/** - @param {TAFFY} data - @param {object} opts - */ -exports.publish = (data, {destination, query}) => { - let docs; - const root = {}; - - data({undocumented: true}).remove(); - docs = data().get(); // <-- an array of Doclet objects - - graft(root, docs); - - if (destination === 'console') { - if (query && query.format === 'xml') { - console.log( xml.parse('jsdoc', root) ); - } - else { - console.log( require('jsdoc/util/dumper').dump(root) ); - } - } - else { - console.log('This template only supports output to the console. Use the option "-d console" when you run JSDoc.'); - } -}; diff --git a/templates/silent/README.md b/templates/silent/README.md deleted file mode 100644 index d33e0fdf..00000000 --- a/templates/silent/README.md +++ /dev/null @@ -1,11 +0,0 @@ -OVERVIEW -======== - -The `silent` template outputs nothing at all. Why would that be useful? Primarily for running JSDoc as a linter to check for syntax errors and unrecognized tags in documentation comments, although it may also be useful for testing or benchmarking purposes. - -USAGE -===== - - ./jsdoc myscript.js -t templates/silent -a all --pedantic - -This command exits with a non-zero exit code if any errors are encountered. It writes nothing to disk and the only output it produces is any error messages written to `stderr`. This command can also be used to warn about tags which are unknown to JSDoc by setting `"allowUnknownTags": false` in a configuration file. diff --git a/templates/silent/publish.js b/templates/silent/publish.js deleted file mode 100644 index 7de0a06f..00000000 --- a/templates/silent/publish.js +++ /dev/null @@ -1,7 +0,0 @@ -/* eslint-disable no-empty-function, no-unused-vars */ -/** - @param {TAFFY} taffyData See . - @param {object} opts - @param {Tutorial} tutorials - */ -exports.publish = (taffyData, opts, tutorials) => {}; diff --git a/test/specs/jsdoc/template.js b/test/specs/jsdoc/template.js deleted file mode 100644 index a79e4b36..00000000 --- a/test/specs/jsdoc/template.js +++ /dev/null @@ -1,3 +0,0 @@ -xdescribe('jsdoc/template', () => { - // TODO -});