diff -Pru wce-ote-2.4.1-20190812/content-extra.css edit/content-extra.css --- wce-ote-2.4.1-20190812/content-extra.css 1970-01-01 01:00:00.000000000 +0100 +++ edit/content-extra.css 2020-07-13 23:49:00.731410025 +0200 @@ -0,0 +1,37 @@ +@font-face { + font-family: 'AntinoouWeb'; + src: url('/community/fonts/antinoou-webfont.eot'); + src: url('/community/fonts/antinoou-webfont.eot?#iefix') format('embedded-opentype'), + url('/community/fonts/antinoou-webfont.woff') format('woff'), + url('/community/fonts/antinoou-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + +} + +@font-face { + font-family: 'EstreWeb'; + src: url('/community/fonts/estre.eot'); + src: url('/community/fonts/estre.eot?#iefix') format('embedded-opentype'), + url('/community/fonts/estre.woff') format('woff'), + url('/community/fonts/estre.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + +} + + +@font-face { + font-family: 'BukyvedeWeb'; + src: url('/community/fonts/Bukyvede.eot?#iefix') format('embedded-opentype'), url('/community/fonts/Bukyvede.woff') format('woff'), url('/community/fonts/Bukyvede.ttf') format('truetype'), url('/community/fonts/Bukyvede.svg#Bukyvede') format('svg'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'SBL_HebrewWeb'; + src: url('/community/fonts/sbl_hbrw-webfont.woff2') format('woff2'), + url('/community/fonts/sbl_hbrw-webfont.woff') format('woff'); + font-weight: normal; + font-style: normal; +} diff -Pru wce-ote-2.4.1-20190812/wce-ote/plugin/abbr.htm edit/wce-ote/plugin/abbr.htm --- wce-ote-2.4.1-20190812/wce-ote/plugin/abbr.htm 2019-08-12 00:07:02.000000000 +0200 +++ edit/wce-ote/plugin/abbr.htm 2020-07-13 23:50:11.767409270 +0200 @@ -68,7 +68,7 @@ {#abbr_addOverline} + id="add_overline" value="overline">{#abbr_addOverline} diff -Pru wce-ote-2.4.1-20190812/wce-ote/plugin/capitals.htm edit/wce-ote/plugin/capitals.htm --- wce-ote-2.4.1-20190812/wce-ote/plugin/capitals.htm 2019-08-12 00:07:02.000000000 +0200 +++ edit/wce-ote/plugin/capitals.htm 2020-07-13 23:50:11.768409270 +0200 @@ -16,7 +16,7 @@ diff -Pru wce-ote-2.4.1-20190812/wce-ote/plugin/gap.htm edit/wce-ote/plugin/gap.htm --- wce-ote-2.4.1-20190812/wce-ote/plugin/gap.htm 2019-08-12 00:07:03.000000000 +0200 +++ edit/wce-ote/plugin/gap.htm 2020-07-13 23:50:27.901409098 +0200 @@ -124,8 +124,8 @@ + + + + - - @@ -196,7 +198,8 @@ }); ed.on('keydown',function(ed) { var v = $('#fw_type').val(); - if (v == 'runTitle' || v == 'chapTitle' || v == 'lectTitle' || v == 'lectionary-other' + if (v == 'runTitle' || v == 'chapTitle' + || v == 'lectTitle' || v == 'lectBibRef' || v == 'lectInstruct' || v == 'lectionary-other' || v == 'colophon' || v == 'euthaliana' || v == 'gloss' || v =='pageNum' || v == 'isolated' || v == 'commentary' || v == 'ews' || v == 'orn' || v == 'other') { return; @@ -241,7 +244,9 @@ function getParaTag() { var v = $('#fw_type').val(); - if (v == 'runTitle' || 'chapTitle' || v == 'lectTitle' || v == 'colophon' + if (v == 'runTitle' || 'chapTitle' + || v == 'lectTitle' || v == 'lectBibRef'|| v == 'lectInstruct' + || v == 'colophon' || v == 'quireSig' || v == 'euthaliana' || v == 'gloss' || v == 'pageNum' || v == 'isolated' || v == 'orn' || v == 'other') return 'fw'; @@ -297,8 +302,9 @@ marginals_text_editor.show(); document.paratextinfo.paratext_position.disabled = false; document.paratextinfo.paratext_alignment.disabled = true; - } else if (v == 'runTitle' || v == 'chapTitle' || v == 'lectTitle' || v == 'colophon' - || v == 'euthaliana' || v == 'gloss' || v == 'pageNum' || v == 'orn' || v == 'other') { + } else if (v == 'runTitle' || v == 'chapTitle' + || v == 'lectTitle' || v == 'lectBibRef' || v == 'lectInstruct' + || v == 'colophon' || v == 'euthaliana' || v == 'gloss' || v == 'pageNum' || v == 'orn' || v == 'other') { //don't get a number, only text document.paratextinfo.number.value = ''; document.paratextinfo.number.disabled = true; diff -Pru wce-ote-2.4.1-20190812/wce-ote/plugin/plugin.js edit/wce-ote/plugin/plugin.js --- wce-ote-2.4.1-20190812/wce-ote/plugin/plugin.js 2019-08-12 20:23:50.000000000 +0200 +++ edit/wce-ote/plugin/plugin.js 2022-01-17 01:50:13.472900738 +0100 @@ -33,7 +33,7 @@ */ (function() { - var wfce_editor = "2.4.1 (2019-08-12)"; + var wfce_editor = "2.4.1+INTF1+COPTOT2 (2020-07-16)"; // Load plugin specific language pack tinymce.PluginManager.requireLangPack('wce'); @@ -1967,6 +1967,10 @@ break; case 'lectTitle': info_text += tinymce.translate('fw_lectionary_title'); + case 'lectBibRef': + info_text += tinymce.translate('fw_lectionary_bibref'); + case 'lectInstruct': + info_text += tinymce.translate('fw_lectionary_instruct'); break; case 'lectionary-other': info_text = '
' + tinymce.translate('infotext_untranscribed_other_lections') + '
'; @@ -2577,19 +2581,19 @@ } var langEn = language.substring(0, 2) == "en"; - //var ignoreShiftNotEn = tinyMCE.activeEditor.settings.ignoreShiftNotEn ? tinyMCE.activeEditor.settings.ignoreShiftNotEn : []; + var ignoreShiftNotEn = tinyMCE.activeEditor.settings.ignoreShiftNotEn ? tinyMCE.activeEditor.settings.ignoreShiftNotEn : []; var keyboardDebug = tinyMCE.activeEditor.settings.keyboardDebug; // Add for some special characters // We need a lot of cases, because of different kyeboard layouts, different browsers and different platforms if (keyboardDebug) console.log('ek: ' + ek + '; shiftKey: ' + e.shiftKey + '; altKey: ' + e.altKey + '; langEn: ' + langEn); - if (ek == 59 && !e.shiftKey && langEn && !tinymce.isWebKit) {// ; en + if (ek == 59 && !e.shiftKey && e.altKey && langEn && !tinymce.isWebKit) {// ; en tinyMCE.activeEditor.execCommand('mceAdd_pc', ';'); stopEvent(ed, e); - } else if (ek == 188 && !langEn && e.shiftKey) { + } else if (ignoreShiftNotEn.indexOf[188] < 0 && ek == 188 && !langEn && e.shiftKey) { // ; dt < en tinyMCE.activeEditor.execCommand('mceAdd_pc', ';'); stopEvent(ed, e); - } else if (ek == 190 && e.shiftKey && !langEn) { + } else if (ignoreShiftNotEn.indexOf[190] < 0 && ek == 190 && e.shiftKey && !langEn) { // : tinyMCE.activeEditor.execCommand('mceAdd_pc', ':'); stopEvent(ed, e); @@ -2601,7 +2605,7 @@ // . tinyMCE.activeEditor.execCommand('mceAdd_pc', '.'); stopEvent(ed, e); - } else if (ek == 189 && !e.shiftKey) { + } else if (ek == 189 && !e.shiftKey && !e.altKey) { // patched this line to make morph div work - Malte // . tinyMCE.activeEditor.execCommand('mceAdd_pc', '\u00B7'); stopEvent(ed, e); @@ -2625,7 +2629,7 @@ } else if (ek == 48 && e.shiftKey && e.altKey) {// Three Dot Punctuation tinyMCE.activeEditor.execCommand('mceAdd_pc', '\u2056'); stopEvent(ed, e); - } else if (ek == 57 && e.shiftKey && !langEn) {// special handling for English keyboards + } else if (ignoreShiftNotEn.indexOf[57] < 0 && ek == 57 && e.shiftKey && !langEn) {// special handling for English keyboards stopEvent(ed, e); doWithoutDialog(ed, 'part_abbr', ''); } else if (ek == 48 && e.shiftKey && langEn) {//special handling for English keyboard @@ -3639,7 +3643,13 @@ }, { text : '\u030B (combining double acute accent)', onclick : function() { - ed.execCommand('mceAdd_pc', '\u030B'); + // ed.execCommand('mceAdd_pc', '\u030B'); + ed.execCommand('mceInsertContent', false, '\u030B'); + } + }, + { text : '\u2CFE (Coptic full stop)', + onclick : function() { + ed.execCommand('mceAdd_pc', '\u2CFE'); } } ], diff -Pru wce-ote-2.4.1-20190812/wce-ote/plugin/spaces.htm edit/wce-ote/plugin/spaces.htm --- wce-ote-2.4.1-20190812/wce-ote/plugin/spaces.htm 2019-08-12 00:07:03.000000000 +0200 +++ edit/wce-ote/plugin/spaces.htm 2020-07-13 23:50:27.904409098 +0200 @@ -56,7 +56,7 @@ @@ -70,7 +70,7 @@ diff -Pru wce-ote-2.4.1-20190812/wce-ote/plugin/unclear_text.htm edit/wce-ote/plugin/unclear_text.htm --- wce-ote-2.4.1-20190812/wce-ote/plugin/unclear_text.htm 2019-08-12 00:07:03.000000000 +0200 +++ edit/wce-ote/plugin/unclear_text.htm 2021-03-02 23:01:10.528657527 +0100 @@ -105,6 +105,7 @@ } function init() { + if (ed.settings.unclear_text_reason_default) $('#unclear_text_reason').val(ed.settings.unclear_text_reason_default); comboBindReturnEvent('insert'); wceInfoInit('unclear'); readWceNodeInfo(); diff -Pru wce-ote-2.4.1-20190812/wce-ote/skin/content.min.css edit/wce-ote/skin/content.min.css --- wce-ote-2.4.1-20190812/wce-ote/skin/content.min.css 2019-08-12 00:07:03.000000000 +0200 +++ edit/wce-ote/skin/content.min.css 2020-07-13 23:50:39.816408971 +0200 @@ -51,6 +51,20 @@ font-style: normal; } +@font-face{ + font-family: AntinoouWeb; + src: url(fonts/antinoou-webfont.woff) format('woff'); + /* should work for all recent browsers */ + font-style: normal; +} + +@font-face{ + font-family: AntinoouWeb; + src: url(fonts/antinoouitalic-webfont.woff) format('woff'); + /* should work for all recent browsers */ + font-style: normal; +} + body, td, pre { color:#000; font-size:24px; @@ -59,6 +73,11 @@ font-family: GentiumPlus; } +.mce-content-body { + font-family: AntinoouWeb; + + +} body { background-color:#FFE6BB; diff -Pru wce-ote-2.4.1-20190812/wce-ote/wce_editor.js edit/wce-ote/wce_editor.js --- wce-ote-2.4.1-20190812/wce-ote/wce_editor.js 2019-08-12 00:07:03.000000000 +0200 +++ edit/wce-ote/wce_editor.js 2021-06-07 16:04:45.216088685 +0200 @@ -63,6 +63,8 @@ manuscriptLang : (getWitnessLang) ? getWitnessLang : "", // invalid_elements:'p', plugins : "pagebreak,save,print,contextmenu,fullscreen,wordcount,autosave,paste,charmap,code,noneditable", + paste_as_text: true, + contextmenu: 'cut copy paste', charmap : charmap_greek.concat(charmap_latin).concat(charmap_slavistic), // plugins : "compat3x,pagebreak,save,layer,print,contextmenu,fullscreen,wordcount,autosave,paste", @@ -71,11 +73,13 @@ 'wcelinenumber': '../../wce-ote/plugin/js/line_number.js' }, show_linenumber:true,//default false, - ignoreShiftNotEn: [188, 190], +// ignoreShiftNotEn: [188, 190], +// unclear_text_reason_default: 'damage to page', keyboardDebug: true, init_instance_callback : "wceReload", // Theme options - toolbar : "undo redo charmap | code | save print contextmenu cut copy pastetext pasteword fullscreen | "+ +// toolbar : "undo redo charmap | code | save print contextmenu cut copy pastetext pasteword fullscreen | "+ + toolbar : "undo redo charmap | code | save print contextmenu cut copy paste fullscreen | "+ "breaks correction illegible decoration abbreviation paratext note punctuation versemodify | showTeiByHtml help | info showHtmlByTei", theme_advanced_buttons2 : "", theme_advanced_toolbar_location : "top", diff -Pru wce-ote-2.4.1-20190812/wce-ote/wce_tei.js edit/wce-ote/wce_tei.js --- wce-ote-2.4.1-20190812/wce-ote/wce_tei.js 2019-08-12 19:46:37.000000000 +0200 +++ edit/wce-ote/wce_tei.js 2022-01-17 02:49:40.333964518 +0100 @@ -1396,7 +1396,7 @@ 'n' : '&number=', 'rend' : '¶text_alignment=', 'type' : { - '0' : '@commentary@ews@runTitle@chapNum@chapTitle@lectTitle@lectionary-other@colophon@quireSig@AmmSec@EusCan@euthaliana@gloss@stichoi@pageNum@andrew@orn', + '0' : '@commentary@ews@runTitle@chapNum@chapTitle@lectTitle@lectBibRef@lectInstruct@lectionary-other@colophon@quireSig@AmmSec@EusCan@euthaliana@gloss@stichoi@pageNum@andrew@orn', '1' : '&fw_type=', '2' : '&fw_type=other&fw_type_other=' } @@ -3832,8 +3832,9 @@ newNodeName = 'note'; } else if (fwType == 'chapNum' || fwType == 'AmmSec' || fwType == 'EusCan' || fwType == 'stichoi' || fwType == 'andrew') { newNodeName = 'num'; - } else if (fwType == 'runTitle' || fwType == 'chapTitle' || fwType == 'lectTitle' || fwType == 'colophon' - || fwType == 'quireSig' || fwType == 'euthaliana' || fwType == 'gloss' || fwType == 'pageNum' + } else if (fwType == 'runTitle' || fwType == 'chapTitle' + || fwType == 'lectTitle' || fwType == 'lectBibRef' || fwType == 'lectInstruct' + || fwType == 'colophon' || fwType == 'quireSig' || fwType == 'euthaliana' || fwType == 'gloss' || fwType == 'pageNum' || fwType == 'orn' || fwType == 'other') { newNodeName = 'fw'; } @@ -4154,30 +4155,16 @@ if (rend && rend != '') { $ex.setAttribute('rend', decodeURIComponent(rend)); } - var textValue = getDomNodeText($htmlNode); - if (textValue) { - textValue = textValue.substr(1, textValue.length - 2); - nodeAddText($ex, textValue); - } - $teiParent.appendChild($ex); + // remove '( .. )' from first text node + var textValue = $($htmlNode).text(); + var newTextValue = textValue.substring(1, textValue.length - 1); + if ($htmlNode.firstChild && $htmlNode.firstChild.nodeValue == textValue) $htmlNode.firstChild.nodeValue = newTextValue; + if ($htmlNode.firstChild && $htmlNode.firstChild.firstChild && $htmlNode.firstChild.firstChild.nodeValue == textValue) $htmlNode.firstChild.firstChild.nodeValue = newTextValue; + appendNodeInW($teiParent, $ex, $htmlNode); return { - 0 : $ex, + 0 : $teiParent, 1 : true }; - - /* - if (!stopAddW) { - var $w = createNewWElement(); - $w.appendChild($ex); - $teiParent.appendChild($w); - } else { - $teiParent.appendChild($ex); - } - - return { - 0 : $ex, - 1 : true - }*/ }; /*