From 2a2cf8bb5c4dd8498911eeb230a3b5934d1e428d Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Thu, 5 Mar 2020 18:13:14 +0100
Subject: [PATCH] =?UTF-8?q?Conversions=20for=20combination=20of=20=D0=B5?=
 =?UTF-8?q?=D0=95=20+=20\u308=20to=20=D1=91=D0=81=20and=20=D0=98=20+=20\u3?=
 =?UTF-8?q?06=20to=20=D0=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IPHRedaction/Clean.xba | 5 ++++-
 description.xml        | 2 +-
 releasenotes.txt       | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/IPHRedaction/Clean.xba b/IPHRedaction/Clean.xba
index 7e84361..c0fdfff 100644
--- a/IPHRedaction/Clean.xba
+++ b/IPHRedaction/Clean.xba
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Clean" script:language="StarBasic">Sub mark20
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Clean" script:language="StarBasic">Sub mark21
 
 End Sub
 
@@ -262,6 +262,9 @@ Private Sub fixFrequentMistakes
 	&apos;Между угловой закрывающейся скобкой и буквой должен быть пробел
 	AskAndReplace(&quot;(?&lt;=&lt;…)&gt;(?=[:alpha:])&quot;,&quot;&gt;&quot; &amp; space)
 	AskAndReplace(&quot;[ий][\u0306]+&quot;,&quot;й&quot;)
+	AskAndReplace(&quot;[ИЙ][\u0306]+&quot;,&quot;Й&quot;)
+	AskAndReplace(&quot;[её][\u0308]+&quot;,&quot;ё&quot;)
+	AskAndReplace(&quot;[ЕЁ][\u0308]+&quot;,&quot;Ё&quot;)
 End Sub
 
 Private Sub loadArticleStyles
diff --git a/description.xml b/description.xml
index 147f116..b0a54c8 100644
--- a/description.xml
+++ b/description.xml
@@ -3,7 +3,7 @@
              xmlns:dep="http://openoffice.org/extensions/description/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
   <identifier value="pro.litvinovg.Redaction" />
-  <version value="0.4.7" />
+  <version value="0.4.8" />
   <platform value="all" />
   <display-name>
     <name lang="en">Cleaning and validation documents for publishing in html and epub with pagination</name>
diff --git a/releasenotes.txt b/releasenotes.txt
index 622a929..75ce53a 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -1,4 +1,5 @@
-0.4.7 Added conversion for и + \u0306 в й
+0.4.8 Added conversion for И + \u0306 to Й  and еЕ + \u308 to ёЁ
+0.4.7 Added conversion for и + \u0306 to й
 0.4.3 Fixed bad regexps
 0.4.2 Fixed subscript/superscript conversion, added finish message
 0.4.1 Improved conversion for diacritic marks