Merge pull request #3778 from livecodefraser/bugfix-16959

peter-b · peter-b · commit 0498732b9752 · 2016-03-22T09:56:29.000Z
Synthesize clipboardData["styledText"] from plain text on the clipboard
diff --git a/docs/notes/bugfix-16959.md b/docs/notes/bugfix-16959.md
@@ -0,0 +1,2 @@
+# Synthesize clipboardData["styledText"] from plain text on the clipboard
+
diff --git a/engine/src/clipboard.cpp b/engine/src/clipboard.cpp
@@ -837,7 +837,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))
     {
@@ -850,6 +850,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
`@@ -0,0 +1,2 @@`
	`1`	`+# Synthesize clipboardData["styledText"] from plain text on the clipboard`
	`2`	`+`
Original file line number	Diff line number	Diff line change
`@@ -837,7 +837,7 @@ bool MCClipboard::CopyAsLiveCodeStyledText(MCDataRef& r_pickled_text) const`
`837`	`837`	`}`
`838`	`838`	`}`
`839`	`839`
`840`		`- // Could not grab as either styled text or RTF. One last try with HTML...`
	`840`	`+ // Could not grab as either styled text or RTF. Try with HTML.`
`841`	`841`	`MCAutoDataRef t_html;`
`842`	`842`	`if (CopyAsData(kMCRawClipboardKnownTypeHTML, &t_html))`
`843`	`843`	`{`
`@@ -850,6 +850,19 @@ bool MCClipboard::CopyAsLiveCodeStyledText(MCDataRef& r_pickled_text) const`
`850`	`850`	`}`
`851`	`851`	`}`
`852`	`852`
	`853`	`+ // Finally, try plain text.`
	`854`	`+ MCAutoStringRef t_plain_text;`
	`855`	`+ if (CopyAsText(&t_plain_text))`
	`856`	`+ {`
	`857`	`+ // Convert to LiveCode styled text`
	`858`	`+ MCDataRef t_pickled_text = ConvertTextToStyledText(*t_plain_text);`
	`859`	`+ if (t_pickled_text != NULL)`
	`860`	`+ {`
	`861`	`+ r_pickled_text = t_pickled_text;`
	`862`	`+ return true;`
	`863`	`+ }`
	`864`	`+ }`
	`865`	`+`
`853`	`866`	`// There was nothing on the clipboard that could be converted to LiveCode`
`854`	`867`	`// styled text.`
`855`	`868`	`return false;`