Skip to content

Commit 71cd962

Browse files
livecodepanoslivecodepanos
authored
Merge pull request livecode#7182 from livecodepanos/merge-develop-9.5-27.09.2019
Merge develop 9.5 27.09.2019
2 parents c0265cc + 8133251 commit 71cd962

7 files changed

Lines changed: 32 additions & 14 deletions

File tree

‎Installer/package.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ component Runtime.iOS
724724
file ios:iphonesimulator12.1/mobile-disable-ats-template.plist as "DisableATS.plist"
725725
file ios:iphonesimulator12.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
726726
file ios:iphonesimulator12.1/fontmap as "fontmap"
727-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-13_0" place
727+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-13_1" place
728728
executable ios:iphonesimulator13.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
729729
executable ios:iphonesimulator13.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
730730
executable ios:iphonesimulator13.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
@@ -820,7 +820,7 @@ component Runtime.iOS
820820
file ios:iphoneos12.1/mobile-disable-ats-template.plist as "DisableATS.plist"
821821
file ios:iphoneos12.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
822822
file ios:iphoneos12.1/fontmap as "fontmap"
823-
into "[[ToolsFolder]]/Runtime/iOS/Device-13_0" place
823+
into "[[ToolsFolder]]/Runtime/iOS/Device-13_1" place
824824
executable ios:iphoneos13.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
825825
executable ios:iphoneos13.1/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
826826
executable ios:iphoneos13.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension

‎docs/dictionary/function/version.lcdoc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ Example:
1919
put the version into field "Version" of me
2020

2121
Example:
22-
if item 1 of the version < 3 then
23-
answer "Not all features will be available"
22+
set the itemDelimiter to "."
23+
if item 1 of the version < 8 then
24+
answer "Widgets are not available"
2425
end if
2526

2627
Returns:

‎docs/dictionary/message/playStopped.lcdoc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ Handle the <playStopped> <message> if you want to perform a task when a
2626
movie or sound finishes playing.
2727

2828
The <playStopped> <message> is sent when the movie or sound reaches its
29-
end, or when a play stop <command> <execute|executes>. If the user
30-
pauses the movie or sound, the <playPaused> <message> is sent instead.
29+
end when playing forwards, the movie or sound reaches its beginning if it
30+
is playing backwards, or when a play stop <command> <execute|executes>.
31+
If the user pauses the movie or sound, the <playPaused> <message> is sent
32+
instead.
3133

3234
When an audio clip or video clip is playing, a temporary player is
3335
created for it. When the clip is finished, the <playStopped> <message>

‎docs/notes/bugfix-19377.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Updated example in the version dictionary entry

‎docs/notes/bugfix-19892.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Clarified in the playStopped entry that it is sent when a clip plays backwards to the beginning.

‎extensions/script-libraries/drawing/drawing.livecodescript‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,20 @@ Finally if the width and height are not specified, or are percentages and there
113113
is no viewBox attribute then the intrinsic width and height are taken to be
114114
256.
115115
116-
Note: The drawing binary format is not currently considered stable and is
116+
>*Note:* The drawing binary format is not currently considered stable and is
117117
subject to change until the end of the RC cycle for 9. At present it is advised
118118
that SVG files be compiled as needed when developing in the IDE, and then
119119
compiled ahead-of-time when building a standalone.
120120
121-
Note: To use this function in a standalone, you must include the XML extension.
121+
122+
>*Note:* To use this function in a standalone, you must include the XML
123+
extension.
124+
125+
126+
>*Note:* The <XML library> (and by extension, this function) can not load
127+
> files from the resources folder on Android. You must either copy the
128+
> resources to the documents folder or use the <drawingSvgCompile>
129+
> function instead.
122130
123131
Parameters:
124132
@@ -132,7 +140,7 @@ of an image directly.
132140
The result:
133141
An error string if an error occurred.
134142
135-
References: drawingSvgCompile (function)
143+
References: drawingSvgCompile (function), XML library (library)
136144
*/
137145
function drawingSvgCompileFile pXmlFile
138146
/* Convert the XML file to the LiveCode array structure. */
@@ -208,12 +216,16 @@ Finally if the width and height are not specified, or are percentages and there
208216
is no viewBox attribute then the intrinsic width and height are taken to be
209217
256.
210218
211-
Note: The drawing binary format is not currently considered stable and is
212-
subject to change until the end of the RC cycle for 9. At present it is advised
213-
that SVG files be compiled as needed when developing in the IDE, and then
214-
compiled ahead-of-time when building a standalone.
219+
>*Note:* The drawing binary format is not currently considered stable and is
220+
> subject to change until the end of the RC cycle for 9. At present it is advised
221+
> that SVG files be compiled as needed when developing in the IDE, and then
222+
> compiled ahead-of-time when building a standalone.
223+
224+
225+
>*Note:* To use this function in a standalone, you must include the XML
226+
> extension.
227+
215228
216-
Note: To use this function in a standalone, you must include the XML extension.
217229
Parameters:
218230
219231
pXmlText (string):

‎extensions/script-libraries/drawing/notes/21822.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# [21822] Added a note mentioning that drawingSvgCompileFile() can not read from the resources folder on Android

0 commit comments

Comments
 (0)