Skip to content

Commit 5460c6a

Browse files
author
Ali Lloyd
committed
Merge remote-tracking branch 'origin' into refactor-syntax_unicode_with_shims
Conflicts: engine/Android.mk engine/engine-mobile.xcodeproj/project.pbxproj engine/engine.xcodeproj/project.pbxproj engine/src/block.cpp engine/src/customprinter.cpp engine/src/dispatch.cpp engine/src/fieldhtml.cpp engine/src/fieldstyledtext.cpp engine/src/font.cpp engine/src/funcs.cpp engine/src/image.cpp engine/src/image_rep_densitymapped.cpp engine/src/ipng.cpp engine/src/lnxflst.cpp engine/src/lnxflstold.cpp engine/src/lnxpsprinter.cpp engine/src/mblandroiddc.cpp engine/src/mblandroidsound.cpp engine/src/mblcontrol.cpp engine/src/mblcontrol.h engine/src/mblflst.cpp engine/src/mbliphonecontrol.mm engine/src/mbliphonescroller.mm engine/src/osxdc.cpp engine/src/osxflst.cpp engine/src/osxprinter.cpp engine/src/util.cpp engine/src/w32flst.cpp
2 parents 9486818 + def82ae commit 5460c6a

File tree

224 files changed

+3208
-1440
lines changed

Some content is hidden

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

224 files changed

+3208
-1440
lines changed

‎docs/dictionary/command/filter.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
<example>filter items of theList matching regex pattern "b.*"</example>
5151
<example>filter items of theList with wildcard pattern "b*" into theFilteredList</example>
5252
<example>filter lines of (theFirstList & return & theSecondList) not matching "b*"</example>
53-
<example>
5453
</examples>
5554
<description>
5655
<p>Use the <b>filter</b> command to pick specific <keyword tag="lines">lines</keyword> or <keyword tag="items">items</keyword> in a <glossary tag="container">container</glossary> or <glossary tag="expression">expression</glossary>.</p><p/><p><b>Parameters:</b></p><p>The <i>container</i> is any <glossary tag="expression">expression</glossary> that <glossary tag="evaluate">evaluates</glossary> to a <glossary tag="container">container</glossary>.</p><p/><p>The <i>filterPattern</i> is an expression used to match certain <keyword tag="lines">lines</keyword> or <keyword tag="items">items</keyword>.</p><p/><p><b>Comments:</b></p><p>The filter...with form and the filter...matching form retain the lines or items that contain a match for the specified <i>filterPattern</i>.</p><p/><p>The filter...without form and the filter...not matching form discard the lines or items that do not contain a match for the specified <i>filterPattern</i>.</p><p/><p>A <glossary tag="wildcard">wildcard</glossary> <i>filterPattern</i> consists of a string of characters to match which may be combined with any number of the following special characters:</p><p/><p><b>*</b></p><p>Matches zero or more of any character. The <i>filterPattern</i> A*C matches "AC", "ABC", or "ADZXC".</p><p/><p><b>?</b></p><p>Matches exactly one character. The <i>filterPattern</i> A?C matches "ABC", but not "AC" or "ADZXC".</p><p/><p><b>[<i>chars</i>]</b></p><p>Matches any one of the characters inside the brackets. The <i>filterPattern</i> A[BC]D matches "ABD" or "ACD", but not "AD" or "ABCD".</p><p/><p><b>[<i>char</i>-<i>char</i>]</b></p><p>Matches any character whose ASCII value is between the first character and the second character.</p><p/><p><b>Changes:</b></p><p>The filter...without form was added in version 2.1.1. In previous versions, the <b>filter</b> <glossary tag="command">command</glossary> could be used only to retrieve <keyword tag="lines">lines</keyword> that matched a <glossary tag="wildcard">wildcard expression</glossary>.</p><p>The filter items... form was added in version 6.1. In previous versions, the <b>filter</b> <glossary tag="command">command</glossary> could be used only to retrieve <keyword tag="lines">lines</keyword>.</p><p>The ability to filter using a <glossary tag="regular expression">regular expression</glossary> was added in version 6.1. In previous versions, the <b>filter</b> <glossary tag="command">command</glossary> only supported <glossary tag="wildcard">wildcard expressions</glossary>.</p><p>The ability to filter an <glossary tag="expression">expression</glossary> was added in version 6.1. In previous versions, the <b>filter</b> <glossary tag="command">command</glossary> could be used only for a <glossary tag="container">container</glossary>.</p><p>The filter...[not] matching form was added in version 6.1 to clarify the pattern handling.</p><p>The filter...into form was added in version 6.1. In previous versions, the <b>filter</b> <glossary tag="command">command</glossary> always replaced the contents of the original <glossary tag="container">container</glossary>.</p>

‎docs/dictionary/command/resolve-image.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
<syntax>
55
<example>resolve image [id] <i>id or name</i> relative to <i>object reference</i></example>
66
</syntax>
7+
<library></library>
8+
<objects>
9+
</objects>
10+
<synonyms>
11+
</synonyms>
712
<references>
813
<property tag="icon">icon Property</property>
914
</references>
@@ -17,6 +22,14 @@
1722
<ios/>
1823
<android/>
1924
</platforms>
25+
<classes>
26+
<desktop/>
27+
<server/>
28+
<web/>
29+
<mobile/>
30+
</classes>
31+
<security>
32+
</security>
2033
<summary>Resolves a short id or name of an image relative to an object to find the long id of the image that will use as an icon or pattern on the object.</summary>
2134
<examples>
2235
<example>resolve image id 1007 relative to button "Cancel"</example>

‎docs/dictionary/command/revXMLAddDTD.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<category>Standalone Applications</category>
1616
</classification>
1717
<references>
18-
<command tag="revAppendXML">revAppendXML Command</command>
18+
<command tag="revXMLAppend">revXMLAppend Command</command>
1919
<function tag="revXMLValidateDTD">revXMLValidateDTD Function</function>
2020
</references>
2121
<history>
@@ -43,6 +43,6 @@
4343
<example>revXMLAddDTD theCurrTree,the templateDTD of me</example>
4444
</examples>
4545
<description>
46-
<p>Use the <b>revXMLAddDTD</b> <glossary tag="command">command</glossary> to specify the format of an <glossary tag="XML tree">XML tree</glossary>.</p><p/><p><b>Parameters:</b></p><p>The <i>treeID</i> is the numbe <glossary tag="return">returned</glossary> by the <function tag="revCreateXMLTree">revCreateXMLTree</function> or <function tag="revCreateXMLTreeFromFile">revCreateXMLTreeFromFile</function> <control_st tag="function">function</control_st> when you created the <glossary tag="XML tree">XML tree</glossary>.</p><p/><p>The <i>DTDText</i> is a string that makes up a valid <glossary tag="DTD">Document Type Definition</glossary>.</p><p/><p><b>Comments:</b></p><p>If the <b>revXMLAddDTD</b> <glossary tag="command">command</glossary> encounters an error, the <function tag="result">result</function> is set to an error message beginning with "xmlerr".</p><p/><p><code/><img src="202653"/> <b>Important!</b><code/> The <b>revXMLAddDTD</b> <glossary tag="command">command</glossary> is part of the <glossary tag="XML library">XML library</glossary>. To ensure that the <glossary tag="command">command</glossary> works in a <glossary tag="standalone application">standalone application</glossary>, you must include this <glossary tag="LiveCode custom library">custom library</glossary> when you create your <glossary tag="standalone application">standalone</glossary>. In the Inclusions section on the General screen of the <glossary tag="Standalone Application Settings">Standalone Application Settings</glossary> window, make sure "XML Library" is selected in the list of script libraries.</p>
46+
<p>Use the <b>revXMLAddDTD</b> <glossary tag="command">command</glossary> to specify the format of an <glossary tag="XML tree">XML tree</glossary>.</p><p/><p><b>Parameters:</b></p><p>The <i>treeID</i> is the numbe <glossary tag="return">returned</glossary> by the <function tag="revXMLCreateTree">revXMLCreateTree</function> or <function tag="revXMLCreateTreeFromFile">revXMLCreateTreeFromFile</function> <control_st tag="function">function</control_st> when you created the <glossary tag="XML tree">XML tree</glossary>.</p><p/><p>The <i>DTDText</i> is a string that makes up a valid <glossary tag="DTD">Document Type Definition</glossary>.</p><p/><p><b>Comments:</b></p><p>If the <b>revXMLAddDTD</b> <glossary tag="command">command</glossary> encounters an error, the <function tag="result">result</function> is set to an error message beginning with "xmlerr".</p><p/><p><code/><img src="202653"/> <b>Important!</b><code/> The <b>revXMLAddDTD</b> <glossary tag="command">command</glossary> is part of the <glossary tag="XML library">XML library</glossary>. To ensure that the <glossary tag="command">command</glossary> works in a <glossary tag="standalone application">standalone application</glossary>, you must include this <glossary tag="LiveCode custom library">custom library</glossary> when you create your <glossary tag="standalone application">standalone</glossary>. In the Inclusions section on the General screen of the <glossary tag="Standalone Application Settings">Standalone Application Settings</glossary> window, make sure "XML Library" is selected in the list of script libraries.</p>
4747
</description>
4848
</doc>

‎docs/dictionary/command/revXMLAppend.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<library>XML library</library>
99
<objects>
1010
</objects>
11-
<synonyms>revAppendXML
11+
<synonyms>
1212
</synonyms>
1313
<classification>
1414
<category>Text and Data Processing</category>
@@ -17,7 +17,7 @@
1717
<references>
1818
<command tag="revXMLAddNode">revXMLAddNode Command</command>
1919
<function tag="revXMLCreateTree">revXMLCreateTree Function</function>
20-
<function tag="revXMLCreateXTreeFromFile">revXMLCreateXTreeFromFile Function</function>
20+
<function tag="revXMLCreateTreeFromFile">revXMLCreateTreeFromFile Function</function>
2121
<command tag="revXMLPutIntoNode">revXMLPutIntoNode Command</command>
2222
<command tag="revXMLSetAttribute">revXMLSetAttribute Command</command>
2323
<command tag="revXMLAddDTD">revXMLAddDTD Command</command>

‎docs/dictionary/function/measureText.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<example>put measureText(theText,me,"bounds") into theTextBounds</example>
4343
</examples>
4444
<description>
45-
<p>Use the <b>measureText</b> <control_st tag="function">function</control_st> to find the dimensions of text drawn with the effective font attributes of an object.</p><p><b>Parameters:</b></p><p>The <i>text</i> is any native string. For unicode strings use <function tag="messureUnicodeText">measureUnicodeText</function>.</p><p>The <i>object reference</i> is an expression that evaluates to an object reference.</p><p>The <i>mode</i> is one of:</p>
45+
<p>Use the <b>measureText</b> <control_st tag="function">function</control_st> to find the dimensions of text drawn with the effective font attributes of an object.</p><p><b>Parameters:</b></p><p>The <i>text</i> is any native string. For unicode strings use <function tag="measureUnicodeText">measureUnicodeText</function>.</p><p>The <i>object reference</i> is an expression that evaluates to an object reference.</p><p>The <i>mode</i> is one of:</p>
4646
<ul>
4747
<li>width - (default if not specified) - returns the width of the text</li>
4848
<li>size - returns the width,height of the text</li>

‎docs/dictionary/function/measureUnicodeText.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<example>put measureUnicodeText(theText,me,"bounds") into theTextBounds</example>
4343
</examples>
4444
<description>
45-
<p>Use the <b>measureUnicodeText</b> <control_st tag="function">function</control_st> to find the dimensions of unicode text drawn with the effective font attributes of an object.</p><p><b>Parameters:</b></p><p>The <i>text</i> is any unicode string. For native strings use <function tag="messureText">measureText</function>.</p><p>The <i>object reference</i> is an expression that evaluates to an object reference.</p><p>The <i>mode</i> is one of:</p>
45+
<p>Use the <b>measureUnicodeText</b> <control_st tag="function">function</control_st> to find the dimensions of unicode text drawn with the effective font attributes of an object.</p><p><b>Parameters:</b></p><p>The <i>text</i> is any unicode string. For native strings use <function tag="measureText">measureText</function>.</p><p>The <i>object reference</i> is an expression that evaluates to an object reference.</p><p>The <i>mode</i> is one of:</p>
4646
<ul>
4747
<li>width - (default if not specified) - returns the width of the text</li>
4848
<li>size - returns the width,height of the text</li>

‎docs/dictionary/function/revXMLAttribute.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
<example>put revXMLAttribute(currTree,currNode,the short name of field x) \</p><p> into field x</example>
4444
</examples>
4545
<description>
46-
<p>Use the <b>revXMLAttribute</b> <control_st tag="function">function</control_st> to get an attribute's value.un</p><p/><p><b>Parameters:</b></p><p>The <i>treeID</i> is the number <glossary tag="return">returned</glossary> by the <function tag="revCreateXMLTree">revCreateXMLTree</function> or <function tag="revCreateXMLTreeFromFile">revCreateXMLTreeFromFile</function> <control_st tag="function">function</control_st> when you created the <glossary tag="XML tree">XML tree</glossary>.</p><p/><p>The <i>node</i> is the path to the node whose attribute value you want to get.</p><p/><p>The <i>attributeName</i> is the name of the attribute.</p><p/><p><b>Value:</b></p><p>The <b>revXMLAttribute</b> <control_st tag="function">function</control_st> returns a <keyword tag="string">string</keyword>.</p><p/><p><b>Comments:</b></p><p>If the <b>revXMLAttribute</b> <control_st tag="function">function</control_st> encounters an error, it <glossary tag="return">returns</glossary> an error message starting with "xmlerr".</p><p/><p><code/><img src="202653"/> <b>Important!</b><code/> The <b>revXMLAttribute</b> <control_st tag="function">function</control_st> is part of the <glossary tag="XML library">XML library</glossary>. To ensure that the <control_st tag="function">function</control_st> works in a <glossary tag="standalone application">standalone application</glossary>, you must include this <glossary tag="LiveCode custom library">custom library</glossary> when you create your <glossary tag="standalone application">standalone</glossary>. In the Inclusions section on the General screen of the <glossary tag="Standalone Application Settings">Standalone Application Settings</glossary> window, make sure "XML Library" is selected in the list of script libraries.</p>
46+
<p>Use the <b>revXMLAttribute</b> <control_st tag="function">function</control_st> to get an attribute's value.un</p><p/><p><b>Parameters:</b></p><p>The <i>treeID</i> is the number <glossary tag="return">returned</glossary> by the <function tag="revXMLCreateTree">revXMLCreateTree</function> or <function tag="revXMLCreateTreeFromFile">revXMLCreateTreeFromFile</function> <control_st tag="function">function</control_st> when you created the <glossary tag="XML tree">XML tree</glossary>.</p><p/><p>The <i>node</i> is the path to the node whose attribute value you want to get.</p><p/><p>The <i>attributeName</i> is the name of the attribute.</p><p/><p><b>Value:</b></p><p>The <b>revXMLAttribute</b> <control_st tag="function">function</control_st> returns a <keyword tag="string">string</keyword>.</p><p/><p><b>Comments:</b></p><p>If the <b>revXMLAttribute</b> <control_st tag="function">function</control_st> encounters an error, it <glossary tag="return">returns</glossary> an error message starting with "xmlerr".</p><p/><p><code/><img src="202653"/> <b>Important!</b><code/> The <b>revXMLAttribute</b> <control_st tag="function">function</control_st> is part of the <glossary tag="XML library">XML library</glossary>. To ensure that the <control_st tag="function">function</control_st> works in a <glossary tag="standalone application">standalone application</glossary>, you must include this <glossary tag="LiveCode custom library">custom library</glossary> when you create your <glossary tag="standalone application">standalone</glossary>. In the Inclusions section on the General screen of the <glossary tag="Standalone Application Settings">Standalone Application Settings</glossary> window, make sure "XML Library" is selected in the list of script libraries.</p>
4747
</description>
4848
</doc>

0 commit comments

Comments
 (0)