Merge remote-tracking branch 'upstream/develop-9.5' into merge-develop-9.5-21.11.2019

livecodepanos · livecodepanos · commit ca0de9c3737c · 2019-11-21T15:57:45.000+02:00
diff --git a/builder/builder_utilities.livecodescript b/builder/builder_utilities.livecodescript
@@ -1,7 +1,7 @@
 ﻿script "BuilderUtilities"
 
 constant kMergExtVersion = "2019-9-23"
-constant kTSNetVersion = "1.3.9"
+constant kTSNetVersion = "1.4.0"
 
 local sEngineDir
 local sWorkDir
diff --git a/docs/dictionary/command/start-session.lcdoc b/docs/dictionary/command/start-session.lcdoc
@@ -21,7 +21,7 @@ start session
 put "jack" into $_SESSION['user']
 
 Example:
-set the sessionLifeTime to 360 -- 10 minutes
+set the sessionLifeTime to 360 -- 6 minutes
 start session
 
 Description:
@@ -37,7 +37,7 @@ The location where the <$_SESSION(keyword)> array is stored on the
 server is configured using the <sessionSavePath> <property>.
 
 A session is stored until it expires or is deleted using the 
-<delete session command>. The maximum age of a session is configured 
+<delete session> <command>. The maximum age of a session is configured 
 using the <sessionLifetime> <property>.
 
 >*Note:* You do not need to alter any of the session properties in order
diff --git a/docs/dictionary/function/controlAtLoc.lcdoc b/docs/dictionary/function/controlAtLoc.lcdoc
@@ -31,8 +31,9 @@ The <controlAtLoc> function returns the control at the given location.
 The function returns the number of the control, below are examples of
 getting the name or long id of the control
 
-  get the name of (controlAtLoc(<coordinates>))
-  get the long ID of (controlAtLoc(<coordinates>))
+    get the name of (controlAtLoc(<coordinates>))
+    
+    get the long ID of (controlAtLoc(<coordinates>))
 
 References: mouseLoc (function), controlAtScreenLoc (function),
 control (keyword), location (property)
diff --git a/docs/dictionary/function/controlAtScreenLoc.lcdoc b/docs/dictionary/function/controlAtScreenLoc.lcdoc
@@ -17,7 +17,7 @@ Example:
 put controlAtScreenLoc((100,100))
 
 Example:
-get the name of (controlAtScreenLoc(the mouseLoc))
+get the name of (controlAtScreenLoc(the screenMouseLoc))
 
 Parameters:
 coordinates(point):
@@ -31,10 +31,11 @@ The <controlAtScreenLoc> function returns the control at the given
 location. The function returns the number of the control, below are
 examples of getting the name or long id of the control
 
-  get the name of (controlAtLoc(<coordinates>))
-  get the long ID of (controlAtLoc(<coordinates>))
+    get the name of (controlAtScreenLoc(<coordinates>))
 
-References: mouseLoc (function), controlAtLoc (function),
+    get the long ID of (controlAtScreenLoc(<coordinates>))
+
+References: screenMouseLoc (function), controlAtLoc (function),
 control (keyword), location (property)
 
 Tags: ui
diff --git a/docs/dictionary/property/fullClipboardData.lcdoc b/docs/dictionary/property/fullClipboardData.lcdoc
@@ -40,10 +40,14 @@ Use the <fullClipboardData> to gain access to the system
   - "rtftext": LiveCode rich text format data
   - "htmltext": LiveCode HTML text
   - "styledtext": array of LiveCode styled text
-  - "image": any of PNG, GIF or JPEG image
+  - "image": any of PNG, GIF or JPEG image. If on Windows, 
+  additionally BMP image.
   - "png": PNG image
   - "gif": GIF image
   - "jpeg": JPEG image
+  - "windows bitmap": BMP image (Windows only)
+  - "windows metafile": Windows native vector graphics image (Windows 
+  only)
   - "rtf": Rich Text Format data
   - "html": HTML
   - "styles": LiveCode styled text data
diff --git a/docs/dictionary/property/showController.lcdoc b/docs/dictionary/property/showController.lcdoc
@@ -35,8 +35,8 @@ Set a player's <showController> <property> to false if you are providing
 these capabilities in the stack already, or if you do not want the user
 to be able to control playback of the movie or sound.
 
-References: property (glossary), controller bar (glossary),
-player (keyword), control (object), player (object),
+References: property (glossary), control (glossary),
+controller bar (glossary), player (keyword), player (object),
 movieControllerID (property), showSelection (property)
 
 Tags: multimedia
diff --git a/docs/dictionary/property/startAngle.lcdoc b/docs/dictionary/property/startAngle.lcdoc
@@ -34,8 +34,8 @@ specify that only a portion of the oval, forming an arc, should be
 drawn. 
 
 The <startAngle> determines the starting <point> of the arc. The
-<angleInDegrees> zero is at the right edge, 3 o'clock. Increasing the
-<angleInDegrees> moves the starting <point> counter-clockwise around the
+*angleInDegrees* zero is at the right edge, 3 o'clock. Increasing the
+*angleInDegrees* moves the starting <point> counter-clockwise around the
 arc. 
 
 The global setting of the <arcAngle> <property> <control|controls> the
@@ -47,7 +47,7 @@ For a graphic oval, the angle is the same as the <startAngle>. Changing
 one changes the other.
 
 References: global (command), property (glossary), paint tool (glossary),
-integer (keyword), point (keyword), graphic (keyword), control (object),
+control (glossary), integer (keyword), point (keyword), graphic (keyword),
 properties (property), arcAngle (property), startAngle (property)
 
 Tags: ui
diff --git a/docs/dictionary/property/strokeGradient.lcdoc b/docs/dictionary/property/strokeGradient.lcdoc
@@ -71,7 +71,7 @@ end points. This property is 1 by default.
 alternating repetitions of the ramp are reversed. This property is false 
 by default.
 
-*strokeGradient["wrap"] - A boolean value specifying whether the ramp is 
+* strokeGradient["wrap"] - A boolean value specifying whether the ramp is 
 repeated to fill the entire graphic a object. This property is false by 
 default.
 
diff --git a/docs/dictionary/property/styledText.lcdoc b/docs/dictionary/property/styledText.lcdoc
@@ -61,9 +61,9 @@ The <styledText> property returns a numerically-indexed array of
 paragraphs, each index representing each paragraph in the field in
 order: 
 
-tStyledTextArray[1] = &lt;first paragraph array&gt;
-...
-tStyledTextArray[&lt;n&gt;] = &lt;last paragraph array&gt; 
+   tStyledTextArray[1] = &lt;first paragraph array&gt;
+   ...
+   tStyledTextArray[&lt;n&gt;] = &lt;last paragraph array&gt; 
 
 Each paragraph array has up to two keys:
 
@@ -79,9 +79,9 @@ borderColor, hGrid, vGrid, dontWrap, padding and hidden.
 The paragraph content array is a numerically-indexed array of runs, each
 index representing each run in the paragraph in order:
 
-tParagraphContentArray[1] = &lt;first paragraph run array&gt;
-...
-tParagraphContentArray[&lt;n&gt;] = &lt;last paragraph run array&gt;
+   tParagraphContentArray[1] = &lt;first paragraph run array&gt;
+   ...
+   tParagraphContentArray[&lt;n&gt;] = &lt;last paragraph run array&gt;
 
 Each paragraph run array has up to three keys:
 
@@ -107,6 +107,7 @@ Centered Hello World
 Left-aligned Hello unicodeString
 
 This would transpire as the following array:
+
     1 =
       style = { textAlign = center }
       runs =
diff --git a/docs/dictionary/property/tabGroupBehavior.lcdoc b/docs/dictionary/property/tabGroupBehavior.lcdoc
@@ -26,7 +26,7 @@ is set to false.
 
 Description:
 Use the <tabGroupBehavior> <property> to enable using the arrow keys to
-tab through a <group(glossary)|group's> <control(object)|controls>.
+tab through a <group(glossary)|group's> <control(glossary)|controls>.
 
 If a group's <tabGroupBehavior> <property> is set to true, pressing the
 Tab key moves to the first <unlock|unlocked> <field(keyword)> in the
@@ -54,8 +54,8 @@ arrow keys to move around in any of the <field(object)|fields> in the
 <control(keyword)> instead.
 
 References: group (command), property (glossary), unlock (glossary),
-group (glossary), field (keyword), control (keyword), tabKey (message),
-field (object), control (object), tabStops (property),
+group (glossary), control (glossary), field (keyword), control (keyword), 
+tabKey (message), field (object), tabStops (property),
 textArrows (property), traversalOn (property), radioBehavior (property),
 layer (property)
 
diff --git a/docs/glossary/s/SOAP.lcdoc b/docs/glossary/s/SOAP.lcdoc
@@ -5,7 +5,7 @@ Synonyms: soap, simple object access protocol
 Type: glossary
 
 Description:
-Simple Object Access <Protocol>. An <XML> -based set of rules for
+Simple Object Access <protocol|Protocol>. An <XML>-based set of rules for
 applications to access and use web services.
 
 References: protocol (glossary), XML (glossary)
diff --git a/docs/glossary/s/stack-version.lcdoc b/docs/glossary/s/stack-version.lcdoc
@@ -36,7 +36,7 @@ When saving in the **5.5 format**, all <Unicode> text will be lost
 unless it is stored in a container that has a Unicode variant. For
 example, this means that Unicode text in <field|fields> and <button>
 labels will be saved, but any Unicode text in <script|scripts> or
-<custom properties> will be lost.
+<custom property|custom properties> will be lost.
 
 When saving in the **2.7 format**, the following properties or property
 aspects will also be lost:
@@ -63,7 +63,7 @@ lost or altered:
 References: save (command), version (function), stack file (glossary),
 stack (glossary), Unicode (glossary), field (glossary), button (glossary),
 script (glossary), custom property (glossary), card (glossary),
-widget (object), blendLevel (property), ink (property), 
+command (glossary), widget (object), blendLevel (property), ink (property), 
 textFont (property), textStyle (property), textSize (property),
 unicodeToolTip (property), antialiased (property), opaque (property),
 minStackFileVersion (property)
diff --git a/docs/notes/Bugfix-20472.md b/docs/notes/Bugfix-20472.md
@@ -0,0 +1 @@
+# Added missing keys to the fullClipboardData entry
diff --git a/docs/notes/bugfix-15645.md b/docs/notes/bugfix-15645.md
@@ -0,0 +1 @@
+# Corrected information the controlAtScreenLoc entry
