diff --git a/.gitignore b/.gitignore index 117bc87..3013977 100644 --- a/.gitignore +++ b/.gitignore @@ -1,22 +1,27 @@ -*.el -*.tex -*.bak -*.log -*.html -*.pdf *.aux -*.toc +*.bak +*.el +*.html +*.log +*.lot +*.map *.out +*.pdf +*.pdf_tex +*.tex +*.toc _minted* /draconian-2/Vulgar_ Language generator.pdf -/draconian-2/auto-generated* -/ignored-folder -/js/.tern-port -*.pdf_tex -*.lot -/css/.sass-cache/ -*.map -/css/light.css -/css/main.css -/css/dark.css -/css/nyqy.css +auto-generated* + +# Files and directories created by pub +.dart_tool/ +.packages +# Remove the following pattern if you wish to check in your lock file +pubspec.lock + +# Conventional directory for build outputs +build/ + +# Directory created by dartdoc +doc/api/ diff --git a/analysis_options.yaml b/analysis_options.yaml new file mode 100644 index 0000000..a686c1b --- /dev/null +++ b/analysis_options.yaml @@ -0,0 +1,14 @@ +# Defines a default set of lint rules enforced for +# projects at Google. For details and rationale, +# see https://github.com/dart-lang/pedantic#enabled-lints. +include: package:pedantic/analysis_options.yaml + +# For lint rules and documentation, see http://dart-lang.github.io/linter/lints. +# Uncomment to specify additional rules. +# linter: +# rules: +# - camel_case_types + +analyzer: +# exclude: +# - path/to/excluded/files/** diff --git a/css/.gitignore b/css/.gitignore deleted file mode 100644 index 9ac4a9f..0000000 --- a/css/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/css/dark.css diff --git a/css/htmlize.css b/css/htmlize.css deleted file mode 100644 index 6bf6c34..0000000 --- a/css/htmlize.css +++ /dev/null @@ -1,763 +0,0 @@ -.org-bold { - /* bold */ - font-weight: bold; -} - -.org-bold-italic { - /* bold-italic */ - font-weight: bold; - font-style: italic; -} - -.org-buffer-menu-buffer { - /* buffer-menu-buffer */ - font-weight: bold; -} - -.org-builtin { - /* font-lock-builtin-face */ - color: #7a378b; -} - -.org-button { - /* button */ - text-decoration: underline; -} - -.org-calendar-today { - /* calendar-today */ - text-decoration: underline; -} - -.org-change-log-acknowledgement { - /* change-log-acknowledgement */ - color: #b22222; -} - -.org-change-log-conditionals { - /* change-log-conditionals */ - color: #a0522d; -} - -.org-change-log-date { - /* change-log-date */ - color: #8b2252; -} - -.org-change-log-email { - /* change-log-email */ - color: #a0522d; -} - -.org-change-log-file { - /* change-log-file */ - color: #0000ff; -} - -.org-change-log-function { - /* change-log-function */ - color: #a0522d; -} - -.org-change-log-list { - /* change-log-list */ - color: #a020f0; -} - -.org-change-log-name { - /* change-log-name */ - color: #008b8b; -} - -.org-comint-highlight-input { - /* comint-highlight-input */ - font-weight: bold; -} - -.org-comint-highlight-prompt { - /* comint-highlight-prompt */ - color: #00008b; -} - -.org-comment { - /* font-lock-comment-face */ - color: #999988; - font-style: italic; -} - -.org-comment-delimiter { - /* font-lock-comment-delimiter-face */ - color: #999988; - font-style: italic; -} - -.org-completions-annotations { - /* completions-annotations */ - font-style: italic; -} - -.org-completions-common-part { - /* completions-common-part */ - color: #000000; - background-color: #ffffff; -} - -.org-completions-first-difference { - /* completions-first-difference */ - font-weight: bold; -} - -.org-constant { - /* font-lock-constant-face */ - color: #008b8b; -} - -.org-diary { - /* diary */ - color: #ff0000; -} - -.org-diff-context { - /* diff-context */ - color: #7f7f7f; -} - -.org-diff-file-header { - /* diff-file-header */ - background-color: #b3b3b3; - font-weight: bold; -} - -.org-diff-function { - /* diff-function */ - background-color: #cccccc; -} - -.org-diff-header { - /* diff-header */ - background-color: #cccccc; -} - -.org-diff-hunk-header { - /* diff-hunk-header */ - background-color: #cccccc; -} - -.org-diff-index { - /* diff-index */ - background-color: #b3b3b3; - font-weight: bold; -} - -.org-diff-nonexistent { - /* diff-nonexistent */ - background-color: #b3b3b3; - font-weight: bold; -} - -.org-diff-refine-change { - /* diff-refine-change */ - background-color: #d9d9d9; -} - -.org-dired-directory { - /* dired-directory */ - color: #0000ff; -} - -.org-dired-flagged { - /* dired-flagged */ - color: #ff0000; - font-weight: bold; -} - -.org-dired-header { - /* dired-header */ - color: #228b22; -} - -.org-dired-ignored { - /* dired-ignored */ - color: #7f7f7f; -} - -.org-dired-mark { - /* dired-mark */ - color: #008b8b; -} - -.org-dired-marked { - /* dired-marked */ - color: #ff0000; - font-weight: bold; -} - -.org-dired-perm-write { - /* dired-perm-write */ - color: #b22222; -} - -.org-dired-symlink { - /* dired-symlink */ - color: #a020f0; -} - -.org-dired-warning { - /* dired-warning */ - color: #ff0000; - font-weight: bold; -} - -.org-doc { - /* font-lock-doc-face */ - color: #8b2252; -} - -.org-escape-glyph { - /* escape-glyph */ - color: #a52a2a; -} - -.org-file-name-shadow { - /* file-name-shadow */ - color: #7f7f7f; -} - -.org-flyspell-duplicate { - /* flyspell-duplicate */ - color: #cdad00; - font-weight: bold; - text-decoration: underline; -} - -.org-flyspell-incorrect { - /* flyspell-incorrect */ - color: #ff4500; - font-weight: bold; - text-decoration: underline; -} - -.org-fringe { - /* fringe */ - background-color: #f2f2f2; -} - -.org-function-name { - /* font-lock-function-name-face */ - color: teal; -} - -.org-header-line { - /* header-line */ - color: #333333; - background-color: #e5e5e5; -} - -.org-help-argument-name { - /* help-argument-name */ - font-style: italic; -} - -.org-highlight { - /* highlight */ - background-color: #b4eeb4; -} - -.org-holiday { - /* holiday */ - background-color: #ffc0cb; -} - -.org-isearch { - /* isearch */ - color: #b0e2ff; - background-color: #cd00cd; -} - -.org-isearch-fail { - /* isearch-fail */ - background-color: #ffc1c1; -} - -.org-italic { - /* italic */ - font-style: italic; -} - -.org-keyword { - /* font-lock-keyword-face */ - color: #0086b3; -} - -.org-lazy-highlight { - /* lazy-highlight */ - background-color: #afeeee; -} - -.org-link { - /* link */ - color: #0000ff; - text-decoration: underline; -} - -.org-link-visited { - /* link-visited */ - color: #8b008b; - text-decoration: underline; -} - -.org-log-edit-header { - /* log-edit-header */ - color: #a020f0; -} - -.org-log-edit-summary { - /* log-edit-summary */ - color: #0000ff; -} - -.org-log-edit-unknown-header { - /* log-edit-unknown-header */ - color: #b22222; -} - -.org-match { - /* match */ - background-color: #ffff00; -} - -.org-next-error { - /* next-error */ - background-color: #eedc82; -} - -.org-nobreak-space { - /* nobreak-space */ - color: #a52a2a; - text-decoration: underline; -} - -.org-org-archived { - /* org-archived */ - color: #7f7f7f; -} - -.org-org-block { - /* org-block */ - color: #7f7f7f; -} - -.org-org-block-begin-line { - /* org-block-begin-line */ - color: #b22222; -} - -.org-org-block-end-line { - /* org-block-end-line */ - color: #b22222; -} - -.org-org-checkbox { - /* org-checkbox */ - font-weight: bold; -} - -.org-org-checkbox-statistics-done { - /* org-checkbox-statistics-done */ - color: #228b22; - font-weight: bold; -} - -.org-org-checkbox-statistics-todo { - /* org-checkbox-statistics-todo */ - color: #ff0000; - font-weight: bold; -} - -.org-org-clock-overlay { - /* org-clock-overlay */ - background-color: #ffff00; -} - -.org-org-code { - /* org-code */ - color: #7f7f7f; -} - -.org-org-column { - /* org-column */ - background-color: #e5e5e5; -} - -.org-org-column-title { - /* org-column-title */ - background-color: #e5e5e5; - font-weight: bold; - text-decoration: underline; -} - -.org-org-date { - /* org-date */ - color: #a020f0; - text-decoration: underline; -} - -.org-org-document-info { - /* org-document-info */ - color: #191970; -} - -.org-org-document-info-keyword { - /* org-document-info-keyword */ - color: #7f7f7f; -} - -.org-org-document-title { - /* org-document-title */ - color: #191970; - font-size: 144%; - font-weight: bold; -} - -.org-org-done { - /* org-done */ - color: #228b22; - font-weight: bold; -} - -.org-org-drawer { - /* org-drawer */ - color: #0000ff; -} - -.org-org-ellipsis { - /* org-ellipsis */ - color: #b8860b; - text-decoration: underline; -} - -.org-org-footnote { - /* org-footnote */ - color: #a020f0; - text-decoration: underline; -} - -.org-org-formula { - /* org-formula */ - color: #b22222; -} - -.org-org-headline-done { - /* org-headline-done */ - color: #bc8f8f; -} - -.org-org-hide { - /* org-hide */ - color: #ffffff; -} - -.org-org-latex-and-export-specials { - /* org-latex-and-export-specials */ - color: #8b4513; -} - -.org-org-level-1 { - /* org-level-1 */ - color: #0000ff; -} - -.org-org-level-2 { - /* org-level-2 */ - color: #a0522d; -} - -.org-org-level-3 { - /* org-level-3 */ - color: #a020f0; -} - -.org-org-level-4 { - /* org-level-4 */ - color: #b22222; -} - -.org-org-level-5 { - /* org-level-5 */ - color: #228b22; -} - -.org-org-level-6 { - /* org-level-6 */ - color: #008b8b; -} - -.org-org-level-7 { - /* org-level-7 */ - color: #7a378b; -} - -.org-org-level-8 { - /* org-level-8 */ - color: #8b2252; -} - -.org-org-link { - /* org-link */ - color: #0000ff; - text-decoration: underline; -} - -.org-org-meta-line { - /* org-meta-line */ - color: #b22222; -} - -.org-org-mode-line-clock { - /* org-mode-line-clock */ - color: #000000; - background-color: #bfbfbf; -} - -.org-org-mode-line-clock-overrun { - /* org-mode-line-clock-overrun */ - color: #000000; - background-color: #ff0000; -} - -.org-org-quote { - /* org-quote */ - color: #7f7f7f; -} - -.org-org-scheduled { - /* org-scheduled */ - color: #006400; -} - -.org-org-scheduled-previously { - /* org-scheduled-previously */ - color: #b22222; -} - -.org-org-scheduled-today { - /* org-scheduled-today */ - color: #006400; -} - -.org-org-sexp-date { - /* org-sexp-date */ - color: #a020f0; -} - -.org-org-special-keyword { - /* org-special-keyword */ - color: #a020f0; -} - -.org-org-table { - /* org-table */ - color: #0000ff; -} - -.org-org-tag { - /* org-tag */ - font-weight: bold; -} - -.org-org-target { - /* org-target */ - text-decoration: underline; -} - -.org-org-time-grid { - /* org-time-grid */ - color: #b8860b; -} - -.org-org-todo { - /* org-todo */ - color: #ff0000; - font-weight: bold; -} - -.org-org-upcoming-deadline { - /* org-upcoming-deadline */ - color: #b22222; -} - -.org-org-verbatim { - /* org-verbatim */ - color: #7f7f7f; -} - -.org-org-verse { - /* org-verse */ - color: #7f7f7f; -} - -.org-org-warning { - /* org-warning */ - color: #ff0000; - font-weight: bold; -} - -.org-outline-1 { - /* outline-1 */ - color: #0000ff; -} - -.org-outline-2 { - /* outline-2 */ - color: #a0522d; -} - -.org-outline-3 { - /* outline-3 */ - color: #a020f0; -} - -.org-outline-4 { - /* outline-4 */ - color: #b22222; -} - -.org-outline-5 { - /* outline-5 */ - color: #228b22; -} - -.org-outline-6 { - /* outline-6 */ - color: #008b8b; -} - -.org-outline-7 { - /* outline-7 */ - color: #7a378b; -} - -.org-outline-8 { - /* outline-8 */ - color: #8b2252; -} - -.org-preprocessor { - /* font-lock-preprocessor-face */ - color: #7a378b; -} - -.org-query-replace { - /* query-replace */ - color: #b0e2ff; - background-color: #cd00cd; -} - -.org-regexp-grouping-backslash { - /* font-lock-regexp-grouping-backslash */ - font-weight: bold; -} - -.org-regexp-grouping-construct { - /* font-lock-regexp-grouping-construct */ - font-weight: bold; -} - -.org-region { - /* region */ - background-color: #eedc82; -} - -.org-secondary-selection { - /* secondary-selection */ - background-color: #ffff00; -} - -.org-shadow { - /* shadow */ - color: #7f7f7f; -} - -.org-show-paren-match { - /* show-paren-match */ - background-color: #40e0d0; -} - -.org-show-paren-mismatch { - /* show-paren-mismatch */ - color: #ffffff; - background-color: #a020f0; -} - -.org-string { - /* font-lock-string-face */ - color: #dd1144; -} - -.org-tool-bar { - /* tool-bar */ - color: #000000; - background-color: #bfbfbf; -} - -.org-tooltip { - /* tooltip */ - color: #000000; - background-color: #ffffe0; -} - -.org-trailing-whitespace { - /* trailing-whitespace */ - background-color: #ff0000; -} - -.org-type { - /* font-lock-type-face */ - color: #228b22; -} - -.org-underline { - /* underline */ - text-decoration: underline; -} - -.org-variable-name { - /* font-lock-variable-name-face */ - color: teal; -} - -.org-warning { - /* font-lock-warning-face */ - color: #ff0000; - font-weight: bold; -} - -.org-widget-button { - /* widget-button */ - font-weight: bold; -} - -.org-widget-button-pressed { - /* widget-button-pressed */ - color: #ff0000; -} - -.org-widget-documentation { - /* widget-documentation */ - color: #006400; -} - -.org-widget-field { - /* widget-field */ - background-color: #d9d9d9; -} - -.org-widget-inactive { - /* widget-inactive */ - color: #7f7f7f; -} - -.org-widget-single-line-field { - /* widget-single-line-field */ - background-color: #d9d9d9; -} diff --git a/css/htmlize.min.css b/css/htmlize.min.css deleted file mode 100644 index 309b3b0..0000000 --- a/css/htmlize.min.css +++ /dev/null @@ -1 +0,0 @@ -.org-bold{font-weight:700}.org-bold-italic{font-weight:700;font-style:italic}.org-buffer-menu-buffer{font-weight:700}.org-builtin{color:#7a378b}.org-button{text-decoration:underline}.org-calendar-today{text-decoration:underline}.org-change-log-acknowledgement{color:#b22222}.org-change-log-conditionals{color:sienna}.org-change-log-date{color:#8b2252}.org-change-log-email{color:sienna}.org-change-log-file{color:#00f}.org-change-log-function{color:sienna}.org-change-log-list{color:#a020f0}.org-change-log-name{color:#008b8b}.org-comint-highlight-input{font-weight:700}.org-comint-highlight-prompt{color:#00008b}.org-comment{color:#998;font-style:italic}.org-comment-delimiter{color:#998;font-style:italic}.org-completions-annotations{font-style:italic}.org-completions-common-part{color:#000;background-color:#fff}.org-completions-first-difference{font-weight:700}.org-constant{color:#008b8b}.org-diary{color:red}.org-diff-context{color:#7f7f7f}.org-diff-file-header{background-color:#b3b3b3;font-weight:700}.org-diff-function{background-color:#ccc}.org-diff-header{background-color:#ccc}.org-diff-hunk-header{background-color:#ccc}.org-diff-index{background-color:#b3b3b3;font-weight:700}.org-diff-nonexistent{background-color:#b3b3b3;font-weight:700}.org-diff-refine-change{background-color:#d9d9d9}.org-dired-directory{color:#00f}.org-dired-flagged{color:red;font-weight:700}.org-dired-header{color:#228b22}.org-dired-ignored{color:#7f7f7f}.org-dired-mark{color:#008b8b}.org-dired-marked{color:red;font-weight:700}.org-dired-perm-write{color:#b22222}.org-dired-symlink{color:#a020f0}.org-dired-warning{color:red;font-weight:700}.org-doc{color:#8b2252}.org-escape-glyph{color:brown}.org-file-name-shadow{color:#7f7f7f}.org-flyspell-duplicate{color:#cdad00;font-weight:700;text-decoration:underline}.org-flyspell-incorrect{color:#ff4500;font-weight:700;text-decoration:underline}.org-fringe{background-color:#f2f2f2}.org-function-name{color:teal}.org-header-line{color:#333;background-color:#e5e5e5}.org-help-argument-name{font-style:italic}.org-highlight{background-color:#b4eeb4}.org-holiday{background-color:pink}.org-isearch{color:#b0e2ff;background-color:#cd00cd}.org-isearch-fail{background-color:#ffc1c1}.org-italic{font-style:italic}.org-keyword{color:#0086b3}.org-lazy-highlight{background-color:#afeeee}.org-link{color:#00f;text-decoration:underline}.org-link-visited{color:#8b008b;text-decoration:underline}.org-log-edit-header{color:#a020f0}.org-log-edit-summary{color:#00f}.org-log-edit-unknown-header{color:#b22222}.org-match{background-color:#ff0}.org-next-error{background-color:#eedc82}.org-nobreak-space{color:brown;text-decoration:underline}.org-org-archived{color:#7f7f7f}.org-org-block{color:#7f7f7f}.org-org-block-begin-line{color:#b22222}.org-org-block-end-line{color:#b22222}.org-org-checkbox{font-weight:700}.org-org-checkbox-statistics-done{color:#228b22;font-weight:700}.org-org-checkbox-statistics-todo{color:red;font-weight:700}.org-org-clock-overlay{background-color:#ff0}.org-org-code{color:#7f7f7f}.org-org-column{background-color:#e5e5e5}.org-org-column-title{background-color:#e5e5e5;font-weight:700;text-decoration:underline}.org-org-date{color:#a020f0;text-decoration:underline}.org-org-document-info{color:#191970}.org-org-document-info-keyword{color:#7f7f7f}.org-org-document-title{color:#191970;font-size:144%;font-weight:700}.org-org-done{color:#228b22;font-weight:700}.org-org-drawer{color:#00f}.org-org-ellipsis{color:#b8860b;text-decoration:underline}.org-org-footnote{color:#a020f0;text-decoration:underline}.org-org-formula{color:#b22222}.org-org-headline-done{color:#bc8f8f}.org-org-hide{color:#fff}.org-org-latex-and-export-specials{color:#8b4513}.org-org-level-1{color:#00f}.org-org-level-2{color:sienna}.org-org-level-3{color:#a020f0}.org-org-level-4{color:#b22222}.org-org-level-5{color:#228b22}.org-org-level-6{color:#008b8b}.org-org-level-7{color:#7a378b}.org-org-level-8{color:#8b2252}.org-org-link{color:#00f;text-decoration:underline}.org-org-meta-line{color:#b22222}.org-org-mode-line-clock{color:#000;background-color:#bfbfbf}.org-org-mode-line-clock-overrun{color:#000;background-color:red}.org-org-quote{color:#7f7f7f}.org-org-scheduled{color:#006400}.org-org-scheduled-previously{color:#b22222}.org-org-scheduled-today{color:#006400}.org-org-sexp-date{color:#a020f0}.org-org-special-keyword{color:#a020f0}.org-org-table{color:#00f}.org-org-tag{font-weight:700}.org-org-target{text-decoration:underline}.org-org-time-grid{color:#b8860b}.org-org-todo{color:red;font-weight:700}.org-org-upcoming-deadline{color:#b22222}.org-org-verbatim{color:#7f7f7f}.org-org-verse{color:#7f7f7f}.org-org-warning{color:red;font-weight:700}.org-outline-1{color:#00f}.org-outline-2{color:sienna}.org-outline-3{color:#a020f0}.org-outline-4{color:#b22222}.org-outline-5{color:#228b22}.org-outline-6{color:#008b8b}.org-outline-7{color:#7a378b}.org-outline-8{color:#8b2252}.org-preprocessor{color:#7a378b}.org-query-replace{color:#b0e2ff;background-color:#cd00cd}.org-regexp-grouping-backslash{font-weight:700}.org-regexp-grouping-construct{font-weight:700}.org-region{background-color:#eedc82}.org-secondary-selection{background-color:#ff0}.org-shadow{color:#7f7f7f}.org-show-paren-match{background-color:#40e0d0}.org-show-paren-mismatch{color:#fff;background-color:#a020f0}.org-string{color:#d14}.org-tool-bar{color:#000;background-color:#bfbfbf}.org-tooltip{color:#000;background-color:#ffffe0}.org-trailing-whitespace{background-color:red}.org-type{color:#228b22}.org-underline{text-decoration:underline}.org-variable-name{color:teal}.org-warning{color:red;font-weight:700}.org-widget-button{font-weight:700}.org-widget-button-pressed{color:red}.org-widget-documentation{color:#006400}.org-widget-field{background-color:#d9d9d9}.org-widget-inactive{color:#7f7f7f}.org-widget-single-line-field{background-color:#d9d9d9} diff --git a/img/nyqy/consonant-feature-tree.png b/img/nyqy/consonant-feature-tree.png deleted file mode 100644 index b64d008..0000000 Binary files a/img/nyqy/consonant-feature-tree.png and /dev/null differ diff --git a/img/nyqy/vowel-feature-tree.png b/img/nyqy/vowel-feature-tree.png deleted file mode 100644 index f1dd520..0000000 Binary files a/img/nyqy/vowel-feature-tree.png and /dev/null differ diff --git a/js/jquery.min.js b/js/jquery.min.js deleted file mode 100644 index a1c07fd..0000000 --- a/js/jquery.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;nx",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="
",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0. - */ - -/*jshint esversion: 6 */ - -window.onload = function() { - reorganize_html(); - create_theme_switcher(); - console.log("JS loaded!"); -}; - -function reorganize_html() { - // Move the postamble in the content div - $('#content').append('
'); - $('#postamble').appendTo($('#content')); - - // Move each table in a div to handle large tables' overflow - $('table').each(function() { - $table = $(this); - $table.before('
'); - $table.prependTo($table.prev()); - }); -} - -function create_theme_switcher() { - // set the correct CSS depending on the cookie, dark is default - var light = isThemeLight(); - // Set the correct symbol in the theme switcher button - $('body').append('
')); - // set the correct css file in the HTML head - $('head').append('')); - - // switch CSS files and button icon, set new cookie on theme switcher click - $('.themeBtn').click(function() { - var light = !isThemeLight(); - // Switch the CSS between light and dark - $("#theme").first().attr('href', 'https://langue.phundrak.com/css/' - .concat(light ? 'light' : 'dark') - .concat('.css')); - // Switch the icon in the theme switcher button - $('.themeBtn').html('')); - Cookies.set('light-theme', light ? 'true' : 'false'); - }); -} - -function isThemeLight() { - // set the css and button depending on the cookie found, dark is default - var light; - switch (Cookies.get('light-theme')) { - case 'true': - light = true; - break; - case null: // If no theme cookie is found, set dark by default - Cookies.set('light-theme', false); - /* falls through */ - default: - light = false; - break; - } - return light; -} - -function isEmpty(el) { - return !$.trim(el.html()); -} diff --git a/pubspec.yaml b/pubspec.yaml new file mode 100644 index 0000000..2e7b766 --- /dev/null +++ b/pubspec.yaml @@ -0,0 +1,16 @@ +name: langue +description: An absolute bare-bones web app. +version: 0.1.0 +homepage: https://langue.phundrak.com +author: Lucien Cartier-Tilet + +environment: + sdk: '>=2.5.0 <3.0.0' + +dependencies: + js: ^0.6.1+1 + +dev_dependencies: + build_runner: ^1.6.0 + build_web_compilers: ^2.3.0 + pedantic: ^1.8.0 diff --git a/web/.gitignore b/web/.gitignore new file mode 100644 index 0000000..5039026 --- /dev/null +++ b/web/.gitignore @@ -0,0 +1,6 @@ +/ignored-folder +/css/.sass-cache/ +/css/light.css +/css/main.css +/css/dark.css +/css/nyqy.css \ No newline at end of file diff --git a/clean.fish b/web/clean.fish similarity index 100% rename from clean.fish rename to web/clean.fish diff --git a/css/dark.scss b/web/css/dark.scss similarity index 93% rename from css/dark.scss rename to web/css/dark.scss index 97b12f9..35733ef 100644 --- a/css/dark.scss +++ b/web/css/dark.scss @@ -18,6 +18,7 @@ $bg: #2c3e50; $darkerbg: #34495e; $textcolor: #ecf0f1; +$tablecolor: #263646; html { background-color: $darkerbg; @@ -50,7 +51,7 @@ a { } th { - border: 1px solid $bg; + border: 1px solid $tablecolor; } td { @@ -62,7 +63,7 @@ pre { } table { - border: 2px solid $bg; + border: 2px solid $tablecolor; } #content { diff --git a/web/css/htmlize.css b/web/css/htmlize.css new file mode 100644 index 0000000..37a52d0 --- /dev/null +++ b/web/css/htmlize.css @@ -0,0 +1,765 @@ +.org-bold { + /* bold */ + font-weight: bold; +} + +.org-bold-italic { + /* bold-italic */ + font-weight: bold; + font-style: italic; +} + +.org-buffer-menu-buffer { + /* buffer-menu-buffer */ + font-weight: bold; +} + +.org-builtin { + /* font-lock-builtin-face */ + color: #7a378b; +} + +.org-button { + /* button */ + text-decoration: underline; +} + +.org-calendar-today { + /* calendar-today */ + text-decoration: underline; +} + +.org-change-log-acknowledgement { + /* change-log-acknowledgement */ + color: #b22222; +} + +.org-change-log-conditionals { + /* change-log-conditionals */ + color: #a0522d; +} + +.org-change-log-date { + /* change-log-date */ + color: #8b2252; +} + +.org-change-log-email { + /* change-log-email */ + color: #a0522d; +} + +.org-change-log-file { + /* change-log-file */ + color: #0000ff; +} + +.org-change-log-function { + /* change-log-function */ + color: #a0522d; +} + +.org-change-log-list { + /* change-log-list */ + color: #a020f0; +} + +.org-change-log-name { + /* change-log-name */ + color: #008b8b; +} + +.org-comint-highlight-input { + /* comint-highlight-input */ + font-weight: bold; +} + +.org-comint-highlight-prompt { + /* comint-highlight-prompt */ + color: #00008b; +} + +.org-comment { + /* font-lock-comment-face */ + color: #999988; + font-style: italic; +} + +.org-comment-delimiter { + /* font-lock-comment-delimiter-face */ + color: #999988; + font-style: italic; +} + +.org-completions-annotations { + /* completions-annotations */ + font-style: italic; +} + +.org-completions-common-part { + /* completions-common-part */ + color: #000000; + background-color: #ffffff; +} + +.org-completions-first-difference { + /* completions-first-difference */ + font-weight: bold; +} + +.org-constant { + /* font-lock-constant-face */ + color: #008b8b; +} + +.org-diary { + /* diary */ + color: #ff0000; +} + +.org-diff-context { + /* diff-context */ + color: #7f7f7f; +} + +.org-diff-file-header { + /* diff-file-header */ + background-color: #b3b3b3; + font-weight: bold; +} + +.org-diff-function { + /* diff-function */ + background-color: #cccccc; +} + +.org-diff-header { + /* diff-header */ + background-color: #cccccc; +} + +.org-diff-hunk-header { + /* diff-hunk-header */ + background-color: #cccccc; +} + +.org-diff-index { + /* diff-index */ + background-color: #b3b3b3; + font-weight: bold; +} + +.org-diff-nonexistent { + /* diff-nonexistent */ + background-color: #b3b3b3; + font-weight: bold; +} + +.org-diff-refine-change { + /* diff-refine-change */ + background-color: #d9d9d9; +} + +.org-dired-directory { + /* dired-directory */ + color: #0000ff; +} + +.org-dired-flagged { + /* dired-flagged */ + color: #ff0000; + font-weight: bold; +} + +.org-dired-header { + /* dired-header */ + color: #228b22; +} + +.org-dired-ignored { + /* dired-ignored */ + color: #7f7f7f; +} + +.org-dired-mark { + /* dired-mark */ + color: #008b8b; +} + +.org-dired-marked { + /* dired-marked */ + color: #ff0000; + font-weight: bold; +} + +.org-dired-perm-write { + /* dired-perm-write */ + color: #b22222; +} + +.org-dired-symlink { + /* dired-symlink */ + color: #a020f0; +} + +.org-dired-warning { + /* dired-warning */ + color: #ff0000; + font-weight: bold; +} + +.org-doc { + /* font-lock-doc-face */ + color: #8b2252; +} + +.org-escape-glyph { + /* escape-glyph */ + color: #a52a2a; +} + +.org-file-name-shadow { + /* file-name-shadow */ + color: #7f7f7f; +} + +.org-flyspell-duplicate { + /* flyspell-duplicate */ + color: #cdad00; + font-weight: bold; + text-decoration: underline; +} + +.org-flyspell-incorrect { + /* flyspell-incorrect */ + color: #ff4500; + font-weight: bold; + text-decoration: underline; +} + +.org-fringe { + /* fringe */ + background-color: #f2f2f2; +} + +.org-function-name { + /* font-lock-function-name-face */ + color: teal; +} + +.org-header-line { + /* header-line */ + color: #333333; + background-color: #e5e5e5; +} + +.org-help-argument-name { + /* help-argument-name */ + font-style: italic; +} + +.org-highlight { + /* highlight */ + background-color: #b4eeb4; +} + +.org-holiday { + /* holiday */ + background-color: #ffc0cb; +} + +.org-isearch { + /* isearch */ + color: #b0e2ff; + background-color: #cd00cd; +} + +.org-isearch-fail { + /* isearch-fail */ + background-color: #ffc1c1; +} + +.org-italic { + /* italic */ + font-style: italic; +} + +.org-keyword { + /* font-lock-keyword-face */ + color: #0086b3; +} + +.org-lazy-highlight { + /* lazy-highlight */ + background-color: #afeeee; +} + +.org-link { + /* link */ + color: #0000ff; + text-decoration: underline; +} + +.org-link-visited { + /* link-visited */ + color: #8b008b; + text-decoration: underline; +} + +.org-log-edit-header { + /* log-edit-header */ + color: #a020f0; +} + +.org-log-edit-summary { + /* log-edit-summary */ + color: #0000ff; +} + +.org-log-edit-unknown-header { + /* log-edit-unknown-header */ + color: #b22222; +} + +.org-match { + /* match */ + background-color: #ffff00; +} + +.org-next-error { + /* next-error */ + background-color: #eedc82; +} + +.org-nobreak-space { + /* nobreak-space */ + color: #a52a2a; + text-decoration: underline; +} + +.org-org-archived { + /* org-archived */ + color: #7f7f7f; +} + +.org-org-block { + /* org-block */ + color: #7f7f7f; +} + +.org-org-block-begin-line { + /* org-block-begin-line */ + color: #b22222; +} + +.org-org-block-end-line { + /* org-block-end-line */ + color: #b22222; +} + +.org-org-checkbox { + /* org-checkbox */ + font-weight: bold; +} + +.org-org-checkbox-statistics-done { + /* org-checkbox-statistics-done */ + color: #228b22; + font-weight: bold; +} + +.org-org-checkbox-statistics-todo { + /* org-checkbox-statistics-todo */ + color: #ff0000; + font-weight: bold; +} + +.org-org-clock-overlay { + /* org-clock-overlay */ + background-color: #ffff00; +} + +.org-org-code { + /* org-code */ + color: #7f7f7f; +} + +.org-org-column { + /* org-column */ + background-color: #e5e5e5; +} + +.org-org-column-title { + /* org-column-title */ + background-color: #e5e5e5; + font-weight: bold; + text-decoration: underline; +} + +.org-org-date { + /* org-date */ + color: #a020f0; + text-decoration: underline; +} + +.org-org-document-info { + /* org-document-info */ + color: #191970; +} + +.org-org-document-info-keyword { + /* org-document-info-keyword */ + color: #7f7f7f; +} + +.org-org-document-title { + /* org-document-title */ + color: #191970; + font-size: 144%; + font-weight: bold; +} + +.org-org-done { + /* org-done */ + color: #228b22; + font-weight: bold; +} + +.org-org-drawer { + /* org-drawer */ + color: #0000ff; +} + +.org-org-ellipsis { + /* org-ellipsis */ + color: #b8860b; + text-decoration: underline; +} + +.org-org-footnote { + /* org-footnote */ + color: #a020f0; + text-decoration: underline; +} + +.org-org-formula { + /* org-formula */ + color: #b22222; +} + +.org-org-headline-done { + /* org-headline-done */ + color: #bc8f8f; +} + +.org-org-hide { + /* org-hide */ + color: #ffffff; +} + +.org-org-latex-and-export-specials { + /* org-latex-and-export-specials */ + color: #8b4513; +} + +.org-org-level-1 { + /* org-level-1 */ + color: #0000ff; +} + +.org-org-level-2 { + /* org-level-2 */ + color: #a0522d; +} + +.org-org-level-3 { + /* org-level-3 */ + color: #a020f0; +} + +.org-org-level-4 { + /* org-level-4 */ + color: #b22222; +} + +.org-org-level-5 { + /* org-level-5 */ + color: #228b22; +} + +.org-org-level-6 { + /* org-level-6 */ + color: #008b8b; +} + +.org-org-level-7 { + /* org-level-7 */ + color: #7a378b; +} + +.org-org-level-8 { + /* org-level-8 */ + color: #8b2252; +} + +.org-org-link { + /* org-link */ + color: #0000ff; + text-decoration: underline; +} + +.org-org-meta-line { + /* org-meta-line */ + color: #b22222; +} + +.org-org-mode-line-clock { + /* org-mode-line-clock */ + color: #000000; + background-color: #bfbfbf; +} + +.org-org-mode-line-clock-overrun { + /* org-mode-line-clock-overrun */ + color: #000000; + background-color: #ff0000; +} + +.org-org-quote { + /* org-quote */ + color: #7f7f7f; +} + +.org-org-scheduled { + /* org-scheduled */ + color: #006400; +} + +.org-org-scheduled-previously { + /* org-scheduled-previously */ + color: #b22222; +} + +.org-org-scheduled-today { + /* org-scheduled-today */ + color: #006400; +} + +.org-org-sexp-date { + /* org-sexp-date */ + color: #a020f0; +} + +.org-org-special-keyword { + /* org-special-keyword */ + color: #a020f0; +} + +.org-org-table { + /* org-table */ + color: #0000ff; +} + +.org-org-tag { + /* org-tag */ + font-weight: bold; +} + +.org-org-target { + /* org-target */ + text-decoration: underline; +} + +.org-org-time-grid { + /* org-time-grid */ + color: #b8860b; +} + +.org-org-todo { + /* org-todo */ + color: #ff0000; + font-weight: bold; +} + +.org-org-upcoming-deadline { + /* org-upcoming-deadline */ + color: #b22222; +} + +.org-org-verbatim { + /* org-verbatim */ + color: #7f7f7f; +} + +.org-org-verse { + /* org-verse */ + color: #7f7f7f; +} + +.org-org-warning { + /* org-warning */ + color: #ff0000; + font-weight: bold; +} + +.org-outline-1 { + /* outline-1 */ + color: #0000ff; +} + +.org-outline-2 { + /* outline-2 */ + color: #a0522d; +} + +.org-outline-3 { + /* outline-3 */ + color: #a020f0; +} + +.org-outline-4 { + /* outline-4 */ + color: #b22222; +} + +.org-outline-5 { + /* outline-5 */ + color: #228b22; +} + +.org-outline-6 { + /* outline-6 */ + color: #008b8b; +} + +.org-outline-7 { + /* outline-7 */ + color: #7a378b; +} + +.org-outline-8 { + /* outline-8 */ + color: #8b2252; +} + +.org-preprocessor { + /* font-lock-preprocessor-face */ + color: #7a378b; +} + +.org-query-replace { + /* query-replace */ + color: #b0e2ff; + background-color: #cd00cd; +} + +.org-regexp-grouping-backslash { + /* font-lock-regexp-grouping-backslash */ + font-weight: bold; +} + +.org-regexp-grouping-construct { + /* font-lock-regexp-grouping-construct */ + font-weight: bold; +} + +.org-region { + /* region */ + background-color: #eedc82; +} + +.org-secondary-selection { + /* secondary-selection */ + background-color: #ffff00; +} + +.org-shadow { + /* shadow */ + color: #7f7f7f; +} + +.org-show-paren-match { + /* show-paren-match */ + background-color: #40e0d0; +} + +.org-show-paren-mismatch { + /* show-paren-mismatch */ + color: #ffffff; + background-color: #a020f0; +} + +.org-string { + /* font-lock-string-face */ + color: #dd1144; +} + +.org-tool-bar { + /* tool-bar */ + color: #000000; + background-color: #bfbfbf; +} + +.org-tooltip { + /* tooltip */ + color: #000000; + background-color: #ffffe0; +} + +.org-trailing-whitespace { + /* trailing-whitespace */ + background-color: #ff0000; +} + +.org-type { + /* font-lock-type-face */ + color: #228b22; +} + +.org-underline { + /* underline */ + text-decoration: underline; +} + +.org-variable-name { + /* font-lock-variable-name-face */ + color: teal; +} + +.org-warning { + /* font-lock-warning-face */ + color: #ff0000; + font-weight: bold; +} + +.org-widget-button { + /* widget-button */ + font-weight: bold; +} + +.org-widget-button-pressed { + /* widget-button-pressed */ + color: #ff0000; +} + +.org-widget-documentation { + /* widget-documentation */ + color: #006400; +} + +.org-widget-field { + /* widget-field */ + background-color: #d9d9d9; +} + +.org-widget-inactive { + /* widget-inactive */ + color: #7f7f7f; +} + +.org-widget-single-line-field { + /* widget-single-line-field */ + background-color: #d9d9d9; +} + +/*# sourceMappingURL=htmlize.css.map */ diff --git a/web/css/htmlize.min.css b/web/css/htmlize.min.css new file mode 100644 index 0000000..a34a2bf --- /dev/null +++ b/web/css/htmlize.min.css @@ -0,0 +1,620 @@ +.org-bold { + font-weight: 700; +} + +.org-bold-italic { + font-weight: 700; + font-style: italic; +} + +.org-buffer-menu-buffer { + font-weight: 700; +} + +.org-builtin { + color: #7a378b; +} + +.org-button { + text-decoration: underline; +} + +.org-calendar-today { + text-decoration: underline; +} + +.org-change-log-acknowledgement { + color: #b22222; +} + +.org-change-log-conditionals { + color: sienna; +} + +.org-change-log-date { + color: #8b2252; +} + +.org-change-log-email { + color: sienna; +} + +.org-change-log-file { + color: #00f; +} + +.org-change-log-function { + color: sienna; +} + +.org-change-log-list { + color: #a020f0; +} + +.org-change-log-name { + color: #008b8b; +} + +.org-comint-highlight-input { + font-weight: 700; +} + +.org-comint-highlight-prompt { + color: #00008b; +} + +.org-comment { + color: #998; + font-style: italic; +} + +.org-comment-delimiter { + color: #998; + font-style: italic; +} + +.org-completions-annotations { + font-style: italic; +} + +.org-completions-common-part { + color: #000; + background-color: #fff; +} + +.org-completions-first-difference { + font-weight: 700; +} + +.org-constant { + color: #008b8b; +} + +.org-diary { + color: red; +} + +.org-diff-context { + color: #7f7f7f; +} + +.org-diff-file-header { + background-color: #b3b3b3; + font-weight: 700; +} + +.org-diff-function { + background-color: #ccc; +} + +.org-diff-header { + background-color: #ccc; +} + +.org-diff-hunk-header { + background-color: #ccc; +} + +.org-diff-index { + background-color: #b3b3b3; + font-weight: 700; +} + +.org-diff-nonexistent { + background-color: #b3b3b3; + font-weight: 700; +} + +.org-diff-refine-change { + background-color: #d9d9d9; +} + +.org-dired-directory { + color: #00f; +} + +.org-dired-flagged { + color: red; + font-weight: 700; +} + +.org-dired-header { + color: #228b22; +} + +.org-dired-ignored { + color: #7f7f7f; +} + +.org-dired-mark { + color: #008b8b; +} + +.org-dired-marked { + color: red; + font-weight: 700; +} + +.org-dired-perm-write { + color: #b22222; +} + +.org-dired-symlink { + color: #a020f0; +} + +.org-dired-warning { + color: red; + font-weight: 700; +} + +.org-doc { + color: #8b2252; +} + +.org-escape-glyph { + color: brown; +} + +.org-file-name-shadow { + color: #7f7f7f; +} + +.org-flyspell-duplicate { + color: #cdad00; + font-weight: 700; + text-decoration: underline; +} + +.org-flyspell-incorrect { + color: #ff4500; + font-weight: 700; + text-decoration: underline; +} + +.org-fringe { + background-color: #f2f2f2; +} + +.org-function-name { + color: teal; +} + +.org-header-line { + color: #333; + background-color: #e5e5e5; +} + +.org-help-argument-name { + font-style: italic; +} + +.org-highlight { + background-color: #b4eeb4; +} + +.org-holiday { + background-color: pink; +} + +.org-isearch { + color: #b0e2ff; + background-color: #cd00cd; +} + +.org-isearch-fail { + background-color: #ffc1c1; +} + +.org-italic { + font-style: italic; +} + +.org-keyword { + color: #0086b3; +} + +.org-lazy-highlight { + background-color: #afeeee; +} + +.org-link { + color: #00f; + text-decoration: underline; +} + +.org-link-visited { + color: #8b008b; + text-decoration: underline; +} + +.org-log-edit-header { + color: #a020f0; +} + +.org-log-edit-summary { + color: #00f; +} + +.org-log-edit-unknown-header { + color: #b22222; +} + +.org-match { + background-color: #ff0; +} + +.org-next-error { + background-color: #eedc82; +} + +.org-nobreak-space { + color: brown; + text-decoration: underline; +} + +.org-org-archived { + color: #7f7f7f; +} + +.org-org-block { + color: #7f7f7f; +} + +.org-org-block-begin-line { + color: #b22222; +} + +.org-org-block-end-line { + color: #b22222; +} + +.org-org-checkbox { + font-weight: 700; +} + +.org-org-checkbox-statistics-done { + color: #228b22; + font-weight: 700; +} + +.org-org-checkbox-statistics-todo { + color: red; + font-weight: 700; +} + +.org-org-clock-overlay { + background-color: #ff0; +} + +.org-org-code { + color: #7f7f7f; +} + +.org-org-column { + background-color: #e5e5e5; +} + +.org-org-column-title { + background-color: #e5e5e5; + font-weight: 700; + text-decoration: underline; +} + +.org-org-date { + color: #a020f0; + text-decoration: underline; +} + +.org-org-document-info { + color: #191970; +} + +.org-org-document-info-keyword { + color: #7f7f7f; +} + +.org-org-document-title { + color: #191970; + font-size: 144%; + font-weight: 700; +} + +.org-org-done { + color: #228b22; + font-weight: 700; +} + +.org-org-drawer { + color: #00f; +} + +.org-org-ellipsis { + color: #b8860b; + text-decoration: underline; +} + +.org-org-footnote { + color: #a020f0; + text-decoration: underline; +} + +.org-org-formula { + color: #b22222; +} + +.org-org-headline-done { + color: #bc8f8f; +} + +.org-org-hide { + color: #fff; +} + +.org-org-latex-and-export-specials { + color: #8b4513; +} + +.org-org-level-1 { + color: #00f; +} + +.org-org-level-2 { + color: sienna; +} + +.org-org-level-3 { + color: #a020f0; +} + +.org-org-level-4 { + color: #b22222; +} + +.org-org-level-5 { + color: #228b22; +} + +.org-org-level-6 { + color: #008b8b; +} + +.org-org-level-7 { + color: #7a378b; +} + +.org-org-level-8 { + color: #8b2252; +} + +.org-org-link { + color: #00f; + text-decoration: underline; +} + +.org-org-meta-line { + color: #b22222; +} + +.org-org-mode-line-clock { + color: #000; + background-color: #bfbfbf; +} + +.org-org-mode-line-clock-overrun { + color: #000; + background-color: red; +} + +.org-org-quote { + color: #7f7f7f; +} + +.org-org-scheduled { + color: #006400; +} + +.org-org-scheduled-previously { + color: #b22222; +} + +.org-org-scheduled-today { + color: #006400; +} + +.org-org-sexp-date { + color: #a020f0; +} + +.org-org-special-keyword { + color: #a020f0; +} + +.org-org-table { + color: #00f; +} + +.org-org-tag { + font-weight: 700; +} + +.org-org-target { + text-decoration: underline; +} + +.org-org-time-grid { + color: #b8860b; +} + +.org-org-todo { + color: red; + font-weight: 700; +} + +.org-org-upcoming-deadline { + color: #b22222; +} + +.org-org-verbatim { + color: #7f7f7f; +} + +.org-org-verse { + color: #7f7f7f; +} + +.org-org-warning { + color: red; + font-weight: 700; +} + +.org-outline-1 { + color: #00f; +} + +.org-outline-2 { + color: sienna; +} + +.org-outline-3 { + color: #a020f0; +} + +.org-outline-4 { + color: #b22222; +} + +.org-outline-5 { + color: #228b22; +} + +.org-outline-6 { + color: #008b8b; +} + +.org-outline-7 { + color: #7a378b; +} + +.org-outline-8 { + color: #8b2252; +} + +.org-preprocessor { + color: #7a378b; +} + +.org-query-replace { + color: #b0e2ff; + background-color: #cd00cd; +} + +.org-regexp-grouping-backslash { + font-weight: 700; +} + +.org-regexp-grouping-construct { + font-weight: 700; +} + +.org-region { + background-color: #eedc82; +} + +.org-secondary-selection { + background-color: #ff0; +} + +.org-shadow { + color: #7f7f7f; +} + +.org-show-paren-match { + background-color: #40e0d0; +} + +.org-show-paren-mismatch { + color: #fff; + background-color: #a020f0; +} + +.org-string { + color: #d14; +} + +.org-tool-bar { + color: #000; + background-color: #bfbfbf; +} + +.org-tooltip { + color: #000; + background-color: #ffffe0; +} + +.org-trailing-whitespace { + background-color: red; +} + +.org-type { + color: #228b22; +} + +.org-underline { + text-decoration: underline; +} + +.org-variable-name { + color: teal; +} + +.org-warning { + color: red; + font-weight: 700; +} + +.org-widget-button { + font-weight: 700; +} + +.org-widget-button-pressed { + color: red; +} + +.org-widget-documentation { + color: #006400; +} + +.org-widget-field { + background-color: #d9d9d9; +} + +.org-widget-inactive { + color: #7f7f7f; +} + +.org-widget-single-line-field { + background-color: #d9d9d9; +} + +/*# sourceMappingURL=htmlize.min.css.map */ diff --git a/css/light.scss b/web/css/light.scss similarity index 88% rename from css/light.scss rename to web/css/light.scss index fcb49f1..ee571bf 100644 --- a/css/light.scss +++ b/web/css/light.scss @@ -15,12 +15,12 @@ along with this program. If not, see . */ -$bg: #2c3e50; -$darkerbg: #ddd; -$textcolor: #444; +$bg: #eee; +$darkerbg: #ddd; +$textcolor: #444; html { - background-color: $darkerbg; + background-color: $bg; } thead { @@ -50,7 +50,7 @@ a { } th { - border: 1px solid $bg; + border: 1px solid $textcolor; } td { @@ -62,13 +62,13 @@ pre { } table { - border: 2px solid $bg; + border: 2px solid $textcolor; } #content { - background-color: $bg; + background-color: $darkerbg; } #postamble{ - background-color: $bg; + @extend #content; } diff --git a/css/main.scss b/web/css/main.scss similarity index 100% rename from css/main.scss rename to web/css/main.scss diff --git a/css/nyqy.scss b/web/css/nyqy.scss similarity index 100% rename from css/nyqy.scss rename to web/css/nyqy.scss diff --git a/web/dart/cookie.dart b/web/dart/cookie.dart new file mode 100644 index 0000000..7dbef43 --- /dev/null +++ b/web/dart/cookie.dart @@ -0,0 +1,11 @@ +@JS() +library cookie; + +import 'package:js/js.dart'; + +@JS() +class Cookies { + // external factory Cookie(); + external static String get(String name); + external static void set(String name, String value); +} diff --git a/web/dart/main.dart b/web/dart/main.dart new file mode 100644 index 0000000..fae5853 --- /dev/null +++ b/web/dart/main.dart @@ -0,0 +1,59 @@ +@JS() +library main; + +import 'dart:html'; + +import 'package:js/js.dart'; +import './cookie.dart'; + +void main() { + reorganizeHtml(); + createThemeSwitcher(); + querySelector('.themeBtn').onClick.listen(themeSwitch); +} + +void createThemeSwitcher() { + // set the correct CSS depending on the cookie, dark is enabled by default + var isDark = isThemeDark(); + // Set the correct symbol in the theme switcher button + querySelector('body').append(DivElement()..className = 'themeBtn'); + querySelector('.themeBtn') + .children + .add(Element.tag('i')..className = 'fas fa-' + (isDark ? 'sun' : 'moon')); +} + +bool isThemeDark() { + if (Cookies.get('theme') == 'light') { + return false; + } + Cookies.set('theme', 'dark'); + return true; +} + +bool setTheme(bool dark) { + Cookies.set('theme', (dark ? 'dark' : 'light')); + return !dark; +} + +void themeSwitch(MouseEvent event) { + print('Switch theme'); + bool isDark = setTheme(isThemeDark()); + querySelector('.fas').className = 'fas fa-' + (isDark ? 'sun' : 'moon'); + querySelector('#theme').attributes['href'] = + '/css/' + (isDark ? 'dark' : 'light') + '.css'; +} + +void reorganizeHtml() { + // Add a
element after the content div + querySelector('#content').appendHtml('
'); + + // Move the postamble in the content div + querySelector('#content').append(querySelector('#postamble')); + + for (var table in querySelectorAll('table')) { + var largetable = DivElement(); + largetable.className = 'largetable'; + table.before(largetable); + largetable.children.add(table); + } +} diff --git a/eittland-files/eittland-detailed.wonderdraft_map b/web/eittland-files/eittland-detailed.wonderdraft_map similarity index 100% rename from eittland-files/eittland-detailed.wonderdraft_map rename to web/eittland-files/eittland-detailed.wonderdraft_map diff --git a/eittland-files/eittlandic_sacrifice.xcf b/web/eittland-files/eittlandic_sacrifice.xcf similarity index 100% rename from eittland-files/eittlandic_sacrifice.xcf rename to web/eittland-files/eittlandic_sacrifice.xcf diff --git a/eittlanda.org b/web/eittlanda.org similarity index 91% rename from eittlanda.org rename to web/eittlanda.org index 69c85a8..4b56a99 100644 --- a/eittlanda.org +++ b/web/eittlanda.org @@ -317,10 +317,37 @@ l’Islande fut transférée du Royaume Uni aux États Unis d’Amérique le 17 Mai 1940, un contingent éittlandais resta sur place afin d’assurer une protection du pays par un autre pays nordique. Lors de l’entrée en guerre - des États Unis, l’Eittlande les invitère à installer une base militaire sur + des États Unis, l’Eittlande les invita à installer une base militaire sur leur île comme base arrière afin d’établir une liaison avec le Royaume Uni et l’Europe au travers de l’Atlantique. + L’Éittlande retira ses troupes d’Islande peu de temps après le retrais des + troupes étasuniennes durant 1946, date à laquelle la base militaire + étasunienne sur le sol Éittlandais fut restituée à la couronne + Éittlandaise. Quelques régiments restèrent tout de même sur le sol + Islandais tandis qu’un régiment Islandais s’établit sur le sol Éittlandais, + marquant la formalisation d’une alliance militaire et économique entre ces + deux pays. + + Éittlande rejoint l’OTAN le 4 Mai 1949 suite à un référendum créé à + l’initiative du roi Ulfor II Ulforsson. + +**** Guerres de la Morue + :PROPERTIES: + :CUSTOM_ID: h-e0d78230-f1e1-4a53-9b14-53da9b9b4c47 + :END: + Durant les années 70, Éittlande participa aux Guerres de la Morue avec + l’Islande face au Royaume Unis, qui furent les seuls à supporter la + décision islandaise d’expansion de leurs eaux territoriales. Lors de la + seconde Guerre de la Morue, Eittlande en profita pour également augmenter + la superficie de ses eaux territoriales, les deux pays dépendant grandement + de l’activité de la pêche. La troisième Guerre de la Morue vit cependant + une rivalerie entre Eittlande et l’Islande malgré leur alliance officielle + dû à des zone maritimes réclamées par les deux pays. Il fût finalement + décidé lors de la fin de la guerre que la zone réclamée par les deux pays + couvrant les 200 miles nautiques auraient un statut de zone économique + exclusive aux deux pays. + *** Situation politique :PROPERTIES: :CUSTOM_ID: h-11e1aecd-4abd-4dd5-a07a-0998e6572b09 @@ -328,12 +355,12 @@ Du fait d’une population croissante et d’un besoin d’une organisation locale, une constitution et un gouvernement furent créés en Eittlande sous l’impulsion de la couronne norvégienne, choisissant comme roi d’Eittlande le - jarl de Ðeberget Ásmundr Ingólfrson, l’un des fils d’Ingólfr Arnarson. - Ásmundr I fut ainsi premier souverain d’Eittlande et vassal de la couronne + jarl de Ðeberget Ásmundor Ingólfrson, l’un des fils d’Ingólfr Arnarson. + Ásmundor I fut ainsi premier souverain d’Eittlande et vassal de la couronne de Norvège. Une monarchie s’installa donc à la tête d’un système féodal. L’Eittlande étant un territoire divisé en deux par la chaîne de volcan traversant l’île, un co-roi fut nommé pour régner au nom du souverain sur la - partie orientale de l’île lorsque Áleifr I, fils d’Ásmundr I, accéda au + partie orientale de l’île lorsque Áleifor I, fils d’Ásmundor I, accéda au trône. Depuis, il est de tradition que le roi éittlandais nomme un de ses frères ou un de ses fils co-souverain de l’île, ce dernier le succédant souvent s’il s’agissait du fils du souverain ou du frère d’un souverain sans @@ -389,48 +416,61 @@ #+NAME: Eittland-kings:1 #+ATTR_LATEX: :float sideways #+CAPTION: Liste des rois Eittlandais de 915 à 1392 - | <4> | <4> | <4> | <4> | <4> | <4> | <4> | <4> | <4> | <4> | - | roi | naissance | mort | âge | règne | co-roi | naissance | mort | âge | règne | - |-------------------------------+-----------+------+-----+-----------+--------------------------------+-----------+------+-----+-----------| - | Ásmundr I, Ingólfrson | 876 | 932 | 56 | 915-935 | - | | | | | - | Áleifr I, Ásmundrson | 879 | 950 | 71 | 935-950 | Steingrímr I, Áleifrbróðir | 879 | 959 | 80 | 936-951 | - | Áleifr II, Áleifrson | 915 | 971 | 56 | 950-971 | Eyvindr I, Áleifrbróðir | 918 | 981 | 63 | 951-972 | - | Áleifr III, Áleifrson | 935 | 981 | 46 | 971-981 | Hallþórr I, Áleifrbróðir | 936 | 1012 | 76 | 972-981 | - | Hallþórr I, Áleifrbróðir | 936 | 1012 | 76 | 981-1012 | Eiríkr I, Áleifrbróðir | 938 | 987 | 49 | 982-987 | - | | | | | | Hallþórr II, Hallþórrson | 955 | 1020 | 65 | 937-1012 | - | Hallþórr II, Hallþórson | 955 | 1020 | 65 | 1012-1020 | Ásmundr I, Hallþórrbróðir | 956 | 1018 | 62 | 1012-1018 | - | | | | | | Hallþórr III, Hallþórrsonarson | 992 | 1058 | 66 | 1018-1020 | - | Hallþórr III, Hallþórsonarson | 992 | 1058 | 66 | 1020-1058 | Ragnheiðr I, Hallþórrson | 976 | 1033 | 57 | 1021-1033 | - | | | | | | Hallþórr IV, Hallþórrson | 1013 | 1065 | 52 | 1033-1058 | - | Hallþór IV, Hallþórson | 1013 | 1065 | 52 | 1058-1065 | Áleifr IV, Hallþórbróðir | 1015 | 1087 | 72 | 1059-1065 | - | Áleifr IV, Hallþórbróðir | 1015 | 1087 | 72 | 1065-1087 | Eríkr II, Áleifrbróðir | 1020 | 1101 | 81 | 1065-1087 | - | Eríkr II, Áleifrbróðir | 1020 | 1101 | 81 | 1087-1101 | Eyvindr II, Áleifrbróðir | 1027 | 1098 | 71 | 1088-1098 | - | | | | | | Eríkr III, Eríkrsonarson | 1053 | 1103 | 50 | 1098-1101 | - | Eríkr III, Eríkrsonarson | 1053 | 1103 | 50 | 1101-1103 | Niall I, Eríkrdóttir | 1076 | 1158 | 82 | 1102-1103 | - | Niall I, Eríkrdóttir | 1076 | 1158 | 82 | 1103-1158 | Eysteinn I, Niallson | 1095 | 1127 | 32 | 1104-1127 | - | | | | | | Yngvarr I, Niallsonarson | 1102 | 1175 | 73 | 1128-1158 | - | Yngvarr I, Niallson | 1102 | 1175 | 73 | 1158-1175 | Eyvindr II, Yngvarrbróðir | 1119 | 1176 | 57 | 1159-1175 | - | Yngvarr II, Yngvarrson | 1137 | 1176 | 39 | 1175-1176 | Eyvindr II, Yngvarrbróðir | 1119 | 1176 | 57 | 1176 | - | | | | | | Yngvarr III, Yngvarrson | 1153 | 1202 | 49 | 1176 | - | Yngvarr III, Yngvarrson | 1153 | 1202 | 49 | 1176-1202 | Heimir I, Yngvarrbróðir | 1162 | 1223 | 61 | 1177-1202 | - | Heimir I, Yngvarrbróðir | 1162 | 1223 | 61 | 1202-1223 | Ásmundr II, Heimirbróðir | 1165 | 1218 | 53 | 1202-1218 | - | | | | | | Gunnhildr I, Ásmundrdóttir | 1189 | 1252 | 63 | 1218-1223 | - | Gunnhildr I, Ásmundrdóttir | 1189 | 1252 | 63 | 1223-1252 | Hallþórr V, Gunnhildrson | 1205 | 1283 | 78 | 1223-1252 | - | Hallþórr V, Gunnhildrson | 1205 | 1283 | 78 | 1252-1283 | Steingrímr II, Hallþórrbroðir | 1209 | 1263 | 54 | 1252-1263 | - | | | | | | Steingrímr III, Steingrímrson | 1233 | 1278 | 45 | 1263-1278 | - | | | | | | Eyvindr III, Steingrímrson | 1235 | 1291 | 56 | 1278-1283 | - | Eyvindr III, Steingrímrson | 1235 | 1291 | 56 | 1283-1291 | Ragnheiðr II, Eyvindrbróðir | 1240 | 1296 | 56 | 1284-1291 | - | Eyvindr IV, Eyvindrson | 1262 | 1318 | 56 | 1291-1318 | Ragnheiðr II, Eyvindrbróðir | 1240 | 1296 | 56 | 1292-1296 | - | | | | | | Ragnheiðr III, Ragnheiðrson | 1259 | 1308 | 49 | 1292-1308 | - | | | | | | Eyvindr V, Eyvindrson | 1285 | 1346 | 61 | 1308-1318 | - | Eyvindr V, Eyvindrson | 1285 | 1346 | 61 | 1318-1346 | Eríkr II, Eyvindrbróðir | 1290 | 1349 | 59 | 1319-1346 | - | Eyvindr VI, Eyvindrson | 1309 | 1354 | 45 | 1346-1354 | Eríkr III, Eyvindrbróðir | 1315 | 1349 | 34 | 1346-1349 | - | | | | | | Eir I, Eyvindrsystir | 1299 | 1360 | 61 | 1349-1354 | - | Eir I, Eyvindrsystir | 1299 | 1360 | 61 | 1354-1360 | Biœrg I, Eirdóttir | 1318 | 1374 | 56 | 1355-1360 | - | Biœrg I, Eirdóttir | 1318 | 1374 | 56 | 1360-1374 | Ásgeirr I, Bjœrgson | 1330 | 1392 | 62 | 1361-1374 | - | Ásgeirr I, Biœrgson | 1330 | 1392 | 62 | 1374-1392 | Eiríkr IV, Ásgeirrbróðir | 1333 | 1393 | 60 | 1375-1392 | + | <4> | <4> | <4> | <4> | <4> | <4> | <4> | <4> | <4> | <4> | + | roi | naissance | mort | âge | règne | co-roi | naissance | mort | âge | règne | + |-------------------------------+-----------+------+-----+-----------+---------------------------------+-----------+------+-----+-----------| + | Ásmundor I, Ingólfrson | 876 | 932 | 56 | 915-935 | - | | | | | + | Áleifor I, Ásmundorson | 879 | 950 | 71 | 935-950 | Steingrímor I, Áleiforbróðir | 879 | 959 | 80 | 936-951 | + | Áleifor II, Áleiforson | 915 | 971 | 56 | 950-971 | Eyvindor I, Áleiforbróðir | 918 | 981 | 63 | 951-972 | + | Áleifor III, Áleiforson | 935 | 981 | 46 | 971-981 | Hallþórr I, Áleiforbróðir | 936 | 1012 | 76 | 972-981 | + | Hallþórr I, Áleiforbróðir | 936 | 1012 | 76 | 981-1012 | Eiríkor I, Áleiforbróðir | 938 | 987 | 49 | 982-987 | + | | | | | | Hallþórr II, Hallþórsson | 955 | 1020 | 65 | 937-1012 | + | Hallþórr II, Hallþórson | 955 | 1020 | 65 | 1012-1020 | Ásmundor I, Hallþórsbróðir | 956 | 1018 | 62 | 1012-1018 | + | | | | | | Hallþórr III, Hallþórssonarson | 992 | 1058 | 66 | 1018-1020 | + | Hallþórr III, Hallþórsonarson | 992 | 1058 | 66 | 1020-1058 | Ragnheiðr I, Hallþórsson | 976 | 1033 | 57 | 1021-1033 | + | | | | | | Hallþórr IV, Hallþórsson | 1013 | 1065 | 52 | 1033-1058 | + | Hallþór IV, Hallþórson | 1013 | 1065 | 52 | 1058-1065 | Áleifor IV, Hallþórbróðir | 1015 | 1087 | 72 | 1059-1065 | + | Áleifor IV, Hallþórbróðir | 1015 | 1087 | 72 | 1065-1087 | Eríkor II, Áleiforbróðir | 1020 | 1101 | 81 | 1065-1087 | + | Eríkor II, Áleiforbróðir | 1020 | 1101 | 81 | 1087-1101 | Eyvindor II, Áleiforbróðir | 1027 | 1098 | 71 | 1088-1098 | + | | | | | | Eríkor III, Eríkorsonarson | 1053 | 1103 | 50 | 1098-1101 | + | Eríkor III, Eríkorsonarson | 1053 | 1103 | 50 | 1101-1103 | Niall I, Eríkordóttir | 1076 | 1158 | 82 | 1102-1103 | + | Niall I, Eríkordóttir | 1076 | 1158 | 82 | 1103-1158 | Eysteinn I, Niallson | 1095 | 1127 | 32 | 1104-1127 | + | | | | | | Yngvarr I, Niallsonarson | 1102 | 1175 | 73 | 1128-1158 | + | Yngvarr I, Niallson | 1102 | 1175 | 73 | 1158-1175 | Eyvindor II, Yngvarsbróðir | 1119 | 1176 | 57 | 1159-1175 | + | Yngvarr II, Yngvarsson | 1137 | 1176 | 39 | 1175-1176 | Eyvindor II, Yngvarsbróðir | 1119 | 1176 | 57 | 1176 | + | | | | | | Yngvarr III, Yngvarsson | 1153 | 1202 | 49 | 1176 | + | Yngvarr III, Yngvarsson | 1153 | 1202 | 49 | 1176-1202 | Heimir I, Yngvarsbróðir | 1162 | 1223 | 61 | 1177-1202 | + | Heimir I, Yngvarsbróðir | 1162 | 1223 | 61 | 1202-1223 | Ásmundor II, Heimirbróðir | 1165 | 1218 | 53 | 1202-1218 | + | | | | | | Gunnhildor I, Ásmundordóttir | 1189 | 1252 | 63 | 1218-1223 | + | Gunnhildor I, Ásmundordóttir | 1189 | 1252 | 63 | 1223-1252 | Hallþórr V, Gunnhildorson | 1205 | 1283 | 78 | 1223-1252 | + | Hallþórr V, Gunnhildorson | 1205 | 1283 | 78 | 1252-1283 | Steingrímor II, Hallþórsbroðir | 1209 | 1263 | 54 | 1252-1263 | + | | | | | | Steingrímor III, Steingrímorson | 1233 | 1278 | 45 | 1263-1278 | + | | | | | | Eyvindor III, Steingrímorson | 1235 | 1291 | 56 | 1278-1283 | + | Eyvindor III, Steingrímorson | 1235 | 1291 | 56 | 1283-1291 | Ragnheiðr II, Eyvindorbróðir | 1240 | 1296 | 56 | 1284-1291 | + | Eyvindor IV, Eyvindorson | 1262 | 1318 | 56 | 1291-1318 | Ragnheiðr II, Eyvindorbróðir | 1240 | 1296 | 56 | 1292-1296 | + | | | | | | Ragnheiðr III, Ragnheiðrson | 1259 | 1308 | 49 | 1292-1308 | + | | | | | | Eyvindor V, Eyvindorson | 1285 | 1346 | 61 | 1308-1318 | + | Eyvindor V, Eyvindorson | 1285 | 1346 | 61 | 1318-1346 | Eríkor II, Eyvindorbróðir | 1290 | 1349 | 59 | 1319-1346 | + | Eyvindor VI, Eyvindorson | 1309 | 1354 | 45 | 1346-1354 | Eríkor III, Eyvindorbróðir | 1315 | 1349 | 34 | 1346-1349 | + | | | | | | Eir I, Eyvindorsystir | 1299 | 1360 | 61 | 1349-1354 | + | Eir I, Eyvindorsystir | 1299 | 1360 | 61 | 1354-1360 | Biœrg I, Eirdóttir | 1318 | 1374 | 56 | 1355-1360 | + | Biœrg I, Eirdóttir | 1318 | 1374 | 56 | 1360-1374 | Ásgeirr I, Bjœrgson | 1330 | 1392 | 62 | 1361-1374 | + | Ásgeirr I, Biœrgson | 1330 | 1397 | 67 | 1374-1397 | Eiríkor IV, Ásgeirsbróðir | 1333 | 1397 | 64 | 1375-1397 | #+TBLFM: $4=$3-$2::$9=$8-$7 + On peut remarquer la mort simultanée d’Ásgeirr I, Biœrgon et de son co-roi + Eiríkor IV, Ásgeirsbródir. Bien que rien ne puisse être affirmé avec + certitude, l’une des théories les plus populaires veut que les deux + souverains furent empoisonnés, marquant une tentative de la couronne de + l’Union de Kalmar de saper le moral éittlandais et de mettre fin à ce qui + était à l’époque considéré par l’Union comme étant une rébellion. Bien que + cela mit un terme à la dynastie d’Ásmundor, un nouveau roi fut nommé, choisi + dans une famille noble proche du trône. Ainsi le nouveau roi Arvid I Geirson + repris la guerre contre l’Union, et repris la tradition du co-roi en nommant + son frère Havardor I Arvidbróðir à la tête de la partie orientale de l’île. + La guerre se termina le 27 Octobre 1400 avec l’indépendance d’Éittlande + reconnue par l’Union de Kalmar. + ** Écologie :PROPERTIES: :CUSTOM_ID: h-1cff65b5-a389-4f68-9feb-7aaf4d6c50ee @@ -697,14 +737,14 @@ (conlanging/tree-to-dot eittlandic-vowels) #+END_SRC - #+BEGIN_SRC dot :file img/eittlanda/vowel-feature-tree.png :var input=vow-dot :exports results :cache yes + #+BEGIN_SRC dot :file img/eittlanda/vowel-feature-tree.png :var input=vow-dot :exports results $input #+END_SRC #+NAME: arbre:vowels #+ATTR_HTML: :alt Arbre des voyelles de l’Eittlandais :width 100% #+ATTR_LATEX: :float sideways #+CAPTION: Arbre des caractéristiques distinctives des voyelles de l’Eittlandais - #+RESULTS[2c6f077ffbc915fa8a280ad51c89c4e778de0dec]: + #+RESULTS: [[file:img/eittlanda/vowel-feature-tree.png]] *** Diphtongues @@ -856,7 +896,7 @@ consonne, un , généralement prononcé {{{phon(ə)}}}, est ajouté avant le final. - Exemple : /frægr/ {{{phon(fræɡr)}}} (VN), /frægor/ {{{phon(fræɡɚ)}}} (E) ; /dalr/ + Exemple : /frægr/ {{{phon(fræɡr)}}} (VN), /frægor/ {{{phon(fræɣɚ)}}} (E) ; /dalr/ {{{phon(dal:)}}} (VN), /dalr/ {{{phon(dælː)}}} (E). L’Eittlandais a tout de même conservé la distinction norroise entre @@ -2112,5 +2152,5 @@ [fn:1] [[https://langue.phundrak.com]] -# LocalWords: non-orale Ingólfr Arnarson Ásmundr Ingólfrson Áleifr Steingrímr -# LocalWords: Ásmundrson Áleifrbróðir Hallþórr Eyvindr +# LocalWords: non-orale Ingólfr Arnarson Ásmundor Ingólfrson Áleifor Steingrímor +# LocalWords: Ásmundorson Áleiforbróðir Hallþórr Eyvindor diff --git a/en/nyqy.org b/web/en/nyqy.org similarity index 100% rename from en/nyqy.org rename to web/en/nyqy.org diff --git a/fonts/DoulosSIL-R-README.txt b/web/fonts/DoulosSIL-R-README.txt similarity index 100% rename from fonts/DoulosSIL-R-README.txt rename to web/fonts/DoulosSIL-R-README.txt diff --git a/fonts/DoulosSIL-R.woff b/web/fonts/DoulosSIL-R.woff similarity index 100% rename from fonts/DoulosSIL-R.woff rename to web/fonts/DoulosSIL-R.woff diff --git a/fonts/HelveticaNeue.ttf b/web/fonts/HelveticaNeue.ttf similarity index 100% rename from fonts/HelveticaNeue.ttf rename to web/fonts/HelveticaNeue.ttf diff --git a/fonts/NotoSansRunic-Regular.ttf b/web/fonts/NotoSansRunic-Regular.ttf similarity index 100% rename from fonts/NotoSansRunic-Regular.ttf rename to web/fonts/NotoSansRunic-Regular.ttf diff --git a/headers/head-lvl0.org b/web/headers/head-lvl0.org similarity index 100% rename from headers/head-lvl0.org rename to web/headers/head-lvl0.org diff --git a/headers/head-lvl1.org b/web/headers/head-lvl1.org similarity index 100% rename from headers/head-lvl1.org rename to web/headers/head-lvl1.org diff --git a/headers/headers.org b/web/headers/headers.org similarity index 100% rename from headers/headers.org rename to web/headers/headers.org diff --git a/hjalpi.org b/web/hjalpi.org similarity index 100% rename from hjalpi.org rename to web/hjalpi.org diff --git a/hjelp.org b/web/hjelp.org similarity index 100% rename from hjelp.org rename to web/hjelp.org diff --git a/hjelp/tools/gen.cc b/web/hjelp/tools/gen.cc similarity index 100% rename from hjelp/tools/gen.cc rename to web/hjelp/tools/gen.cc diff --git a/img/eittlanda/cons-feature-tree.png b/web/img/eittlanda/cons-feature-tree.png similarity index 100% rename from img/eittlanda/cons-feature-tree.png rename to web/img/eittlanda/cons-feature-tree.png diff --git a/img/eittlanda/map-hq.jpg b/web/img/eittlanda/map-hq.jpg similarity index 100% rename from img/eittlanda/map-hq.jpg rename to web/img/eittlanda/map-hq.jpg diff --git a/img/eittlanda/map-simple.jpg b/web/img/eittlanda/map-simple.jpg similarity index 100% rename from img/eittlanda/map-simple.jpg rename to web/img/eittlanda/map-simple.jpg diff --git a/img/eittlanda/map-world.jpg b/web/img/eittlanda/map-world.jpg similarity index 100% rename from img/eittlanda/map-world.jpg rename to web/img/eittlanda/map-world.jpg diff --git a/img/eittlanda/religious-pop.png b/web/img/eittlanda/religious-pop.png similarity index 100% rename from img/eittlanda/religious-pop.png rename to web/img/eittlanda/religious-pop.png diff --git a/img/eittlanda/sacrifice.png b/web/img/eittlanda/sacrifice.png similarity index 100% rename from img/eittlanda/sacrifice.png rename to web/img/eittlanda/sacrifice.png diff --git a/img/eittlanda/vowel-feature-tree.png b/web/img/eittlanda/vowel-feature-tree.png similarity index 100% rename from img/eittlanda/vowel-feature-tree.png rename to web/img/eittlanda/vowel-feature-tree.png diff --git a/img/hjelp/tones.jpg b/web/img/hjelp/tones.jpg similarity index 100% rename from img/hjelp/tones.jpg rename to web/img/hjelp/tones.jpg diff --git a/img/matter/einlant-old-map.jpg b/web/img/matter/einlant-old-map.jpg similarity index 100% rename from img/matter/einlant-old-map.jpg rename to web/img/matter/einlant-old-map.jpg diff --git a/img/nyqy/basic-syntax.png b/web/img/nyqy/basic-syntax.png similarity index 100% rename from img/nyqy/basic-syntax.png rename to web/img/nyqy/basic-syntax.png diff --git a/web/img/nyqy/consonant-feature-tree.png b/web/img/nyqy/consonant-feature-tree.png new file mode 100644 index 0000000..f97e163 Binary files /dev/null and b/web/img/nyqy/consonant-feature-tree.png differ diff --git a/web/img/nyqy/vowel-feature-tree.png b/web/img/nyqy/vowel-feature-tree.png new file mode 100644 index 0000000..3d81dad Binary files /dev/null and b/web/img/nyqy/vowel-feature-tree.png differ diff --git a/img/taso/consonant-feature-tree.png b/web/img/taso/consonant-feature-tree.png similarity index 100% rename from img/taso/consonant-feature-tree.png rename to web/img/taso/consonant-feature-tree.png diff --git a/img/taso/vowel-feature-tree.png b/web/img/taso/vowel-feature-tree.png similarity index 100% rename from img/taso/vowel-feature-tree.png rename to web/img/taso/vowel-feature-tree.png diff --git a/index.org b/web/index.org similarity index 100% rename from index.org rename to web/index.org diff --git a/lijokken/auto-generated-draft_files/320px-Blank_vowel_trapezoid.svg.png b/web/lijokken/auto-generated-draft_files/320px-Blank_vowel_trapezoid.svg.png similarity index 100% rename from lijokken/auto-generated-draft_files/320px-Blank_vowel_trapezoid.svg.png rename to web/lijokken/auto-generated-draft_files/320px-Blank_vowel_trapezoid.svg.png diff --git a/lijokken/auto-generated-draft_files/data4_7.js b/web/lijokken/auto-generated-draft_files/data4_7.js similarity index 100% rename from lijokken/auto-generated-draft_files/data4_7.js rename to web/lijokken/auto-generated-draft_files/data4_7.js diff --git a/lijokken/auto-generated-draft_files/ink.svg b/web/lijokken/auto-generated-draft_files/ink.svg similarity index 100% rename from lijokken/auto-generated-draft_files/ink.svg rename to web/lijokken/auto-generated-draft_files/ink.svg diff --git a/lijokken/auto-generated-draft_files/playb.svg b/web/lijokken/auto-generated-draft_files/playb.svg similarity index 100% rename from lijokken/auto-generated-draft_files/playb.svg rename to web/lijokken/auto-generated-draft_files/playb.svg diff --git a/lijokken/auto-generated-draft_files/up.svg b/web/lijokken/auto-generated-draft_files/up.svg similarity index 100% rename from lijokken/auto-generated-draft_files/up.svg rename to web/lijokken/auto-generated-draft_files/up.svg diff --git a/lijokken/auto-generated-draft_files/v4_7.js b/web/lijokken/auto-generated-draft_files/v4_7.js similarity index 100% rename from lijokken/auto-generated-draft_files/v4_7.js rename to web/lijokken/auto-generated-draft_files/v4_7.js diff --git a/lijokken/auto-generated-draft_files/vulgar-style15.css b/web/lijokken/auto-generated-draft_files/vulgar-style15.css similarity index 100% rename from lijokken/auto-generated-draft_files/vulgar-style15.css rename to web/lijokken/auto-generated-draft_files/vulgar-style15.css diff --git a/lijokken/exemple_draconique.mp3 b/web/lijokken/exemple_draconique.mp3 similarity index 100% rename from lijokken/exemple_draconique.mp3 rename to web/lijokken/exemple_draconique.mp3 diff --git a/lijokken/lijokken-glossaire.org b/web/lijokken/lijokken-glossaire.org similarity index 100% rename from lijokken/lijokken-glossaire.org rename to web/lijokken/lijokken-glossaire.org diff --git a/lijokken/lijokken-grammaire.org b/web/lijokken/lijokken-grammaire.org similarity index 100% rename from lijokken/lijokken-grammaire.org rename to web/lijokken/lijokken-grammaire.org diff --git a/matter-grammar.org b/web/matter-grammar.org similarity index 100% rename from matter-grammar.org rename to web/matter-grammar.org diff --git a/matter.org b/web/matter.org similarity index 100% rename from matter.org rename to web/matter.org diff --git a/nyqy-old.org b/web/nyqy-old.org similarity index 100% rename from nyqy-old.org rename to web/nyqy-old.org diff --git a/nyqy.org b/web/nyqy.org similarity index 96% rename from nyqy.org rename to web/nyqy.org index 7a9843a..08ddda1 100644 --- a/nyqy.org +++ b/web/nyqy.org @@ -487,15 +487,42 @@ #+END_SRC #+NAME: arbre:vowels #+ATTR_HTML: :alt Arbre des voyelles du Ñyqy :align center :width 800px - #+ATTR_LATEX: :float sideways + #+ATTR_LATEX: :width 10cm #+CAPTION: Arbre des caractéristiques des voyelles du Ñyqy #+RESULTS[d6752d93f1ef9dbe412d3eb47db94ef37601fbd2]: [[file:img/nyqy/vowel-feature-tree.png]] + Voici une description des voyelles du Ñyqy : + - e :: il s’agit de la voyelle antérieure mi-ouverte non-arrondie [ɛ] que + l’on retrouve en Français dans « bête » [bɛt̪] par example. + - é :: il s’agit de la voyelle antérieure mi-fermée non-arrondie [e] que + l’on retrouve en Français dans « été » [et̪e] par exemple. + - i :: Il s’agit de la voyelle antérieure pré-fermée non-arrondie [ɪ] que + l’on retrouve en Anglais comme dans « bit » [bɪt]. + - o :: Il s’agit de la voyelle postérieure mi-ouverte arrondie [ɔ] que l’on + retrouve en Français dans « sort » [sɔːʁ]. + - ó :: Il s’agit de la voyelle postérieure mi-fermée non-arrondie [ɤ] que + l’on retrouve en Gaellique Écossais « doirbh » [d̪̊ɤrʲɤv] ou en + Estonien « kõrv » [kɤrv]. + - u :: Il s’agit de la voyelle postérieure pré-fermée arrondie [ʊ] que l’on + retrouve en Anglais américain « hook » [hʊ̞k]. + - ú :: Il s’agit de la voyelle postérieure fermée arrondie [u] que l’on + retrouve en français avec « août » [ut̪]. + - y :: Il s’agit de la voyelle antérieure fermée arrondie [y] que l’on + retrouve en Français avec « dune » [d̪yn̪]. + *** Consonnes :PROPERTIES: :CUSTOM_ID: h-49ab3d74-6565-4f88-835c-f88425493d3f :END: + Le Ñyqy est une langue ayant une particularité intéressante : bien qu’elle + dispose d’un total de seulement douze consonnes, elle dispose réellement + approximativement du double dû à un effet de mutation des consonnes qui sera + décrit plus bas. Vous pouvez retrouver l’inventaire total dans le tableau + [[table:cons:ipa]], les lettres résultant de mutations étant entre parenthèses. + Vous trouverez également la translittération des consonnes non-mutées dans + le tableau [[table:cons:trans]]. + #+NAME: table:cons:ipa #+CAPTION: Consonnes du Ñyqy (IPA) | | | | | | | | @@ -524,6 +551,10 @@ | affriqué | | c j | | | | spirant | | | w | | + + Le Ñyqy dispose également d’une hiérarchie entre ses consonnes basée sur des + caractéristiques distinctives entre elles, à l’instar de ses voyelles. Vous + trouverez dans l’arbre [[arbre:cons]] l’organisation de ces consonnes. #+NAME: cons-tree #+BEGIN_SRC emacs-lisp :noweb yes :exports none :eval yes :cache yes (setq-local nyqy-consonants @@ -632,10 +663,19 @@ - Si les règles précédentes ne s’appliquent pas, il est supposé qu’un schwa est ajouté afin de pouvoir rendre la syllabe prononçable. +** Structure des mots + :PROPERTIES: + :CUSTOM_ID: h-3a8e9769-9aca-4ada-b127-6386742d5b32 + :END: + +** Processus phonologiques et morphophonémiques principaux + :PROPERTIES: + :CUSTOM_ID: h-477abbdc-eab0-4bd4-9d27-c39d9219d1d7 + :END: *** Allophonie :PROPERTIES: - :CUSTOM_ID: h-19816428-bd33-40a2-a682-acc2d0afe668 - :END: + :CUSTOM_ID: h-19816428-bd33-40a2-a682-acc2d0afe668 + :END: Il existe relativement peu de règles allophoniques connues en Ñyqy, cependant quelques unes sont à peu près certaines : @@ -667,15 +707,6 @@ Ainsi, la phrase {{{nyqy(ñe pom qy)}}} ne se prononce pas *{{{phon(ɴɛ pɔm qy)}}}, et la phrase {{{nyqy(qi bú pim mo coq)}}} se ne prononce pas *{{{phon(qɪ bʊ pɪm mɔ t͡ʃɔq)}}}. -** Structure des mots - :PROPERTIES: - :CUSTOM_ID: h-3a8e9769-9aca-4ada-b127-6386742d5b32 - :END: - -** Processus phonologiques et morphophonémiques principaux - :PROPERTIES: - :CUSTOM_ID: h-477abbdc-eab0-4bd4-9d27-c39d9219d1d7 - :END: *** Harmonie des consonnes :PROPERTIES: diff --git a/taso.org b/web/taso.org similarity index 100% rename from taso.org rename to web/taso.org diff --git a/template.org b/web/template.org similarity index 100% rename from template.org rename to web/template.org diff --git a/vernacular-hjalpi.org b/web/vernacular-hjalpi.org similarity index 100% rename from vernacular-hjalpi.org rename to web/vernacular-hjalpi.org diff --git a/vernacular-hjalpi/vernacular-hjalpi-cas-grammaticaux-2.org b/web/vernacular-hjalpi/vernacular-hjalpi-cas-grammaticaux-2.org similarity index 100% rename from vernacular-hjalpi/vernacular-hjalpi-cas-grammaticaux-2.org rename to web/vernacular-hjalpi/vernacular-hjalpi-cas-grammaticaux-2.org diff --git a/vernacular-hjalpi/vernacular-hjalpi-cas-grammaticaux.org b/web/vernacular-hjalpi/vernacular-hjalpi-cas-grammaticaux.org similarity index 100% rename from vernacular-hjalpi/vernacular-hjalpi-cas-grammaticaux.org rename to web/vernacular-hjalpi/vernacular-hjalpi-cas-grammaticaux.org diff --git a/vernacular-hjalpi/vernacular-hjalpi-dictionnaire.org b/web/vernacular-hjalpi/vernacular-hjalpi-dictionnaire.org similarity index 100% rename from vernacular-hjalpi/vernacular-hjalpi-dictionnaire.org rename to web/vernacular-hjalpi/vernacular-hjalpi-dictionnaire.org diff --git a/vernacular-hjalpi/vernacular-hjalpi-grammaire-2.org b/web/vernacular-hjalpi/vernacular-hjalpi-grammaire-2.org similarity index 100% rename from vernacular-hjalpi/vernacular-hjalpi-grammaire-2.org rename to web/vernacular-hjalpi/vernacular-hjalpi-grammaire-2.org diff --git a/vernacular-hjalpi/vernacular-hjalpi-grammaire.org b/web/vernacular-hjalpi/vernacular-hjalpi-grammaire.org similarity index 100% rename from vernacular-hjalpi/vernacular-hjalpi-grammaire.org rename to web/vernacular-hjalpi/vernacular-hjalpi-grammaire.org diff --git a/zohaen-grammaire.org b/web/zohaen-grammaire.org similarity index 100% rename from zohaen-grammaire.org rename to web/zohaen-grammaire.org diff --git a/zohaen/auto-generated_files/320px-Blank_vowel_trapezoid.svg.png b/web/zohaen/auto-generated_files/320px-Blank_vowel_trapezoid.svg.png similarity index 100% rename from zohaen/auto-generated_files/320px-Blank_vowel_trapezoid.svg.png rename to web/zohaen/auto-generated_files/320px-Blank_vowel_trapezoid.svg.png diff --git a/zohaen/auto-generated_files/data4_7.js b/web/zohaen/auto-generated_files/data4_7.js similarity index 100% rename from zohaen/auto-generated_files/data4_7.js rename to web/zohaen/auto-generated_files/data4_7.js diff --git a/zohaen/auto-generated_files/ink.svg b/web/zohaen/auto-generated_files/ink.svg similarity index 100% rename from zohaen/auto-generated_files/ink.svg rename to web/zohaen/auto-generated_files/ink.svg diff --git a/zohaen/auto-generated_files/playb.svg b/web/zohaen/auto-generated_files/playb.svg similarity index 100% rename from zohaen/auto-generated_files/playb.svg rename to web/zohaen/auto-generated_files/playb.svg diff --git a/zohaen/auto-generated_files/up.svg b/web/zohaen/auto-generated_files/up.svg similarity index 100% rename from zohaen/auto-generated_files/up.svg rename to web/zohaen/auto-generated_files/up.svg diff --git a/zohaen/auto-generated_files/v4_7.js b/web/zohaen/auto-generated_files/v4_7.js similarity index 100% rename from zohaen/auto-generated_files/v4_7.js rename to web/zohaen/auto-generated_files/v4_7.js diff --git a/zohaen/auto-generated_files/vulgar-style15.css b/web/zohaen/auto-generated_files/vulgar-style15.css similarity index 100% rename from zohaen/auto-generated_files/vulgar-style15.css rename to web/zohaen/auto-generated_files/vulgar-style15.css diff --git a/zohaen/zohaen-glossaire.org b/web/zohaen/zohaen-glossaire.org similarity index 100% rename from zohaen/zohaen-glossaire.org rename to web/zohaen/zohaen-glossaire.org