diff --git a/Redaction/Clean.xba b/Redaction/Clean.xba index ec44e4a..23c0318 100644 --- a/Redaction/Clean.xba +++ b/Redaction/Clean.xba @@ -1,6 +1,6 @@ -Sub mark87 +Sub mark88 End Sub @@ -2101,4 +2101,4 @@ Function fixColoredBackgroundInDoc() As Boolean EndIf End Function - + \ No newline at end of file diff --git a/Redaction/Configuration.xba b/Redaction/Configuration.xba index ab8a0e7..6bd091c 100644 --- a/Redaction/Configuration.xba +++ b/Redaction/Configuration.xba @@ -1,7 +1,7 @@ Public Const redactionExtensionName = "cleanAndValidate" -Public Const redactionExtensionVersion = "0.10.1" +Public Const redactionExtensionVersion = "0.10.2" Public Const template_name_monography = "Монография" Public Const template_name_pj = "Философский журнал" Public Const template_name_pq = "Вопросы философии" @@ -13,6 +13,7 @@ Public Const template_name_pa = "Философская антрополо 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" Function initRedactionConfiguration() @@ -351,12 +352,15 @@ Function getTemplateFile(templateName As String) As String fileName = config.getPropertyValue("defaultTemplate") getTemplateFile = getTemplatePath() & "/" & fileName Exit Function - Case template_name_pj - getTemplateFile = extensionPath() & "/templates/articles/default_article_template_ru.ott" - Exit Function Case template_name_eifn getTemplateFile = extensionPath() & "/templates/articles/статья_журнала_ЭиФН.ott" Exit Function + Case template_name_et + getTemplateFile = extensionPath() & "/templates/articles/статья_этическая_мысль.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" Exit Function diff --git a/description.xml b/description.xml index 7bc58f3..5c22061 100644 --- a/description.xml +++ b/description.xml @@ -11,7 +11,7 @@ - + diff --git a/gradle.properties b/gradle.properties index c1bf17f..bf54d76 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=0.10.1 +version=0.10.2 diff --git a/templates/articles/default article template_ru.ott b/templates/articles/default article template_ru.ott deleted file mode 100644 index 6fbbd62..0000000 Binary files a/templates/articles/default article template_ru.ott and /dev/null differ diff --git a/templates/articles/default_article_template_ru.ott b/templates/articles/default_article_template_ru.ott index 6fbbd62..cd681fc 100644 Binary files a/templates/articles/default_article_template_ru.ott and b/templates/articles/default_article_template_ru.ott differ diff --git a/templates/articles/статья_журнала_ЭиФН.ott b/templates/articles/статья_журнала_ЭиФН.ott deleted file mode 100644 index f5d7384..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..cd794b2 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..ee3742b 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..aa9c993 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..d061163 Binary files /dev/null and b/templates/articles/статья_журнала_этическая_мысль.ott differ diff --git a/templates/books/большой_формат_для_архива.ott b/templates/books/большой_формат_для_архива.ott new file mode 100644 index 0000000..73b55f7 Binary files /dev/null and b/templates/books/большой_формат_для_архива.ott differ