Changeset 190 for trunk

Timestamp:

Jul 13, 2018, 5:16:39 PM (6 years ago)

Author:

chronos

Message:

• Added: Support for document plural acronyms check.

Location:

trunk

Files:

• AcronymDecoder.lpi (modified) (1 diff)
• Forms/UFormCheck.pas (modified) (6 diffs)
• Languages/AcronymDecoder.cs.po (modified) (2 diffs)
• Languages/AcronymDecoder.po (modified) (1 diff)

trunk/AcronymDecoder.lpi

@@ -22 +22 @@
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="1"/>
-      <MinorVersionNr Value="5"/>
+      <MinorVersionNr Value="6"/>
       <StringTable FileDescription="Acronym Decoder" ProductName="Acronym Decoder"/>
     </VersionInfo>

trunk/Forms/UFormCheck.pas

@@ -55 +55 @@
     function IsUppercaseAlpha(Text: string): Boolean;
     function IsAlpha(Text: string): Boolean;
+    function IsAcronym(Text: string): Boolean;
     procedure ReportDifferencies;
     function WordContainsLetters(Text, Letters: string): Boolean;
@@ -77 +78 @@
   SAcronymCountContent = 'Content acronym count:';
   SAcronymCountSummary = 'Summary acronym count:';
-  SDuplicateAcronymContent = 'Duplicate acronym %s with "%s" in document content.';
-  SDuplicateAcronymSummary = 'Duplicate acronym %s with "%s" in acronym summary.';
-  SMissingAcronymContent = 'Content acronym %s with meaning "%s" missing from summary acronyms.';
-  SMissingAcronymSummary = 'Summary acronym %s with meaning "%s" missing from content acronyms.';
-
+  SDuplicateAcronymContent = 'Warning: Duplicate acronym %s with "%s" in document body.';
+  SDuplicateAcronymSummary = 'Warning: Duplicate acronym %s with "%s" in acronym summary.';
+  SMissingAcronymContent = 'Warning: Document body acronym %s with meaning "%s" missing from acronym summary.';
+  SMissingAcronymSummary = 'Warning: Summary acronym %s with meaning "%s" missing from document body.';
+  SPluralAcronym = 'Note: Acronym %s is defined as plural in document body.';
 
 { TFormCheck }
@@ -218 +219 @@
   HasMeaning1: Boolean;
   HasMeaning2: Boolean;
+  Plural: Boolean;
 begin
   AcronymDbContent.Acronyms.Clear;
@@ -232 +234 @@
       if EndIndex <> 0 then begin
         Acronym := Trim(Copy(Text, StartIndex + 1, EndIndex - StartIndex - 1));
-        if (Length(Acronym) > 1) and IsUppercaseAlpha(Acronym) then begin
+        // Allow plural acronyms with ending 's' character
+        if (Length(Acronym) >= 1) and (Acronym[Length(Acronym)] = 's') then begin
+          Acronym := Copy(Acronym, 1, Length(Acronym) - 1);
+          Plural := True;
+        end else Plural := False;
+        if IsAcronym(Acronym) then begin
           HasMeaning1 := ParseMeaning(Acronym, Text, StartIndex - 1, Meaning1);
           if HasMeaning1 then Meaning := Meaning1;
@@ -242 +249 @@
           end;
           if HasMeaning1 or HasMeaning2 then begin
+            // If plural acronym then try to remove ending 's' character from the meaning
+            if Plural then MemoReport.Lines.Add(Format(SPluralAcronym, [Acronym]));
+            if Plural and (Length(Meaning) >= 1) and (Meaning[Length(Meaning)] = 's') then begin
+              Meaning := Copy(Meaning, 1, Length(Meaning) - 1);
+            end;
             if Assigned(AcronymDbContent.SearchAcronym(Acronym, Meaning)) then
               MemoReport.Lines.Add(Format(SDuplicateAcronymContent, [Acronym, Meaning]))
@@ -360 +372 @@
 end;
 
+function TFormCheck.IsAcronym(Text: string): Boolean;
+const
+  MinAcronymLength = 2;
+begin
+  Result := (Length(Text) >= MinAcronymLength) and IsUppercaseAlpha(Text);
+end;
+
 procedure TFormCheck.ReportDifferencies;
 var

trunk/Languages/AcronymDecoder.cs.po

@@ -928 +928 @@
 
 #: uformcheck.sduplicateacronymcontent
-msgid "Duplicate acronym %s with \"%s\" in document content."
-msgstr "Zdvojená zkratka %s s významem \"%s\" v těle dokumentu."
+msgid "Warning: Duplicate acronym %s with \"%s\" in document body."
+msgstr "Varování: Zdvojená zkratka %s s významem \"%s\" v těle dokumentu."
 
 #: uformcheck.sduplicateacronymsummary
-msgid "Duplicate acronym %s with \"%s\" in acronym summary."
-msgstr "Zdvojená zkratka %s s významem \"%s\" v přehledu zkratek."
+msgid "Warning: Duplicate acronym %s with \"%s\" in acronym summary."
+msgstr "Varování: Zdvojená zkratka %s s významem \"%s\" v přehledu zkratek."
 
 #: uformcheck.smissingacronymcontent
-msgid "Content acronym %s with meaning \"%s\" missing from summary acronyms."
-msgstr "V zkratkách přehledu chybí zkratka obsahu %s s významem \"%s\"."
+msgid "Warning: Document body acronym %s with meaning \"%s\" missing from acronym summary."
+msgstr "Varování: V zkratkách přehledu chybí zkratka těla dokumentu %s s významem \"%s\"."
 
 #: uformcheck.smissingacronymsummary
-msgid "Summary acronym %s with meaning \"%s\" missing from content acronyms."
-msgstr "V zkratkách obsahu chybí zkratka přehledu %s s významem \"%s\"."
+msgid "Warning: Summary acronym %s with meaning \"%s\" missing from document body."
+msgstr "Ve zkratkách těla dokumentu chybí zkratka přehledu %s s významem \"%s\"."
+
+#: uformcheck.spluralacronym
+msgid "Note: Acronym %s is defined as plural in document body."
+msgstr "Poznámka: Zkratka %s je definována v těle dokumentu v množném čísle."
 
 #: uformexport.sexportedacronyms
@@ -1034 +1038 @@
 msgid "Process import sources"
 msgstr "Zpracovat zdroje importu"
-

trunk/Languages/AcronymDecoder.po

@@ -918 +918 @@
 
 #: uformcheck.sduplicateacronymcontent
-msgid "Duplicate acronym %s with \"%s\" in document content."
+msgid "Warning: Duplicate acronym %s with \"%s\" in document body."
 msgstr ""
 
 #: uformcheck.sduplicateacronymsummary
-msgid "Duplicate acronym %s with \"%s\" in acronym summary."
+msgid "Warning: Duplicate acronym %s with \"%s\" in acronym summary."
 msgstr ""
 
 #: uformcheck.smissingacronymcontent
-msgid "Content acronym %s with meaning \"%s\" missing from summary acronyms."
+msgid "Warning: Document body acronym %s with meaning \"%s\" missing from acronym summary."
 msgstr ""
 
 #: uformcheck.smissingacronymsummary
-msgid "Summary acronym %s with meaning \"%s\" missing from content acronyms."
+msgid "Warning: Summary acronym %s with meaning \"%s\" missing from document body."
+msgstr ""
+
+#: uformcheck.spluralacronym
+msgid "Note: Acronym %s is defined as plural in document body."
 msgstr ""