diff --git a/COM380/Project3/CoverSheet.docx b/COM380/Project3/CoverSheet.docx new file mode 100644 index 0000000..dc08aed Binary files /dev/null and b/COM380/Project3/CoverSheet.docx differ diff --git a/COM380/Project3/Project3.docx b/COM380/Project3/Project3.docx new file mode 100644 index 0000000..8819354 Binary files /dev/null and b/COM380/Project3/Project3.docx differ diff --git a/COM380/Project3/Project3/Form1.h b/COM380/Project3/Project3/Form1.h index 920e131..29604f4 100644 --- a/COM380/Project3/Project3/Form1.h +++ b/COM380/Project3/Project3/Form1.h @@ -253,41 +253,43 @@ private: System::Void button1_Click(System::Object^ sender, System::EventArgs^ if (word->Length > 2) { String^ t1 = word->Substring(0, 1); - String^ tt = word->Substring(0, 2)->ToLowerInvariant(); - if (tt->Equals("qu")) - { - t1 = word->Substring(0, 2); - } - if (!numbers->Contains(t1)) - { - if (vowels->Contains(t1)) - { - translated += word + "way" + " "; - } - else - { - String^ t2 = word->Substring(1); - if (t1->Length >= 2) - { - t2 = word->Substring(t1->Length); - } + /* + String^ tt = word->Substring(0, 2)->ToLowerInvariant(); + if (tt->Equals("qu")) + { + t1 = word->Substring(0, 2); + } + */ + if (!numbers->Contains(t1)) + { + if (vowels->Contains(t1)) + { + translated += word + "way" + " "; + } + else + { + String^ t2 = word->Substring(1); + if (t1->Length >= 2) + { + t2 = word->Substring(t1->Length); + } - String^ c1 = c1 = t2->Substring(0, 1); - if (t1->ToUpperInvariant() == t1) - { - c1 = c1->ToUpperInvariant(); - } + String^ c1 = c1 = t2->Substring(0, 1); + if (t1->ToUpperInvariant() == t1) + { + c1 = c1->ToUpperInvariant(); + } - c1 += t2->Substring(1); - c1 += t1->ToLowerInvariant(); - c1 += "ay" + " "; - translated += c1; - } - } - else - { - translated += word + " "; - } + c1 += t2->Substring(1); + c1 += t1->ToLowerInvariant(); + c1 += "ay" + " "; + translated += c1; + } + } + else + { + translated += word + " "; + } } else { @@ -305,35 +307,42 @@ private: System::Void button2_Click(System::Object^ sender, System::EventArgs^ { String^ wordbuff = gcnew String(""); - int start = word->LastIndexOf("ay"); - String^ t1 = word->Substring(start, 2); String^ d1 = word->Substring(0, 1); - String^ c1 = word->Substring(start - 1, 1); - String^ t2 = word->Substring(1, start -2); - - if (t1->Equals("ay")) + if (!numbers->Contains(d1)) { - if (d1->ToUpperInvariant() == d1) // is caps + int start = word->LastIndexOf("ay"); + String^ t1 = word->Substring(start, 2); + String^ c1 = word->Substring(start - 1, 1); + String^ t2 = word->Substring(1, start -2); + + if (t1->Equals("ay")) { - c1 = c1->ToUpperInvariant(); - d1 = d1->ToLowerInvariant(); - } - if (c1->ToLowerInvariant()->Equals("w") && vowels->Contains(d1)) - { - wordbuff += d1; + if (d1->ToUpperInvariant() == d1) // is caps + { + c1 = c1->ToUpperInvariant(); + d1 = d1->ToLowerInvariant(); + } + if (c1->ToLowerInvariant()->Equals("w") && vowels->Contains(d1)) + { + wordbuff += d1; + } + else + { + wordbuff += c1 + d1; + } + + wordbuff += t2; + translated += wordbuff + " "; + // translated += t2 + " "; } else { - wordbuff += c1 + d1; + translated += word + " "; } - - wordbuff += t2; - translated += wordbuff + " "; - // translated += t2 + " "; } else { - translated += word + " "; + translated += word + " "; } } diff --git a/COM380/Template.docx b/COM380/Template.dotx similarity index 53% rename from COM380/Template.docx rename to COM380/Template.dotx index 48998f5..ee6f9d2 100644 Binary files a/COM380/Template.docx and b/COM380/Template.dotx differ diff --git a/SDrive/Templates/CoverSheet.dotx b/SDrive/Templates/CoverSheet.dotx index c83b79a..722ebf5 100644 Binary files a/SDrive/Templates/CoverSheet.dotx and b/SDrive/Templates/CoverSheet.dotx differ