Merge remote-tracking branch 'upstream/develop-8.2' into merge-develop-8.2_20.09.17

livecodeali · livecodeali · commit 58d86d36a0d3 · 2017-09-20T09:54:30.000+01:00
diff --git a/docs/dictionary/command/local.lcdoc b/docs/dictionary/command/local.lcdoc
@@ -2,7 +2,7 @@ Name: local
 
 Type: command
 
-Syntax: local <variableName> [= <value>] [, ...]
+Syntax: local <variableName> [= <value>] [, <variableName> [= <value>] ...]
 
 Summary:
 <declare|Declares> one or more <local variable|local variables> and
diff --git a/docs/dictionary/command/mobileControlDo.lcdoc b/docs/dictionary/command/mobileControlDo.lcdoc
@@ -4,7 +4,7 @@ Synonyms: iphonecontroldo
 
 Type: command
 
-Syntax: mobileControlDo <idOrName>, <action>, ...action specific parameters...
+Syntax: mobileControlDo <idOrName>, <action> [, <actionParameter> ...]
 
 Summary:
 Execute specific behaviors of native mobile controls created using
@@ -42,6 +42,7 @@ The id or name of the control.
 action (enum):
 The name of the <action> to perform. See Description for complete <action> listing.
 
+actionParameter: Additional parameter required for the action.
 
 Description:
 Use the <mobileControlDo> command to execute behaviors specific to a
diff --git a/docs/dictionary/command/mobilePick.lcdoc b/docs/dictionary/command/mobilePick.lcdoc
@@ -4,7 +4,7 @@ Synonyms: iphonepick
 
 Type: command
 
-Syntax: mobilePick <optionList>, <initialIndex> [, <optionList>, <initialIndex>, ...] [, <style> ] [, <button>] [, <view>]
+Syntax: mobilePick <optionList1>, <initialIndex1> [, <optionList2>, <initialIndex2> ...] [, <style> ] [, <button>] [, <view>]
 
 Summary:
 Presents the user with a native list picker dialog.
@@ -38,12 +38,15 @@ mobilePick tDays, 2, tMonths, 3, "checkmark"
 answer the result with "Okay"
 
 Parameters:
-optionList:
+optionList1:
 A return delimited list of options.
 
-initialIndex:
+initialIndex1:
 The (1-based) index of the item to be initially highlighted.
 
+optionList2:
+initialIndex2:
+
 style:
 The type of display used. On the iPad if "checkmark" is specified a
 check-mark (tick) is put against the currently selected item. If not
diff --git a/docs/dictionary/command/visual-effect.lcdoc b/docs/dictionary/command/visual-effect.lcdoc
@@ -2,8 +2,7 @@ Name: visual effect
 
 Type: command
 
-Syntax: visual [effect] <effectName> [<speed>] [to <finalImage>] 
-[with sound <audioClip>] [and <param> <value> and ...]
+Syntax: visual [effect] <effectName> [<speed>] [to <finalImage>] [with sound <audioClip>] [and <param> <value> ...]
 
 Summary:
 Adds a visual effect transition.
diff --git a/docs/dictionary/control_st/after.lcdoc b/docs/dictionary/control_st/after.lcdoc
@@ -2,7 +2,10 @@ Name: after
 
 Type: control structure
 
-Syntax: after <messageName> [<parametersList>] <statementList> end <messageName>
+Syntax:
+after <messageName> [<parametersList>]
+   <statementList>
+end <messageName>
 
 Summary:
 Defines a <message handler>.
diff --git a/docs/dictionary/control_st/before.lcdoc b/docs/dictionary/control_st/before.lcdoc
@@ -2,7 +2,10 @@ Name: before
 
 Type: control structure
 
-Syntax: before <messageName> [<parametersList>] <statementList> end <messageName>
+Syntax:
+before <messageName> [<parametersList>]
+   <statementList>
+end <messageName>
 
 Summary:
 Defines a <message handler>.
diff --git a/docs/dictionary/control_st/function.lcdoc b/docs/dictionary/control_st/function.lcdoc
@@ -3,8 +3,8 @@ Name: function
 Type: control structure
 
 Syntax: 
-function <functionName> [<parametersList>] 
-  <statementList> 
+[private] function <functionName> [<parametersList>] 
+   <statementList> 
 end <functionName>
 
 Summary:
diff --git a/docs/dictionary/control_st/getProp.lcdoc b/docs/dictionary/control_st/getProp.lcdoc
@@ -2,7 +2,10 @@ Name: getProp
 
 Type: control structure
 
-Syntax: getProp <propertyName> <statementList> end <propertyName>
+Syntax:
+getProp <propertyName>
+   <statementList>
+end <propertyName>
 
 Summary:
 <handle|Handles> the <message> sent to an <object(glossary)> when you
diff --git a/docs/dictionary/control_st/if.lcdoc b/docs/dictionary/control_st/if.lcdoc
@@ -2,7 +2,12 @@ Name: if
 
 Type: control structure
 
-Syntax: if <condition> then <statementList> [else <elseStatementList>]
+Syntax:
+if <condition> then
+   <statementList>
+[else
+   <elseStatementList>]
+end if
 
 Syntax:if <condition> then
    <statementList>
diff --git a/docs/dictionary/control_st/on.lcdoc b/docs/dictionary/control_st/on.lcdoc
@@ -4,7 +4,10 @@ Synonyms: command
 
 Type: control structure
 
-Syntax: on <messageName> [<parametersList>] <statementList> end <messageName>
+Syntax:
+[private] on <messageName> [<parametersList>]
+   <statementList>
+end <messageName>
 
 Summary:
 Defines a <message handler>.
diff --git a/docs/dictionary/control_st/setProp.lcdoc b/docs/dictionary/control_st/setProp.lcdoc
@@ -2,7 +2,10 @@ Name: setProp
 
 Type: control structure
 
-Syntax: setProp <propertyName> <newValue> <statementList> end <propertyName>
+Syntax:
+setProp <propertyName> <newValue>
+   <statementList>
+end <propertyName>
 
 Summary:
 <handle|Handles> the <trigger> sent to an <object(glossary)> when you
diff --git a/docs/dictionary/control_st/switch.lcdoc b/docs/dictionary/control_st/switch.lcdoc
@@ -2,11 +2,22 @@ Name: switch
 
 Type: control structure
 
-Syntax: switch [<switchExpression>]
-  case {<caseValue> | <caseCondition>}
-    [<statementList>]
-  [default
-    <defaultStatementList>]
+Syntax:
+switch <switchExpression>
+   case <caseValue>
+       <statementList>
+       [break]
+   [default
+       <defaultStatementList>]
+end switch
+
+Syntax:
+switch
+   case <caseCondition>
+       <statementList>
+       [break]
+   [default
+       <defaultStatementList>]
 end switch
 
 Summary:
diff --git a/docs/dictionary/function/libUrlFormData.lcdoc b/docs/dictionary/function/libUrlFormData.lcdoc
@@ -2,7 +2,7 @@ Name: libURLFormData
 
 Type: function
 
-Syntax: libURLFormData(<key_1>, <value_1>, ..., <key_n>, <value_n>)
+Syntax: libURLFormData(<key1>, <value1> [, <key2>, <value2> ...])
 
 Summary:
 <libURLFormData> formats data in the standard format suitable for
@@ -26,16 +26,10 @@ post it to url "http://www.someserver.com/cgi-bin/form.pl"
 -- In this case, the data posted to the url will look like this: name=John&message=Hello
 
 Parameters:
-key_1:
-
-
-value_1:
-
-
-key_n:
-
-
-value_n:
+key1:
+value1:
+key2:
+value2:
 
 
 Description:
diff --git a/docs/dictionary/function/libUrlMultipartFormData.lcdoc b/docs/dictionary/function/libUrlMultipartFormData.lcdoc
@@ -2,9 +2,9 @@ Name: libURLMultipartFormData
 
 Type: function
 
-Syntax: libURLMultipartFormData(<formData>, key_1, value_1, ..., key_n, value_n)
+Syntax: libURLMultipartFormData(<formData>, <key1>, <value1> [, <key2>, <value2> ...])
 
-Syntax: libURLMultipartFormData(<formData>, array)
+Syntax: libURLMultipartFormData(<formData>, <array>)
 
 Syntax: libURLMultipartFormData(<formData>)
 
@@ -42,6 +42,11 @@ end if
 
 Parameters:
 formData: A variable, which will be filled with the form data.
+key1:
+value1:
+key2:
+value2:
+array:
 
 Returns:
 The function will return empty if successful, or an error message
diff --git a/docs/dictionary/function/revBrowserCallScript.lcdoc b/docs/dictionary/function/revBrowserCallScript.lcdoc
@@ -2,7 +2,7 @@ Name: revBrowserCallScript
 
 Type: function
 
-Syntax: revBrowserCallScript(<instanceId>, <functionName> [, <parameter1>, <parameter2>, ..., <parameterN>])
+Syntax: revBrowserCallScript(<instanceId>, <functionName> [, <functionParameter> ...])
 
 Summary:
 Calls a web script function in the current browser object
@@ -28,15 +28,9 @@ The integer identifier of a browser object
 functionName:
 The name of the web script function to call
 
-parameter1:
-The parameters parameter1  through to parameterN  contain the arguments
-to pass to the function (optional).
-
-parameter2:
-
-
-parameterN:
-
+functionParameter:
+One or more optional parameters may contain the arguments to pass to the
+function.
 
 Description:
 Use the <revBrowserCallScript> function to call a web script function in
diff --git a/docs/dictionary/function/revOpenDatabase.lcdoc b/docs/dictionary/function/revOpenDatabase.lcdoc
@@ -3,15 +3,14 @@ Name: revOpenDatabase
 Synonyms: revdb_connect
 
 Type: function
-Syntax: revOpenDatabase(<databaseType>, {<hostAddress>, <databaseName>, [<userName>],[<passWord>],{[<useSSL>], [<socketAddr>], [<rwTimeout>], [<autoReconnect>] | [<cursorType>] | [<sslOption>],...} | <filePath>,[<sqliteOptions>]})
 
 Syntax: revOpenDatabase("mysql", <hostAddress>, <databaseName>, [<userName>],[<passWord>],[<useSSL>], [<socketAddr>], [<rwTimeout>], [<autoReconnect>])
 
 Syntax: revOpenDatabase("odbc", <hostAddress>, <databaseName>, [<userName>],[<passWord>],[<cursorType>])
 
 Syntax: revOpenDatabase("sqlite",<filePath>,[<sqliteOptions>])
 
-Syntax: revOpenDatabase("postgresql", <hostAddress>, <databaseName>, [<userName>], [<passWord>], [<sslOption>],...)
+Syntax: revOpenDatabase("postgresql", <hostAddress>, <databaseName>, [<userName>], [<passWord>] [, <sslOption> ...])
 
 Syntax: revOpenDatabase("oracle", <hostAddress>, <databaseName>, [<userName>],[<passWord>])
 
@@ -123,17 +122,6 @@ order of the items in the options parameter is not important):
     LiveCode encoding).
 
 
-databaseType (enum):
-A string specifying the database type to use. One of the following:
-
-- "mysql"
-- "oracle"
-- "odbc"
-- "postgresql"
-- "valentina"
-- "sqlite"
-
-
 filePath (string):
 (SQLite Only) A string specifying the path to the SQLite database.
 
diff --git a/docs/guides/LiveCode Documentation Format Reference.md b/docs/guides/LiveCode Documentation Format Reference.md
@@ -59,7 +59,7 @@ An entry may have a number of Syntax elements, if there are variations within th
 
 The following can be used to specify livecode syntax:
 - [optional]
-- ... (repeated)
+- [repeated optional ...]
 - { variant 1 | variant 2 }
 - <parameterName>
 
diff --git a/docs/notes/bugfix-20410.md b/docs/notes/bugfix-20410.md
@@ -0,0 +1 @@
+# Script Editor can drop keystrokes on Windows
diff --git a/engine/src/w32dcw32.cpp b/engine/src/w32dcw32.cpp
@@ -308,14 +308,14 @@ Boolean MCScreenDC::handle(real8 sleep, Boolean dispatch, Boolean anyevent,
 			msg.wParam = tptr->wParam;
 			msg.lParam = tptr->lParam;
 			msg.pt.x = msg.pt.y = 0;
+            msg.time = tptr->time;
 			delete tptr;
 		}
 
 		bool t_keymessage, t_syskeymessage;
 		t_keymessage = msg.message == WM_KEYDOWN || msg.message == WM_KEYUP;
 		t_syskeymessage = msg.message == WM_SYSKEYDOWN || msg.message == WM_SYSKEYUP;
 
-		curinfo->live = True;
 		MCeventtime = msg.time;
 		if (t_keymessage || t_syskeymessage)
 			curinfo->keysym = getkeysym(msg.wParam, msg.lParam);
@@ -828,7 +828,9 @@ LRESULT CALLBACK MCWindowProc(HWND hwnd, UINT msg, WPARAM wParam,
 			//   a dead-key started sequence
 			// SN-2015-05-18: [[ Bug 15040 ]] We must send the char resulting
 			//  from an Alt+<number> sequence.
-			if (curinfo->keymove == KM_KEY_DOWN || deadcharfollower || isInAltPlusSequence)
+            // If the current event isn't live, then we cannot trust the keymove
+            // field, so we assume that we must process it.
+			if (!curinfo->live || curinfo->keymove == KM_KEY_DOWN || deadcharfollower || isInAltPlusSequence)
 			{
 				// Pressing Alt and the key "+" starts a number-typing sequence.
 				//  Otherwise, we are not in such a sequence - be it because a normal
diff --git a/extensions/widgets/paletteactions/paletteactions.lcb b/extensions/widgets/paletteactions/paletteactions.lcb
@@ -29,7 +29,7 @@ use com.livecode.library.widgetutils
 
 metadata title is "Palette Actions"
 metadata author is "LiveCode"
-metadata version is "1.0.0"
+metadata version is "1.0.1"
 metadata userVisible is "false"
 
 property navNames		get getNavNames			set setNavNames
