Auto-convert plain text on the clipboard to LiveCode styled text runs

livecodefraser · livecodefraser · commit 3e1acd5d549c · 2016-03-21T15:04:51.000Z
diff --git a/engine/src/clipboard.cpp b/engine/src/clipboard.cpp
@@ -832,7 +832,7 @@ bool MCClipboard::CopyAsLiveCodeStyledText(MCDataRef& r_pickled_text) const
         }
     }
     
-    // Could not grab as either styled text or RTF. One last try with HTML...
+    // Could not grab as either styled text or RTF. Try with HTML.
     MCAutoDataRef t_html;
     if (CopyAsData(kMCRawClipboardKnownTypeHTML, &t_html))
     {
@@ -845,6 +845,19 @@ bool MCClipboard::CopyAsLiveCodeStyledText(MCDataRef& r_pickled_text) const
         }
     }
     
+    // Finally, try plain text.
+    MCAutoStringRef t_plain_text;
+    if (CopyAsText(&t_plain_text))
+    {
+        // Convert to LiveCode styled text
+        MCDataRef t_pickled_text = ConvertTextToStyledText(*t_plain_text);
+        if (t_pickled_text != NULL)
+        {
+            r_pickled_text = t_pickled_text;
+            return true;
+        }
+    }
+    
     // There was nothing on the clipboard that could be converted to LiveCode
     // styled text.
     return false;

Original file line number	Diff line number	Diff line change
`@@ -832,7 +832,7 @@ bool MCClipboard::CopyAsLiveCodeStyledText(MCDataRef& r_pickled_text) const`
`832`	`832`	`}`
`833`	`833`	`}`
`834`	`834`
`835`		`- // Could not grab as either styled text or RTF. One last try with HTML...`
	`835`	`+ // Could not grab as either styled text or RTF. Try with HTML.`
`836`	`836`	`MCAutoDataRef t_html;`
`837`	`837`	`if (CopyAsData(kMCRawClipboardKnownTypeHTML, &t_html))`
`838`	`838`	`{`
`@@ -845,6 +845,19 @@ bool MCClipboard::CopyAsLiveCodeStyledText(MCDataRef& r_pickled_text) const`
`845`	`845`	`}`
`846`	`846`	`}`
`847`	`847`
	`848`	`+ // Finally, try plain text.`
	`849`	`+ MCAutoStringRef t_plain_text;`
	`850`	`+ if (CopyAsText(&t_plain_text))`
	`851`	`+ {`
	`852`	`+ // Convert to LiveCode styled text`
	`853`	`+ MCDataRef t_pickled_text = ConvertTextToStyledText(*t_plain_text);`
	`854`	`+ if (t_pickled_text != NULL)`
	`855`	`+ {`
	`856`	`+ r_pickled_text = t_pickled_text;`
	`857`	`+ return true;`
	`858`	`+ }`
	`859`	`+ }`
	`860`	`+`
`848`	`861`	`// There was nothing on the clipboard that could be converted to LiveCode`
`849`	`862`	`// styled text.`
`850`	`863`	`return false;`