]*>([\s\S]*?)(<\/style\b[^>]*>)/i ], [ "lang-in.tag", /^(<\/?[a-z][^<>]*>)/i ] ]), [ "default-markup", "htm", "html", "mxml", "xhtml", "xml", "xsl" ]),
+ l(r([ [ P, /^[\s]+/, null, " \r\n" ], [ $, /^(?:\"[^\"]*\"?|\'[^\']*\'?)/, null, "\"'" ] ], [ [ O, /^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i ], [ j, /^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i ], [ "lang-uq.val", /^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/ ], [ R, /^[=<>\/]+/ ], [ "lang-js", /^on\w+\s*=\s*\"([^\"]+)\"/i ], [ "lang-js", /^on\w+\s*=\s*\'([^\']+)\'/i ], [ "lang-js", /^on\w+\s*=\s*([^\"\'>\s]+)/i ], [ "lang-css", /^style\s*=\s*\"([^\"]+)\"/i ], [ "lang-css", /^style\s*=\s*\'([^\']+)\'/i ], [ "lang-css", /^style\s*=\s*([^\"\'>\s]+)/i ] ]), [ "in.tag" ]),
+ l(r([], [ [ $, /^[\s\S]+/ ] ]), [ "uq.val" ]), l(o({
keywords: v,
hashComments: !0,
cStyleComments: !0,
- types: T
+ types: I
}), [ "c", "cc", "cpp", "cxx", "cyc", "m" ]), l(o({
keywords: "null,true,false"
}), [ "json" ]), l(o({
@@ -8526,63 +8540,67 @@ var prettyPrintOne, prettyPrint;
hashComments: !0,
cStyleComments: !0,
verbatimStrings: !0,
- types: T
+ types: I
}), [ "cs" ]), l(o({
keywords: b,
cStyleComments: !0
}), [ "java" ]), l(o({
- keywords: k,
+ keywords: E,
hashComments: !0,
multiLineStrings: !0
- }), [ "bsh", "csh", "sh" ]), l(o({
+ }), [ "bash", "bsh", "csh", "sh" ]), l(o({
keywords: C,
hashComments: !0,
multiLineStrings: !0,
tripleQuotedStrings: !0
- }), [ "cv", "py" ]), l(o({
+ }), [ "cv", "py", "python" ]), l(o({
keywords: S,
hashComments: !0,
multiLineStrings: !0,
- regexLiterals: !0
+ regexLiterals: 2
}), [ "perl", "pl", "pm" ]), l(o({
keywords: _,
hashComments: !0,
multiLineStrings: !0,
regexLiterals: !0
- }), [ "rb" ]), l(o({
+ }), [ "rb", "ruby" ]), l(o({
keywords: w,
cStyleComments: !0,
regexLiterals: !0
- }), [ "js" ]), l(o({
+ }), [ "javascript", "js" ]), l(o({
keywords: x,
hashComments: 3,
cStyleComments: !0,
multilineStrings: !0,
tripleQuotedStrings: !0,
regexLiterals: !0
- }), [ "coffee" ]), l(r([], [ [ I, /^[\s\S]+/ ] ]), [ "regex" ]);
- var z = h.PR = {
+ }), [ "coffee" ]), l(o({
+ keywords: k,
+ cStyleComments: !0,
+ multilineStrings: !0
+ }), [ "rc", "rs", "rust" ]), l(r([], [ [ D, /^[\s\S]+/ ] ]), [ "regex" ]);
+ var V = h.PR = {
createSimpleLexer: r,
registerLangHandler: l,
sourceDecorator: o,
- PR_ATTRIB_NAME: B,
- PR_ATTRIB_VALUE: j,
- PR_COMMENT: N,
+ PR_ATTRIB_NAME: j,
+ PR_ATTRIB_VALUE: $,
+ PR_COMMENT: M,
PR_DECLARATION: F,
- PR_KEYWORD: D,
- PR_LITERAL: L,
- PR_NOCODE: $,
- PR_PLAIN: R,
- PR_PUNCTUATION: A,
- PR_SOURCE: O,
- PR_STRING: I,
- PR_TAG: P,
- PR_TYPE: M,
- prettyPrintOne: h.prettyPrintOne = d,
- prettyPrint: h.prettyPrint = p
+ PR_KEYWORD: N,
+ PR_LITERAL: A,
+ PR_NOCODE: q,
+ PR_PLAIN: P,
+ PR_PUNCTUATION: R,
+ PR_SOURCE: B,
+ PR_STRING: D,
+ PR_TAG: O,
+ PR_TYPE: L,
+ prettyPrintOne: IN_GLOBAL_SCOPE ? h.prettyPrintOne = d : prettyPrintOne = d,
+ prettyPrint: prettyPrint = IN_GLOBAL_SCOPE ? h.prettyPrint = p : prettyPrint = p
};
"function" == typeof define && define.amd && define("google-code-prettify", [], function() {
- return z;
+ return V;
});
}();
@@ -10115,7 +10133,7 @@ hljs.registerLanguage("bash", function(e) {
}), hljs.registerLanguage("php", function(e) {
var t = {
cN: "variable",
- b: "\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"
+ b: "\\$+[a-zA-Z_-\xff][a-zA-Z0-9_-\xff]*"
}, n = {
cN: "preprocessor",
b: /<\?(php)?|\?>/
@@ -10286,7 +10304,7 @@ hljs.registerLanguage("bash", function(e) {
} ]
};
}), hljs.registerLanguage("1c", function(e) {
- var t = "[a-zA-Zа-яА-Я][a-zA-Z0-9_а-яА-Я]*", n = "возврат дата для если и или иначе иначеесли исключение конецесли конецпопытки конецпроцедуры конецфункции конеццикла константа не перейти перем перечисление по пока попытка прервать продолжить процедура строка тогда фс функция цикл число экспорт", i = "ansitooem oemtoansi ввестивидсубконто ввестидату ввестизначение ввестиперечисление ввестипериод ввестиплансчетов ввестистроку ввестичисло вопрос восстановитьзначение врег выбранныйплансчетов вызватьисключение датагод датамесяц датачисло добавитьмесяц завершитьработусистемы заголовоксистемы записьжурналарегистрации запуститьприложение зафиксироватьтранзакцию значениевстроку значениевстрокувнутр значениевфайл значениеизстроки значениеизстрокивнутр значениеизфайла имякомпьютера имяпользователя каталогвременныхфайлов каталогиб каталогпользователя каталогпрограммы кодсимв командасистемы конгода конецпериодаби конецрассчитанногопериодаби конецстандартногоинтервала конквартала конмесяца коннедели лев лог лог10 макс максимальноеколичествосубконто мин монопольныйрежим названиеинтерфейса названиенабораправ назначитьвид назначитьсчет найти найтипомеченныенаудаление найтиссылки началопериодаби началостандартногоинтервала начатьтранзакцию начгода начквартала начмесяца начнедели номерднягода номерднянедели номернеделигода нрег обработкаожидания окр описаниеошибки основнойжурналрасчетов основнойплансчетов основнойязык открытьформу открытьформумодально отменитьтранзакцию очиститьокносообщений периодстр полноеимяпользователя получитьвремята получитьдатута получитьдокументта получитьзначенияотбора получитьпозициюта получитьпустоезначение получитьта прав праводоступа предупреждение префиксавтонумерации пустаястрока пустоезначение рабочаядаттьпустоезначение рабочаядата разделительстраниц разделительстрок разм разобратьпозициюдокумента рассчитатьрегистрына рассчитатьрегистрыпо сигнал симв символтабуляции создатьобъект сокрл сокрлп сокрп сообщить состояние сохранитьзначение сред статусвозврата стрдлина стрзаменить стрколичествострок стрполучитьстроку стрчисловхождений сформироватьпозициюдокумента счетпокоду текущаядата текущеевремя типзначения типзначениястр удалитьобъекты установитьтана установитьтапо фиксшаблон формат цел шаблон", r = {
+ var t = "[a-zA-Z\u0430-\u044f\u0410-\u042f][a-zA-Z0-9_\u0430-\u044f\u0410-\u042f]*", n = "\u0432\u043e\u0437\u0432\u0440\u0430\u0442 \u0434\u0430\u0442\u0430 \u0434\u043b\u044f \u0435\u0441\u043b\u0438 \u0438 \u0438\u043b\u0438 \u0438\u043d\u0430\u0447\u0435 \u0438\u043d\u0430\u0447\u0435\u0435\u0441\u043b\u0438 \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a\u043e\u043d\u0435\u0446\u0435\u0441\u043b\u0438 \u043a\u043e\u043d\u0435\u0446\u043f\u043e\u043f\u044b\u0442\u043a\u0438 \u043a\u043e\u043d\u0435\u0446\u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u044b \u043a\u043e\u043d\u0435\u0446\u0444\u0443\u043d\u043a\u0446\u0438\u0438 \u043a\u043e\u043d\u0435\u0446\u0446\u0438\u043a\u043b\u0430 \u043a\u043e\u043d\u0441\u0442\u0430\u043d\u0442\u0430 \u043d\u0435 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u043f\u0435\u0440\u0435\u043c \u043f\u0435\u0440\u0435\u0447\u0438\u0441\u043b\u0435\u043d\u0438\u0435 \u043f\u043e \u043f\u043e\u043a\u0430 \u043f\u043e\u043f\u044b\u0442\u043a\u0430 \u043f\u0440\u0435\u0440\u0432\u0430\u0442\u044c \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c \u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u0430 \u0441\u0442\u0440\u043e\u043a\u0430 \u0442\u043e\u0433\u0434\u0430 \u0444\u0441 \u0444\u0443\u043d\u043a\u0446\u0438\u044f \u0446\u0438\u043a\u043b \u0447\u0438\u0441\u043b\u043e \u044d\u043a\u0441\u043f\u043e\u0440\u0442", i = "ansitooem oemtoansi \u0432\u0432\u0435\u0441\u0442\u0438\u0432\u0438\u0434\u0441\u0443\u0431\u043a\u043e\u043d\u0442\u043e \u0432\u0432\u0435\u0441\u0442\u0438\u0434\u0430\u0442\u0443 \u0432\u0432\u0435\u0441\u0442\u0438\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0432\u0432\u0435\u0441\u0442\u0438\u043f\u0435\u0440\u0435\u0447\u0438\u0441\u043b\u0435\u043d\u0438\u0435 \u0432\u0432\u0435\u0441\u0442\u0438\u043f\u0435\u0440\u0438\u043e\u0434 \u0432\u0432\u0435\u0441\u0442\u0438\u043f\u043b\u0430\u043d\u0441\u0447\u0435\u0442\u043e\u0432 \u0432\u0432\u0435\u0441\u0442\u0438\u0441\u0442\u0440\u043e\u043a\u0443 \u0432\u0432\u0435\u0441\u0442\u0438\u0447\u0438\u0441\u043b\u043e \u0432\u043e\u043f\u0440\u043e\u0441 \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0432\u0440\u0435\u0433 \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0439\u043f\u043b\u0430\u043d\u0441\u0447\u0435\u0442\u043e\u0432 \u0432\u044b\u0437\u0432\u0430\u0442\u044c\u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0434\u0430\u0442\u0430\u0433\u043e\u0434 \u0434\u0430\u0442\u0430\u043c\u0435\u0441\u044f\u0446 \u0434\u0430\u0442\u0430\u0447\u0438\u0441\u043b\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c\u043c\u0435\u0441\u044f\u0446 \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c\u0440\u0430\u0431\u043e\u0442\u0443\u0441\u0438\u0441\u0442\u0435\u043c\u044b \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a\u0441\u0438\u0441\u0442\u0435\u043c\u044b \u0437\u0430\u043f\u0438\u0441\u044c\u0436\u0443\u0440\u043d\u0430\u043b\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0437\u0430\u0444\u0438\u043a\u0441\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0432\u0441\u0442\u0440\u043e\u043a\u0443 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0432\u0441\u0442\u0440\u043e\u043a\u0443\u0432\u043d\u0443\u0442\u0440 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0432\u0444\u0430\u0439\u043b \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0438\u0437\u0441\u0442\u0440\u043e\u043a\u0438 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0438\u0437\u0441\u0442\u0440\u043e\u043a\u0438\u0432\u043d\u0443\u0442\u0440 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u0438\u0437\u0444\u0430\u0439\u043b\u0430 \u0438\u043c\u044f\u043a\u043e\u043c\u043f\u044c\u044e\u0442\u0435\u0440\u0430 \u0438\u043c\u044f\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u044b\u0445\u0444\u0430\u0439\u043b\u043e\u0432 \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0438\u0431 \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b \u043a\u043e\u0434\u0441\u0438\u043c\u0432 \u043a\u043e\u043c\u0430\u043d\u0434\u0430\u0441\u0438\u0441\u0442\u0435\u043c\u044b \u043a\u043e\u043d\u0433\u043e\u0434\u0430 \u043a\u043e\u043d\u0435\u0446\u043f\u0435\u0440\u0438\u043e\u0434\u0430\u0431\u0438 \u043a\u043e\u043d\u0435\u0446\u0440\u0430\u0441\u0441\u0447\u0438\u0442\u0430\u043d\u043d\u043e\u0433\u043e\u043f\u0435\u0440\u0438\u043e\u0434\u0430\u0431\u0438 \u043a\u043e\u043d\u0435\u0446\u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e\u0433\u043e\u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b\u0430 \u043a\u043e\u043d\u043a\u0432\u0430\u0440\u0442\u0430\u043b\u0430 \u043a\u043e\u043d\u043c\u0435\u0441\u044f\u0446\u0430 \u043a\u043e\u043d\u043d\u0435\u0434\u0435\u043b\u0438 \u043b\u0435\u0432 \u043b\u043e\u0433 \u043b\u043e\u043310 \u043c\u0430\u043a\u0441 \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0435\u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e\u0441\u0443\u0431\u043a\u043e\u043d\u0442\u043e \u043c\u0438\u043d \u043c\u043e\u043d\u043e\u043f\u043e\u043b\u044c\u043d\u044b\u0439\u0440\u0435\u0436\u0438\u043c \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435\u043d\u0430\u0431\u043e\u0440\u0430\u043f\u0440\u0430\u0432 \u043d\u0430\u0437\u043d\u0430\u0447\u0438\u0442\u044c\u0432\u0438\u0434 \u043d\u0430\u0437\u043d\u0430\u0447\u0438\u0442\u044c\u0441\u0447\u0435\u0442 \u043d\u0430\u0439\u0442\u0438 \u043d\u0430\u0439\u0442\u0438\u043f\u043e\u043c\u0435\u0447\u0435\u043d\u043d\u044b\u0435\u043d\u0430\u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u043d\u0430\u0439\u0442\u0438\u0441\u0441\u044b\u043b\u043a\u0438 \u043d\u0430\u0447\u0430\u043b\u043e\u043f\u0435\u0440\u0438\u043e\u0434\u0430\u0431\u0438 \u043d\u0430\u0447\u0430\u043b\u043e\u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e\u0433\u043e\u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b\u0430 \u043d\u0430\u0447\u0430\u0442\u044c\u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044e \u043d\u0430\u0447\u0433\u043e\u0434\u0430 \u043d\u0430\u0447\u043a\u0432\u0430\u0440\u0442\u0430\u043b\u0430 \u043d\u0430\u0447\u043c\u0435\u0441\u044f\u0446\u0430 \u043d\u0430\u0447\u043d\u0435\u0434\u0435\u043b\u0438 \u043d\u043e\u043c\u0435\u0440\u0434\u043d\u044f\u0433\u043e\u0434\u0430 \u043d\u043e\u043c\u0435\u0440\u0434\u043d\u044f\u043d\u0435\u0434\u0435\u043b\u0438 \u043d\u043e\u043c\u0435\u0440\u043d\u0435\u0434\u0435\u043b\u0438\u0433\u043e\u0434\u0430 \u043d\u0440\u0435\u0433 \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0430\u043e\u0436\u0438\u0434\u0430\u043d\u0438\u044f \u043e\u043a\u0440 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435\u043e\u0448\u0438\u0431\u043a\u0438 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0439\u0436\u0443\u0440\u043d\u0430\u043b\u0440\u0430\u0441\u0447\u0435\u0442\u043e\u0432 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0439\u043f\u043b\u0430\u043d\u0441\u0447\u0435\u0442\u043e\u0432 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0439\u044f\u0437\u044b\u043a \u043e\u0442\u043a\u0440\u044b\u0442\u044c\u0444\u043e\u0440\u043c\u0443 \u043e\u0442\u043a\u0440\u044b\u0442\u044c\u0444\u043e\u0440\u043c\u0443\u043c\u043e\u0434\u0430\u043b\u044c\u043d\u043e \u043e\u0442\u043c\u0435\u043d\u0438\u0442\u044c\u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044e \u043e\u0447\u0438\u0441\u0442\u0438\u0442\u044c\u043e\u043a\u043d\u043e\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 \u043f\u0435\u0440\u0438\u043e\u0434\u0441\u0442\u0440 \u043f\u043e\u043b\u043d\u043e\u0435\u0438\u043c\u044f\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0432\u0440\u0435\u043c\u044f\u0442\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0434\u0430\u0442\u0443\u0442\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0442\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f\u043e\u0442\u0431\u043e\u0440\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043f\u043e\u0437\u0438\u0446\u0438\u044e\u0442\u0430 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u043f\u0443\u0441\u0442\u043e\u0435\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0442\u0430 \u043f\u0440\u0430\u0432 \u043f\u0440\u0430\u0432\u043e\u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u043f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435 \u043f\u0440\u0435\u0444\u0438\u043a\u0441\u0430\u0432\u0442\u043e\u043d\u0443\u043c\u0435\u0440\u0430\u0446\u0438\u0438 \u043f\u0443\u0441\u0442\u0430\u044f\u0441\u0442\u0440\u043e\u043a\u0430 \u043f\u0443\u0441\u0442\u043e\u0435\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0440\u0430\u0431\u043e\u0447\u0430\u044f\u0434\u0430\u0442\u0442\u044c\u043f\u0443\u0441\u0442\u043e\u0435\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0440\u0430\u0431\u043e\u0447\u0430\u044f\u0434\u0430\u0442\u0430 \u0440\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u0435\u043b\u044c\u0441\u0442\u0440\u0430\u043d\u0438\u0446 \u0440\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u0435\u043b\u044c\u0441\u0442\u0440\u043e\u043a \u0440\u0430\u0437\u043c \u0440\u0430\u0437\u043e\u0431\u0440\u0430\u0442\u044c\u043f\u043e\u0437\u0438\u0446\u0438\u044e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0440\u0430\u0441\u0441\u0447\u0438\u0442\u0430\u0442\u044c\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u044b\u043d\u0430 \u0440\u0430\u0441\u0441\u0447\u0438\u0442\u0430\u0442\u044c\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u044b\u043f\u043e \u0441\u0438\u0433\u043d\u0430\u043b \u0441\u0438\u043c\u0432 \u0441\u0438\u043c\u0432\u043e\u043b\u0442\u0430\u0431\u0443\u043b\u044f\u0446\u0438\u0438 \u0441\u043e\u0437\u0434\u0430\u0442\u044c\u043e\u0431\u044a\u0435\u043a\u0442 \u0441\u043e\u043a\u0440\u043b \u0441\u043e\u043a\u0440\u043b\u043f \u0441\u043e\u043a\u0440\u043f \u0441\u043e\u043e\u0431\u0449\u0438\u0442\u044c \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0441\u0440\u0435\u0434 \u0441\u0442\u0430\u0442\u0443\u0441\u0432\u043e\u0437\u0432\u0440\u0430\u0442\u0430 \u0441\u0442\u0440\u0434\u043b\u0438\u043d\u0430 \u0441\u0442\u0440\u0437\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0442\u0440\u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e\u0441\u0442\u0440\u043e\u043a \u0441\u0442\u0440\u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0441\u0442\u0440\u043e\u043a\u0443 \u0441\u0442\u0440\u0447\u0438\u0441\u043b\u043e\u0432\u0445\u043e\u0436\u0434\u0435\u043d\u0438\u0439 \u0441\u0444\u043e\u0440\u043c\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u043f\u043e\u0437\u0438\u0446\u0438\u044e\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0441\u0447\u0435\u0442\u043f\u043e\u043a\u043e\u0434\u0443 \u0442\u0435\u043a\u0443\u0449\u0430\u044f\u0434\u0430\u0442\u0430 \u0442\u0435\u043a\u0443\u0449\u0435\u0435\u0432\u0440\u0435\u043c\u044f \u0442\u0438\u043f\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u0442\u0438\u043f\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f\u0441\u0442\u0440 \u0443\u0434\u0430\u043b\u0438\u0442\u044c\u043e\u0431\u044a\u0435\u043a\u0442\u044b \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0442\u0430\u043d\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0442\u0430\u043f\u043e \u0444\u0438\u043a\u0441\u0448\u0430\u0431\u043b\u043e\u043d \u0444\u043e\u0440\u043c\u0430\u0442 \u0446\u0435\u043b \u0448\u0430\u0431\u043b\u043e\u043d", r = {
cN: "dquote",
b: '""'
}, o = {
@@ -10309,10 +10327,10 @@ hljs.registerLanguage("bash", function(e) {
},
c: [ e.CLCM, e.NM, o, a, {
cN: "function",
- b: "(процедура|функция)",
+ b: "(\u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u0430|\u0444\u0443\u043d\u043a\u0446\u0438\u044f)",
e: "$",
l: t,
- k: "процедура функция",
+ k: "\u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u0430 \u0444\u0443\u043d\u043a\u0446\u0438\u044f",
c: [ e.inherit(e.TM, {
b: t
}), {
@@ -10323,14 +10341,14 @@ hljs.registerLanguage("bash", function(e) {
b: "\\(",
e: "\\)",
l: t,
- k: "знач",
+ k: "\u0437\u043d\u0430\u0447",
c: [ o, a ]
}, {
cN: "export",
- b: "экспорт",
+ b: "\u044d\u043a\u0441\u043f\u043e\u0440\u0442",
eW: !0,
l: t,
- k: "экспорт",
+ k: "\u044d\u043a\u0441\u043f\u043e\u0440\u0442",
c: [ e.CLCM ]
} ]
}, e.CLCM ]
@@ -10457,10 +10475,10 @@ hljs.registerLanguage("bash", function(e) {
}), hljs.registerLanguage("tex", function() {
var e = {
cN: "command",
- b: "\\\\[a-zA-Zа-яА-я]+[\\*]?"
+ b: "\\\\[a-zA-Z\u0430-\u044f\u0410-\u044f]+[\\*]?"
}, t = {
cN: "command",
- b: "\\\\[^a-zA-Zа-яА-я0-9]"
+ b: "\\\\[^a-zA-Z\u0430-\u044f\u0410-\u044f0-9]"
}, n = {
cN: "special",
b: "[{}\\[\\]\\&#~]",
@@ -10468,7 +10486,7 @@ hljs.registerLanguage("bash", function(e) {
};
return {
c: [ {
- b: "\\\\[a-zA-Zа-яА-я]+[\\*]? *= *-?\\d*\\.?\\d+(pt|pc|mm|cm|in|dd|cc|ex|em)?",
+ b: "\\\\[a-zA-Z\u0430-\u044f\u0410-\u044f]+[\\*]? *= *-?\\d*\\.?\\d+(pt|pc|mm|cm|in|dd|cc|ex|em)?",
rB: !0,
c: [ e, t, {
cN: "number",
@@ -12458,7 +12476,7 @@ function() {
}, Markdown.Converter = function() {
function e(e) {
return e = e.replace(/^[ ]{0,3}\[(.+)\]:[ \t]*\n?[ \t]*?(?=\s|$)[ \t]*\n?[ \t]*((\n*)["(](.+?)[")][ \t]*)?(?:\n+)/gm, function(e, t, n, i, r, o) {
- return t = t.toLowerCase(), P.set(t, C(n)), r ? i : (o && F.set(t, o.replace(/"/g, """)),
+ return t = t.toLowerCase(), P.set(t, C(n)), r ? i : (o && O.set(t, o.replace(/"/g, """)),
"");
});
}
@@ -12470,7 +12488,7 @@ function() {
}
function r(e, t) {
var n = t;
- return n = n.replace(/^\n+/, ""), n = n.replace(/\n+$/g, ""), n = "\n\n~K" + (O.push(n) - 1) + "K\n\n";
+ return n = n.replace(/^\n+/, ""), n = n.replace(/\n+$/g, ""), n = "\n\n~K" + (F.push(n) - 1) + "K\n\n";
}
function o(e, n) {
e = R.preBlockGamut(e, j), e = h(e);
@@ -12500,7 +12518,7 @@ function() {
void 0 == s && (s = "");
var l = t, c = n.replace(/:\/\//g, "~P"), u = i.toLowerCase(), p = r, h = s;
if ("" == p) if ("" == u && (u = c.toLowerCase().replace(/ ?\n/g, " ")), p = "#" + u,
- void 0 != P.get(u)) p = P.get(u), void 0 != F.get(u) && (h = F.get(u)); else {
+ void 0 != P.get(u)) p = P.get(u), void 0 != O.get(u) && (h = O.get(u)); else {
if (!(l.search(/\(\s*\)$/m) > -1)) return l;
p = "";
}
@@ -12518,7 +12536,7 @@ function() {
var l = t, c = n, u = i.toLowerCase(), p = r, h = s;
if (h || (h = ""), "" == p) {
if ("" == u && (u = c.toLowerCase().replace(/ ?\n/g, " ")), p = "#" + u, void 0 == P.get(u)) return l;
- p = P.get(u), void 0 != F.get(u) && (h = F.get(u));
+ p = P.get(u), void 0 != O.get(u) && (h = O.get(u));
}
c = M(d(c), "*_[]()"), p = M(p, "*_");
var f = '
s; s++) for (var c = !0; c; ) c = !1, i[s] = i[s].replace(/~K(\d+)K/g, function(e, t) {
- return c = !0, O[t];
+ return c = !0, F[t];
});
}
return i.join("\n\n");
@@ -12676,14 +12694,14 @@ function() {
R.addNoop("plainLinkText"), R.addNoop("preConversion"), R.addNoop("postNormalization"),
R.addNoop("preBlockGamut"), R.addNoop("postBlockGamut"), R.addNoop("preSpanGamut"),
R.addNoop("postSpanGamut"), R.addNoop("postConversion");
- var P, F, O, B;
+ var P, O, F, B;
this.makeHtml = function(n) {
if (P) throw new Error("Recursive call to converter.makeHtml");
- return P = new i(), F = new i(), O = [], B = 0, n = R.preConversion(n), n = n.replace(/~/g, "~T"),
+ return P = new i(), O = new i(), F = [], B = 0, n = R.preConversion(n), n = n.replace(/~/g, "~T"),
n = n.replace(/\$/g, "~D"), n = n.replace(/\r\n/g, "\n"), n = n.replace(/\r/g, "\n"),
n = "\n\n" + n + "\n\n", n = D(n), n = n.replace(/^[ \t]+$/gm, ""), n = R.postNormalization(n),
n = t(n), n = e(n), n = o(n), n = T(n), n = n.replace(/~D/g, "$$"), n = n.replace(/~T/g, "~"),
- n = R.postConversion(n), O = F = P = null, n;
+ n = R.postConversion(n), F = O = P = null, n;
};
var j = function(e) {
return o(e);
@@ -14405,7 +14423,7 @@ function() {
}, a;
}), function(e) {
var t = function() {
- return !1 === e.support.boxModel && e.support.objectAll && $support.leadingWhitespace;
+ return !1 === e.support.boxModel && e.support.objectAll && e.support.leadingWhitespace;
}();
e.jGrowl = function(t, n) {
0 == e("#jGrowl").size() && e('').addClass(n && n.position ? n.position : e.jGrowl.defaults.position).appendTo("body"),
@@ -14467,7 +14485,7 @@ function() {
render: function(t) {
var n = this, i = t.message, r = t.options;
r.themeState = "" == r.themeState ? "" : "ui-state-" + r.themeState;
- var t = e('' + r.closeTemplate + '
' + i + "
Maps keyboard shortcuts to JavaScript functions.
\n\n';
}), define("text!html/tooltipSettingsShortcutsExtension.html", [], function() {
- return 'You can create expanding macros like this:\n
\n
\n\'- - > space\': function() {\n
\n expand(\'--> \', \'→ \');\n
\n}\n
\n
\nMore\n info\n
\n
\n Careful! This is subject to malicious code. Don\'t copy/paste untrusted content.\n';
+ return 'You can create expanding macros like this:\n
\n
\n\'- - > space\': function() {\n
\n expand(\'--> \', \'\u2192 \');\n
\n}\n
\n
\nMore\n info\n
\n
\n Careful! This is subject to malicious code. Don\'t copy/paste untrusted content.\n';
}), define("extensions/shortcuts", [ "jquery", "underscore", "utils", "mousetrap", "classes/Extension", "text!extensions/shortcutsDefaultMapping.settings", "text!html/shortcutsSettingsBlock.html", "text!html/tooltipSettingsShortcutsExtension.html" ], function($, _, utils, mousetrap, Extension, shortcutsDefaultMapping, shortcutsSettingsBlockHTML, tooltipSettingsShortcutsExtensionHTML) {
function bindPagedownButton(e) {
return function(t) {
@@ -20809,7 +20871,7 @@ function() {
reply: !0
})), r.join("");
}
- var h, f = new a("comments", "Comments", !1, !0), m = [ "" ].join(""), g = [ '', ' ', ' ', " ", " “<%- title %>”", "" ].join("");
+ var h, f = new a("comments", "Comments", !1, !0), m = [ "" ].join(""), g = [ '', ' ', ' ', " ", " \u201c<%- title %>\u201d", "" ].join("");
f.onEventMgrCreated = function(e) {
h = e;
};
@@ -20993,7 +21055,7 @@ function() {
}), D = I.find("i");
}, f;
}), define("text!html/findReplace.html", [], function() {
- return '\n\n\n
\n 0 found\n
\n
\n \n \n \n
\n
\n
\n 0 found\n
\n
\n \n \n \n
\n
Helps find and replace text in the current document.
\n';
}), define("extensions/findReplace", [ "jquery", "underscore", "crel", "utils", "classes/Extension", "mousetrap", "rangy", "text!html/findReplace.html", "text!html/findReplaceSettingsBlock.html" ], function(e, t, n, i, r, o, a, s, l) {
@@ -21020,7 +21082,7 @@ function() {
offset: e.offset
} : e;
}
- if (F) {
+ if (O) {
var n = k.val(), i = I.prop("checked"), r = D.prop("checked");
if (e || n != A || i != R || r != P) {
A = n, R = i, P = r, c();
@@ -21053,11 +21115,11 @@ function() {
}
}
function p() {
- y.onEditorPopover(), F = !0, _.show(), k.focus()[0].setSelectionRange(0, k.val().length),
+ y.onEditorPopover(), O = !0, _.show(), k.focus()[0].setSelectionRange(0, k.val().length),
b.selectionMgr.adjustTop = 50, b.selectionMgr.adjustBottom = 220, d(!0);
}
function h() {
- F = !1, _.hide(), c(), b.selectionMgr.adjustTop = 0, b.selectionMgr.adjustBottom = 0,
+ O = !1, _.hide(), c(), b.selectionMgr.adjustTop = 0, b.selectionMgr.adjustBottom = 0,
b.focus();
}
function f() {
@@ -21101,7 +21163,7 @@ function() {
v.onEventMgrCreated = function(e) {
y = e;
};
- var x, w, S, C, _, k, E, T, I, D, N, M = [], L = [], A = "", R = !1, P = !1, F = !1;
+ var x, w, S, C, _, k, E, T, I, D, N, M = [], L = [], A = "", R = !1, P = !1, O = !1;
return v.onEditorPopover = function() {
h();
}, v.onContentChanged = t.bind(d, null, !0), v.onFileOpen = t.bind(d, null, !0),
@@ -21183,7 +21245,7 @@ function() {
}
function c(e) {
if (!e) return "";
- var t = F.exec(e), n = t[1], i = t[3], r = t[2];
+ var t = O.exec(e), n = t[1], i = t[3], r = t[2];
return r && (P.innerHTML = r.replace(/.*?<\/span> /g, "");
b(n, i);
@@ -22996,14 +23064,14 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
pattern: /\([^\)]+\)/,
inside: {
"md md-paren-start": /^\(/,
- "md md-title": /(['‘][^'’]*['’]|["“][^"”]*["”])(?=\)$)/,
+ "md md-title": /(['\u2018][^'\u2019]*['\u2019]|["\u201c][^"\u201d]*["\u201d])(?=\)$)/,
"md md-src": /[^\('" \t]+(?=[\)'" \t])/,
"md md-paren-end": /\)$/
}
}
}
}, a.link = {
- pattern: /\[(?:(\\.)|[^\[\]])*\]\([^\(\)\s]+(\(\S*?\))??[^\(\)\s]*?(\s(['‘][^'’]*['’]|["“][^"”]*["”]))?\)/gm,
+ pattern: /\[(?:(\\.)|[^\[\]])*\]\([^\(\)\s]+(\(\S*?\))??[^\(\)\s]*?(\s(['\u2018][^'\u2019]*['\u2019]|["\u201c][^"\u201d]*["\u201d]))?\)/gm,
inside: {
"md md-bracket-start": {
pattern: /(^|[^\\])\[/,
@@ -23115,7 +23183,7 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
strong: a.strong,
em: a.em,
strike: a.strike,
- conflict: /⧸⧸/g,
+ conflict: /\u29f8\u29f8/g,
comment: Prism.languages.markup.comment,
tag: Prism.languages.markup.tag,
entity: Prism.languages.markup.entity
@@ -23127,14 +23195,14 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
fn: a.fn,
link: a.link,
linkref: a.linkref,
- conflict: /⧸⧸/g
+ conflict: /\u29f8\u29f8/g
}, a.strong.inside.rest = l, a.em.inside.rest = l, a.strike.inside.rest = l;
var u = {
code: a.code,
strong: a.strong,
em: a.em,
strike: a.strike,
- conflict: /⧸⧸/g,
+ conflict: /\u29f8\u29f8/g,
comment: Prism.languages.markup.comment,
tag: Prism.languages.markup.tag,
entity: Prism.languages.markup.entity
@@ -23310,7 +23378,7 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
X.currentMode = X.currentMode || "replace";
var n = W.replace(e, t);
if (n != W) {
- var i = O.setValue(n);
+ var i = F.setValue(n);
V.setSelectionStartEnd(i.end, i.end), V.updateSelectionRange(), V.updateCursorCoordinates(!0);
}
}
@@ -23391,7 +23459,7 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
}
function S() {
var e = I.textContent;
- if (N.lastChild === F && "\n" == F.textContent.slice(-1) && (e = e.slice(0, -1)),
+ if (N.lastChild === O && "\n" == O.textContent.slice(-1) && (e = e.slice(0, -1)),
e = e.replace(/\r\n?/g, "\n"), G === !1) {
if (e == W) return void (0 === N.children.length && (N.innerHTML = "", K.forEach(function(e) {
N.appendChild(e.elt);
@@ -23459,9 +23527,9 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
});
}
function E() {
- F = l("span", {
+ O = l("span", {
"class": "token lf"
- }), F.textContent = "\n", N.appendChild(F);
+ }), O.textContent = "\n", N.appendChild(O);
}
function T(e) {
var t = et(e.text);
@@ -23475,7 +23543,7 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
});
i.generated = !0, i.innerHTML = t, e.elt = i;
}
- var I, D, N, M, L, A, R, P, F, O = {}, B = 0, j = function() {
+ var I, D, N, M, L, A, R, P, O, F = {}, B = 0, j = function() {
var e, n = 0, r = function() {
var e = Date.now();
P.refreshPreview(), n = Date.now() - e;
@@ -23496,7 +23564,7 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
G = !0, q = e;
});
var H = new u();
- O.watcher = H;
+ F.watcher = H;
var U = new a(), z = s.create({
objectHash: function(e) {
return JSON.stringify(e);
@@ -23508,13 +23576,13 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
minLength: 9999999
}
}), V = new d();
- O.selectionMgr = V, e(document).on("selectionchange", ".editor-content", t.bind(V.saveSelectionState, V, !0, !1)),
- O.adjustCursorPosition = p;
+ F.selectionMgr = V, e(document).on("selectionchange", ".editor-content", t.bind(V.saveSelectionState, V, !0, !1)),
+ F.adjustCursorPosition = p;
var W;
- O.setValue = h, O.replace = f, O.replaceAll = m, O.replacePreviousText = g, O.setValueNoWatch = v,
- O.getValue = b, O.focus = y;
+ F.setValue = h, F.replace = f, F.replaceAll = m, F.replacePreviousText = g, F.setValueNoWatch = v,
+ F.getValue = b, F.focus = y;
var X = new x();
- O.undoMgr = X, r.addListener("onDiscussionCreated", w), r.addListener("onDiscussionRemoved", w),
+ F.undoMgr = X, r.addListener("onDiscussionCreated", w), r.addListener("onDiscussionRemoved", w),
r.addListener("onCommentsChanged", w);
var Q = t.debounce(function() {
var e = window.getSelection();
@@ -23522,7 +23590,7 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
e.modify("move", "forward", "character")) : (e.modify("move", "forward", "character"),
e.modify("move", "backward", "character")));
}, 10);
- O.adjustCommentOffsets = C, O.init = function() {
+ F.adjustCommentOffsets = C, F.init = function() {
if (I = document.getElementById("wmd-input"), D = e(I), N = I.querySelector(".editor-content"),
M = e(N), L = I.querySelector(".editor-margin"), A = e(L), R = document.querySelector(".preview-container"),
D.addClass(i.editorFontClass), H.startWatching(), e(I).scroll(function() {
@@ -23638,7 +23706,7 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
var e = {
"&": "&",
"<": "<",
- " ": " "
+ "\xa0": " "
};
return function(t) {
return t.replace(/[&<\u00a0]/g, function(t) {
@@ -23646,7 +23714,7 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
});
};
}();
- return r.onEditorCreated(O), O;
+ return r.onEditorCreated(F), F;
}), function(e, t) {
function n() {
i.READY || (b.determineEventTypes(), f.each(i.gestures, function(e) {
@@ -23656,10 +23724,10 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
var i = function(e, t) {
return new i.Instance(e, t || {});
};
- i.VERSION = "1.0.10", i.defaults = {
+ i.VERSION = "1.0.11", i.defaults = {
stop_browser_behavior: {
userSelect: "none",
- touchAction: "none",
+ touchAction: "pan-y",
touchCallout: "none",
contentZooming: "none",
userDrag: "none",
@@ -24142,13 +24210,13 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
x.width = v.width, x.height = b.height - P, b.applyCss(), y.applyCss(), x.applyCss(),
window.viewerMode) return k.width = x.width, k.height = x.height, E.width = x.width,
E.height = x.height, k.applyCss(), E.applyCss(), f();
- if (!(w.isOpen && x.height < F.height + A)) {
+ if (!(w.isOpen && x.height < O.height + A)) {
if (lt) {
if (k.isOpen) {
- if (k.halfSize && (k.height = (x.height + A) / 2), k.height < O.height && (k.height = O.height),
- k.y = x.height - k.height, k.y < F.height) {
- var e = x.height - F.height;
- if (e < O.height) {
+ if (k.halfSize && (k.height = (x.height + A) / 2), k.height < F.height && (k.height = F.height),
+ k.y = x.height - k.height, k.y < O.height) {
+ var e = x.height - O.height;
+ if (e < F.height) {
k.isOpen = !1, k.$elt.trigger("hide.layout.toggle").trigger("hidden.layout.toggle");
continue;
}
@@ -24159,10 +24227,10 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
E.width = k.width, T.width = R, I.width = R, I.x = (k.width - R) / 2, D.width = E.width;
} else {
if (k.isOpen) {
- if (k.halfSize && (k.width = (x.width + A) / 2), k.width < O.width && (k.width = O.width),
- k.x = x.width - k.width, k.x < F.width) {
- var t = x.width - F.width;
- if (t < O.width) {
+ if (k.halfSize && (k.width = (x.width + A) / 2), k.width < F.width && (k.width = F.width),
+ k.x = x.width - k.width, k.x < O.width) {
+ var t = x.width - O.width;
+ if (t < F.width) {
k.isOpen = !1, k.$elt.trigger("hide.layout.toggle").trigger("hidden.layout.toggle");
continue;
}
@@ -24180,10 +24248,10 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
_.applyCss(), k.applyCss(), E.applyCss(), I.applyCss(), D.applyCss(), T.applyCss(),
m(), N.adjustPosition(), f();
}
- var v, b, y, x, w, S, C, _, k, E, T, I, D, N, M, L = {}, A = 32, R = 60, P = 50, F = {
+ var v, b, y, x, w, S, C, _, k, E, T, I, D, N, M, L = {}, A = 32, R = 60, P = 50, O = {
width: 250,
height: 140
- }, O = {
+ }, F = {
width: 330,
height: 160
}, B = 280, j = 320, $ = 200, q = 18, G = 130, H = {
@@ -24994,7 +25062,7 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
e.extend(l, n), s.settings = JSON.stringify(l), s.themeV4 = i);
}
function S(e) {
- var t = e && e.app == O && (e.chargeOption && "once" == e.chargeOption.alias || e.subscriptionOption && "yearly" == e.subscriptionOption.alias);
+ var t = e && e.app == F && (e.chargeOption && "once" == e.chargeOption.alias || e.subscriptionOption && "yearly" == e.subscriptionOption.alias);
return c.isSponsor = t, t;
}
function C() {
@@ -25011,9 +25079,9 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
T.setOffline = function() {
A = a.currentTime, L === !1 && (L = !0, c.onOfflineChanged(!0));
};
- var R, P, F;
+ var R, P, O;
T.initEditor = function(t) {
- if (void 0 !== F && c.onFileClosed(F), F = t, void 0 !== P) return i.undoMgr.init(),
+ if (void 0 !== O && c.onFileClosed(O), O = t, void 0 !== P) return i.undoMgr.init(),
P.uiManager.setUndoRedoButtonStates();
var n = new Markdown.Converter(), r = {
_DoItalicsAndBold: function(e) {
@@ -25048,8 +25116,8 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
y());
}, 1e3), c.onReady();
};
- var O = "ESTHdCYOi18iLhhO", B = new u({
- applicationID: O
+ var F = "ESTHdCYOi18iLhhO", B = new u({
+ applicationID: F
}), j = e(), $ = t.debounce(function() {
L || B.getPaymentsImmediate(function(n, i) {
C(), S(i) || t.each(document.querySelectorAll(".modal-body"), function(t) {
@@ -25278,8 +25346,9 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
return l.prototype.syncMerge = function(n, a, s, l, p, h) {
function f(e) {
function t() {
- (i[1] || r[1]) && (i[1] && r[1] ? (i[1] = "⧸⧸" + i[1] + "⧸⧸", r[1] += "⧸⧸", n.push(i),
- n.push(r)) : n.push([ 0, i[1] + r[1] ]), i = [ -1, "" ], r = [ 1, "" ]);
+ (i[1] || r[1]) && (i[1] && r[1] ? (i[1] = "\u29f8\u29f8" + i[1] + "\u29f8\u29f8",
+ r[1] += "\u29f8\u29f8", n.push(i), n.push(r)) : n.push([ 0, i[1] + r[1] ]), i = [ -1, "" ],
+ r = [ 1, "" ]);
}
var n = [], i = [ -1, "" ], r = [ 1, "" ], o = 20;
return e.forEach(function(a, s) {
@@ -25306,7 +25375,7 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
}
var m = n.content, g = n.title, v = n.discussionListJSON, b = n.discussionList, y = t.crc32(m), x = t.crc32(g), w = t.crc32(v), S = t.crc32(s), C = t.crc32(l), _ = t.crc32(h), k = a.contentCRC != y, E = a.contentCRC != S, T = m != s && E, I = T && k;
a.titleCRC = a.titleCRC || x;
- var D, N, M = a.titleCRC != x, L = a.titleCRC != C, A = g != l && L, R = A && M, P = a.discussionListCRC != w, F = a.discussionListCRC != _, O = v != h && F, B = O && P, j = [], $ = s, q = l, G = p, H = !1, U = !1, z = !1;
+ var D, N, M = a.titleCRC != x, L = a.titleCRC != C, A = g != l && L, R = A && M, P = a.discussionListCRC != w, O = a.discussionListCRC != _, F = v != h && O, B = F && P, j = [], $ = s, q = l, G = p, H = !1, U = !1, z = !1;
if (!d && (I || R || B) || I && void 0 === a.content || R && void 0 === a.title || B && void 0 === a.discussionList) r.createFile(g + " (backup)", m, v),
i.onMessage('Conflict detected on "' + g + '". A backup has been created locally.'); else {
if (I) {
@@ -25325,7 +25394,7 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
}), X && (X.selectionEnd = $.length, j.push(X));
}
}
- T && (P && (H = !0), F ? U = !0 : (H = !0, G = b)), B && (z = !0), R && (N = c.patch_make(a.title, g),
+ T && (P && (H = !0), O ? U = !0 : (H = !0, G = b)), B && (z = !0), R && (N = c.patch_make(a.title, g),
q = c.patch_apply(N, l)[0]);
}
var Q;
@@ -25335,7 +25404,7 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
selectionStart: o.selectionMgr.selectionStart,
selectionEnd: o.selectionMgr.selectionEnd
}, Y.push(Q), n.newDiscussion && Y.push(n.newDiscussion)), H && (Y = Y.concat(e.values(b))),
- O |= o.adjustCommentOffsets(m, $, Y);
+ F |= o.adjustCommentOffsets(m, $, Y);
}
if (U) {
var K = e.values(p);
@@ -25347,14 +25416,14 @@ this.DIFF_EQUAL = DIFF_EQUAL, define("diff_match_patch_uncompressed", function(e
e || delete p[t];
});
}
- return j.length && (O = !0, j.forEach(function(n) {
+ return j.length && (F = !0, j.forEach(function(n) {
var i;
do i = t.id(); while (e.has(G, i));
n.discussionIndex = i, G[i] = n;
})), A && (n.title = q, i.onTitleChanged(n), i.onMessage('"' + g + '" has been renamed to "' + q + '" on ' + this.providerName + ".")),
- (T || O) && o.watcher.noWatch(e.bind(function() {
+ (T || F) && o.watcher.noWatch(e.bind(function() {
if (T && (r.currentFile === n && (o.setValueNoWatch($), Q && o.selectionMgr.setSelectionStartEnd(Q.selectionStart, Q.selectionEnd)),
- n.content = $, i.onContentChanged(n, $)), O) {
+ n.content = $, i.onContentChanged(n, $)), F) {
n.discussionList = G;
var t = u.diff(b, G), a = !1;
e.each(t, function(t, r) {
diff --git a/public/res-min/require.js b/public/res-min/require.js
index 24b061e6..77a5bb1d 100644
--- a/public/res-min/require.js
+++ b/public/res-min/require.js
@@ -1,5 +1,5 @@
/** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.11 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/requirejs for details
*/
@@ -12,7 +12,7 @@ var requirejs, require, define;
(function (global) {
var req, s, head, baseElement, dataMain, src,
interactiveScript, currentlyAddingScript, mainScript, subPath,
- version = '2.1.11',
+ version = '2.1.15',
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
jsSuffixRegExp = /\.js$/,
@@ -180,7 +180,7 @@ var requirejs, require, define;
if (typeof requirejs !== 'undefined') {
if (isFunction(requirejs)) {
- //Do not overwrite and existing requirejs instance.
+ //Do not overwrite an existing requirejs instance.
return;
}
cfg = requirejs;
@@ -232,21 +232,20 @@ var requirejs, require, define;
* @param {Array} ary the array of path segments.
*/
function trimDots(ary) {
- var i, part, length = ary.length;
- for (i = 0; i < length; i++) {
+ var i, part;
+ for (i = 0; i < ary.length; i++) {
part = ary[i];
if (part === '.') {
ary.splice(i, 1);
i -= 1;
} else if (part === '..') {
- if (i === 1 && (ary[2] === '..' || ary[0] === '..')) {
- //End of the line. Keep at least one non-dot
- //path segment at the front so it can be mapped
- //correctly to disk. Otherwise, there is likely
- //no path mapping for a path starting with '..'.
- //This can still fail, but catches the most reasonable
- //uses of ..
- break;
+ // If at the start, or previous value is still ..,
+ // keep them so that when converted to a path it may
+ // still work when converted to a path, even though
+ // as an ID it is less than ideal. In larger point
+ // releases, may be better to just kick out an error.
+ if (i === 0 || (i == 1 && ary[2] === '..') || ary[i - 1] === '..') {
+ continue;
} else if (i > 0) {
ary.splice(i - 1, 2);
i -= 2;
@@ -267,43 +266,37 @@ var requirejs, require, define;
*/
function normalize(name, baseName, applyMap) {
var pkgMain, mapValue, nameParts, i, j, nameSegment, lastIndex,
- foundMap, foundI, foundStarMap, starI,
- baseParts = baseName && baseName.split('/'),
- normalizedBaseParts = baseParts,
+ foundMap, foundI, foundStarMap, starI, normalizedBaseParts,
+ baseParts = (baseName && baseName.split('/')),
map = config.map,
starMap = map && map['*'];
//Adjust any relative paths.
- if (name && name.charAt(0) === '.') {
- //If have a base name, try to normalize against it,
- //otherwise, assume it is a top-level require that will
- //be relative to baseUrl in the end.
- if (baseName) {
+ if (name) {
+ name = name.split('/');
+ lastIndex = name.length - 1;
+
+ // If wanting node ID compatibility, strip .js from end
+ // of IDs. Have to do this here, and not in nameToUrl
+ // because node allows either .js or non .js to map
+ // to same file.
+ if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
+ name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
+ }
+
+ // Starts with a '.' so need the baseName
+ if (name[0].charAt(0) === '.' && baseParts) {
//Convert baseName to array, and lop off the last part,
//so that . matches that 'directory' and not name of the baseName's
//module. For instance, baseName of 'one/two/three', maps to
//'one/two/three.js', but we want the directory, 'one/two' for
//this normalization.
normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
- name = name.split('/');
- lastIndex = name.length - 1;
-
- // If wanting node ID compatibility, strip .js from end
- // of IDs. Have to do this here, and not in nameToUrl
- // because node allows either .js or non .js to map
- // to same file.
- if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
- name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
- }
-
name = normalizedBaseParts.concat(name);
- trimDots(name);
- name = name.join('/');
- } else if (name.indexOf('./') === 0) {
- // No baseName, so this is ID is resolved relative
- // to baseUrl, pull off the leading dot.
- name = name.substring(2);
}
+
+ trimDots(name);
+ name = name.join('/');
}
//Apply map config if available.
@@ -379,7 +372,13 @@ var requirejs, require, define;
//retry
pathConfig.shift();
context.require.undef(id);
- context.require([id]);
+
+ //Custom require that does not do map translation, since
+ //ID is "absolute", already mapped/resolved.
+ context.makeRequire(null, {
+ skipMap: true
+ })([id]);
+
return true;
}
}
@@ -445,7 +444,16 @@ var requirejs, require, define;
return normalize(name, parentName, applyMap);
});
} else {
- normalizedName = normalize(name, parentName, applyMap);
+ // If nested plugin references, then do not try to
+ // normalize, as it will not normalize correctly. This
+ // places a restriction on resourceIds, and the longer
+ // term solution is not to normalize until plugins are
+ // loaded and all normalizations to allow for async
+ // loading of a loader plugin. But for now, fixes the
+ // common uses. Details in #1131
+ normalizedName = name.indexOf('!') === -1 ?
+ normalize(name, parentName, applyMap) :
+ name;
}
} else {
//A regular module.
diff --git a/public/res/constants.js b/public/res/constants.js
index cc1b37c8..ee30d573 100644
--- a/public/res/constants.js
+++ b/public/res/constants.js
@@ -1,6 +1,6 @@
define([], function() {
var constants = {};
- constants.VERSION = "4.3.8";
+ constants.VERSION = "4.3.9";
constants.MAIN_URL = "https://stackedit.io/";
constants.GOOGLE_ANALYTICS_ACCOUNT_ID = "UA-39556145-1";
constants.GOOGLE_API_KEY = "AIzaSyAeCU8CGcSkn0z9js6iocHuPBX4f_mMWkw";
diff --git a/public/res/eventMgr.js b/public/res/eventMgr.js
index 94f0c299..7b124dce 100644
--- a/public/res/eventMgr.js
+++ b/public/res/eventMgr.js
@@ -231,7 +231,14 @@ define([
setTimeout(function() {
var html = "";
_.each(previewContentsElt.children, function(elt) {
- html += elt.innerHTML;
+ if(!elt.exportableHtml) {
+ var clonedElt = elt.cloneNode(true);
+ _.each(clonedElt.querySelectorAll('.MathJax, .MathJax_Display, .MathJax_Preview'), function(elt) {
+ elt.parentNode.removeChild(elt);
+ });
+ elt.exportableHtml = clonedElt.innerHTML;
+ }
+ html += elt.exportableHtml;
});
var htmlWithComments = utils.trim(html);
var htmlWithoutComments = htmlWithComments.replace(/