aaf42d1948
build(deps): bump syn from 1.0.33 to 1.0.34
...
Bumps [syn](https://github.com/dtolnay/syn ) from 1.0.33 to 1.0.34.
- [Release notes](https://github.com/dtolnay/syn/releases )
- [Commits](https://github.com/dtolnay/syn/compare/1.0.33...1.0.34 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-12 15:01:43 -07:00
180891c58e
avm1: Add impl_custom_object!() macro to simplify custom object types
2020-07-10 16:48:05 -07:00
eb94cc54b2
chore: Move avm1 objects to their own module, we have plenty of them now
2020-07-10 16:48:05 -07:00
3322c2d916
avm1: Implement updateAfterEvent
2020-07-10 14:38:48 -07:00
8715589f50
tests: Add setInterval test
2020-07-10 14:38:48 -07:00
98e7da7d93
avm1: Implement setInterval
2020-07-10 14:38:48 -07:00
a1ff80bb18
avm1: Object.watch is case insensitive on SWFv6
2020-07-10 12:02:26 -07:00
8a0430d744
avm1: Implement Object.watch & Object.unwatch ( #268 )
2020-07-10 12:02:26 -07:00
ecbab536b5
avm1: Respect ScriptLimits for recursion depth, and use that in infinite_recursion_function
2020-07-08 14:47:38 -07:00
2b30fd32b7
avm1: Activation depth can be up to u16.
2020-07-08 14:47:38 -07:00
51ec5739c6
avm1: Throw errors when functions (user-called, or special) go too deep
2020-07-08 14:47:38 -07:00
aa98c2c24f
avm1: Track the reason for executions, if it's a function call vs
...
something special, like a getter
2020-07-08 14:47:38 -07:00
65396ba87a
avm1: All errors are ignored during getters or setters
2020-07-08 14:47:38 -07:00
3ee1902117
avm1: Don't log errors at every Activation, only at the "root" frames
2020-07-08 14:47:38 -07:00
8218e14824
avm1: Remove unused field is_executing from Activation
2020-07-08 14:47:38 -07:00
a3bdb20cf1
build(deps): bump smallvec from 1.4.0 to 1.4.1
...
Bumps [smallvec](https://github.com/servo/rust-smallvec ) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/servo/rust-smallvec/releases )
- [Commits](https://github.com/servo/rust-smallvec/compare/v1.4.0...v1.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-06 20:30:41 -07:00
2cbbe32412
tests: Add test for GetVariable/SetVariable on _x, etc.
2020-07-05 15:15:31 -07:00
804385347f
tests: Add test for virtual properties on prototype
2020-07-05 15:15:31 -07:00
fec8cf5e52
tests: Add tests for with from issue #792
2020-07-05 15:15:31 -07:00
bd7f986594
avm1: Allow overwriting _parent
2020-07-05 15:15:31 -07:00
ad6e2ceed4
avm1: Remove TObject::is_property_overwritable
...
Local virtual properties take precedence over prototype/parent
scopes, even for read-only propreties.
2020-07-05 15:15:31 -07:00
1240c79f70
avm1: StageObject::has_property should return true for _x, etc.
2020-07-05 15:15:31 -07:00
6feb266576
avm1: with(undefined) or with(null) is ignored
2020-07-05 15:15:31 -07:00
00d55b05a0
chore: Fix formatting
2020-07-05 13:49:59 -07:00
64eed4def9
chore: Cleanup
2020-07-05 13:49:59 -07:00
ab58cff8b3
core: Add tests for ColorTransform and cleanup code
2020-07-05 13:49:59 -07:00
0dcbd05f5d
chore: Fix formatting
2020-07-05 13:49:59 -07:00
68eb6a6342
core: Fix ColorTransformObject virtual prototype setters
2020-07-05 13:49:59 -07:00
73e9dc1a82
core: Refactor ColorTransform
2020-07-05 13:49:59 -07:00
26ae182584
core: Update to reflect avm changes
2020-07-05 13:49:59 -07:00
431cc532be
core: ColorTransform no longer passed through engine ColorTransform object
2020-07-05 13:49:59 -07:00
a8b1be2afa
core: Remove useless to_owned in color_transform
2020-07-05 13:49:59 -07:00
c0315dce3f
chore: Format
2020-07-05 13:49:59 -07:00
a8f7638d99
core: Implement ColorTransform
2020-07-05 13:49:59 -07:00
328246dc10
build(deps): bump jpeg-decoder from 0.1.19 to 0.1.20
...
Bumps [jpeg-decoder](https://github.com/image-rs/jpeg-decoder ) from 0.1.19 to 0.1.20.
- [Release notes](https://github.com/image-rs/jpeg-decoder/releases )
- [Changelog](https://github.com/image-rs/jpeg-decoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/image-rs/jpeg-decoder/compare/v0.1.19...v0.1.20 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-04 15:29:45 -07:00
7b4045f32b
core: Remove some unneccessary `take` calls in tag functions
2020-07-03 18:52:26 -07:00
08569ae979
core: Limit tag parsing to slice of tag data
2020-07-03 18:52:26 -07:00
c50c835790
avm1: Made Executable::Action take in a Gc to Avm1Function, reducing the size of the struct significantly
2020-07-03 18:47:34 -07:00
c4980d0bf5
core: Make XMLName::node_name return Cow<str>. It's not always owned, and we don't always need it to be.
2020-07-03 17:30:59 -07:00
c036e2cf88
avm1: Made f64_to_string return Cow<str> instead of String, as we sometimes return static values
2020-07-03 17:30:59 -07:00
938d644d7d
core: Made PropertyMap::insert take &str instead of String, as ownership isn't always needed
2020-07-03 17:30:59 -07:00
fb84999778
core: Made VacantEntry store a &str instead of a String, avoiding allocation until insertation is requested
2020-07-03 17:30:59 -07:00
f4921fad45
core: Made PropertyMap::entry take &str instead of String. We often don't need ownership here.
2020-07-03 17:30:59 -07:00
b5c06be8a2
avm1: Anonymous function names for debugging when not in debug mode
2020-07-03 17:24:20 -07:00
51321713b5
avm1: Show stack frame with the avm_debug feature
2020-07-03 17:24:20 -07:00
c976cf8efb
avm1: Replace action.avm() with activation.avm to help with borrow checker in next commit
2020-07-03 17:24:20 -07:00
07814fdf53
tests: Add test for Error
2020-07-02 20:58:01 -07:00
48c65f02a1
avm1: Implement Error object (see #251 )
2020-07-02 20:58:01 -07:00
301d696670
Add a fast path for ASCII case conversions
2020-07-02 12:48:50 -07:00
3a4d432645
tests: Edit textfield_variable test for #777
2020-07-02 01:29:41 -07:00
dd32acd8fc
avm1: Empty text field does not initialize variable binding
...
If a text field with a variable binding is placed on the stage,
usually the variable is initialized with the initial text. However,
if the text field is empty, the variable remains undefined.
Fixes #777 .
2020-07-02 01:29:41 -07:00
b05da5ef0f
avm1: CastOp fails for primitive values
2020-07-01 17:30:56 -07:00
d86761db5d
avm1: Implement try {..} catch {..} finally {..} - #731
2020-07-01 17:30:56 -07:00
7c0b0a7a57
avm1: Fix instanceof checks with primitives
2020-07-01 16:36:54 -07:00
d1732dd3d6
avm1: Returning from with{} should return from the parent activation
2020-07-01 16:21:43 -07:00
4b4370b90d
avm: Refactor Avm1, move execution to StackFrame (merge #767 )
...
AVM1 refactoring: moving execution from Avm1 to StackFrame
2020-07-01 15:56:09 -07:00
8bc3eedc43
avm1: Rename StackFrame to Activation now that they're merged
2020-07-02 00:09:43 +02:00
41e262d745
build(deps): bump libflate from 1.0.1 to 1.0.2
...
Bumps [libflate](https://github.com/sile/libflate ) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/sile/libflate/releases )
- [Commits](https://github.com/sile/libflate/compare/1.0.1...1.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-01 11:43:31 -07:00
9b66b496d0
avm1: Fix double-borrow when calling a getter that calls another method
2020-07-01 18:53:16 +02:00
aa9100395f
build(deps): bump downcast-rs from 1.1.1 to 1.2.0
...
Bumps [downcast-rs](https://github.com/marcianx/downcast-rs ) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/marcianx/downcast-rs/releases )
- [Changelog](https://github.com/marcianx/downcast-rs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/marcianx/downcast-rs/compare/v1.1.1...v1.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-30 17:32:47 -07:00
987375299b
avm1: Replace 'run_in_avm' with just building a StackFrame object, letting Rust borrowchecker do our stack management for us
2020-06-30 21:57:51 +02:00
47a806a5ee
avm1: Removed errors that are no longer possible to run into
2020-06-30 21:28:32 +02:00
a989aa235a
avm1: We don't need to lock StackFrames anymore, the borrow checker will steer us right
2020-06-30 21:26:57 +02:00
2288919663
avm1: We don't need to store data in StackFrame, it's only used when actually running data
2020-06-30 21:24:46 +02:00
45c3967deb
avm1: Merge Activation into StackFrame
2020-06-30 21:08:42 +02:00
d889b98043
avm1: Merge Activation::from_function and Activation::from_action as they're identical
2020-06-30 20:34:05 +02:00
6e4dd506da
avm1: Activation doesn't need to be in a GcCell
2020-06-30 20:31:49 +02:00
4d24bc7f09
avm1: Removed pc from Activation, it's no longer needed
2020-06-30 19:42:18 +02:00
3e9c380ba1
avm1: Remove is_function from Activation, it's no longer needed
2020-06-30 19:40:21 +02:00
ec4affcf10
avm1: Use child activations when already running from another activation
2020-06-29 10:13:59 +02:00
aaa082fb60
avm1: Replace run_with_stack_frame with run_in_avm
2020-06-29 10:13:57 +02:00
0dd2ece371
avm1: Introduce parents to StackFrame, and move run_activation from avm1 to StackFrame
2020-06-29 10:12:17 +02:00
9b630bd305
avm1: Remove ReturnValue, it's no longer needed
2020-06-29 10:12:16 +02:00
ab4304d634
avm1: Properly and more explicitly work around the double-borrow issue in setters
2020-06-29 10:10:38 +02:00
a2103d906d
avm1: Remove dead code from Avm1
2020-06-29 10:10:24 +02:00
f85684fec0
avm1: Move current_swf_version and is_case_sensitive from avm1 to stackframe
2020-06-29 10:10:11 +02:00
d470c52aea
avm1: Move root_object, target_clip_or_root, target_clip and base_clip from avm1 to StackFrame
2020-06-29 10:09:57 +02:00
ca305684db
avm1: Removed unused return_value on Activation
2020-06-29 10:09:40 +02:00
da8ca1379f
avm1: Change from 'avm, context' to 'activation, context' and restructured to support this
2020-06-29 10:09:38 +02:00
a841743962
avm1: Make current_stack_frame return a Result for easy chaining
2020-06-29 10:07:48 +02:00
cdfd58d619
avm1: Move register get/setting from avm1 to StackFrame
2020-06-29 10:07:31 +02:00
63e66c29eb
avm1: We already have our stack frame, don't refetch it in actions
2020-06-29 10:07:14 +02:00
3a093dddbd
avm1: Run activations immediate, not queued up for some-time-later
2020-06-29 10:07:12 +02:00
10b8f4abaf
avm1: Handle stack poping in avm
2020-06-29 08:55:50 +02:00
84a5fae43f
avm1: Only perform stack-frame adjustments in one place, not scattered throughout actions
2020-06-29 08:51:34 +02:00
9109d89daa
avm1: Allow for frame control in StackFrame from any action
2020-06-29 08:51:34 +02:00
329716bfe7
avm1: Don't refetch activation.data every action
2020-06-29 08:51:33 +02:00
af72f68f0f
avm1: Run entire stack frames at once
2020-06-29 08:51:33 +02:00
c6b9de883f
avm1: Add Activation to StackFrame, removing lots of get-and-unwraps
2020-06-29 08:51:33 +02:00
4d76e8b24d
avm1: Move all actions from Avm1 to a new StackFrame
2020-06-29 08:51:33 +02:00
3bc3d4acb2
text: Fix bindings being incorrectly cleared in StageObject
...
Call to `Vec::retain` was backwards, causing bindings to be
incorrectly cleared/not cleared when a text field was removed.
2020-06-28 23:38:58 -07:00
93cf7a1386
text: Use retire_stack_frame after firing text bindings
2020-06-28 23:37:50 -07:00
ed82d984d2
text: Properly set text field position when created dynamically
2020-06-28 18:36:10 -07:00
7eeda7d93e
chore: clippy
2020-06-28 18:36:10 -07:00
ef31a6bea4
text: Don't override TextField::set_matrix and other layout changes
...
Don't override set_matrix and set_x for TextFields, and leave the
bounds intact.
TODO: There are still some wrapping issues in the tests, but
this allows the simple case of single-line texts to render
correctly.
2020-06-28 18:36:10 -07:00
b40f9d4c1a
avm1: Implement TextField.html
2020-06-28 18:36:10 -07:00
d97a515330
tests: Add text field variable test
2020-06-28 18:36:10 -07:00
618fa11acb
avm1: Implement text field variable binding
2020-06-28 18:36:10 -07:00
51d66c53f0
core: Edit text sets variables on instantiation
2020-06-28 18:36:10 -07:00
12fca71b21
avm1: Move StageObjectData behind a GC pointer
2020-06-28 18:36:10 -07:00
a922fd559f
avm1: Add EditText variable property
...
Add `EditText::variable` as well as `TextField.variable` property.
This commit only adds the getter/setter and does not yet add the
binding functionality.
2020-06-28 18:36:10 -07:00
dd50071240
core: Move frame and goto methods from MovieClipData to MovieClip
2020-06-28 18:36:10 -07:00
8da0f43412
tests: Add test for DefineLocal and issue #760
2020-06-28 15:15:45 -07:00
52fbb77e99
avm1: DefineLocal respects virtual properties and prototype chain ( fix #760 )
...
DefineLocal will call a virtual setter if the property already exists
on the local object, including the local object's prototype chain.
DefineLocal2 will also not overwrite a property if it already exists
on the local object, including the local object's prototype chain.
2020-06-28 15:15:45 -07:00
905f9d7ac6
core: Clear mouse down flag even if there is no hovered object
2020-06-27 23:34:19 -07:00
a846d92d8c
core: Don't fire rollOut events if clip is removed
...
Allows the inventory to work in The Room Tribute.
2020-06-27 21:24:49 -07:00
0833c15e25
tests: Add test for enumerating array indices
2020-06-27 20:25:45 -07:00
478d88b22d
tests: Test hasOwnProperty for array indices in array_properties
2020-06-27 20:25:45 -07:00
8e3b96f1b1
tests: Add tests for non-string params in hasOwnProperty:
2020-06-27 20:25:45 -07:00
ccf33eedf6
avm1: Array indices are enumerable
2020-06-27 20:25:45 -07:00
ecc54d01f7
avm1: Disallow setting "" property
...
object[""] has no effect.
2020-06-27 20:25:45 -07:00
ef82fc472e
avm1: Object.hasOwnProperty should coerce_to_string
2020-06-27 20:25:45 -07:00
b37b74e0b6
tests: Add test for __constructor__ being DontEnum
2020-06-27 18:54:01 -07:00
054194026e
avm1: Mark __constructor__ and constructor as DontEnum
2020-06-27 18:54:01 -07:00
63beea22a2
build(deps): bump weak-table from 0.2.3 to 0.3.0
...
Bumps [weak-table](https://github.com/tov/weak-table-rs ) from 0.2.3 to 0.3.0.
- [Release notes](https://github.com/tov/weak-table-rs/releases )
- [Changelog](https://github.com/tov/weak-table-rs/blob/master/release.toml )
- [Commits](https://github.com/tov/weak-table-rs/compare/0.2.3...0.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-27 16:08:52 -07:00
82a86d6139
build(deps): bump png from 0.16.5 to 0.16.6
...
Bumps [png](https://github.com/image-rs/image-png ) from 0.16.5 to 0.16.6.
- [Release notes](https://github.com/image-rs/image-png/releases )
- [Changelog](https://github.com/image-rs/image-png/blob/master/CHANGES.md )
- [Commits](https://github.com/image-rs/image-png/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-27 16:08:11 -07:00
463b79f063
avm1: Implement Action::Throw
2020-06-25 02:03:15 -07:00
70e4a40f01
avm1: Allow for user errors inside avm1::error::Error
2020-06-25 02:03:15 -07:00
81d75c6256
text: Text formatting for EditText fields (merge #615 )
...
First implementation of HTML parsing and formatting for text fields.
2020-06-24 23:06:11 -07:00
5d9701313e
text: Fix TextField.embedFonts setter
2020-06-24 22:46:59 -07:00
b2c96336fd
text: Cull text field if offscreen
2020-06-24 22:46:54 -07:00
74af7b345c
Adjust `BoxBounds` to use `Copy` instead of `Clone`.
2020-06-24 23:40:27 -04:00
d7a257f93f
Adjust `LayoutContext` and `LayoutBox` to construct a `Vec` of boxes rather than an intrusive, garbage-collected linked list.
2020-06-24 23:34:38 -04:00
d281452fe1
Expose the device font flag to AVM1 code.
2020-06-24 22:55:50 -04:00
453cf6c0f1
Remove *extremely* out of date documentation on `BoxBounds`.
2020-06-24 22:36:36 -04:00
2723c3f6d9
Rename `Collec` to `CollectWrapper`
2020-06-24 22:34:04 -04:00
5b36522258
Remove out-of-date doccomment on `LayoutBox`.
2020-06-24 22:19:16 -04:00
0b8d0e8c85
Move the internal padding to a separate constant.
2020-06-24 21:53:58 -04:00
e4d4d996f9
Don't push each line of text down with the leading adjustment.
...
We already adjust the cursor with the same adjustment, so we don't need to move the text down.
2020-06-24 21:32:59 -04:00
bfb150ec05
Remove hardcoded 3px margin.
...
This was originally intended to correctly position text within the border, but it appears borders are weird and this doesn't jive with what unbordered text does.
2020-06-24 21:32:59 -04:00
0f794489a4
text: Don't create underline drawing if no underline exists
2020-06-24 12:53:51 -07:00
3558e42c34
text: Always fallback to Noto Sans if text field is set to use device fonts
2020-06-24 12:19:06 -07:00
f591e1dafc
text: process_html_entity returns a Cow
2020-06-24 11:56:20 -07:00
5a7012923b
avm1: Move TextField methods into functions
2020-06-24 11:11:00 -07:00
d2702464a5
avm1: TextField properties are emumerable and deletable
2020-06-24 11:02:21 -07:00
b47e84b131
text: Derive Default for TextFormat
2020-06-24 10:44:34 -07:00
a5b0a196cc
core: Update to use updated value conversion functions
2020-06-24 01:57:15 +01:00
f03093528c
core: Add shared object cache and saving on exit
...
On the desktop player, shared objects will now be flushed on quit.
Attempting to retrieve an existing shared object will now return a
reference to the existing one.
2020-06-24 01:46:42 +01:00
166cb60d89
chore: Clean up useage of unwrap
2020-06-24 01:46:07 +01:00
62834fd690
chore: Remove unnecessary comment
2020-06-24 01:46:07 +01:00
fce8e8b7de
chore: Fix build
2020-06-24 01:46:07 +01:00
8a65ac764b
chore: Clean up comments
2020-06-24 01:46:07 +01:00
8e28bab159
chore: Fix clippy lints, refactor storage to use data_local_dir
2020-06-24 01:46:07 +01:00
0122d65a09
core: Refactor SharedObject
2020-06-24 01:46:07 +01:00
1b130ccd47
chore: Refactor storage access
2020-06-24 01:46:06 +01:00
4e286b43ae
chore: Format
2020-06-24 01:46:06 +01:00
0c6a7b3b4c
core: Add SharedObject object type
2020-06-24 01:46:05 +01:00
752ffc5cca
chore: Fix clippy lints and tests
2020-06-24 01:44:07 +01:00
eff06d3d4d
core: Add stub listener methods for SharedObject
2020-06-24 01:43:25 +01:00
d3ae6a3a40
core: Fix data property of SharedObject
2020-06-24 01:43:25 +01:00
48693e4a7a
core: Add inital storage backend implementation
...
Currently SharedObjects are encoded and decoded from JSON via the
StorageBackend, also provided is a basic in-memory implementation
2020-06-24 01:43:23 +01:00
539b4b0f63
core: Add stub for SharedObject
2020-06-24 01:42:19 +01:00
12495de91e
Generate `LI`s when newlines are encountered with bullets on.
2020-06-22 19:45:39 -04:00
ed5f3cdd0e
Don't attempt to use non-embedded fonts. Instead, replace all of them with Noto (like EditText used to do).
2020-06-22 19:02:32 -04:00
40ea58c1c0
Since we cannot parse `<br>` properly yet, replace them and `<sbr>` with newlines before parsing so that we don't get spurious parse errors.
2020-06-22 18:00:51 -04:00
0a166af8ac
build(deps): bump syn from 1.0.32 to 1.0.33
...
Bumps [syn](https://github.com/dtolnay/syn ) from 1.0.32 to 1.0.33.
- [Release notes](https://github.com/dtolnay/syn/releases )
- [Commits](https://github.com/dtolnay/syn/compare/1.0.32...1.0.33 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-22 10:15:50 -07:00
cea2c9520d
chore: Ignore new 'unnested_or_patterns' clippy lint as we the suggested behaviour doesn't exist outside of nightly
2020-06-21 04:18:44 -07:00
7a9796a2f9
Restore BR parsing.
...
Note that this won't actually work since we're behind an XML parser that chokes on implicitly self-closing HTML tags.
2020-06-20 20:15:00 -04:00
c1ad37a0f6
Implement text span raising, sans list items.
...
During the raising process, we maintain a list of pointers to the lowest-most `textformat`, `p`, `font`, `a`, `b`, `i`, and `u` in the document that we are appending to. When we get a new one of any of those elements, we clear the rest off the stack. This forces us to add HTML in the same order Flash does.
LIs are not yet supported because they require us to process text line-by-line which doesn't mesh with this model.
There's also a test but the XML DOM generates HTML strings with the wrong attribute order, so the test fails spuriously.
2020-06-20 20:14:57 -04:00
e036d6594b
Add some entity support to HTML parsing.
2020-06-20 20:08:22 -04:00
88fcb98913
Allow disabling entity processing when parsing XML.
...
This necessitated a change to edittext_bullet, which turns out is accidentally an entity test, too. It now no longer uses entities so that it won't spuriously fail due to an entity related problem.
2020-06-20 20:06:21 -04:00
65f4d2cf1e
Add regression tests for `underline`.
...
We're within 4px in every case.
2020-06-20 19:56:01 -04:00
f097a6584e
Implement underlines.
2020-06-20 19:56:01 -04:00
d63b3f23e9
Add support for inserting arbitrary drawings into the layout.
2020-06-20 19:56:00 -04:00
a2d69a69a3
Add a test for bullets.
...
As usual with most newline related things, we're 3px off no matter how many or how few lines we have.
2020-06-20 19:56:00 -04:00
1c371c3a95
Render bullets.
...
Bullets are implemented by rendering U+2022 as if it were normal text, but always placed 18px from the left of the line. This appears to be sort of what Flash does.
2020-06-20 19:55:59 -04:00
a3dfa8c21f
Bulleted lists get 35px of additional left-margin and do not respect alignment at all.
2020-06-20 19:55:59 -04:00
fa2da492a7
Allow ActionScript to control text field borders.
2020-06-20 19:55:58 -04:00
2aa7d9770f
Draw a border around text if requested.
2020-06-20 19:55:58 -04:00
8628261dc8
Add a bunch of necessary fixes to default text formatting and HTML format extraction.
...
This also replaces the `edittext_html_defaults` test with a more robust test that checks the default format and global format of SWF-based, text, and HTML test vectors.
2020-06-20 19:55:57 -04:00
4f3d4c82fb
For some reason, Flash does not respect `<br>` at all, so we won't, either.
...
It *does*, however, respect `<sbr>` (which does the exact same thing), as well as `\n` (which makes absolutely no sense in HTML, normally that would get stripped out).
2020-06-20 19:55:57 -04:00
efc6236cb5
Treat the end of each paragraph as a newline.
2020-06-20 19:55:56 -04:00
d5fc2709fc
Don't use a slice to hold an index.
...
Fixes clippy on beta and nightly Rust.
2020-06-20 19:55:56 -04:00
58a039a6aa
Nulls in font names are ignored.
2020-06-20 19:55:56 -04:00
d8a38d06bb
Collect font height, letter spacing and the kerning flag into a single `EvalParameters` structure.
2020-06-20 19:55:55 -04:00
1f6d6018dc
Use a char pattern here for clippy's sake
2020-06-20 19:55:55 -04:00
1966ec5cb1
Implement `sbr` tags.
...
No, I don't know what they are either, but at least one movie exists which treats them like `br`, so we'll treat them like that, too.
2020-06-20 19:55:54 -04:00
9e56f10fd0
Approx the align and margins text by up to 3 pixels.
...
These tests currently have visual bugs in all cases, and measurement bugs in the justification case that require me to approx them.
2020-06-20 19:55:54 -04:00
f746ac5539
Implement `justify`, mostly.
...
This implementation has a few bugs which appear to have something to do with alignment. It's not only justify, but justify is the only test that's flagged as failing.
If you look at the margins test, you'll see what I mean: right-aligned and justified text doesn't quite make it to the right edge of the box even though it should. I'm not sure why.
This also restricts text rounding further: `measure` now only rounds when wrapping text, since Flash Player appears to account for fractional pixels in all other cases.
2020-06-20 19:55:54 -04:00
670c4723e3
Add support for the `kerning` flag, which turns on and off the kerning information on fonts.
2020-06-20 19:55:53 -04:00
3c9a43ea72
Add a regression test for newlines.
...
This test includes tests for HTML newlines, which causes the XML parser in Ruffle to throw errors. Hence why it's currently ignored.
2020-06-20 19:55:53 -04:00
180ef3b423
Recognize `<br>` as a line break.
...
This code is currently unreachable as `<br>` will actually trigger an AVM1 error due to our overly-strict XML parser.
2020-06-20 19:55:52 -04:00
045a81e79e
Implement `html` and `htmlText`... sort of.
...
There are several problems, first off:
1. I'm not entirely sure what I'm supposed to be changing on the text field when someone writes `html`.
2. We're using the XML parser for HTML (both `htmlText` and SWF tag parsing) which causes problems. Notably, `<br>` issues an AVM1 error (!!!) because the XML parser doesn't like unclosed tags.
3. Reading `htmlText` should not return the same HTML tree (at least, not until we implement stylesheets). It should instead regenerate an HTML tree from text spans.
2020-06-20 19:55:52 -04:00
2452124631
Break individual words at the start of lines that are too big to fit on the line.
2020-06-20 19:55:51 -04:00
6c44418b10
Add a test for tab_stops.
...
This test is currently inaccurate by up to 5 pixels, this is due to some behavior with really, really wide tabstops and word breaks that I don't entirely get yet.
2020-06-20 19:55:51 -04:00
2ad216cab4
Don't continue comparing tab stops after we find one that fits.
2020-06-20 19:55:50 -04:00
b6c12b1e23
Use current font height times 2.7 as the natural tab stop, as that seems to match Flash... for now.
2020-06-20 19:55:50 -04:00
0e45dc12e9
Recompile the letter spacing test 'cause I spotted an errant `s` in the FLA
2020-06-20 19:55:49 -04:00
2caaa6875d
Add support for explicit tabs and newlines.
2020-06-20 19:55:49 -04:00
153ab675e9
When aligning a line, actually consider all the boxes within the line.
2020-06-20 19:55:49 -04:00
3d094ed689
Add margins test.
...
This test is also approx'd to 1px due to the same issue where heights are off by one.
2020-06-20 19:55:48 -04:00
db0398d2ee
Left and right margins and indents should not be included in `textWidth`.
2020-06-20 19:55:48 -04:00
74d4c25133
Add a test for letter spacing.
...
This test is approximate because the 0.5px test is off by 1px in terms of height.
2020-06-20 19:55:47 -04:00
6ce7ecee78
Implement `letterSpacing`.
2020-06-20 19:55:47 -04:00
171954d5e4
Add `edittext_leading` test.
...
This test constructs a handful of text fields and measures them. Each field has 0, 5, or 15px of `leading` applied to it's text format.
2020-06-20 19:55:47 -04:00
bbc73f1477
The `edittext_align` test now passes perfectly.
2020-06-20 19:55:46 -04:00
16da6d827c
Line-leading is always applied at least once, even if there are no line breaks in the text field.
2020-06-20 19:55:46 -04:00
410fb3ab86
Don't round each line's leading. Instead, round at the end of the operation.
...
This was verified by visual comparison with Flash Player; lines of text appear to be shifted by half-pixels, while the script output is always still rounded down.
2020-06-20 19:55:45 -04:00
2858c09b6e
Only apply leading adjustment on newlines.
...
This results in ALL height adjustments being off by 2px, regardless of leading or font size. Tantalizing!
2020-06-20 19:55:45 -04:00
2ab85c32e2
When wrapping text, measure the text including the trailing space (if present).
...
This matches Flash behavior, but breaks an existing test, which I've adjusted appropriately.
2020-06-20 19:55:44 -04:00
dependabot-preview[bot]