diff --git a/Redaction/Clean.xba b/Redaction/Clean.xba index eff17be..826d34e 100644 --- a/Redaction/Clean.xba +++ b/Redaction/Clean.xba @@ -1,6 +1,6 @@ -Sub mark90 +Sub mark93 End Sub diff --git a/Redaction/Configuration.xba b/Redaction/Configuration.xba index 80b0227..d06346e 100644 --- a/Redaction/Configuration.xba +++ b/Redaction/Configuration.xba @@ -1,7 +1,7 @@ Public Const redactionExtensionName = "cleanAndValidate" -Public Const redactionExtensionVersion = "0.10.3" +Public Const redactionExtensionVersion = "0.10.5" Public Const template_name_monography = "Монография" Public Const template_name_pj = "Философский журнал" Public Const template_name_pq = "Вопросы философии" @@ -10,11 +10,12 @@ Public Const template_name_hpe = "Историко-философский Public Const template_name_pr = "Философия религии" Public Const template_name_fnit = "Философия науки и техники" Public Const template_name_pa = "Философская антропология" -Public Const template_name_pcr = "Путь цивилизационного развития" +Public Const template_name_pcr = "Проблемы цивилизационного развития" Public Const template_name_eifn = "Эпистемология и философия науки" Public Const template_name_et = "Этическая мысль" Public Const template_name_iph_big = "Большой формат издания" Public Const template_manual = "custom_selected_template" +Public Const articles_path = "/templates/articles/" Function initRedactionConfiguration() On Error Goto exceptionHandler @@ -324,13 +325,14 @@ End Function Function getTemplateNames() As Variant Dim names() As String - AddToArray(names, template_name_monography) +' AddToArray(names, template_name_monography) AddToArray(names, template_name_pq) AddToArray(names, template_name_hp) AddToArray(names, template_name_hpe) AddToArray(names, template_name_pr) AddToArray(names, template_name_fnit) AddToArray(names, template_name_pa) + AddToArray(names, template_name_pj) AddToArray(names, template_name_pcr) AddToArray(names, template_name_eifn) AddToArray(names, template_name_et) @@ -354,16 +356,40 @@ Function getTemplateFile(templateName As String) As String getTemplateFile = getTemplatePath() & "/" & fileName Exit Function Case template_name_eifn - getTemplateFile = extensionPath() & "/templates/articles/статья_журнала_ЭиФН.ott" + getTemplateFile = extensionPath() & articles_path & "статья_эифн.ott" + Exit Function + Case template_name_fnit + getTemplateFile = extensionPath() & articles_path & "статья_фнит.ott" + Exit Function + Case template_name_pa + getTemplateFile = extensionPath() & articles_path & "статья_фа.ott" + Exit Function + Case template_name_pj + getTemplateFile = extensionPath() & articles_path & "статья_фж.ott" Exit Function Case template_name_et - getTemplateFile = extensionPath() & "/templates/articles/статья_этическая_мысль.ott" + getTemplateFile = extensionPath() & articles_path & "статья_эм.ott" + Exit Function + Case template_name_pq + getTemplateFile = extensionPath() & articles_path & "статья_вф.ott" + Exit Function + Case template_name_pr + getTemplateFile = extensionPath() & articles_path & "статья_фр.ott" + Exit Function + Case template_name_pcr + getTemplateFile = extensionPath() & articles_path & "статья_пцр.ott" + Exit Function + Case template_name_hp + getTemplateFile = extensionPath() & articles_path & "статья_иф.ott" + Exit Function + Case template_name_hpe + getTemplateFile = extensionPath() & articles_path & "статья_ифе.ott" Exit Function Case template_name_iph_big getTemplateFile = extensionPath() & "/templates/books/большой_формат_для_архива.ott" Exit Function Case Else - getTemplateFile = extensionPath() & "/templates/articles/default_article_template_ru.ott" + getTemplateFile = extensionPath() & articles_path & "статья.ott" Exit Function End Select End Function diff --git a/description.xml b/description.xml index 8407e76..63c2ecb 100644 --- a/description.xml +++ b/description.xml @@ -21,7 +21,7 @@ - + diff --git a/gradle.properties b/gradle.properties index 67c6e5c..b571681 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=0.10.3 +version=0.10.5 diff --git a/templates/articles/default_article_template_ru.ott b/templates/articles/default_article_template_ru.ott deleted file mode 100644 index cd681fc..0000000 Binary files a/templates/articles/default_article_template_ru.ott and /dev/null differ diff --git a/templates/articles/статья.ott b/templates/articles/статья.ott new file mode 100644 index 0000000..ecf42ce Binary files /dev/null and b/templates/articles/статья.ott differ diff --git a/templates/articles/статья_вф.ott b/templates/articles/статья_вф.ott new file mode 100644 index 0000000..4e95ee4 Binary files /dev/null and b/templates/articles/статья_вф.ott differ diff --git a/templates/articles/статья_журнала_вопросы_философии.ott b/templates/articles/статья_журнала_вопросы_философии.ott deleted file mode 100644 index cd794b2..0000000 Binary files a/templates/articles/статья_журнала_вопросы_философии.ott and /dev/null differ diff --git a/templates/articles/статья_журнала_фа.ott b/templates/articles/статья_журнала_фа.ott deleted file mode 100644 index ebe36e0..0000000 Binary files a/templates/articles/статья_журнала_фа.ott and /dev/null differ diff --git a/templates/articles/статья_журнала_философский_журнал.ott b/templates/articles/статья_журнала_философский_журнал.ott deleted file mode 100644 index ee3742b..0000000 Binary files a/templates/articles/статья_журнала_философский_журнал.ott and /dev/null differ diff --git a/templates/articles/статья_журнала_эифн.ott b/templates/articles/статья_журнала_эифн.ott deleted file mode 100644 index aa9c993..0000000 Binary files a/templates/articles/статья_журнала_эифн.ott and /dev/null differ diff --git a/templates/articles/статья_журнала_этическая_мысль.ott b/templates/articles/статья_журнала_этическая_мысль.ott deleted file mode 100644 index d061163..0000000 Binary files a/templates/articles/статья_журнала_этическая_мысль.ott and /dev/null differ diff --git a/templates/articles/статья_иф.ott b/templates/articles/статья_иф.ott new file mode 100644 index 0000000..e1f8d8d Binary files /dev/null and b/templates/articles/статья_иф.ott differ diff --git a/templates/articles/статья_ифе.ott b/templates/articles/статья_ифе.ott new file mode 100644 index 0000000..f9c3425 Binary files /dev/null and b/templates/articles/статья_ифе.ott differ diff --git a/templates/articles/статья_пцр.ott b/templates/articles/статья_пцр.ott new file mode 100644 index 0000000..409063a Binary files /dev/null and b/templates/articles/статья_пцр.ott differ diff --git a/templates/articles/статья_фа.ott b/templates/articles/статья_фа.ott new file mode 100644 index 0000000..ab2571b Binary files /dev/null and b/templates/articles/статья_фа.ott differ diff --git a/templates/articles/статья_фж.ott b/templates/articles/статья_фж.ott new file mode 100644 index 0000000..8c1eb5c Binary files /dev/null and b/templates/articles/статья_фж.ott differ diff --git a/templates/articles/статья_фнит.ott b/templates/articles/статья_фнит.ott new file mode 100644 index 0000000..9fbacfd Binary files /dev/null and b/templates/articles/статья_фнит.ott differ diff --git a/templates/articles/статья_фр.ott b/templates/articles/статья_фр.ott new file mode 100644 index 0000000..7823637 Binary files /dev/null and b/templates/articles/статья_фр.ott differ diff --git a/templates/articles/статья_эифн.ott b/templates/articles/статья_эифн.ott new file mode 100644 index 0000000..bbfec52 Binary files /dev/null and b/templates/articles/статья_эифн.ott differ diff --git a/templates/articles/статья_эм.ott b/templates/articles/статья_эм.ott new file mode 100644 index 0000000..69cef11 Binary files /dev/null and b/templates/articles/статья_эм.ott differ