Fri, 04 Dec 2020 18:30:00 +0100 merged
nipkow [Fri, 04 Dec 2020 18:30:00 +0100] rev 72811
merged
Fri, 04 Dec 2020 18:29:48 +0100 NEWS
nipkow [Fri, 04 Dec 2020 18:29:48 +0100] rev 72810
NEWS
Fri, 04 Dec 2020 17:21:09 +0000 merged
Peter Lammich [Fri, 04 Dec 2020 17:21:09 +0000] rev 72809
merged
Fri, 04 Dec 2020 17:20:41 +0000 summarized structural and ordering invariant for trees
Peter Lammich [Fri, 04 Dec 2020 17:20:41 +0000] rev 72808
summarized structural and ordering invariant for trees
Fri, 04 Dec 2020 15:16:03 +0100 Total correctness examples by Walter Guttmann
nipkow [Fri, 04 Dec 2020 15:16:03 +0100] rev 72807
Total correctness examples by Walter Guttmann
Fri, 04 Dec 2020 15:07:47 +0100 Extension of session HOL/Hoare with total correctness proof system by Walter Guttmann
nipkow [Fri, 04 Dec 2020 15:07:47 +0100] rev 72806
Extension of session HOL/Hoare with total correctness proof system by Walter Guttmann
Fri, 04 Dec 2020 13:24:49 +0100 tuned
nipkow [Fri, 04 Dec 2020 13:24:49 +0100] rev 72805
tuned
Thu, 03 Dec 2020 23:00:23 +0100 Highlight that 'intro_locales' and 'trace_locales' are useful debug features, plus minor clarifications.
ballarin [Thu, 03 Dec 2020 23:00:23 +0100] rev 72804
Highlight that 'intro_locales' and 'trace_locales' are useful debug features, plus minor clarifications.
Wed, 02 Dec 2020 10:30:59 +0100 merged
nipkow [Wed, 02 Dec 2020 10:30:59 +0100] rev 72803
merged
Wed, 02 Dec 2020 10:22:02 +0100 added abbrev
nipkow [Wed, 02 Dec 2020 10:22:02 +0100] rev 72802
added abbrev
Tue, 01 Dec 2020 20:47:19 +0100 merged
wenzelm [Tue, 01 Dec 2020 20:47:19 +0100] rev 72801
merged
Tue, 01 Dec 2020 20:47:03 +0100 clarified signature --- more positions;
wenzelm [Tue, 01 Dec 2020 20:47:03 +0100] rev 72800
clarified signature --- more positions;
Tue, 01 Dec 2020 16:07:19 +0100 clarified signature;
wenzelm [Tue, 01 Dec 2020 16:07:19 +0100] rev 72799
clarified signature;
Tue, 01 Dec 2020 15:29:54 +0100 tuned proof preplay to explicitly refer to Z3 backend
desharna [Tue, 01 Dec 2020 15:29:54 +0100] rev 72798
tuned proof preplay to explicitly refer to Z3 backend
Mon, 30 Nov 2020 22:00:23 +0000 A bunch of suggestions from Pedro Sánchez Terraf
paulson <lp15@cam.ac.uk> [Mon, 30 Nov 2020 22:00:23 +0000] rev 72797
A bunch of suggestions from Pedro Sánchez Terraf
Mon, 30 Nov 2020 19:33:07 +0000 merged
paulson [Mon, 30 Nov 2020 19:33:07 +0000] rev 72796
merged
Mon, 30 Nov 2020 11:06:13 +0000 merged
paulson [Mon, 30 Nov 2020 11:06:13 +0000] rev 72795
merged
Mon, 30 Nov 2020 11:06:01 +0000 tweaked
paulson <lp15@cam.ac.uk> [Mon, 30 Nov 2020 11:06:01 +0000] rev 72794
tweaked
Mon, 30 Nov 2020 19:08:58 +0100 obsolete -- done by Isabelle/PIDE/ML;
wenzelm [Mon, 30 Nov 2020 19:08:58 +0100] rev 72793
obsolete -- done by Isabelle/PIDE/ML;
Mon, 30 Nov 2020 17:10:49 +0100 tuned whitespace --- avoid TABs;
wenzelm [Mon, 30 Nov 2020 17:10:49 +0100] rev 72792
tuned whitespace --- avoid TABs;
Mon, 30 Nov 2020 17:00:35 +0100 updated to Haskell stack-2.5.1, stackage lts-16.12, ghc-8.8.4;
wenzelm [Mon, 30 Nov 2020 17:00:35 +0100] rev 72791
updated to Haskell stack-2.5.1, stackage lts-16.12, ghc-8.8.4;
Mon, 30 Nov 2020 16:34:03 +0100 updated to postgresql-42.2.18;
wenzelm [Mon, 30 Nov 2020 16:34:03 +0100] rev 72790
updated to postgresql-42.2.18;
Mon, 30 Nov 2020 16:22:42 +0100 updated to jfreechart-1.5.1;
wenzelm [Mon, 30 Nov 2020 16:22:42 +0100] rev 72789
updated to jfreechart-1.5.1;
Mon, 30 Nov 2020 15:51:29 +0100 updated to current cygwin-20201130, after 3.1.7-1 from 24-Aug-2020;
wenzelm [Mon, 30 Nov 2020 15:51:29 +0100] rev 72788
updated to current cygwin-20201130, after 3.1.7-1 from 24-Aug-2020;
Mon, 30 Nov 2020 09:47:05 +0100 Added tag Isabelle2021-RC0 for changeset 21ff9c1a4644
wenzelm [Mon, 30 Nov 2020 09:47:05 +0100] rev 72787
Added tag Isabelle2021-RC0 for changeset 21ff9c1a4644
Sun, 29 Nov 2020 23:23:32 +0100 more Isabelle fonts, notably for PanelWindowContainer buttons with Windows L&F;
wenzelm [Sun, 29 Nov 2020 23:23:32 +0100] rev 72786
more Isabelle fonts, notably for PanelWindowContainer buttons with Windows L&F;
Sun, 29 Nov 2020 21:58:40 +0100 merged
wenzelm [Sun, 29 Nov 2020 21:58:40 +0100] rev 72785
merged
Sun, 29 Nov 2020 21:42:15 +0100 Path.implode_symbolic as in ML;
wenzelm [Sun, 29 Nov 2020 21:42:15 +0100] rev 72784
Path.implode_symbolic as in ML;
Sun, 29 Nov 2020 21:09:46 +0100 proper source symbols in persistent data;
wenzelm [Sun, 29 Nov 2020 21:09:46 +0100] rev 72783
proper source symbols in persistent data;
Sun, 29 Nov 2020 17:57:20 +0100 more completion;
wenzelm [Sun, 29 Nov 2020 17:57:20 +0100] rev 72782
more completion;
Sun, 29 Nov 2020 17:54:50 +0100 tuned signature;
wenzelm [Sun, 29 Nov 2020 17:54:50 +0100] rev 72781
tuned signature;
Sun, 29 Nov 2020 16:45:29 +0100 restrict report redirection to current node;
wenzelm [Sun, 29 Nov 2020 16:45:29 +0100] rev 72780
restrict report redirection to current node;
Sun, 29 Nov 2020 16:21:27 +0100 clarified parser;
wenzelm [Sun, 29 Nov 2020 16:21:27 +0100] rev 72779
clarified parser;
Sun, 29 Nov 2020 16:11:52 +0100 tuned signature;
wenzelm [Sun, 29 Nov 2020 16:11:52 +0100] rev 72778
tuned signature;
Sun, 29 Nov 2020 15:58:43 +0100 proper positions for inlined command messages, e.g. for completion within theory header;
wenzelm [Sun, 29 Nov 2020 15:58:43 +0100] rev 72777
proper positions for inlined command messages, e.g. for completion within theory header;
Sun, 29 Nov 2020 15:44:53 +0100 tuned signature;
wenzelm [Sun, 29 Nov 2020 15:44:53 +0100] rev 72776
tuned signature;
Sun, 29 Nov 2020 15:41:36 +0100 clarified modules;
wenzelm [Sun, 29 Nov 2020 15:41:36 +0100] rev 72775
clarified modules;
Sun, 29 Nov 2020 15:33:19 +0100 tuned signature;
wenzelm [Sun, 29 Nov 2020 15:33:19 +0100] rev 72774
tuned signature;
Sun, 29 Nov 2020 15:23:18 +0100 clarified checks (see f34f5c057c9e);
wenzelm [Sun, 29 Nov 2020 15:23:18 +0100] rev 72773
clarified checks (see f34f5c057c9e);
Sun, 29 Nov 2020 14:57:15 +0100 clarified signature;
wenzelm [Sun, 29 Nov 2020 14:57:15 +0100] rev 72772
clarified signature;
Sun, 29 Nov 2020 14:27:15 +0100 tuned comments;
wenzelm [Sun, 29 Nov 2020 14:27:15 +0100] rev 72771
tuned comments;
Sun, 29 Nov 2020 13:59:18 +0100 tuned;
wenzelm [Sun, 29 Nov 2020 13:59:18 +0100] rev 72770
tuned;
Sun, 29 Nov 2020 07:57:50 +0000 typo
haftmann [Sun, 29 Nov 2020 07:57:50 +0000] rev 72769
typo
Sat, 28 Nov 2020 21:38:48 +0000 more on signed division
haftmann [Sat, 28 Nov 2020 21:38:48 +0000] rev 72768
more on signed division
Sat, 28 Nov 2020 23:36:17 +0100 clarified files;
wenzelm [Sat, 28 Nov 2020 23:36:17 +0100] rev 72767
clarified files;
Sat, 28 Nov 2020 23:30:25 +0100 tuned whitespace;
wenzelm [Sat, 28 Nov 2020 23:30:25 +0100] rev 72766
tuned whitespace;
Sat, 28 Nov 2020 23:28:56 +0100 clarified parsing vs. semantic errors;
wenzelm [Sat, 28 Nov 2020 23:28:56 +0100] rev 72765
clarified parsing vs. semantic errors;
Sat, 28 Nov 2020 22:20:48 +0100 clarified signature;
wenzelm [Sat, 28 Nov 2020 22:20:48 +0100] rev 72764
clarified signature;
Sat, 28 Nov 2020 21:56:24 +0100 added document antiquotation @{tool};
wenzelm [Sat, 28 Nov 2020 21:56:24 +0100] rev 72763
added document antiquotation @{tool}; formal check of isabelle tools via Isabelle/Scala;
Sat, 28 Nov 2020 20:18:29 +0100 more robust isabelle_scala_files;
wenzelm [Sat, 28 Nov 2020 20:18:29 +0100] rev 72762
more robust isabelle_scala_files; clarified evaluation;
Sat, 28 Nov 2020 20:14:46 +0100 avoid conflicting base names;
wenzelm [Sat, 28 Nov 2020 20:14:46 +0100] rev 72761
avoid conflicting base names;
Sat, 28 Nov 2020 17:38:03 +0100 clarified protocol: Doc.check at run-time via Scala function;
wenzelm [Sat, 28 Nov 2020 17:38:03 +0100] rev 72760
clarified protocol: Doc.check at run-time via Scala function;
Sat, 28 Nov 2020 16:25:29 +0100 more antiquotations (reverting 4df341249348);
wenzelm [Sat, 28 Nov 2020 16:25:29 +0100] rev 72759
more antiquotations (reverting 4df341249348);
Sat, 28 Nov 2020 15:59:24 +0100 tuned;
wenzelm [Sat, 28 Nov 2020 15:59:24 +0100] rev 72758
tuned;
Sat, 28 Nov 2020 15:53:46 +0100 tuned signature --- more explicit types;
wenzelm [Sat, 28 Nov 2020 15:53:46 +0100] rev 72757
tuned signature --- more explicit types;
Sat, 28 Nov 2020 15:17:14 +0100 more positions;
wenzelm [Sat, 28 Nov 2020 15:17:14 +0100] rev 72756
more positions;
Sat, 28 Nov 2020 15:15:53 +0100 support for Scala compile-time positions;
wenzelm [Sat, 28 Nov 2020 15:15:53 +0100] rev 72755
support for Scala compile-time positions;
Sat, 28 Nov 2020 14:25:27 +0100 clarified modules;
wenzelm [Sat, 28 Nov 2020 14:25:27 +0100] rev 72754
clarified modules;
Sat, 28 Nov 2020 13:49:46 +0100 more robust (amending a4d7da18ac5c);
wenzelm [Sat, 28 Nov 2020 13:49:46 +0100] rev 72753
more robust (amending a4d7da18ac5c);
Sat, 28 Nov 2020 09:58:56 +0000 merged
paulson [Sat, 28 Nov 2020 09:58:56 +0000] rev 72752
merged
Fri, 27 Nov 2020 21:20:18 +0000 merged
paulson [Fri, 27 Nov 2020 21:20:18 +0000] rev 72751
merged
Fri, 27 Nov 2020 21:19:52 +0000 More removal of apply
paulson <lp15@cam.ac.uk> [Fri, 27 Nov 2020 21:19:52 +0000] rev 72750
More removal of apply
Fri, 27 Nov 2020 23:51:37 +0100 merged
wenzelm [Fri, 27 Nov 2020 23:51:37 +0100] rev 72749
merged
Fri, 27 Nov 2020 23:47:06 +0100 more flexible syntax for theory load commands via Isabelle/Scala;
wenzelm [Fri, 27 Nov 2020 23:47:06 +0100] rev 72748
more flexible syntax for theory load commands via Isabelle/Scala;
Fri, 27 Nov 2020 21:59:23 +0100 clarified theory keywords: loaded_files are determined statically in Scala, but ML needs to do it semantically;
wenzelm [Fri, 27 Nov 2020 21:59:23 +0100] rev 72747
clarified theory keywords: loaded_files are determined statically in Scala, but ML needs to do it semantically; propagate blob src_path from Scala to ML; clarified signature;
Fri, 27 Nov 2020 19:56:30 +0100 proper structural equality;
wenzelm [Fri, 27 Nov 2020 19:56:30 +0100] rev 72746
proper structural equality;
Fri, 27 Nov 2020 16:44:36 +0100 more explicit types;
wenzelm [Fri, 27 Nov 2020 16:44:36 +0100] rev 72745
more explicit types;
Fri, 27 Nov 2020 16:40:31 +0100 unused (see 7634d33c1a79);
wenzelm [Fri, 27 Nov 2020 16:40:31 +0100] rev 72744
unused (see 7634d33c1a79);
Fri, 27 Nov 2020 14:25:39 +0100 clarified signature;
wenzelm [Fri, 27 Nov 2020 14:25:39 +0100] rev 72743
clarified signature;
Fri, 27 Nov 2020 14:00:54 +0100 clarified modules;
wenzelm [Fri, 27 Nov 2020 14:00:54 +0100] rev 72742
clarified modules;
Fri, 27 Nov 2020 11:50:23 +0100 clarified file names;
wenzelm [Fri, 27 Nov 2020 11:50:23 +0100] rev 72741
clarified file names;
Fri, 27 Nov 2020 11:41:43 +0100 tuned signature;
wenzelm [Fri, 27 Nov 2020 11:41:43 +0100] rev 72740
tuned signature;
Fri, 27 Nov 2020 06:48:35 +0000 refined syntax for bundle mixins for locale and class specifications
haftmann [Fri, 27 Nov 2020 06:48:35 +0000] rev 72739
refined syntax for bundle mixins for locale and class specifications
Thu, 26 Nov 2020 23:23:19 +0100 store timings for used_theories in canonical order, with reconstructed store.read_theories;
wenzelm [Thu, 26 Nov 2020 23:23:19 +0100] rev 72738
store timings for used_theories in canonical order, with reconstructed store.read_theories;
Thu, 26 Nov 2020 20:49:40 +0000 merged
paulson [Thu, 26 Nov 2020 20:49:40 +0000] rev 72737
merged
Thu, 26 Nov 2020 18:09:15 +0000 merged
paulson [Thu, 26 Nov 2020 18:09:15 +0000] rev 72736
merged
Thu, 26 Nov 2020 18:09:02 +0000 Stepan Holub's stronger version of comm_append_are_replicate, and a de-applied Word.thy
paulson <lp15@cam.ac.uk> [Thu, 26 Nov 2020 18:09:02 +0000] rev 72735
Stepan Holub's stronger version of comm_append_are_replicate, and a de-applied Word.thy
Thu, 26 Nov 2020 19:27:42 +0100 merged
nipkow [Thu, 26 Nov 2020 19:27:42 +0100] rev 72734
merged
Thu, 26 Nov 2020 19:27:28 +0100 tuned
nipkow [Thu, 26 Nov 2020 19:27:28 +0100] rev 72733
tuned
Thu, 26 Nov 2020 14:53:38 +0100 removed assumptions in lemma (Stepan Holub)
nipkow [Thu, 26 Nov 2020 14:53:38 +0100] rev 72732
removed assumptions in lemma (Stepan Holub)
Thu, 26 Nov 2020 18:32:06 +0100 merged
wenzelm [Thu, 26 Nov 2020 18:32:06 +0100] rev 72731
merged
Thu, 26 Nov 2020 18:05:24 +0100 more exports from rendering;
wenzelm [Thu, 26 Nov 2020 18:05:24 +0100] rev 72730
more exports from rendering; suppress empty exports;
Thu, 26 Nov 2020 17:32:43 +0100 clarified signature;
wenzelm [Thu, 26 Nov 2020 17:32:43 +0100] rev 72729
clarified signature;
Thu, 26 Nov 2020 17:23:33 +0100 clarified options: batch-build has pide_reports disabled by default (requires significant resources);
wenzelm [Thu, 26 Nov 2020 17:23:33 +0100] rev 72728
clarified options: batch-build has pide_reports disabled by default (requires significant resources);
Thu, 26 Nov 2020 17:01:19 +0100 tuned;
wenzelm [Thu, 26 Nov 2020 17:01:19 +0100] rev 72727
tuned;
Thu, 26 Nov 2020 16:51:40 +0100 proper return code for more errors (amending d892f6d66402);
wenzelm [Thu, 26 Nov 2020 16:51:40 +0100] rev 72726
proper return code for more errors (amending d892f6d66402);
Thu, 26 Nov 2020 16:19:55 +0100 more exports, as in "isabelle dump";
wenzelm [Thu, 26 Nov 2020 16:19:55 +0100] rev 72725
more exports, as in "isabelle dump";
Thu, 26 Nov 2020 16:14:16 +0100 tuned;
wenzelm [Thu, 26 Nov 2020 16:14:16 +0100] rev 72724
tuned;
Thu, 26 Nov 2020 16:08:39 +0100 clarified signature;
wenzelm [Thu, 26 Nov 2020 16:08:39 +0100] rev 72723
clarified signature;
Thu, 26 Nov 2020 15:59:09 +0100 clarified signature: initial markup is_empty, not init_markup;
wenzelm [Thu, 26 Nov 2020 15:59:09 +0100] rev 72722
clarified signature: initial markup is_empty, not init_markup;
Thu, 26 Nov 2020 15:49:27 +0100 clarified signature: prefer high-level Snapshot over low-level Command.State;
wenzelm [Thu, 26 Nov 2020 15:49:27 +0100] rev 72721
clarified signature: prefer high-level Snapshot over low-level Command.State;
Thu, 26 Nov 2020 15:18:09 +0100 tuned;
wenzelm [Thu, 26 Nov 2020 15:18:09 +0100] rev 72720
tuned;
Thu, 26 Nov 2020 15:16:37 +0100 more strict;
wenzelm [Thu, 26 Nov 2020 15:16:37 +0100] rev 72719
more strict;
Thu, 26 Nov 2020 14:48:22 +0100 clarified signature;
wenzelm [Thu, 26 Nov 2020 14:48:22 +0100] rev 72718
clarified signature;
Thu, 26 Nov 2020 13:15:57 +0100 tuned;
wenzelm [Thu, 26 Nov 2020 13:15:57 +0100] rev 72717
tuned;
Thu, 26 Nov 2020 12:27:09 +0100 clarified signature;
wenzelm [Thu, 26 Nov 2020 12:27:09 +0100] rev 72716
clarified signature;
Thu, 26 Nov 2020 12:21:45 +0100 clarified signature --- avoid repeated open_database on server;
wenzelm [Thu, 26 Nov 2020 12:21:45 +0100] rev 72715
clarified signature --- avoid repeated open_database on server;
Thu, 26 Nov 2020 15:51:20 +0000 renaming
Peter Lammich [Thu, 26 Nov 2020 15:51:20 +0000] rev 72714
renaming
Wed, 25 Nov 2020 21:13:45 +0100 merged
wenzelm [Wed, 25 Nov 2020 21:13:45 +0100] rev 72713
merged
Wed, 25 Nov 2020 21:08:43 +0100 recovered document output from 6bc199a70bf9;
wenzelm [Wed, 25 Nov 2020 21:08:43 +0100] rev 72712
recovered document output from 6bc199a70bf9;
Wed, 25 Nov 2020 20:48:33 +0100 clarified command_timings protocol;
wenzelm [Wed, 25 Nov 2020 20:48:33 +0100] rev 72711
clarified command_timings protocol;
Wed, 25 Nov 2020 17:49:09 +0100 more robust: include reports from Thy_Output.present_thy/output_document;
wenzelm [Wed, 25 Nov 2020 17:49:09 +0100] rev 72710
more robust: include reports from Thy_Output.present_thy/output_document;
Wed, 25 Nov 2020 16:14:16 +0100 more complete report positions, notably for command 'back' (amending eca176f773e0);
wenzelm [Wed, 25 Nov 2020 16:14:16 +0100] rev 72709
more complete report positions, notably for command 'back' (amending eca176f773e0);
Wed, 25 Nov 2020 15:24:55 +0100 tuned signature;
wenzelm [Wed, 25 Nov 2020 15:24:55 +0100] rev 72708
tuned signature;
Wed, 25 Nov 2020 15:12:02 +0100 clarified signature;
wenzelm [Wed, 25 Nov 2020 15:12:02 +0100] rev 72707
clarified signature;
Wed, 25 Nov 2020 13:51:28 +0100 unused;
wenzelm [Wed, 25 Nov 2020 13:51:28 +0100] rev 72706
unused;
Wed, 25 Nov 2020 13:30:06 +0100 unused;
wenzelm [Wed, 25 Nov 2020 13:30:06 +0100] rev 72705
unused;
Wed, 25 Nov 2020 13:22:34 +0100 tuned;
wenzelm [Wed, 25 Nov 2020 13:22:34 +0100] rev 72704
tuned;
Wed, 25 Nov 2020 13:12:31 +0100 removed pointless case: messages should always carry proper position;
wenzelm [Wed, 25 Nov 2020 13:12:31 +0100] rev 72703
removed pointless case: messages should always carry proper position;
Wed, 25 Nov 2020 13:06:03 +0100 clarified names;
wenzelm [Wed, 25 Nov 2020 13:06:03 +0100] rev 72702
clarified names;
Wed, 25 Nov 2020 12:57:45 +0100 eliminated pointless transaction;
wenzelm [Wed, 25 Nov 2020 12:57:45 +0100] rev 72701
eliminated pointless transaction;
Wed, 25 Nov 2020 12:55:09 +0100 tuned signature;
wenzelm [Wed, 25 Nov 2020 12:55:09 +0100] rev 72700
tuned signature;
Wed, 25 Nov 2020 12:52:00 +0100 clarified document_output vs. progress;
wenzelm [Wed, 25 Nov 2020 12:52:00 +0100] rev 72699
clarified document_output vs. progress;
Wed, 25 Nov 2020 12:34:08 +0100 clarified: more uniform;
wenzelm [Wed, 25 Nov 2020 12:34:08 +0100] rev 72698
clarified: more uniform;
Tue, 24 Nov 2020 16:49:42 +0100 more robust;
wenzelm [Tue, 24 Nov 2020 16:49:42 +0100] rev 72697
more robust;
Tue, 24 Nov 2020 16:39:58 +0100 clarified signature and database layout;
wenzelm [Tue, 24 Nov 2020 16:39:58 +0100] rev 72696
clarified signature and database layout;
Mon, 23 Nov 2020 16:18:22 +0100 clarified messages;
wenzelm [Mon, 23 Nov 2020 16:18:22 +0100] rev 72695
clarified messages;
Mon, 23 Nov 2020 16:02:04 +0100 unused (see ac7ae5067783, 1c451e5c145f);
wenzelm [Mon, 23 Nov 2020 16:02:04 +0100] rev 72694
unused (see ac7ae5067783, 1c451e5c145f);
Mon, 23 Nov 2020 15:34:35 +0100 unused;
wenzelm [Mon, 23 Nov 2020 15:34:35 +0100] rev 72693
unused;
Mon, 23 Nov 2020 15:14:58 +0100 support for PIDE markup in batch build (inactive due to pide_reports=false);
wenzelm [Mon, 23 Nov 2020 15:14:58 +0100] rev 72692
support for PIDE markup in batch build (inactive due to pide_reports=false);
(0) -30000 -10000 -3000 -1000 -120 +120 +1000 +3000 tip