Skip to content

Commit 1126319

Browse files
peter-bpeter-b
committed
Merge branch 'develop-8.0' into develop
Conflicts: - builder/builder_utilities.livecodescript: mergExt version - version: trivial
2 parents aae3b33 + 64fbc11 commit 1126319

29 files changed

+218
-76
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ _cache/
107107
build/
108108
/_tests/
109109
*-bin/
110+
mac-bin
110111
build-*/
111112

112113
# SDKs #

‎builder/builder.rev‎

11.6 KB
Binary file not shown.

‎builder/builder_utilities.livecodescript‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
script "BuilderUtilities"
2-
constant kMergExtVersion = "2016-6-24"
2+
constant kMergExtVersion = "2016-7-4"
33
constant kTSNetVersion = "1.2"
44

55
local sEngineDir
@@ -11,9 +11,9 @@ local sBuiltDocsDir
1111

1212
////////////////////////////////////////////////////////////////////////////////
1313

14-
command builderLog pType, pMessage
14+
command builderLog pType, pMessage, pContext
1515
if there is a stack "Builder" then
16-
dispatch "__builderLog" to stack "Builder" with pType, pMessage
16+
dispatch "__builderLog" to stack "Builder" with pType, pMessage, pContext
1717
end if
1818
end builderLog
1919

‎builder/docs_builder.livecodescript‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ command docsBuilderProgressUpdate pProgress, pMessage
1717
builderLog "message", pMessage
1818
end docsBuilderProgressUpdate
1919

20-
command errorShow pError
21-
builderLog "error", pError
22-
throw pError
23-
end errorShow
20+
command logError pError
21+
local tContext
22+
// get the context of the calling handler: <handler>:<linenumber>
23+
put item -2 to -1 of line -2 of the executionContexts into tContext
24+
builderLog "error", pError, tContext
25+
end logError
2426

2527
command docsBuilderRun pEdition, pVersion
2628
set the itemdelimiter to "."
@@ -1938,7 +1940,7 @@ private command addFolderToListIfExists pFolder, pThrowIfNot, @xArray
19381940
end if
19391941

19401942
if pThrowIfNot then
1941-
builderLog "error", "Expected docs folder" && pFolder && "doesn't exist"
1943+
logError "Expected docs folder" && pFolder && "doesn't exist"
19421944
else
19431945
builderLog "message", "Folder" && pFolder && "doesn't exist"
19441946
end if
@@ -2146,7 +2148,7 @@ command docsBuilderGenerateDistributedAPI pEdition
21462148
put docsBuilderParseDictionary("LiveCode Script", "LiveCode", tDictionaryFolders, tAdditionalFolders, false) into tLCSDictionaryA
21472149

21482150
if tLCSDictionaryA is empty then
2149-
builderLog "error", "Couldn't parse script dictionary data for" && pEdition
2151+
logError "Couldn't parse script dictionary data for" && pEdition
21502152
exit docsBuilderGenerateDistributedAPI
21512153
end if
21522154

@@ -2185,7 +2187,7 @@ command docsBuilderGenerateDistributedAPI pEdition
21852187
put "dictionary" into tLCBDictionaryA["type"]
21862188

21872189
if tLCBDictionaryA is empty then
2188-
builderLog "error", "Couldn't parse builder dictionary data for" && pEdition
2190+
logError "Couldn't parse builder dictionary data for" && pEdition
21892191
exit docsBuilderGenerateDistributedAPI
21902192
end if
21912193

@@ -2226,7 +2228,7 @@ on docsBuilderPopulateDatabase pEdition, pLibrariesA
22262228

22272229
put the result into tConnection
22282230
if tConnection is not a number then
2229-
builderLog "error", the result
2231+
logError the result
22302232
exit docsBuilderPopulateDatabase
22312233
end if
22322234

@@ -2236,7 +2238,7 @@ on docsBuilderPopulateDatabase pEdition, pLibrariesA
22362238
builderLog "message", "adding library" && pLibrariesA[tKey]["display name"] && "to docs database"
22372239
revDocsUpdateDatabase tConnection, pLibrariesA[tKey]
22382240
if the result is not empty then
2239-
builderLog "error", the result
2241+
logError the result
22402242
exit docsBuilderPopulateDatabase
22412243
end if
22422244
end repeat
@@ -2269,7 +2271,7 @@ private command docsBuilderGenerateZip pEdition, pVersion
22692271
put merge("cd $(dirname '[[tDocItem]]') && zip -r '[[tZipPath]]' $(basename '[[tDocItem]]')") into tCmd
22702272
put shell(tCmd) into tCmdOutput
22712273
if the result is not 0 then
2272-
builderLog "error", "Archiving failed"
2274+
logError "Archiving failed:" && tCmdOutput
22732275
exit docsBuilderGenerateZip
22742276
end if
22752277
end repeat

‎docs/dictionary/command/import-widget.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Introduced: 8.0
1010

1111
OS: mac,windows,linux,ios,android
1212

13-
Platforms: desktop,web,modile
13+
Platforms: desktop,web,mobile
1414

1515
Example:
1616
import widget from array tMyArray

‎docs/dictionary/control_st/repeat.lcdoc‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,12 @@ The <loopForm> is one of the following forms:
5656
statementList: One or more LiveCode statements, and can also include `if`, `switch`,
5757
`try`, or `repeat` <control structure|control structures>.
5858
condition (bool): Any <expression> that <evaluate|evaluates> to true or false.
59-
number, startValue, endValue, and increment: Numbers or <expression|expressions> that evaluate to numbers.
60-
counter or labelVariable: A legal <variable> name.
59+
number (number): A numbers or an <expression|expressions> that evaluates to a number.
60+
startValue (number): A numbers or an <expression|expressions> that evaluates to a number.
61+
endValue (number): A numbers or an <expression|expressions> that evaluates to a number.
62+
increment (number): A numbers or an <expression|expressions> that evaluates to a number.
63+
counter: A legal <variable> name.
64+
labelVariable: A legal <variable> name.
6165
chunkType: One of these text chunk types: byte, codeunit, codepoint, character (or char),
6266
token, trueword, word (or segment), item, sentence, paragraph or line.
6367
container: Any existing <container>; e.g. a <variable> or a <field>.
@@ -225,7 +229,7 @@ Use the `for each`*`element`* form if you want to perform an action on
225229
each <element(glossary)> in an <array>. The following example gets only
226230
the multi-word entries in an <array> of phrases:
227231

228-
repeat for each element thisIndexTerm in listOfTerms
232+
repeat for each element thisIndexTerm in arrayOfTerms
229233
if the number of words in thisIndexTerm > 1 then
230234
put thisIndexTerm & return after multiWordTerms
231235
end if

‎docs/dictionary/property/HTMLText.lcdoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Instead, it can be understood as a way to faithfully represent the entire conten
4040
using HTML-style tags and attributes.
4141

4242
The <HTMLText> of a <field(object)> or <chunk> is a <string>.
43-
If the <effective> keyword is specified the <htmlText> property returns the <HTML> of the field with explicit formatting.
43+
If the <effective> keyword is specified the <HTMLText> property returns the <HTML> of the field with explicit formatting.
4444
For example if the <textFont> of the stack is set this is not included in the <HTMLText> but is included in the <effective> <HTMLText>.
4545

4646
The <HTMLText> <property> is a representation of the styled text and paragraph formatting of the <field(object)>.
@@ -205,13 +205,13 @@ Support was added for &lt;strong&gt; and &lt;em&gt; tags in version 6.0.
205205

206206
References: ASCII (glossary), backgroundColor (property), borderColor (property), borderWidth (property), character set (glossary),
207207
charToNum (function), chunk (glossary), colorNames (function), default (glossary), dontWrap (property), dragData (property),
208-
effective (keyword), encode (glossary), field (keyword), field (object), firstIndent (property), firstIndent (property),
208+
effective (keyword), encode (glossary), field (keyword), field (object), firstIndent (property),
209209
fontLanguage (property), foregroundColor (property), format (function), format (glossary), get (command), hexadecimal (glossary),
210210
hGrid (property), hidden (property), HTML (glossary), HTMLText (property), imageSource (property), integer (glossary),
211211
leftIndent (property), linkText (property), listStyle (property), metadata (property), mimeText (property), negative (glossary),
212212
numToChar (function), padding (property), property (glossary), rightIndent (property), RTFText (property), set (command),
213213
spaceAbove (property), spaceBelow (property), string (glossary), tabStops (property), textAlign (property), textFont (property),
214214
textShift (property), textSize (property), textStyle (property), unicodeText (property), URL (keyword), vGrid (property),
215-
Windows (glossary),
215+
Windows (glossary)
216216

217217
Tags: text processing

‎docs/dictionary/property/layerMode.lcdoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Use the layerMode property to specify if an object is static or dynamic. The Liv
4040

4141
If you specify the effective keyword, getting the <layerMode> returns how the engine is actually treating the layer, rather than what you requested it to be. There can be a difference for a number of reasons:
4242

43-
1) You are not using a compositor (set using <compositorType property>) - effective layerMode is set to 'static'.
43+
1) You are not using a compositor (set using <compositorType>) - effective layerMode is set to 'static'.
4444
2) You have a static <layerMode> object with a non-copy/blendSrcOver ink set - effective layerMode is set to 'dynamic'.
4545
3) You have a scrolling <layerMode> on a non-group or an adorned group - effective layerMode is set to 'dynamic'.
4646

@@ -56,8 +56,8 @@ Take a platform game as an example. The main character, any animated elements an
5656
NON-GAME DRAG EXAMPLE
5757
Consider a drag-drop interface where a user can 'pick' something up and drop it elsewhere. While the object is being dragged across the stack the <layerMode> can be set to 'dynamic' (particularly important if it has graphic effects applied). Once in its final location the <layerMode> can be returned to 'static'
5858

59-
>*Warning:* The <layerMode> only has an effect if the <compositorType property> of the stack is not empty.
59+
>*Warning:* The <layerMode> only has an effect if the <compositorType> of the stack is not empty.
6060

61-
References: compositorTileSize (property), compositorType property (property), compositorType (property), compositorCacheLimit (property)
61+
References: compositorTileSize (property), compositorType (property), compositorCacheLimit (property)
6262

6363
Tags: windowing

‎docs/notes/bugfix-17149.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure iconGravity property is preserved when copying/cloning buttons.

‎docs/notes/bugfix-17615.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix crash when printing preview of card with browser widget on OSX

0 commit comments

Comments
 (0)