Redaction/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 mark96
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Clean" script:language="StarBasic">Sub mark93
 
 End Sub
 
@@ -50,7 +50,6 @@ Private Sub makerUpMenu
     advancedCleaningDialog.getControl(&quot;convertFontsToCharStyles&quot;).Label = getTranslation(&quot;advancedMenuconvertFontsToCharStyles&quot;)
     advancedCleaningDialog.getControl(&quot;fixBrokenCharBackTransparent&quot;).Label = getTranslation(&quot;fixBrokenCharBackTransparentMenuItem&quot;)
     advancedCleaningDialog.getControl(&quot;removeNotTransparentBackgrounds&quot;).Label = getTranslation(&quot;removeNotTransparentBackgrounds&quot;)
-    advancedCleaningDialog.getControl(&quot;fixDiacriticKerning&quot;).Label = getTranslation(&quot;fixDiacriticKerning&quot;)
     advancedCleaningDialog.getControl(&quot;Cancel&quot;).Label = getTranslation(&quot;buttonCancel&quot;)
     advancedCleaningDialog.getControl(&quot;OK&quot;).Label = getTranslation(&quot;buttonOK&quot;)
     advancedCleaningDialog.getControl(&quot;buttonLoad&quot;).Label = getTranslation(&quot;buttonLoad&quot;)
@@ -165,9 +164,7 @@ Private Sub cleanAccordingTo(dialog As Object)
 	If dialog.getControl(&quot;removeNotTransparentBackgrounds&quot;).state = 1 Then
 		fixColoredBackgroundInDoc()
 	EndIf
-	If dialog.getControl(&quot;fixDiacriticKerning&quot;).state = 1 Then
+	
-		fixDiacriticKerning()
-	EndIf
 	
 	statusIndicator.end()
 	saveAndreload()
@@ -206,8 +203,6 @@ Private Sub quietCleaning
 	saveAndreload()
 	statusIndicator = ThisComponent.getCurrentController.statusIndicator
     unicodeSymbolsConversion
-  	statusIndicator.Start(getTranslation(&quot;statusFixingDiacriticCharactersKerning&quot;),100)	
-    fixDiacriticKerning
    	statusIndicator.Start(getTranslation(&quot;statusCleaningManualFormatting&quot;),100)	
 	cleanFormatting
 	statusIndicator.Start(getTranslation(&quot;statusReplaceWhiteBackground&quot;),100)	
@@ -335,7 +330,7 @@ Private Sub unicodeSymbolsConversion
 	&apos;Cyrillic unicode block range \u0400-\u04FF
 	&apos;Basic Latin \u0020-\u007E
 	&apos;Combining diacritical marks 0301 0304 0303 0323 032e 0331 035f
-	combiningDiacritic_Astra = &quot;\u0301\u0303\u0304\u0308\u0323\u032e\u0331\u0341\u035f&quot;
+	combiningDiacritic_Astra = &quot;\u0301\u0303\u0304\u0323\u032e\u0331\u0341\u035f&quot;
 	Dim extendedLatinA_Astra As String 
 	extendedLatinA_Astra = &quot;\u1e15\u1e17\u1e53\u0129\u0169&quot;
 	&apos;
@@ -2123,67 +2118,4 @@ Function fixColoredBackgroundInDoc() As Boolean
 	EndIf
 	
 End Function
-
-
-Sub fixDiacriticKerning
-	Dim oSearch As Object
-	Dim oFound As Object
-	Dim oPara As Object
-	oSearch = ThisComponent.createSearchDescriptor()
-	oSearch.SearchString = &quot;[\u0300-\u036F]&quot;
-	oSearch.SearchRegularExpression=True
-	oSearch.searchAll=True
-	oFound = ThisComponent.findFirst(oSearch)
-	Do While Not IsNull(oFound)
-		oPara = oFound.TextParagraph
-		fixDiacriticKerningInPara(oPara)
-		oFound = ThisComponent.findNext(oFound.End, oSearch)
-	Loop
-End Sub
-
-Sub fixDiacriticKerningInPara(oPara As Object)
-  Dim paraEnum As Object
-  Dim portion As Object
-  Dim prevPortion As Object
-  paraEnum = oPara.createEnumeration
-  If paraEnum.hasMoreElements Then
-  	prevPortion = paraEnum.nextElement
-    While paraEnum.hasMoreElements
-      portion = paraEnum.nextElement
-      While isFirstCharDiacritic(portion)
-        moveFirstCharacter(portion, prevPortion)
-      Wend
-      prevPortion = portion
-    Wend
-  EndIf
-End Sub
-
-Function isFirstCharDiacritic(portion As Object) As Boolean
-	isFirstCharDiacritic = false
-	Dim portionText As String
-	Dim diaLowBound As Long
-	Dim diaHighBound As Long
-	Dim charNum As Long
-	diaLowBound = 768
-	diaHighBound = 879
-	portionText = portion.String
-	If Len(portionText) = 0 Then
-	  Exit Function
-	EndIf
-	charNum = Asc(portionText)
-	If charNum &gt;= diaLowBound And charNum &lt;= diaHighBound Then
-	  isFirstCharDiacritic = true
-	EndIf
-End Function
-
-Sub moveFirstCharacter(portion As Object, prevPortion As Object)
-	Dim prevEnd As Object
-	Dim nextStart As Object
-	prevEnd = prevPortion.getEnd()
-	prevEnd.String = Left(portion.String,1)
-	nextStart = portion.Text.createTextCursorByRange(portion.Start)
-	nextStart.goRight(1,true)
-	nextStart.setString(&quot;&quot;)
-End Sub
-
 </script:module>

Redaction/CleaningDialog.xdl

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="CleaningDialog" dlg:left="107" dlg:top="22" dlg:width="237" dlg:height="285" dlg:help-text="&amp;21.CleaningDialog.HelpText" dlg:closeable="true" dlg:moveable="true" dlg:title="&amp;22.CleaningDialog.Title">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="CleaningDialog" dlg:left="107" dlg:top="22" dlg:width="237" dlg:height="265" dlg:help-text="&amp;21.CleaningDialog.HelpText" dlg:closeable="true" dlg:moveable="true" dlg:title="&amp;22.CleaningDialog.Title">
  <dlg:bulletinboard>
-  <dlg:button dlg:id="Cancel" dlg:tab-index="0" dlg:left="28" dlg:top="271" dlg:width="40" dlg:height="12" dlg:value="Отмена" dlg:button-type="cancel"/>
+  <dlg:button dlg:id="Cancel" dlg:tab-index="0" dlg:left="28" dlg:top="251" dlg:width="40" dlg:height="12" dlg:value="Отмена" dlg:button-type="cancel"/>
   <dlg:button dlg:id="CommandButton1" dlg:tab-index="1" dlg:left="24" dlg:top="180" dlg:width="2" dlg:height="0" dlg:value="CommandButton1"/>
-  <dlg:button dlg:id="OK" dlg:tab-index="2" dlg:left="92" dlg:top="271" dlg:width="40" dlg:height="12" dlg:value="OK" dlg:button-type="ok"/>
+  <dlg:button dlg:id="OK" dlg:tab-index="2" dlg:left="92" dlg:top="251" dlg:width="40" dlg:height="12" dlg:value="OK" dlg:button-type="ok"/>
   <dlg:checkbox dlg:id="fontsInStyles" dlg:tab-index="3" dlg:left="11" dlg:top="10" dlg:width="218" dlg:height="7" dlg:value="Заменить названия шрифтов в стилях" dlg:checked="false"/>
   <dlg:checkbox dlg:id="removeLinks" dlg:tab-index="6" dlg:left="11" dlg:top="60" dlg:width="218" dlg:height="7" dlg:value="Удалить гиперссылки" dlg:checked="false"/>
   <dlg:checkbox dlg:id="cleanFormatting" dlg:tab-index="5" dlg:left="11" dlg:top="30" dlg:width="218" dlg:height="7" dlg:value="Очистить форматирование" dlg:checked="false"/>
@@ -20,7 +20,7 @@
   <dlg:checkbox dlg:id="removeManualPageBreaks" dlg:tab-index="15" dlg:left="11" dlg:top="160" dlg:width="218" dlg:height="7" dlg:value="Удалить все  разрывы страниц" dlg:checked="false"/>
   <dlg:checkbox dlg:id="replaceWhiteBackground" dlg:tab-index="16" dlg:left="11" dlg:top="40" dlg:width="218" dlg:height="7" dlg:value="Заменить белый фон символов на прозрачный" dlg:checked="false"/>
   <dlg:checkbox dlg:id="removeBasic" dlg:tab-index="17" dlg:left="11" dlg:top="170" dlg:width="218" dlg:height="7" dlg:value="Удалить макросы" dlg:checked="false"/>
-  <dlg:button dlg:id="buttonLoad" dlg:tab-index="18" dlg:left="158" dlg:top="271" dlg:width="65" dlg:height="12" dlg:value="loadTemplate">
+  <dlg:button dlg:id="buttonLoad" dlg:tab-index="18" dlg:left="158" dlg:top="251" dlg:width="65" dlg:height="12" dlg:value="loadTemplate">
    <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Redaction.Configuration.configureStyleFileDialog?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:button>
   <dlg:checkbox dlg:id="removeAllFields" dlg:tab-index="19" dlg:left="11" dlg:top="180" dlg:width="218" dlg:height="7" dlg:value="Удалить все поля" dlg:checked="false"/>
@@ -30,7 +30,6 @@
   <dlg:checkbox dlg:id="convertFontsToCharStyles" dlg:tab-index="23" dlg:left="11" dlg:top="210" dlg:width="218" dlg:height="7" dlg:value="Конвертировать шрифты в стили символов" dlg:checked="false"/>
   <dlg:checkbox dlg:id="fixBrokenCharBackTransparent" dlg:tab-index="24" dlg:left="11" dlg:top="220" dlg:width="218" dlg:height="7" dlg:value="fixBrokenCharBackTransparent" dlg:checked="false"/>
   <dlg:checkbox dlg:id="removeNotTransparentBackgrounds" dlg:tab-index="25" dlg:left="11" dlg:top="50" dlg:width="218" dlg:height="7" dlg:value="Удалить непрозрачные фоны в тексте" dlg:checked="false"/>
-  <dlg:text dlg:id="description" dlg:tab-index="26" dlg:left="11" dlg:top="251" dlg:width="217" dlg:height="16" dlg:value="Label1" dlg:multiline="true"/>
+  <dlg:text dlg:id="description" dlg:tab-index="26" dlg:left="11" dlg:top="231" dlg:width="217" dlg:height="16" dlg:value="Label1" dlg:multiline="true"/>
-  <dlg:checkbox dlg:id="fixDiacriticKerning" dlg:tab-index="27" dlg:left="11" dlg:top="230" dlg:width="218" dlg:height="7" dlg:value="Fix diacritic kerning" dlg:checked="false"/>
  </dlg:bulletinboard>
 </dlg:window>

Redaction/Configuration.xba

@@ -1,7 +1,7 @@
 <?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="Configuration" script:language="StarBasic" script:moduleType="normal">Public Const redactionExtensionName = &quot;cleanAndValidate&quot;
-Public Const redactionExtensionVersion = &quot;0.10.11&quot;
+Public Const redactionExtensionVersion = &quot;0.10.5&quot;
 Public Const template_name_monography = &quot;Монография&quot;
 Public Const template_name_pj = &quot;Философский журнал&quot;
 Public Const template_name_pq = &quot;Вопросы философии&quot;

Redaction/Translations.xba

@@ -344,12 +344,6 @@ Function getRussian(identifier As String) As String
       Case "templateChosen"
          getRussian = "Выбран шаблон"
          Exit Function
-      Case "statusFixingDiacriticCharactersKerning"
-         getRussian = "Исправляем комбинирование с диакритическими символами"
-         Exit Function
-      Case "fixDiacriticKerning"
-         getRussian = "Исправить комбинирование с диакритическими символами"
-         Exit Function
 	  Case Else
 	    getRussian = "Перевод не найден"
 	End Select  
@@ -676,12 +670,6 @@ Function getEnglish(identifier As String) As String
       Case "templateChosen"
          getEnglish = "Selected template"
          Exit Function
-      Case "statusFixingDiacriticCharactersKerning"
-         getEnglish = "Fixing the combination with diacritics "
-         Exit Function
-      Case "fixDiacriticKerning"
-         getEnglish = "Fix combining with diacritic characters"
-         Exit Function
 	  Case Else
 	    getEnglish = "No translation"
 	End Select  
@@ -1007,12 +995,6 @@ Function getCroatian(identifier As String) As String
       Case "templateChosen"
          getCroatian = "Izabrani šablon"
          Exit Function
-      Case "statusFixingDiacriticCharactersKerning"
-         getCroatian = "Popravljanje kombinacije s dijakritičkim znakovima"
-         Exit Function
-      Case "fixDiacriticKerning"
-         getCroatian = "Ispravite kombiniranje s naglašenim likovima"
-         Exit Function
       Case Else
 	    getCroatian = "No translation"
 	End Select  
@@ -1338,12 +1320,6 @@ Function getSerbian(identifier As String) As String
       Case "templateChosen"
          getSerbian = "Изабрани шаблон"
          Exit Function
-      Case "statusFixingDiacriticCharactersKerning"
-         getSerbian = "Ispravljanje kombinacije sa dijakritičkim znacima "
-         Exit Function
-      Case "fixDiacriticKerning"
-         getSerbian = "Ispravite kombiniranje s naglašenim likovima"
-         Exit Function
       Case Else
 	    getSerbian = "No translation"
 	End Select  
@@ -1669,12 +1645,6 @@ Function getBosnian(identifier As String) As String
       Case "templateChosen"
          getBosnian = "Izabrani šablon"
          Exit Function
-      Case "statusFixingDiacriticCharactersKerning"
-         getBosnian = "Popravljanje kombinacije s dijakritičkim znakovima"
-         Exit Function
-      Case "fixDiacriticKerning"
-         getBosnian = "Ispravite kombiniranje s naglašenim likovima"
-         Exit Function
       Case Else
 	    getBosnian = "No translation"
 	End Select  

Redaction/Validation.xba

@@ -1,6 +1,7 @@
 <?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="Validation" script:language="StarBasic">Sub markval31
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Validation" script:language="StarBasic">Sub markval30
+
 End Sub
 
 
@@ -769,9 +770,11 @@ Sub fontReportButton
         Exit sub
     EndIf    
     Dim FileName As String
-	getCharsInFont(targetFontName)
+	FileName = getCharsInFont(targetFontName)
 	statusIndicator.end()
-
+	If FileName &lt;&gt; &quot;&quot; Then
+    	openReport(FileName)
+	EndIf
 End Sub
 
 Sub onSelectFont(oEvent)
@@ -911,7 +914,7 @@ Sub addToArray(xArray(),vNextElement)
 	xArray(iUB) = vNextElement
 End Sub
 
-Sub getCharsInFont(fontName As String)
+Function getCharsInFont(fontName As String) As String
 	Dim resultArray() As String
 	Dim pageNums() As Long
 	Dim firstPages() As Long
@@ -997,30 +1000,43 @@ Sub getCharsInFont(fontName As String)
 			EndIf	  
 		Next j
 	Next i 
-	If resultString &lt;&gt; &quot;&quot; Then
+	resultString = &quot;&quot;
-		Dim newDocCursor As Object
-		Dim newDoc As Object
-		newDoc = starDesktop.loadComponentFromURL(&quot;private:factory/swriter&quot;, &quot;_blank&quot;, 0, Array())
-        newDocCursor = newDoc.getCurrentController().getViewCursor()
-        newDocCursor.String = getTranslation(&quot;symbolsInFontHeading&quot;) &amp; &quot; &quot; &amp; fontName
-		newDocCursor.ParaStyleName = &quot;Heading 1&quot;
-		newDocCursor.collapseToEnd()
-		newDocCursor.Text.insertControlCharacter(newDocCursor.End,com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK,False)
 	For i = LBound(resultArray) To UBound(resultArray)
-			newDocCursor.ParaStyleName = &quot;Text body&quot;
+		resultString = resultString &amp; &quot;&lt;a href=&apos;https://unicode-table.com/ru/&quot; &amp; resultArray(i) &amp; &quot;&apos;&quot; &amp; &quot;&gt;https://unicode-table.com/ru/&quot; &amp; resultArray(i) &amp; &quot;&lt;/a&gt; &quot; &amp; getTranslation(&quot;charFirstPage&quot;) &amp; &quot; &quot; &amp; pageNums(i) &amp; &quot;&lt;br&gt;&quot; &amp; Chr(10)
-			newDocCursor.String = &quot;https://unicode-table.com/ru/&quot; &amp; resultArray(i)       
-			newDocCursor.HyperLinkURL = &quot;https://unicode-table.com/ru/&quot; &amp; resultArray(i)
-			newDocCursor.collapseToEnd()
-			newDocCursor.String = &quot; &quot; &amp; getTranslation(&quot;charFirstPage&quot;) &amp; &quot; &quot; &amp; pageNums(i)
-			newDocCursor.collapseToEnd()
-			newDocCursor.Text.insertControlCharacter(newDocCursor.End,com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK,False)
 	Next i
-		Exit Sub
+	
+	If resultString &lt;&gt; &quot;&quot; Then
+		&apos;MsgBox &quot;Символы в шрифте &quot;&amp; fontName &amp;Chr(10)&amp;resultString
+		Dim FileName As String		&apos;Holds the file name
+		Dim n As Integer		&apos;Holds the file number
+		Dim f As Integer		&apos;Index variable
+		Dim s As String		&apos;Temporary string for input
+		Dim fileaccess As Object
+		Dim outtextstream As Object
+		Dim out As Object
+		
+		Dim sTemp$
+		GlobalScope.BasicLibraries.loadLibrary(&quot;Tools&quot;)
+		path=DirectoryNameoutofPath(ThisComponent.getURL(),&quot;/&quot;)
+		FileName = path &amp; &quot;/symbolsInFont&quot; &amp; fontName &amp; &quot;.html&quot;
+		&apos;n = FreeFile()		&apos;Next free file number
+		&apos;Open FileName For Output Access Read Write As #n		&apos;Open for read/write
+        fileaccess = createUnoService (&quot;com.sun.star.ucb.SimpleFileAccess&quot;)
+        outtextstream = createUnoService (&quot;com.sun.star.io.TextOutputStream&quot;)
+        outtextstream.setEncoding( &quot;UTF-8&quot; )
+        out = fileaccess.openFileWrite( FileName )
+        outtextstream.setOutputStream( out )
+        outtextstream.writeString(  &quot;&lt;html&gt;&lt;head&gt;&lt;title&gt;&quot; &amp; getTranslation(&quot;symbolsInFontHeading&quot;) &amp; &quot; &quot;&amp; fontName &amp; &quot;&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;h2&gt;&quot; &amp; getTranslation(&quot;symbolsInFontHeading&quot;) &amp; &quot; &quot;&amp; fontName &amp;&quot;:&lt;/h2&gt;&quot;&amp;resultString &amp;&quot;&lt;/body&gt;&lt;/html&gt;&quot; )
+        outtextstream.closeOutput()
+		getCharsInFont = FileName
+		Exit Function
 
 	Else
 		MsgBox getTranslation(&quot;symbolsInFontNotFound1&quot;) &amp; &quot; &quot; &amp; fontName &amp; &quot; &quot; &amp; getTranslation(&quot;symbolsInFontNotFound2&quot;)
+		getCharsInFont = &quot;&quot;
+		Exit Function
 	EndIf
-End Sub
+End Function
 
 
 Function findBadCharacters() As Boolean

cleanandvalidate.update.xml

@@ -2,9 +2,9 @@
 <description xmlns="http://openoffice.org/extensions/update/2006" 
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="pro.litvinovg.Redaction"/>
-    <version value="0.10.11" />
+    <version value="0.10.6" />
     <update-download>
-        <src xlink:href="https://dev.litvinovg.pro/litvinovg/cleanandvalidate/uploads/330066acb026243a8a0eab002de1a1f3/cleanAndValidate.oxt" />
+        <src xlink:href="https://dev.litvinovg.pro/litvinovg/cleanandvalidate/uploads/2b71def6e0a91a02dbee2b8c73fda880/cleanAndValidate.oxt" />
     </update-download>
     <release-notes>
         <src xlink:href="https://dev.litvinovg.pro/litvinovg/cleanandvalidate/-/raw/master/releasenotes.txt" lang="en" />

description.xml

@@ -21,7 +21,7 @@
     
     
     
-    <version value="0.10.11"/>
+    <version value="0.10.5"/>
                                           
     
     

gradle.properties

@@ -1 +1 @@
-version=0.10.11
+version=0.10.6