Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 9949b31

Browse files
committed
Merge remote-tracking branch 'upstream/develop-9.0' into merge-develop-9.0_21.02.2019
2 parents 1cffb16 + 69c4a73 commit 9949b31

File tree

73 files changed

+366
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+366
-191
lines changed

builder/builder_utilities.livecodescript

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
script "BuilderUtilities"
22

3-
constant kMergExtVersion = "2018-10-11"
4-
constant kTSNetVersion = "1.3.8"
3+
constant kMergExtVersion = "2019-2-12"
4+
constant kTSNetVersion = "1.3.9"
55

66
local sEngineDir
77
local sWorkDir

builder/tools_builder.livecodescript

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,11 +251,6 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
251251
packageCompilerConfigureVariable tPackager, "ProductTitle", tProductName && getReadableVersion(pVersion)
252252
packageCompilerConfigureVariable tPackager, "ProductTag", tProductTag & "_" & getTaggedVersion(pVersion)
253253

254-
-- For Linux only, case-fold the product name to lowercase and
255-
-- remove all spaces - we can just use the product tag
256-
if pPlatform is "Linux" or pPlatform is "Linux-x86_64" or pPlatform is "Linux-armv6hf" then
257-
put tProductTag into tProductName
258-
end if
259254
packageCompilerConfigureVariable tPackager, "ProductName", tProductName
260255

261256
-- The edition tags.

docs/dictionary/command/revXMLPutIntoNode.lcdoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ revXMLPutIntoNode myCurrentNode,dataPaths["current"],field "Data", true
2525

2626
Parameters:
2727
treeID:
28-
The number returned by the revXMLCreateTree or revXMLCreateTreeFromFile
29-
function when you created the XML tree.
28+
The number returned by the <revXMLCreateTree> or <revXMLCreateTreeFromFile>
29+
function when you created the <XML tree>.
3030

3131
nodePath:
3232
The path to the node whose contents you want to set.
@@ -66,7 +66,8 @@ the <node|node's> start and end <tag|tags>.
6666
> checkbox is checked.
6767

6868
References: revXMLDeleteNode (command), revXMLAppend (command),
69-
result (function), uniDecode (function), XML tree (glossary),
69+
result (function), uniDecode (function), revXMLCreateTree (function),
70+
revXMLCreateTreeFromFile (function), XML tree (glossary),
7071
Standalone Application Settings (glossary), tag (glossary),
7172
standalone application (glossary), Unicode (glossary), node (glossary),
7273
command (glossary), LiveCode custom library (glossary),

docs/dictionary/command/revXMLSetAttribute.lcdoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ If the attribute already exists, its value is set to the <newValue>.
5555
> <uniDecode> function to encode the text as UTF-8:
5656

5757
revXMLSetAttribute myTree,the nodeName of me, \
58-
59-
uniDecode(the unicodeText of it,"UTF8")
58+
uniDecode(the unicodeText of it,"UTF8")
6059

6160

6261
>*Important:* The <revXMLSetAttribute> <command> is part of the

docs/dictionary/command/revZipCloseArchive.lcdoc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@ revZipCloseArchive the cArchive of me
2323

2424
Parameters:
2525
archivePath:
26-
The absolute path to the zip archive to close. >*Note:* Any changes you
27-
make to an open zip archive will not be applied until you close the
28-
archive using this command. If revZipCloseArchive encounters an error,
29-
the result is set to an error code beginning with "ziperr", otherwise
30-
the result will be empty.
26+
The absolute path to the zip archive to close.
27+
>*Note:* Any changes you make to an open zip archive will not be
28+
>applied until you close the archive using this command.
3129

3230
The result:
3331
If <revZipCloseArchive> encounters an error, the result is set to an

docs/dictionary/command/revZipExtractItemToVariable.lcdoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ otherwise the result will be empty.
3535
Description:
3636
Use the <revZipExtractItemToVariable> command to load an item from a zip
3737
archive into memory as a variable in your LiveCode program. The archive
38-
must already have been opened by using the <revZipOpenArchive
39-
(command)>command.
38+
must already have been opened by using the <revZipOpenArchive (command)>
39+
command.
4040

4141
References: revZipOpenArchive (command),
4242
revZipExtractItemToFile (command), revZipEnumerateItems (function)

docs/dictionary/command/rotate.lcdoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,8 @@ the <angle> <property> affects only the screen display of the
6262
<image(keyword)>, not the actual picture data in it, so setting it
6363
repeatedly does not introduce distortion.
6464

65-
>*Note:*Rotating an image using good or best <resizeQuality> might
66-
> cause the mask to be promoted to an alpha channel.
67-
65+
>*Note:*Rotating an image using good or best <resizeQuality> might
66+
> cause the mask to be promoted to an alpha channel.
6867

6968
>*Note:* As rotate is an image editing operation, the target image needs
7069
> to be on the currently visible card of an open stack to function.

docs/dictionary/command/topLevel.lcdoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ stack:
2727
Any stack reference.
2828

2929
Description:
30-
Use the <topLevel> <command> to display a <stack> in an <editable
31-
window>.
30+
Use the <topLevel> <command> to display a <stack> in an
31+
<editable window>.
3232

3333
An editable window can be resized (if its resizable <property> is true),
3434
and its <control|controls> can be <selected>, moved, and changed. To
35-
edit a <stack> of a different style (a <palette>, <modeless>, or <modal
36-
dialog box|modal dialog>), use the <topLevel> <command> to display it in
37-
an <editable window>.
35+
edit a <stack> of a different style (a <palette>, <modeless>, or
36+
<modal dialog box|modal dialog>), use the <topLevel> <command> to
37+
display it in an <editable window>.
3838

3939
The <topLevel> <command> closes the <stack> and reopens it as an
4040
<editable window>, so <closeStack> and <openStack>, <closeCard> and
@@ -50,11 +50,11 @@ does not close and reopen it.
5050
References: palette (command), lock messages (command), drawer (command),
5151
modeless (command), choose (command), property (glossary),
5252
current card (glossary), execute (glossary), message (glossary),
53-
editable window (glossary), command (glossary),
53+
editable window (glossary), command (glossary), control (glossary),
5454
modal dialog box (glossary), openCard (message), closeStack (message),
5555
closeCard (message), closeBackground (message), openStack (message),
56-
openBackground (message), stack (object), control (object),
57-
cantModify (property), selected (property)
56+
openBackground (message), stack (object), cantModify (property),
57+
selected (property)
5858

5959
Tags: windowing
6060

docs/dictionary/command/undo.lcdoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ Description:
2020
The undo command undoes the last action performed by the user. Undoable
2121
actions include:
2222

23-
* Using the paint tools
24-
* Deleting controls by selecting them with the Pointer tool and
25-
pressing Delete
26-
* Moving controls with the Pointer tool
27-
* Editing actions (such as typing, cutting, and pasting) in a field
23+
* Using the paint tools
24+
* Deleting controls by selecting them with the Pointer tool and
25+
pressing Delete
26+
* Moving controls with the Pointer tool
27+
* Editing actions (such as typing, cutting, and pasting) in a field
2828

2929

3030
The undo command cannot be used to undo actions performed by a script.

docs/dictionary/command/ungroup.lcdoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Type: command
55
Syntax: ungroup
66

77
Summary:
8-
Makes a <group(glossary)|group's> <object|objects> into <card
9-
control|card objects>, deleting the <group(command)>.
8+
Makes a <group(glossary)|group's> <object|objects> into
9+
<card control|card objects>, deleting the <group(command)>.
1010

1111
Associations: group
1212

0 commit comments

Comments
 (0)