diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-11-12 10:41:52 -0800 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-11-12 10:42:01 -0800 |
| commit | 9c6f3112ffe942e4bb0b5d5d8476ce7014499650 (patch) | |
| tree | a0a1a2817c17cddc428e1faf8dd7754ab593c0dc /xml | |
| parent | f88d3e15cd8228cba4070811da68d8ad54d81fd7 (diff) | |
| download | idea-9c6f3112ffe942e4bb0b5d5d8476ce7014499650.tar.gz | |
Snapshot 205707dc11cdd6508ae84db85d104f834028fd65 from idea/132.1045 of git://git.jetbrains.org/idea/community.git
205707d: support abbreviations in Search Everywhere
9eeb98a: NPE fix
f701598: AA painting for shortcuts
9636e23: add abbreviations
d1f7c58: IDEA-116296 Search match looks terrible under Retina
8bc5adc: AIOOBE
f92fa41: IDEA-116194 "Generate equals() and hashcode()" for final classes should disable "accept subclasses" variant
ec773fc: CCE
9a208ab: selected completion item should be the first or second visible (IDEA-115199)
be542d6: linear-time filterByDumbAwareness
83273e5: faster next/prev occurrence action in the console (IDEA-115163)
d684469: LanguageConsole: shutdown printXXX fiesta. Everyone is advised to use ConsoleView API the right way.
480215a: Merge branch 'master' of git.labs.intellij.net:idea/community
c85aae4: https://android-review.googlesource.com/69716
76daf2e: Heroku integration - show log on redeploy
c567431: Jediterm updated (PY-11368).
5d325de: Accept only terminal tabs on DnD.
a1d5cd4: Merge remote-tracking branch 'origin/master'
0a3bcdb: Jediterm updated.
218607a8: Terminal: support presentation mode.
ea6fd6f: switch on console-content-type highlighting in all language consoles
e824117: Quick fix for RefParserTest
450ecea: suggest scrambled classes on second completion
7ba82d9: NPE fixed
525a30d: cleanup
2fa314d: don't display "Loading spellchecker dictionaries" in status bar (IDEA-115130)
276a47a: don't suggest scrambled classes in autopopup (IDEA-115199)
b4a4b99: temporary fix for layouts of small IDEs
02e07e1: [log] Move SimpleHash from vcs-log-graph to vcs-log-impl
f7b1796: [log] Hash -> int in Graph
0c4d0bb: [log] Don't call new VcsRefImpl() directly, use the factory
4c1c1c2: [log] Memory consumption: Hash -> int. Take 1
2e36939: Improvement from Roman Shevchenko to be compatible with Ubuntu 13.10.
b6edb35: Show pin icon in pinned Find Usages tabs
c143cee: IDEA-110064 JSF 2.2: Pass-through elements: if upper-case symbols are used instead of default 'jsf' namespace prefix, attributes are red-highlihted
3a69458: added actions 'mark/unmark as generated sources root' to popup menu
bdfc48c: Use maven3 importer by default.
d9417b6: Merge remote-tracking branch 'origin/master'
5b526fc: Add pty libs to pycharm community build.
c912c67: add HowTo
6d940b1: depend on PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT if the file cannot be resolved yet
7c63c25: platform: jayatana patched to support Ubuntu 13.10 (sources only)
59622ee: IDEA-116276 Console font is small in Presentation mode
6863abc: IDEA-115889 Framework toolwindows: support scope-based file colors for items
ac0f8ab: obtaining framework libraries from app server: download libraries list asynchronously from server
185804e: refactor supported root type checking according to CR-IC-3056
6b085fe: formatter removes spaces in import statement parentheses (PY-11359)
b04030e: Show pin icon in pinned Find Usages tabs
90ea6d7: do not disable empty frameworks page if no templates available
bb55e29: platform: jayatana sources attached
d1911f7: platform: Ubuntu app menu loading code extracted and corrected
897738a: Cleanup (deprecated code)
56e41fb: Check Grails SDK in background thread, not in the AWT. +review CR-IU @gromopert
fd2b6b3: IDEA-115074 New Project Wizard: Grails: grails-specific settings are missing
a69a88a: spi: decline abstract classes, suggest all available inheritors (IDEA-115502)
eeaee1e: SIOOBE
6cd3cb9: Fix spelling
5f4c814: IDEA-102413 (pointless assertion dropped)
dc455bd: Cleanup (arrangement, formatting)
44590dc: IDEA-25934 Maven: Webapp resources filtering store web resources configuration.
6e65f2b: IDEA-25934 Maven: Webapp resources filtering store web resources configuration.
df137ae: DOM stubs: namespace key index
046e455: Merge remote-tracking branch 'origin/master'
0681517: testdata fixed
dd63221: IDEA-116168 Action creation does not escape special chars in plugin.xml
48fa01e: restore plugin description
d34d829: new project wizard: remote templates
389db71: methods renamed
b07e674: prefer non-qualified xml completion variants (IDEA-115355)
add165a: IDEA-116144 Opening build.gradle of android project fails
d524a84: refixed IDEA-111753 to remove unnecessary dependency on debugger
b8df146: show usages from generated code in separate group (IDEA-97579)
034f42b: removed obsolete 'remote-server-util' module from installation, added new module to git plugin installation
c8deccf: download libraries in parallel (IDEA-88561)
674de91: our LinkedHashMap: added methods to obtain last added key/value
43aced8: Restore context menu after DnD back to Terminal View.
b6987d3: Merge remote-tracking branch 'origin/master'
c147027: Fix: terminal tab doesn't save name change after DnD.
495bda4: JediTerm update to version 1.0
46667e2: Fix closing tab on session end. Fix popup for editor terminal tabs.
fdd3e70: Fix potential NPE.
9ea940a: [git] Fix refresh notification after changing non-active branch hashes
34b357c: more console folding by default
d21cf01: Fix memory leak.
1dcfd64: Fix removing terminal tabs on drag'n'drop.
29a4f60: add accessOrder parameter to our LinkedHashMap
e0ff96d: DockableEditorTabbedContainer shouldn't return root pane as accept area as it makes impossible to add any other dockable container. It is better to return root pane in the special fallback method after we checked all containers.
4b22045: Terminal tabs: drag'n'drop to editor and back implemented.
6ac9ae9: DockableEditor doesn't need EditorWindow reference.
73f7ab5: [log] IDEA-115980 Don't show Git actions if there are no Git roots
7964385: [log] "Go To Commit" action
c647083: [log] Extract the popup text field used for user completion
7e9497a: Merge remote-tracking branch 'origin/master'
0eb8a6f: [log] Fix hidden graph because of the date filter existance
95d5d5b: [log] IDEA-116022 Implement Structure filter for VCS Log & Git
4989fa1: [vcs] VcsStructureChooser: remove dependency on the AbstractVcs.
278cd62: [log] move structure filter implementation to vcs-log-impl
9b5b1c2: Github: change search request parameter
a543347: IDEA-115330 Incorrect "condition is always false"
0b85cc1: trying to make project opening progress information more meaningful (IDEA-115130)
35af155: Don't display empty panel if there are no moreMessage in the dialog
41592ca: [vcs] IDEA-116036 Pressing Escape in Commit/TODO dialog performs commit
7c5ba53: [log] Fix IDEA-115676 once again
8fb8d34: [log] IDEA-116056 Display commit time in details if different from author time
9b6d291: [log] IDEA-116022 Add filter by date
c49b45b: only suppress eager psi creation when there were stubs in the file
f815aa9: our LinkedHashMap clients aren't necessarily aware that it updates its ordering on every get. Let clients specify if they need this feature (IDEA-116222)
6fcd19c: return not-null MODULE_CONTEXT data only for single content roots (IDEA-115422)
0af49e6: fix two psi elements per one ast element in stub-ast switch: psi1 is taken from stub psi2 is eagerly created during chameleon parsing another thread gets the ast when some psi1 parent is already switched and psi1 is not, it walks down the ast and gets psi2
fcfef16: remove big JI sign
2ad7bd2: support for <shortcut>
cd74ff8: IDEA-116206
59b556f: set transparency 20%
152e772: fix missing help button
b8f59ef: add getLanguage() method
25dece1: IDEA-110540 ("String concat (+) and super.toString()" template adds "+ super.toString()" even if no super)
35c07da: new inference: reject isExact for no constructor parameterized class
5fafbd5: EA-51725 - NPE: IntroduceVariableBase.replace
22cf8de: ignore anonymous classes when generating constructors EA-51713 - assert: CreateConstructorMatchingSuperFix$.run
1735391: getWidget method
fcb4970: attempt to fix IDEA-116128 LiveEdit doesn't work correctly for JSP files
36e4932: continue "ability to return list of URLs" — isConfigurationFromContext
d67f88c: Cleanup (formatting)
3112d12: reliably check if a task for debugger manager thread was interrupted
201c7b5: IDEA-75717 ("Referenced checked for null not used inside if" false positive)
795357c: do not suppress file-level inspections
4745efc: continue "ability to return list of URLs" IDEA-115787
43216f8: IDEA-115787 Better resolvement for JSF page URLs
2e6db86: IDEA-100279 ChooseComponentsToExportDialog
72ee12c: fix warning "mac file equals"
19576b2: overrides, cleanup
0a15306: IDEA-100279 git init
b596340: IDEA-100279 xml editor location dialog
3c0f6cd: IDEA-100279 copyright plugin
b7c6e4c: overrides
e9e6eb2: 'Download library' refactored a little
946216e: IDEA-116197 (filter improvements)
9439744: EA-51425 - ISE: MavenUtil.resolveSuperPomFile add assertion.
9c38499: EA-51325 - assert: MavenIndices.createNewDir
9346755: don't log Connection reset by peer
cfb11fa: cleanup
038e39d: IDEA-114461 Structure tool window: Jump to Source (F4) does not move focus to Editor
ed4794e: VcsRootDetector and RootErrorsFinder tests updated
c196ab3: Remove unnecessary check and param from HgRepositoryImpl
b486fcb: template actions are now injection aware
773f5f0: IDEA-102454 Parameter Info: TAB/Shift-TAB and editing does not work in language injected fragment
3b34a0b: IDEA-49273 Injected language: parameter info tooltip disappears on moving caret
7afa57d: move indexer to indexing-impl
4ab17a0: don't shift text range if the element has no last child (PY-11344)
9e3bbe9: don't show "inspect test source" checkbox in PyCharm (PY-1187)
ac7f1b2: IDEA-113483 (action fixed to select directories too)
7bd9931: Emmet: extract SurroundWithEmmetAction
625e81b: don't show "production" and "test" scopes in predefined scopes if current product doesn't support test source roots (PY-7324)
f01a713: grouping by directory uses project-relative paths (PY-11176); rename the action from "Group by package" to "Group by directory" in platform-based IDEs
be45c85: move GeneralFormatterTest to platform-tests; fix NPE in DocumentImpl when running standalone GeneralFormatterTest
4d22f5e: DirectoryIndex: don't include roots from content to projectExcludeRoots set, update projectExcludeRoots on VFS change
02f7305: Merge branch 'master' of git.labs.intellij.net:idea/community
7994da2: External System: test fix Related task: IDEA-79466 gradle support should generate web module configuration
e3cfba1: IDEA-116126 - NoClassDefFound on attempt to deploy to heroku
630eacf: Merge remote-tracking branch 'origin/master'
a902c4e: testdata fixed
db0433c: fix NPE — final class variable is not yet initialized — we must not open connection until debug process class is not constructed.
dd2d5f6: platform: ensure event file validity on dropping symlink target
eaeed33: platform: better pairing of before/after VFS events
97aec30: Cleanup (formatting)
017646f: remove dead code, cleanup
2181005: more templates
ab315c8: new project wizard: template description & count
e789a57: External system: adding TEST_GENERATED source type to ExternalSystemSourceType
62eeca9: new project wizard: adding project templates
25e633c: SimpleColoredComponent: builder style
84c2eb6: ColoredListCellRenderer parameterized
3c567ba: cleanup
ab15886: cleanup
aaad70d: cleanup
81c7d30: update Key.findKeyByName usages due to API changes
41ca0a4: CCE aware API
fe3700f: java call hierarchy extension
51c76a3: Make view meta model extendable
e17daa4: unused methods with strange names deprecated
4910498: service replaced by utility methods
d0fd16f: faster for simple cases
3dd6919: fix CSS completion tests: if the reference starts at completion start location, we do need to overwrite it when Tab is pressed
22c1ef9: Gradle: update to Gradle 1.9-rc-3
7a38323: Pty4j updated.
29ac873: IDEA-97390 Java Debugger: View Text action shows white on white [2]
1c329ac: Merge branch 'master' of git.labs.intellij.net:idea/community
0c60dd9: IDEA-86998 Evaluate expression mixes colorschemas when displaying injected code
ce6fbd9: IDEA-97390 Java Debugger: View Text action shows white on white
a50bd7e: Merge branch 'master' of git.labs.intellij.net:idea/community
8de20e2: remote servers - headers cleanup
c5e1cf7: don't reformat mock variable during control flow building
8e11281: don't walk module src roots in search for .class file source (IDEA-116085)
992d740: cache expected names (IDEA-116085)
10976b3: walk library src roots once when searching for class sources (IDEA-116085)
dfc71fc: fix java pull up refactoring!
4af2a83: Merge remote-tracking branch 'origin/master'
a818922: javadoc: include in classpath only libraries from modules which participate in the scope (IDEA-116083)
38e2991: new inference: do not use nested call args to infer on the top level
465762a: new inference: reject multiple eq bounds
d84a0a0: Darcula eats almost all EDT cpu time
fe23143: IDEA-94922 (Report negatively named boolean variables and suggest to perform 'Invert Boolean' for them)
f637ac6: fix description
9005acd: common "invert boolean" quickfix
9a5bfa9: add #loc's
dd94fc6: fix "No dependencies provided which causes CachedValue to be never recalculated again."
e4cce36: java.lang.IllegalThreadStateException additional handling
1249362: disposed check
0495c47: cleanup
25fc653: extra inspections
8850957: IDEA-101405 Call hierarchy support for Groovy
3026341: hierarchy package
deb52f5: Flat & round stripe buttons (Internal Mode only) v.3, colors improvement
d903511: IDEA-116139 Workaround NPE fix
8fccc30: avoid assertion on file path completion (EA-51068)
fdb9f6e: ctrl+w shouldn't choke on unclosed argument lists (EA-51589)
1de20e6: don't inc modification counter on first load of gant/gradle settings
8a9c177: IDEA-25934 Maven: Webapp resources filtering store web resource configuration.
9553c1a: catch all exceptions that may influence VM attach process
aa8a8e8: IDEA-116146 Search everywhere has small font in Presentation mode
9c7d5d5: #WEB-8915 fixed
5d96196: dfa: flush resource variables when leaving try block
15c0fd6: jsr166e.jar included into standalone jps distribution
edbde43: generics: bounds check should stop expanding nested wildcards up to 2nd level
d991c73: fix invalid file assertion
aae4c5a: IDEA-116049 Mercurial log problem with Mac default locale (x_MacRoman)
08a6b0c: Unnecessary encoding argument in new hg log removed.
5cd75d1: style
5a365fd: fix BooleanParameterInspectionTest
4e2e6ca: [log] IDEA-115966 Show HAND cursor over branch arrows
7793ca6: [log] Collect user information from the whole log
4e8c466: [log] Completion in filter by user
bc4c9f8: [log] intern VcsUsers.
0505705: [log] Encapsulate author & committer into VcsUser
1fb280e: [log] Let VcsLogObjectsFactory be project service & depend on VcsLogManager
2f2f008: Gradle: add Tooling API extra models support. Related task: IDEA-79466 gradle support should generate web module configuration
3c9aa6d: convert EventLogCategory to abstract class
0804cb1: html5 char entities for fragments
0e50db9: #IDEA-116106 fixed
483a5d1: enable entities validation for html5 #WEB-7053 fixed
962e050: generated entities for html 5 chars, use it in resolve and completion
b57823a: Merge remote-tracking branch 'origin/master'
da8e5d0: we must add "http://" prefix if specified path is not absolute
6bb2810: small lens mode fix
88caaf7: Merge remote-tracking branch 'origin/master'
4268072: IDEA-116125 extra gutter in presentation mode
6d03a86: Eliminated dependencies on pthread, glib rec mutex synchronization. A crash fixed.
b5f05f4: Quick fix for not Unity window managers. Should be moved into linux-specific code.
fe27876: WI-14476 When hovering over variable, Expression Evaluation tooltip disappears before I can click the + icon (cherry picked from commit 3034e98)
202e2ae: Cleanup (test)
a5960af: java: no need to check package prefix for annotations on ref adjustment
ab262e2: Cleanup (test)
5b2a86b: IDEA-89720 Preview usages: "select usages to preview" should be shown at the center of panel
7b82bf1: IDEA-116119 Darcula: links are hardly visible on warnings
d2a2cd9: don't hide run configuration type if there are only one irrelevant type (IDEA-116046)
15e08d4: javadoc corrected
5575eb1: hide 'deploy to cloud' run configurations if corresponding cloud isn't configured (IDEA-116046)
3b3c221: WEB-9876 Fuzzy search is still colliding with completion
50bd840: Spock method should be a GrMethod.
5364513: exception-safe rendering
544a580: thread assertion fix
bc4c101: fix NPEs
56940f1: a way to increase dismiss delay
9aee54e: framework version from existing library
37f430f: removing borders automatically
19a21fd: new "Non-varargs method overrides varargs method" inspection
e82e54d: improve description
31fedec: New in 13
0fbffa1: fixed downloading client libraries from modal dialog (IDEA-115975)
5db09f5: CCE from android step fixed
cded14f: IDEA-115064 New Project Wizard: Spring page looks bad: preselected frameworks
e6b1f8e: fix NPE (request status)
8bba7c9: IDEA-115076 Groovy: New Project Wizard: IAE at DialogWrapperPeerFactoryImpl.createPeer() on 'Create Groovy Library'
5a47ef8: app server editor: don't show 'change version' button for app server library
f510156: IDEA-115398 New Project Wizard: libraries downloading doesn't work
3d251be: event log category EP
7d76939: Take shortcuts for next tab and prev tabs from keymap.
be19e2e: Next tab and Previous tab actions.
67310ba: Null class name tolerated
db170d7: Fixed text shaking on tab name editing.
bd3c4bc: Some cleanup.
b27ba6e: IDEA-112596 SQL: MySQL uncomment doesn't work with "--"
a67dac8: IDEA-115954 lens mode warning annotation bubbles overlap text on retina
b6c179c: IDEA-93733 Double line above editor tabs
2c91f79: EA-51491 - assert: DocumentImpl.createRangeMarker
1743e7b: EA-51650 - assert: JavaDocInfoGenerator.getDocComment
16712b8: Todo
f9d2c43: Cleanup (formatting)
38f058d: failing test for PY-10319
dd3f3fa: rename some methods and cleanup code to make logic clearer
aa885ea: report missing identifier after 'as' (PY-9853)
52efcb5: only allow single expression after 'in'; tweak error recovery when waiting for colon (PY-9561)
7f8dc3d: change default match-from-start to false
bfb1819: EA-51669 (unneeded augmentation avoided)
b27e492: platform: extension point declaration moved to correct .xml
4d9e686: sourcemaps: ability to resolve sources relative to generated file
40e08dc: Fix the size changing of text field for terminal tabs.
62223eb: Merge remote-tracking branch 'origin/master'
6c84d33: take synchronized statements into account when mapping local variable names to slots
4e560b6: allow to view hidden items in 'New Run Configuration' popup (IDEA-116046)
37caefe: IDEA-72889 (CodeStyle inspection to check tabs instead of spaces in file)
f345cfd: EA-51469: do not call GemManager.updateGemset(Module) with null
e27287d: ShowSettingUtil: selecting configurable by class is fixed
b9f0e95: new inference: infer recursively for conditional expression
646aea3: new inference: avoid self bounds when possible
a2ad6fd: new inference: accept captured wildcard opening during subtype constraint reduction
66462d0: remove incorrect copyright messages
c3c03a0: don't set default cursor if empty text is invisible
4f009e8: IDEA-115398 New Project Wizard: libraries downloading doesn't work
3607191: Merge remote-tracking branch 'origin/master'
a95509a: extracted method to get/set 'for generated source' option via API
7b00b8f: hide Groovy run configuration if there are no groovy files in project (IDEA-116046)
89f2a76: Minor VFS optimization (cleanup)
0defb40: less spam in the logs when there's PSI/document inconsistency during reference search (IDEA-115950)
29427e7: added service to quickly find modules by module type; hide DevKit and J2ME run configurations if there are no corresponding modules (IDEA-116046)
d031ebc: hide Python run configurations if they are irrelevant (IDEA-116046)
75ca45a: IDEA-116000 Error message shown if hg root marked as git
e9b3a8c: style
24f91c2: IDEA-115474 Maven Dependency template broken in latest Idea Cardea
26b5659: added API to hide irrelevant run configuration types from 'New' popup in 'Edit Configurations' dialog (IDEA-116046)
5b6b259: Merge remote-tracking branch 'origin/master'
0525b10: Revert the change.
4f9d3f0: Disable formatter ranges in formatter off/on tags [CR-IC-2916]
f760c44: IDEA-36685: Provide better 'no matching constructor' warnings where possible
915fb35a: new overload resolution: testdata
3546317: new overload resolution
971909a: method refs: exact tweaks
f6932ac: Merge remote-tracking branch 'origin/master'
c22e14c: JediTerm jar updated.
08eed1d: Merge remote-tracking branch 'origin/master'
5ff6e1a: Merge remote-tracking branch 'origin/master'
feec183: Pty4j with debug info.
08c90e8: Minor VFS optimization
53a81a0: Cleanup (formatting)
dc52633: EA-50578 - assert: TextRange.<init>
b532d92: Merge remote-tracking branch 'origin/master'
aa20e7d: status bar should have a height at least of an icon, even before any icons appear, to prevent unnecessary blinking (IDEA-114453)
1e0e31e: IDEA-112982 Status bar starts with bad layout before project is fully loaded default min height was 1 which made BoxLayout center-align everything along the top border resulting in 2x less memory indicator height
5fdc8f8: Merge branch 'svn_18_2'
cc6dd17: svn: Fixed destroy for process under terminal
9826ae7: external system: EA-51656, check for disposable project components added
7337a62: external system: EA-51656, check for disposable project components added
ea5159b: IDEA-116001 Incorrect behavior of root scanner in case non hg project marked as hg fixed
2186112: Merge remote-tracking branch 'origin/master'
9f02f7e: don't generate icons for IntelliJ laf
0f252a9: IDEA-90751 Scope tabs coloring does not affect hidden tabs pop-up
ab0e88a: cleanup dead code
79bf40e: IDEA-114608 breakpoints dialog: add panel must be at top
d9b94c5: new icons: vendors & sql structure view
5b4b9a7: svn: Do not read from error stream for process under terminal
ca6a8ac: drop command wrapper
5617a42: use correct date format in command to fix reverting changes on file with a sticky date
afbef4d: new inference: mark List::get as inexact
4fde439: EA-51621 - IOE: CheckUtil.checkWritable
eb79b67: EA-51643 - assert: DataManagerImpl$MyDataContext.getData
e1b69a4: new inference: exact method reference: decline constructor with parameter with type parameter of class
664ee85: improve parser recovery if keyword is used as function or class name (PY-8319)
5d6bac5: improve parser recovery if keyword is used as named parameter (PY-8318)
ce1ff5d: if we have only one import candidate, show its name instead of "import this name" (PY-8067)
27c5fbb: Visual Studio keymap maps Shift+F1 to both QuickJavaDoc and ExternalJavaDoc (PY-7291)
baaf551: rename file when renaming class if file name equals lowercased class name (PY-7155)
f52709b: tweak decorator parsing so that following line comment is outside the text range of PyDecorator (PY-5912)
a61112a: don't overwrite reference by Tab if it starts exactly after reference being completed (PY-6095)
12249d1: tab completion for keyword arguments overwrites the = sign (PY-1337(
a351f53: highlight only the last line of string literal when triple quotes are unclosed (PY-1780); allow running StringLiteralQuotesAnnotator in dumb mode
1bf4336: consistent behavior of PyFunction.getContainingClass() in stub-based and non-stub-based cases (PY-1448)
36c20c2: fix caret position after pressing Enter in Python line comment
e55c85f: fix HtmlCompletionTest.testDotTypeWhileActiveLookupInFileReference
a3e89bc: IntelliLang PatternValidator: class parsing errors should not fail the build if the class is not going to be instrumented by the validator. Covered 2 more cases when this check was not performed (IDEA-115189 IntelliLang Pattern Validator: Class not found)
6f7b23e: Merge remote-tracking branch 'origin/master'
c5d7ccd: Merge remote-tracking branch 'origin/master'
946d9ab: svn: terminal: Implemented handling of "unknown host" prompt for ssh
f1e1ceb: IDEA-113191 Used "write" access to sqlite db and try to access db several times if failed
b95367c: svn: Do not handle auth errors when command is finished if in terminal mode
e306801: svn: terminal: Added separate logging for status command output (as there are some issues with terminal output parsing)
f22a4ed: svn: terminal: Implemented cancelling authentication prompts
4e7c774: svn: terminal: Treat stdout lines with svn errors as stderr lines
a48733d: svn: Fixed default focused element for credentials dialog opening (password is focused if username is disabled)
aac45e5: svn: Implemented password prompts for ssh authentication through terminal
b8768d1: svn: Implemented basic svn+ssh authentication using terminal (under svn.use.terminal registry key)
13a217b: svn: Refactored CommandExecutor - ability to write to process input stream, small changes for inheritors
e9ccca6: svn: Moved setting "non-interactive" mode when command executor is created
4092ffa: svn: Added command logging in for non-zero exit code
8441324: Tab name length is limited by 50 in jediterm library.
1c63154: Use JB tabs in terminal(PY-10609). Pass disposable to terminal widget.
2ba2163: Extract method that sets content to the holder.
9c5a392: NPE (IDEA-115607).
Change-Id: I83d19d7826b59dbc1d782247b78553b4632e7635
Diffstat (limited to 'xml')
26 files changed, 2487 insertions, 174 deletions
diff --git a/xml/dom-impl/src/META-INF/DomPlugin.xml b/xml/dom-impl/src/META-INF/DomPlugin.xml index 9fdaaedc89d8..00b15cbbccec 100644 --- a/xml/dom-impl/src/META-INF/DomPlugin.xml +++ b/xml/dom-impl/src/META-INF/DomPlugin.xml @@ -32,6 +32,7 @@ <filetype.stubBuilder filetype="XML" implementationClass="com.intellij.util.xml.stubs.builder.DomStubBuilder"/> <stubElementTypeHolder class="com.intellij.util.xml.stubs.DomElementTypeHolder"/> + <stubIndex implementation="com.intellij.util.xml.stubs.index.DomNamespaceKeyIndex"/> <applicationService serviceInterface="com.intellij.util.xml.impl.DomApplicationComponent" serviceImplementation="com.intellij.util.xml.impl.DomApplicationComponent"/> diff --git a/xml/dom-impl/src/com/intellij/util/xml/stubs/ElementStubSerializer.java b/xml/dom-impl/src/com/intellij/util/xml/stubs/ElementStubSerializer.java index 5247af3833ea..d1522f523846 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/stubs/ElementStubSerializer.java +++ b/xml/dom-impl/src/com/intellij/util/xml/stubs/ElementStubSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,10 +15,12 @@ */ package com.intellij.util.xml.stubs; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.stubs.IndexSink; import com.intellij.psi.stubs.ObjectStubSerializer; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; +import com.intellij.util.xml.stubs.index.DomNamespaceKeyIndex; import org.jetbrains.annotations.NotNull; import java.io.IOException; @@ -46,6 +48,10 @@ public class ElementStubSerializer implements ObjectStubSerializer<ElementStub, @Override public void indexStub(@NotNull ElementStub stub, @NotNull IndexSink sink) { + final String namespaceKey = stub.getNamespaceKey(); + if (StringUtil.isNotEmpty(namespaceKey)) { + sink.occurrence(DomNamespaceKeyIndex.KEY, namespaceKey); + } } @NotNull diff --git a/xml/dom-impl/src/com/intellij/util/xml/stubs/index/DomNamespaceKeyIndex.java b/xml/dom-impl/src/com/intellij/util/xml/stubs/index/DomNamespaceKeyIndex.java new file mode 100644 index 000000000000..b3528ba728bf --- /dev/null +++ b/xml/dom-impl/src/com/intellij/util/xml/stubs/index/DomNamespaceKeyIndex.java @@ -0,0 +1,78 @@ +/* + * Copyright 2000-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.util.xml.stubs.index; + +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.openapi.vfs.VirtualFileWithId; +import com.intellij.psi.PsiFile; +import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.psi.stubs.StringStubIndexExtension; +import com.intellij.psi.stubs.StubIndex; +import com.intellij.psi.stubs.StubIndexKey; +import com.intellij.util.CommonProcessors; +import com.intellij.util.indexing.IdFilter; +import com.intellij.util.xml.DomFileElement; +import org.jetbrains.annotations.NotNull; + +public class DomNamespaceKeyIndex extends StringStubIndexExtension<PsiFile> { + + public static final StubIndexKey<String, PsiFile> KEY = StubIndexKey.createIndexKey("dom.namespaceKey"); + + private static final DomNamespaceKeyIndex ourInstance = new DomNamespaceKeyIndex(); + + public static DomNamespaceKeyIndex getInstance() { + return ourInstance; + } + + public boolean hasStubElementsWithNamespaceKey(final DomFileElement domFileElement, final String namespaceKey) { + final VirtualFile file = domFileElement.getFile().getVirtualFile(); + assert file instanceof VirtualFileWithId : file; + + final int virtualFileId = ((VirtualFileWithId)file).getId(); + CommonProcessors.FindFirstProcessor<String> processor = + new CommonProcessors.FindFirstProcessor<String>() { + @Override + protected boolean accept(String s) { + return namespaceKey.equals(s); + } + }; + StubIndex.getInstance().processAllKeys(KEY, processor, + GlobalSearchScope.fileScope(domFileElement.getFile()), + new IdFilter() { + @Override + public boolean containsFileId(int id) { + return id == virtualFileId; + } + }); + return processor.isFound(); + } + + @Override + public boolean traceKeyHashToVirtualFileMapping() { + return true; + } + + @NotNull + @Override + public StubIndexKey<String, PsiFile> getKey() { + return KEY; + } + + @Override + public int getVersion() { + return 0; + } +} diff --git a/xml/dom-openapi/src/com/intellij/util/xml/AbstractConvertContext.java b/xml/dom-openapi/src/com/intellij/util/xml/AbstractConvertContext.java index f8f8e69853fd..fc7cbefea494 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/AbstractConvertContext.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/AbstractConvertContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package com.intellij.util.xml; import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.ModuleUtil; +import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.vfs.VirtualFile; @@ -52,7 +52,7 @@ public abstract class AbstractConvertContext extends ConvertContext { final DomFileElement<DomElement> fileElement = DomUtil.getFileElement(getInvocationElement()); if (fileElement == null) { final XmlElement xmlElement = getInvocationElement().getXmlElement(); - return xmlElement == null ? null : ModuleUtil.findModuleForPsiElement(xmlElement); + return xmlElement == null ? null : ModuleUtilCore.findModuleForPsiElement(xmlElement); } return fileElement.getRootElement().getModule(); } @@ -65,7 +65,7 @@ public abstract class AbstractConvertContext extends ConvertContext { public GlobalSearchScope getSearchScope() { GlobalSearchScope scope = null; - Module[] modules = getConvertContextModules(this); + Module[] modules = getConvertContextModules(); if (modules.length != 0) { PsiFile file = getFile(); @@ -88,39 +88,14 @@ public abstract class AbstractConvertContext extends ConvertContext { return scope; // ??? scope == null ? GlobalSearchScope.allScope(getProject()) : scope; ??? } - public static GlobalSearchScope getSearchScope(@NotNull ConvertContext context) { - Module[] modules = getConvertContextModules(context); - if (modules.length == 0) return null; - - PsiFile file = context.getFile(); - file = file.getOriginalFile(); - VirtualFile virtualFile = file.getVirtualFile(); - if (virtualFile == null) return null; - ProjectFileIndex fileIndex = ProjectRootManager.getInstance(file.getProject()).getFileIndex(); - boolean tests = fileIndex.isInTestSourceContent(virtualFile); - - - GlobalSearchScope scope = null; - for (Module module : modules) { - if (scope == null) { - scope = module.getModuleRuntimeScope(tests); - } - else { - scope.union(module.getModuleRuntimeScope(tests)); - } - } - return scope; - } - - @NotNull - private static Module[] getConvertContextModules(@NotNull ConvertContext context) { - Module[] modules = ModuleContextProvider.getModules(context.getFile()); + private Module[] getConvertContextModules() { + Module[] modules = ModuleContextProvider.getModules(getFile()); if (modules.length > 0) return modules; - final Module module = context.getModule(); + final Module module = getModule(); if (module != null) return new Module[]{module}; - return new Module[0]; + return Module.EMPTY_ARRAY; } } diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionData.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionData.java index bf87f35c9411..4249986cf002 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionData.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionData.java @@ -32,6 +32,7 @@ import com.intellij.psi.tree.TokenSet; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.*; import com.intellij.util.ArrayUtil; +import com.intellij.xml.Html5SchemaProvider; import com.intellij.xml.XmlElementDescriptor; import com.intellij.xml.XmlNSDescriptor; import com.intellij.xml.util.HtmlUtil; @@ -186,7 +187,7 @@ public class XmlCompletionData extends CompletionData { try { final int unicodeChar = Integer.valueOf(s).intValue(); - return LookupValueFactory.createLookupValueWithHint(name, null, new String(Character.toChars(unicodeChar))); + return LookupValueFactory.createLookupValueWithHint(name, null, String.valueOf((char)unicodeChar)); } catch (NumberFormatException e) { return null; @@ -208,8 +209,9 @@ public class XmlCompletionData extends CompletionData { descriptorFile = findDescriptorFile(tag, containingFile); } - boolean isHtml5 = false; - if (tag == null || (isHtml5 = HtmlUtil.isHtml5Context(tag))) { // Html5 RNG does not have entities + if (HtmlUtil.isHtml5Context(tag)) { + descriptorFile = XmlUtil.findXmlFile(containingFile, Html5SchemaProvider.getCharsDtdLocation()); + } else if (tag == null) { final XmlDocument document = PsiTreeUtil.getParentOfType(context, XmlDocument.class); if (document != null) { @@ -218,7 +220,7 @@ public class XmlCompletionData extends CompletionData { final FileType ft = containingFile.getFileType(); if(ft != StdFileTypes.XML) { - final String namespace = ft == StdFileTypes.XHTML || ft == StdFileTypes.JSPX || isHtml5? XmlUtil.XHTML_URI:XmlUtil.HTML_URI; + final String namespace = ft == StdFileTypes.XHTML || ft == StdFileTypes.JSPX ? XmlUtil.XHTML_URI : XmlUtil.HTML_URI; final XmlNSDescriptor nsDescriptor = document.getDefaultNSDescriptor(namespace, true); if (nsDescriptor != null) { diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/SurroundWithEmmetAction.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/SurroundWithEmmetAction.java new file mode 100644 index 000000000000..4ba881666bc1 --- /dev/null +++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/SurroundWithEmmetAction.java @@ -0,0 +1,83 @@ +/* + * Copyright 2000-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.codeInsight.template.emmet; + +import com.intellij.application.options.emmet.EmmetOptions; +import com.intellij.codeInsight.CodeInsightActionHandler; +import com.intellij.codeInsight.actions.BaseCodeInsightAction; +import com.intellij.codeInsight.hint.HintManager; +import com.intellij.codeInsight.template.CustomTemplateCallback; +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.editor.Document; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.editor.SelectionModel; +import com.intellij.openapi.fileEditor.FileDocumentManager; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.vfs.ReadonlyStatusHandler; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.psi.PsiDocumentManager; +import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; + +public class SurroundWithEmmetAction extends BaseCodeInsightAction { + public SurroundWithEmmetAction() { + setEnabledInModalContext(true); + } + + @Override + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { + return EmmetOptions.getInstance().isEmmetEnabled() && new ZenCodingTemplate().isApplicable(file, editor.getCaretModel().getOffset(), true); + } + + @NotNull + @Override + protected CodeInsightActionHandler getHandler() { + return new SurroundWithEmmetHandler(); + } + + private static class SurroundWithEmmetHandler implements CodeInsightActionHandler { + @Override + public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { + SelectionModel selectionModel = editor.getSelectionModel(); + if (!selectionModel.hasSelection() && !selectionModel.hasBlockSelection()) { + selectionModel.selectLineAtCaret(); + } + + final Document document = editor.getDocument(); + final VirtualFile virtualFile = FileDocumentManager.getInstance().getFile(document); + if (virtualFile != null) { + ReadonlyStatusHandler.getInstance(project).ensureFilesWritable(virtualFile); + } + + String selection = editor.getSelectionModel().getSelectedText(); + + final ZenCodingTemplate template = new ZenCodingTemplate(); + if (selection != null && template.isApplicable(file, editor.getCaretModel().getOffset(), true)) { + selection = selection.trim(); + PsiDocumentManager.getInstance(project).commitAllDocuments(); + template.wrap(selection, new CustomTemplateCallback(editor, file, true)); + } + else if (!ApplicationManager.getApplication().isUnitTestMode()) { + HintManager.getInstance().showErrorHint(editor, "Cannot invoke Surround with Emmet in the current context"); + } + } + + @Override + public boolean startInWriteAction() { + return true; + } + } +} diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java index 236743c901a1..a80b08d9d972 100644 --- a/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java +++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java @@ -381,6 +381,13 @@ public class ZenCodingTemplate implements CustomLiveTemplate { return applicableGenerator != null && applicableGenerator.isEnabled(); } + @Override + public boolean hasCompletionItem(@NotNull PsiFile file, int offset) { + PsiElement element = CustomTemplateCallback.getContext(file, offset); + final ZenCodingGenerator applicableGenerator = findApplicableDefaultGenerator(element, false); + return applicableGenerator != null && applicableGenerator.isEnabled() && applicableGenerator.hasCompletionItem(); + } + public static void doWrap(final String selection, final String abbreviation, final CustomTemplateCallback callback) { final ZenCodingGenerator defaultGenerator = findApplicableDefaultGenerator(callback.getContext(), true); assert defaultGenerator != null; diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java index 5c23ba994e84..1965bf1e0470 100644 --- a/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java +++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java @@ -179,4 +179,8 @@ public abstract class ZenCodingGenerator { public UnnamedConfigurable createConfigurable() { return null; } + + public boolean hasCompletionItem() { + return false; + } } diff --git a/xml/impl/src/com/intellij/ide/browsers/OpenFileInDefaultBrowserAction.java b/xml/impl/src/com/intellij/ide/browsers/OpenFileInDefaultBrowserAction.java index 7e822817a44e..92f5abf20591 100644 --- a/xml/impl/src/com/intellij/ide/browsers/OpenFileInDefaultBrowserAction.java +++ b/xml/impl/src/com/intellij/ide/browsers/OpenFileInDefaultBrowserAction.java @@ -15,7 +15,7 @@ */ package com.intellij.ide.browsers; -import com.intellij.ide.BrowserUtil; +import com.intellij.icons.AllIcons; import com.intellij.ide.GeneralSettings; import com.intellij.ide.browsers.impl.WebBrowserServiceImpl; import com.intellij.openapi.actionSystem.*; @@ -23,13 +23,23 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.ui.popup.JBPopupFactory; +import com.intellij.openapi.util.AsyncResult; import com.intellij.openapi.util.Pair; +import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.testFramework.LightVirtualFile; +import com.intellij.ui.ColoredListCellRenderer; +import com.intellij.ui.components.JBList; +import com.intellij.util.Consumer; +import com.intellij.util.containers.ContainerUtil; import com.intellij.xml.XmlBundle; import com.intellij.xml.util.HtmlUtil; +import org.jetbrains.annotations.NotNull; +import javax.swing.*; import java.awt.event.InputEvent; +import java.util.Set; public class OpenFileInDefaultBrowserAction extends DumbAwareAction { private static final Logger LOG = Logger.getInstance(OpenFileInDefaultBrowserAction.class); @@ -46,7 +56,7 @@ public class OpenFileInDefaultBrowserAction extends DumbAwareAction { return; } - Pair<WebBrowserUrlProvider, Url> browserUrlProvider = WebBrowserServiceImpl.getProvider(file); + Pair<WebBrowserUrlProvider, Set<Url>> browserUrlProvider = WebBrowserServiceImpl.getProvider(file); final boolean isHtmlFile = HtmlUtil.isHtmlFile(file); if (browserUrlProvider == null) { if (file.getVirtualFile() instanceof LightVirtualFile) { @@ -102,15 +112,20 @@ public class OpenFileInDefaultBrowserAction extends DumbAwareAction { PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataContext); LOG.assertTrue(psiFile != null); InputEvent event = e.getInputEvent(); - doOpen(psiFile, event != null && event.isShiftDown()); + doOpen(psiFile, event != null && event.isShiftDown(), null); } - static void doOpen(PsiFile psiFile, boolean preferLocalUrl) { + public static void doOpen(PsiElement psiFile, boolean preferLocalUrl, final WebBrowser browser) { try { - Url url = WebBrowserService.getInstance().getUrlToOpen(psiFile, preferLocalUrl); - if (url != null) { - ApplicationManager.getApplication().saveAll(); - BrowserUtil.launchBrowser(url.toExternalForm()); + Set<Url> urls = WebBrowserService.getInstance().getUrlToOpen(psiFile, preferLocalUrl); + if (!urls.isEmpty()) { + chooseUrl(urls).doWhenDone(new Consumer<Url>() { + @Override + public void consume(Url url) { + ApplicationManager.getApplication().saveAll(); + UrlOpener.launchBrowser(url.toExternalForm(), browser); + } + }); } } catch (WebBrowserUrlProvider.BrowserException e1) { @@ -120,4 +135,40 @@ public class OpenFileInDefaultBrowserAction extends DumbAwareAction { LOG.error(e1); } } + + @NotNull + private static AsyncResult<Url> chooseUrl(Set<Url> urls) { + if (urls.size() == 1) { + return new AsyncResult.Done<Url>(ContainerUtil.getFirstItem(urls)); + } + + final JBList list = new JBList(urls); + list.setCellRenderer(new ColoredListCellRenderer() { + @Override + protected void customizeCellRenderer(JList list, Object value, int index, boolean selected, boolean hasFocus) { + // todo icons looks good, but is it really suitable for all URLs providers? + setIcon(AllIcons.Nodes.Servlet); + append(((Url)value).getPath()); + } + }); + + final AsyncResult<Url> result = new AsyncResult<Url>(); + JBPopupFactory.getInstance(). + createListPopupBuilder(list). + setTitle("Choose Url"). + setItemChoosenCallback(new Runnable() { + @Override + public void run() { + Url value = (Url)list.getSelectedValue(); + if (value != null) { + result.setDone(value); + } + else { + result.setRejected(); + } + } + }). + createPopup().showInFocusCenter(); + return result; + } } diff --git a/xml/impl/src/com/intellij/ide/browsers/SelectInDefaultBrowserTarget.java b/xml/impl/src/com/intellij/ide/browsers/SelectInDefaultBrowserTarget.java index 3114bb80d97b..55ceeeb5e977 100644 --- a/xml/impl/src/com/intellij/ide/browsers/SelectInDefaultBrowserTarget.java +++ b/xml/impl/src/com/intellij/ide/browsers/SelectInDefaultBrowserTarget.java @@ -27,6 +27,8 @@ import com.intellij.testFramework.LightVirtualFile; import com.intellij.xml.XmlBundle; import com.intellij.xml.util.HtmlUtil; +import java.util.Set; + class SelectInDefaultBrowserTarget extends SelectInTargetBase { private static final Logger LOG = Logger.getInstance(SelectInDefaultBrowserTarget.class); @@ -44,7 +46,7 @@ class SelectInDefaultBrowserTarget extends SelectInTargetBase { return false; } - Pair<WebBrowserUrlProvider, Url> browserUrlProvider = WebBrowserServiceImpl.getProvider(file); + Pair<WebBrowserUrlProvider, Set<Url>> browserUrlProvider = WebBrowserServiceImpl.getProvider(file); currentName = XmlBundle.message("browser.select.in.default.name"); if (browserUrlProvider == null) { return HtmlUtil.isHtmlFile(file) && !(file.getVirtualFile() instanceof LightVirtualFile); @@ -69,7 +71,7 @@ class SelectInDefaultBrowserTarget extends SelectInTargetBase { LOG.assertTrue(psiElement != null); PsiFile psiFile = psiElement.getContainingFile(); LOG.assertTrue(psiFile != null); - OpenFileInDefaultBrowserAction.doOpen(psiFile, false); + OpenFileInDefaultBrowserAction.doOpen(psiFile, false, null); } @Override diff --git a/xml/impl/src/com/intellij/ide/browsers/UrlImpl.java b/xml/impl/src/com/intellij/ide/browsers/UrlImpl.java index 936cda3bb505..3523ad9bd172 100644 --- a/xml/impl/src/com/intellij/ide/browsers/UrlImpl.java +++ b/xml/impl/src/com/intellij/ide/browsers/UrlImpl.java @@ -169,6 +169,9 @@ public final class UrlImpl implements Url { return true; } if (!(o instanceof UrlImpl)) { + if (o instanceof LocalFileUrl && isInLocalFileSystem()) { + return o.getPath().equals(path); + } return false; } diff --git a/xml/impl/src/com/intellij/ide/browsers/Urls.java b/xml/impl/src/com/intellij/ide/browsers/Urls.java index 763204d24a23..cd40599b7a01 100644 --- a/xml/impl/src/com/intellij/ide/browsers/Urls.java +++ b/xml/impl/src/com/intellij/ide/browsers/Urls.java @@ -120,12 +120,23 @@ public final class Urls { // must not be used in NodeJS public static Url newFromVirtualFile(@NotNull VirtualFile file) { - String path = file.getPath(); if (file.isInLocalFileSystem()) { - return new UrlImpl(file.getFileSystem().getProtocol(), null, path); + return new UrlImpl(file.getFileSystem().getProtocol(), null, file.getPath()); } else { return parseUrl(file.getUrl(), false); } } + + public static boolean equalsIgnoreParameters(@NotNull Url url, @NotNull VirtualFile file) { + if (file.isInLocalFileSystem()) { + return url.isInLocalFileSystem() && url.getPath().equals(file.getPath()); + } + else if (url.isInLocalFileSystem()) { + return false; + } + + Url fileUrl = parseUrl(file.getUrl(), false); + return fileUrl != null && fileUrl.equalsIgnoreParameters(url); + } }
\ No newline at end of file diff --git a/xml/impl/src/com/intellij/ide/browsers/impl/WebBrowserServiceImpl.java b/xml/impl/src/com/intellij/ide/browsers/impl/WebBrowserServiceImpl.java index 4541caf9f483..af7eb2e28278 100644 --- a/xml/impl/src/com/intellij/ide/browsers/impl/WebBrowserServiceImpl.java +++ b/xml/impl/src/com/intellij/ide/browsers/impl/WebBrowserServiceImpl.java @@ -27,10 +27,14 @@ import com.intellij.openapi.vfs.impl.http.HttpVirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.testFramework.LightVirtualFile; +import com.intellij.util.containers.ContainerUtil; import com.intellij.xml.util.HtmlUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Collections; +import java.util.Set; + public class WebBrowserServiceImpl extends WebBrowserService { @Override public boolean canOpenInBrowser(@NotNull PsiElement psiElement) { @@ -40,32 +44,32 @@ public class WebBrowserServiceImpl extends WebBrowserService { ((HtmlUtil.isHtmlFile(psiFile) && !(virtualFile instanceof LightVirtualFile)) || getProvider(psiElement, psiFile) != null); } + @NotNull @Override - @Nullable - public Url getUrlToOpen(@NotNull PsiElement psiElement, boolean preferLocalUrl) throws WebBrowserUrlProvider.BrowserException { + public Set<Url> getUrlToOpen(@NotNull PsiElement psiElement, boolean preferLocalUrl) throws WebBrowserUrlProvider.BrowserException { final PsiFile psiFile = psiElement instanceof PsiFile ? (PsiFile)psiElement : psiElement.getContainingFile(); if (psiFile == null) { - return null; + return Collections.emptySet(); } VirtualFile virtualFile = psiFile.getVirtualFile(); if (virtualFile == null) { - return null; + return Collections.emptySet(); } if (virtualFile instanceof HttpVirtualFile) { - return Urls.newFromVirtualFile(virtualFile); + return Collections.singleton(Urls.newFromVirtualFile(virtualFile)); } if (!(preferLocalUrl && HtmlUtil.isHtmlFile(psiFile))) { - Pair<WebBrowserUrlProvider, Url> provider = getProvider(psiElement); + Pair<WebBrowserUrlProvider, Set<Url>> provider = getProvider(psiElement); if (provider != null) { if (provider.second != null) { return provider.second; } try { - Url url = provider.first.getUrl(psiElement, psiFile, virtualFile); - if (url != null) { - return url; + Set<Url> urls = provider.first.getUrls(psiElement, psiFile, virtualFile); + if (!urls.isEmpty()) { + return urls; } } catch (WebBrowserUrlProvider.BrowserException e) { @@ -75,28 +79,17 @@ public class WebBrowserServiceImpl extends WebBrowserService { } } } - return virtualFile instanceof LightVirtualFile ? null : Urls.newFromVirtualFile(virtualFile); + return virtualFile instanceof LightVirtualFile ? Collections.<Url>emptySet() : Collections.singleton(Urls.newFromVirtualFile(virtualFile)); } - @Override @Nullable - public Url getUrlToOpen(@NotNull PsiElement psiElement) { - try { - return getUrlToOpen(psiElement, false); - } - catch (WebBrowserUrlProvider.BrowserException ignored) { - return null; - } - } - - @Nullable - public static Pair<WebBrowserUrlProvider, Url> getProvider(@Nullable PsiElement element) { + public static Pair<WebBrowserUrlProvider, Set<Url>> getProvider(@Nullable PsiElement element) { PsiFile psiFile = element == null ? null : element.getContainingFile(); return psiFile == null ? null : getProvider(element, psiFile); } - private static Pair<WebBrowserUrlProvider, Url> getProvider(PsiElement element, PsiFile psiFile) { - Ref<Url> result = Ref.create(); + private static Pair<WebBrowserUrlProvider, Set<Url>> getProvider(PsiElement element, PsiFile psiFile) { + Ref<Set<Url>> result = Ref.create(); DumbService dumbService = DumbService.getInstance(element.getProject()); for (WebBrowserUrlProvider urlProvider : WebBrowserUrlProvider.EP_NAME.getExtensions()) { if ((!dumbService.isDumb() || DumbService.isDumbAware(urlProvider)) && urlProvider.canHandleElement(element, psiFile, result)) { @@ -113,8 +106,15 @@ public class WebBrowserServiceImpl extends WebBrowserService { return null; } - Url url = WebBrowserService.getInstance().getUrlToOpen(sourceElement); - if (url == null) { + Url url; + try { + Set<Url> urls = WebBrowserService.getInstance().getUrlToOpen(sourceElement, false); + url = ContainerUtil.getFirstItem(urls); + if (url == null) { + return null; + } + } + catch (WebBrowserUrlProvider.BrowserException ignored) { return null; } @@ -123,7 +123,6 @@ public class WebBrowserServiceImpl extends WebBrowserService { return null; } - boolean isRemote = !url.isInLocalFileSystem(); - return isRemote || HtmlUtil.isHtmlFile(virtualFile) ? url : null; + return !url.isInLocalFileSystem() || HtmlUtil.isHtmlFile(virtualFile) ? url : null; } } diff --git a/xml/impl/src/com/intellij/javaee/EditLocationDialog.java b/xml/impl/src/com/intellij/javaee/EditLocationDialog.java index 443e0d6c42c8..a07d23213227 100644 --- a/xml/impl/src/com/intellij/javaee/EditLocationDialog.java +++ b/xml/impl/src/com/intellij/javaee/EditLocationDialog.java @@ -22,6 +22,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.FixedSizeButton; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.Consumer; import com.intellij.xml.XmlBundle; import javax.swing.*; @@ -63,54 +64,53 @@ public class EditLocationDialog extends DialogWrapper { init(); } + @Override protected JComponent createCenterPanel() { JPanel panel = new JPanel(new GridBagLayout()); panel.add( - new JLabel(myName), - new GridBagConstraints(0, 0, 1, 1, 0, 0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 5, 3, 5), 0, 0) + new JLabel(myName), + new GridBagConstraints(0, 0, 1, 1, 0, 0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 5, 3, 5), 0, 0) ); panel.add( - myTfUrl, - new GridBagConstraints(0, 1, 2, 1, 1, 0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 5, 5, 5), 0, 0) + myTfUrl, + new GridBagConstraints(0, 1, 2, 1, 1, 0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 5, 5, 5), 0, 0) ); myTfUrl.setPreferredSize(new Dimension(350, myTfUrl.getPreferredSize().height)); - if (myShowPath) { + if (myShowPath) { panel.add( - new JLabel(myLocation), - new GridBagConstraints(0, 2, 1, 1, 0, 0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 5, 3, 5), 0, 0) + new JLabel(myLocation), + new GridBagConstraints(0, 2, 1, 1, 0, 0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 5, 3, 5), 0, 0) ); panel.add( - myTfPath, - new GridBagConstraints(0, 3, 1, 1, 1, 0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 5, 10, 0), 0, 0) + myTfPath, + new GridBagConstraints(0, 3, 1, 1, 1, 0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 5, 10, 0), 0, 0) ); panel.add( - myBtnBrowseLocalPath, - new GridBagConstraints(1, 3, 1, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 10, 5), 0, 0) + myBtnBrowseLocalPath, + new GridBagConstraints(1, 3, 1, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 10, 5), 0, 0) ); - // - TextFieldWithBrowseButton.MyDoClickAction.addTo(myBtnBrowseLocalPath, myTfPath); - myBtnBrowseLocalPath.addActionListener( - new ActionListener() { - public void actionPerformed(ActionEvent ignored) { - FileChooserDescriptor descriptor = getChooserDescriptor(); - VirtualFile file = FileChooser.chooseFile(descriptor, myProject, null); - if (file != null) { - myTfPath.setText(file.getPath().replace('/', File.separatorChar)); - } + TextFieldWithBrowseButton.MyDoClickAction.addTo(myBtnBrowseLocalPath, myTfPath); + myBtnBrowseLocalPath.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent ignored) { + FileChooserDescriptor descriptor = getChooserDescriptor(); + FileChooser.chooseFile(descriptor, myProject, null, new Consumer<VirtualFile>() { + @Override + public void consume(VirtualFile file) { + myTfPath.setText(file.getPath().replace('/', File.separatorChar)); } - } - ); + }); + } + }); } - - // - return panel; } + @Override public JComponent getPreferredFocusedComponent() { return myTfUrl; } @@ -125,6 +125,7 @@ public class EditLocationDialog extends DialogWrapper { return new FileChooserDescriptor(true, false, false, false, true, false); } + @Override protected void init() { setTitle(myTitle); myTfUrl = new JTextField(); diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/DefaultXmlTagNameProvider.java b/xml/impl/src/com/intellij/psi/impl/source/xml/DefaultXmlTagNameProvider.java index 1c6ddd4482b4..714d305f969b 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/DefaultXmlTagNameProvider.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/DefaultXmlTagNameProvider.java @@ -15,6 +15,7 @@ */ package com.intellij.psi.impl.source.xml; +import com.intellij.codeInsight.completion.PrioritizedLookupElement; import com.intellij.codeInsight.completion.XmlTagInsertHandler; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; @@ -69,11 +70,10 @@ public class DefaultXmlTagNameProvider implements XmlTagNameProvider { lookupElement = lookupElement.withIcon(((PsiPresentableMetaData)descriptor).getIcon()); } if (xmlExtension.useXmlTagInsertHandler()) { - elements.add(lookupElement.withInsertHandler(XmlTagInsertHandler.INSTANCE)); - } - else { - elements.add(lookupElement); + lookupElement = lookupElement.withInsertHandler(XmlTagInsertHandler.INSTANCE); } + + elements.add(PrioritizedLookupElement.withPriority(lookupElement, separator > 0 ? 0 : 1)); } } diff --git a/xml/openapi/src/com/intellij/ide/browsers/WebBrowserService.java b/xml/openapi/src/com/intellij/ide/browsers/WebBrowserService.java index a6acf587633c..267cfd013fba 100644 --- a/xml/openapi/src/com/intellij/ide/browsers/WebBrowserService.java +++ b/xml/openapi/src/com/intellij/ide/browsers/WebBrowserService.java @@ -18,7 +18,8 @@ package com.intellij.ide.browsers; import com.intellij.openapi.components.ServiceManager; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; + +import java.util.Set; public abstract class WebBrowserService { public static WebBrowserService getInstance() { @@ -27,9 +28,6 @@ public abstract class WebBrowserService { public abstract boolean canOpenInBrowser(@NotNull PsiElement psiElement); - @Nullable - public abstract Url getUrlToOpen(@NotNull PsiElement psiElement); - - @Nullable - public abstract Url getUrlToOpen(@NotNull PsiElement psiElement, boolean preferLocalUrl) throws WebBrowserUrlProvider.BrowserException; + @NotNull + public abstract Set<Url> getUrlToOpen(@NotNull PsiElement psiElement, boolean preferLocalUrl) throws WebBrowserUrlProvider.BrowserException; }
\ No newline at end of file diff --git a/xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProvider.java b/xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProvider.java index 2bdf78c50732..e0d0c85713b6 100644 --- a/xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProvider.java +++ b/xml/openapi/src/com/intellij/ide/browsers/WebBrowserUrlProvider.java @@ -23,11 +23,14 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Collections; +import java.util.Set; + public abstract class WebBrowserUrlProvider { public static ExtensionPointName<WebBrowserUrlProvider> EP_NAME = ExtensionPointName.create("com.intellij.webBrowserUrlProvider"); /** - * Browser exceptions are printed in Error Dialog when user presses any browser button. + * Browser exceptions are printed in Error Dialog when user presses any browser button */ public static class BrowserException extends Exception { public BrowserException(final String message) { @@ -35,16 +38,16 @@ public abstract class WebBrowserUrlProvider { } } - public boolean canHandleElement(@NotNull PsiElement element, @NotNull PsiFile psiFile, @NotNull Ref<Url> result) { + public boolean canHandleElement(@NotNull PsiElement element, @NotNull PsiFile psiFile, @NotNull Ref<Set<Url>> result) { VirtualFile file = psiFile.getVirtualFile(); if (file == null) { return false; } try { - Url url = getUrl(element, psiFile, file); - if (url != null) { - result.set(url); + Set<Url> urls = getUrls(element, psiFile, file); + if (!urls.isEmpty()) { + result.set(urls); return true; } } @@ -55,7 +58,14 @@ public abstract class WebBrowserUrlProvider { } @Nullable - public abstract Url getUrl(@NotNull PsiElement element, @NotNull PsiFile psiFile, @NotNull VirtualFile virtualFile) throws BrowserException; + protected Url getUrl(@NotNull PsiElement element, @NotNull PsiFile psiFile, @NotNull VirtualFile virtualFile) throws BrowserException { + return null; + } + + public Set<Url> getUrls(@NotNull PsiElement element, @NotNull PsiFile psiFile, @NotNull VirtualFile virtualFile) throws BrowserException { + Url url = getUrl(element, psiFile, virtualFile); + return url == null ? Collections.<Url>emptySet() : Collections.singleton(url); + } @Nullable public String getOpenInBrowserActionText(@NotNull PsiFile file) { diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/xml/RngHtml5SchemaProvider.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/xml/RngHtml5SchemaProvider.java index e86e5328481b..d59cd9035f7b 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/xml/RngHtml5SchemaProvider.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/xml/RngHtml5SchemaProvider.java @@ -20,4 +20,10 @@ public class RngHtml5SchemaProvider extends Html5SchemaProvider { public URL getXhtmlSchemaLocation() { return RngHtml5SchemaProvider.class.getResource("/resources/html5-schema/xhtml5.rnc"); } + + @NotNull + @Override + public URL getCharsLocation() { + return RngHtml5SchemaProvider.class.getResource("/resources/html5-schema/html5chars.ent"); + } } diff --git a/xml/relaxng/src/resources/html5-schema/html5charref.rb b/xml/relaxng/src/resources/html5-schema/html5charref.rb new file mode 100755 index 000000000000..b5850d6ece72 --- /dev/null +++ b/xml/relaxng/src/resources/html5-schema/html5charref.rb @@ -0,0 +1,38 @@ +#! /usr/bin/env ruby +CHAR_REFS_URL = 'http://dev.w3.org/html5/html-author/charref' +refs = `curl #{CHAR_REFS_URL}` + +header = <<header +<!-- + * Copyright 2000-#{Time.now.year} JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + --> + +<!-- It's an automatically generated code. Do not modify it. --> +<!-- Please see #{CHAR_REFS_URL} and #{$0} --> + +header + +body = "" +refs.scan(/<td class="named"><code>&((\w|; &)+);\<\/code><td class="hex"><code>&(#([^;])*);<\/code><td class="dec"><code>&(#([^;])*);<\/code>/) do | match | + $1.split("; &").each do | name | + body = body + " <!ENTITY #{name} \"&#{$5};\" >\n" + end +end + + +footer = <<footer +footer + +puts header + body + footer
\ No newline at end of file diff --git a/xml/relaxng/src/resources/html5-schema/html5chars.ent b/xml/relaxng/src/resources/html5-schema/html5chars.ent new file mode 100644 index 000000000000..419a0e6a83a0 --- /dev/null +++ b/xml/relaxng/src/resources/html5-schema/html5chars.ent @@ -0,0 +1,2050 @@ +<!-- + * Copyright 2000-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + --> + +<!-- It's an automatically generated code. Do not modify it. --> +<!-- Please see http://dev.w3.org/html5/html-author/charref and ./html5charref.rb --> + + <!ENTITY Tab "	" > + <!ENTITY NewLine " " > + <!ENTITY excl "!" > + <!ENTITY quot """ > + <!ENTITY QUOT """ > + <!ENTITY num "#" > + <!ENTITY dollar "$" > + <!ENTITY percnt "%" > + <!ENTITY amp "&" > + <!ENTITY AMP "&" > + <!ENTITY apos "'" > + <!ENTITY lpar "(" > + <!ENTITY rpar ")" > + <!ENTITY ast "*" > + <!ENTITY midast "*" > + <!ENTITY plus "+" > + <!ENTITY comma "," > + <!ENTITY period "." > + <!ENTITY sol "/" > + <!ENTITY colon ":" > + <!ENTITY semi ";" > + <!ENTITY lt "<" > + <!ENTITY LT "<" > + <!ENTITY equals "=" > + <!ENTITY gt ">" > + <!ENTITY GT ">" > + <!ENTITY quest "?" > + <!ENTITY commat "@" > + <!ENTITY lsqb "[" > + <!ENTITY lbrack "[" > + <!ENTITY bsol "\" > + <!ENTITY rsqb "]" > + <!ENTITY rbrack "]" > + <!ENTITY Hat "^" > + <!ENTITY lowbar "_" > + <!ENTITY grave "`" > + <!ENTITY DiacriticalGrave "`" > + <!ENTITY lcub "{" > + <!ENTITY lbrace "{" > + <!ENTITY verbar "|" > + <!ENTITY vert "|" > + <!ENTITY VerticalLine "|" > + <!ENTITY rcub "}" > + <!ENTITY rbrace "}" > + <!ENTITY nbsp " " > + <!ENTITY NonBreakingSpace " " > + <!ENTITY iexcl "¡" > + <!ENTITY cent "¢" > + <!ENTITY pound "£" > + <!ENTITY curren "¤" > + <!ENTITY yen "¥" > + <!ENTITY brvbar "¦" > + <!ENTITY sect "§" > + <!ENTITY Dot "¨" > + <!ENTITY die "¨" > + <!ENTITY DoubleDot "¨" > + <!ENTITY uml "¨" > + <!ENTITY copy "©" > + <!ENTITY COPY "©" > + <!ENTITY ordf "ª" > + <!ENTITY laquo "«" > + <!ENTITY not "¬" > + <!ENTITY shy "­" > + <!ENTITY reg "®" > + <!ENTITY circledR "®" > + <!ENTITY REG "®" > + <!ENTITY macr "¯" > + <!ENTITY OverBar "¯" > + <!ENTITY strns "¯" > + <!ENTITY deg "°" > + <!ENTITY plusmn "±" > + <!ENTITY pm "±" > + <!ENTITY PlusMinus "±" > + <!ENTITY sup2 "²" > + <!ENTITY sup3 "³" > + <!ENTITY acute "´" > + <!ENTITY DiacriticalAcute "´" > + <!ENTITY micro "µ" > + <!ENTITY para "¶" > + <!ENTITY middot "·" > + <!ENTITY centerdot "·" > + <!ENTITY CenterDot "·" > + <!ENTITY cedil "¸" > + <!ENTITY Cedilla "¸" > + <!ENTITY sup1 "¹" > + <!ENTITY ordm "º" > + <!ENTITY raquo "»" > + <!ENTITY frac14 "¼" > + <!ENTITY frac12 "½" > + <!ENTITY half "½" > + <!ENTITY frac34 "¾" > + <!ENTITY iquest "¿" > + <!ENTITY Agrave "À" > + <!ENTITY Aacute "Á" > + <!ENTITY Acirc "Â" > + <!ENTITY Atilde "Ã" > + <!ENTITY Auml "Ä" > + <!ENTITY Aring "Å" > + <!ENTITY AElig "Æ" > + <!ENTITY Ccedil "Ç" > + <!ENTITY Egrave "È" > + <!ENTITY Eacute "É" > + <!ENTITY Ecirc "Ê" > + <!ENTITY Euml "Ë" > + <!ENTITY Igrave "Ì" > + <!ENTITY Iacute "Í" > + <!ENTITY Icirc "Î" > + <!ENTITY Iuml "Ï" > + <!ENTITY ETH "Ð" > + <!ENTITY Ntilde "Ñ" > + <!ENTITY Ograve "Ò" > + <!ENTITY Oacute "Ó" > + <!ENTITY Ocirc "Ô" > + <!ENTITY Otilde "Õ" > + <!ENTITY Ouml "Ö" > + <!ENTITY times "×" > + <!ENTITY Oslash "Ø" > + <!ENTITY Ugrave "Ù" > + <!ENTITY Uacute "Ú" > + <!ENTITY Ucirc "Û" > + <!ENTITY Uuml "Ü" > + <!ENTITY Yacute "Ý" > + <!ENTITY THORN "Þ" > + <!ENTITY szlig "ß" > + <!ENTITY agrave "à" > + <!ENTITY aacute "á" > + <!ENTITY acirc "â" > + <!ENTITY atilde "ã" > + <!ENTITY auml "ä" > + <!ENTITY aring "å" > + <!ENTITY aelig "æ" > + <!ENTITY ccedil "ç" > + <!ENTITY egrave "è" > + <!ENTITY eacute "é" > + <!ENTITY ecirc "ê" > + <!ENTITY euml "ë" > + <!ENTITY igrave "ì" > + <!ENTITY iacute "í" > + <!ENTITY icirc "î" > + <!ENTITY iuml "ï" > + <!ENTITY eth "ð" > + <!ENTITY ntilde "ñ" > + <!ENTITY ograve "ò" > + <!ENTITY oacute "ó" > + <!ENTITY ocirc "ô" > + <!ENTITY otilde "õ" > + <!ENTITY ouml "ö" > + <!ENTITY divide "÷" > + <!ENTITY div "÷" > + <!ENTITY oslash "ø" > + <!ENTITY ugrave "ù" > + <!ENTITY uacute "ú" > + <!ENTITY ucirc "û" > + <!ENTITY uuml "ü" > + <!ENTITY yacute "ý" > + <!ENTITY thorn "þ" > + <!ENTITY yuml "ÿ" > + <!ENTITY Amacr "Ā" > + <!ENTITY amacr "ā" > + <!ENTITY Abreve "Ă" > + <!ENTITY abreve "ă" > + <!ENTITY Aogon "Ą" > + <!ENTITY aogon "ą" > + <!ENTITY Cacute "Ć" > + <!ENTITY cacute "ć" > + <!ENTITY Ccirc "Ĉ" > + <!ENTITY ccirc "ĉ" > + <!ENTITY Cdot "Ċ" > + <!ENTITY cdot "ċ" > + <!ENTITY Ccaron "Č" > + <!ENTITY ccaron "č" > + <!ENTITY Dcaron "Ď" > + <!ENTITY dcaron "ď" > + <!ENTITY Dstrok "Đ" > + <!ENTITY dstrok "đ" > + <!ENTITY Emacr "Ē" > + <!ENTITY emacr "ē" > + <!ENTITY Edot "Ė" > + <!ENTITY edot "ė" > + <!ENTITY Eogon "Ę" > + <!ENTITY eogon "ę" > + <!ENTITY Ecaron "Ě" > + <!ENTITY ecaron "ě" > + <!ENTITY Gcirc "Ĝ" > + <!ENTITY gcirc "ĝ" > + <!ENTITY Gbreve "Ğ" > + <!ENTITY gbreve "ğ" > + <!ENTITY Gdot "Ġ" > + <!ENTITY gdot "ġ" > + <!ENTITY Gcedil "Ģ" > + <!ENTITY Hcirc "Ĥ" > + <!ENTITY hcirc "ĥ" > + <!ENTITY Hstrok "Ħ" > + <!ENTITY hstrok "ħ" > + <!ENTITY Itilde "Ĩ" > + <!ENTITY itilde "ĩ" > + <!ENTITY Imacr "Ī" > + <!ENTITY imacr "ī" > + <!ENTITY Iogon "Į" > + <!ENTITY iogon "į" > + <!ENTITY Idot "İ" > + <!ENTITY imath "ı" > + <!ENTITY inodot "ı" > + <!ENTITY IJlig "IJ" > + <!ENTITY ijlig "ij" > + <!ENTITY Jcirc "Ĵ" > + <!ENTITY jcirc "ĵ" > + <!ENTITY Kcedil "Ķ" > + <!ENTITY kcedil "ķ" > + <!ENTITY kgreen "ĸ" > + <!ENTITY Lacute "Ĺ" > + <!ENTITY lacute "ĺ" > + <!ENTITY Lcedil "Ļ" > + <!ENTITY lcedil "ļ" > + <!ENTITY Lcaron "Ľ" > + <!ENTITY lcaron "ľ" > + <!ENTITY Lmidot "Ŀ" > + <!ENTITY lmidot "ŀ" > + <!ENTITY Lstrok "Ł" > + <!ENTITY lstrok "ł" > + <!ENTITY Nacute "Ń" > + <!ENTITY nacute "ń" > + <!ENTITY Ncedil "Ņ" > + <!ENTITY ncedil "ņ" > + <!ENTITY Ncaron "Ň" > + <!ENTITY ncaron "ň" > + <!ENTITY napos "ʼn" > + <!ENTITY ENG "Ŋ" > + <!ENTITY eng "ŋ" > + <!ENTITY Omacr "Ō" > + <!ENTITY omacr "ō" > + <!ENTITY Odblac "Ő" > + <!ENTITY odblac "ő" > + <!ENTITY OElig "Œ" > + <!ENTITY oelig "œ" > + <!ENTITY Racute "Ŕ" > + <!ENTITY racute "ŕ" > + <!ENTITY Rcedil "Ŗ" > + <!ENTITY rcedil "ŗ" > + <!ENTITY Rcaron "Ř" > + <!ENTITY rcaron "ř" > + <!ENTITY Sacute "Ś" > + <!ENTITY sacute "ś" > + <!ENTITY Scirc "Ŝ" > + <!ENTITY scirc "ŝ" > + <!ENTITY Scedil "Ş" > + <!ENTITY scedil "ş" > + <!ENTITY Scaron "Š" > + <!ENTITY scaron "š" > + <!ENTITY Tcedil "Ţ" > + <!ENTITY tcedil "ţ" > + <!ENTITY Tcaron "Ť" > + <!ENTITY tcaron "ť" > + <!ENTITY Tstrok "Ŧ" > + <!ENTITY tstrok "ŧ" > + <!ENTITY Utilde "Ũ" > + <!ENTITY utilde "ũ" > + <!ENTITY Umacr "Ū" > + <!ENTITY umacr "ū" > + <!ENTITY Ubreve "Ŭ" > + <!ENTITY ubreve "ŭ" > + <!ENTITY Uring "Ů" > + <!ENTITY uring "ů" > + <!ENTITY Udblac "Ű" > + <!ENTITY udblac "ű" > + <!ENTITY Uogon "Ų" > + <!ENTITY uogon "ų" > + <!ENTITY Wcirc "Ŵ" > + <!ENTITY wcirc "ŵ" > + <!ENTITY Ycirc "Ŷ" > + <!ENTITY ycirc "ŷ" > + <!ENTITY Yuml "Ÿ" > + <!ENTITY Zacute "Ź" > + <!ENTITY zacute "ź" > + <!ENTITY Zdot "Ż" > + <!ENTITY zdot "ż" > + <!ENTITY Zcaron "Ž" > + <!ENTITY zcaron "ž" > + <!ENTITY fnof "ƒ" > + <!ENTITY imped "Ƶ" > + <!ENTITY gacute "ǵ" > + <!ENTITY jmath "ȷ" > + <!ENTITY circ "ˆ" > + <!ENTITY caron "ˇ" > + <!ENTITY Hacek "ˇ" > + <!ENTITY breve "˘" > + <!ENTITY Breve "˘" > + <!ENTITY dot "˙" > + <!ENTITY DiacriticalDot "˙" > + <!ENTITY ring "˚" > + <!ENTITY ogon "˛" > + <!ENTITY tilde "˜" > + <!ENTITY DiacriticalTilde "˜" > + <!ENTITY dblac "˝" > + <!ENTITY DiacriticalDoubleAcute "˝" > + <!ENTITY DownBreve "̑" > + <!ENTITY UnderBar "̲" > + <!ENTITY Alpha "Α" > + <!ENTITY Beta "Β" > + <!ENTITY Gamma "Γ" > + <!ENTITY Delta "Δ" > + <!ENTITY Epsilon "Ε" > + <!ENTITY Zeta "Ζ" > + <!ENTITY Eta "Η" > + <!ENTITY Theta "Θ" > + <!ENTITY Iota "Ι" > + <!ENTITY Kappa "Κ" > + <!ENTITY Lambda "Λ" > + <!ENTITY Mu "Μ" > + <!ENTITY Nu "Ν" > + <!ENTITY Xi "Ξ" > + <!ENTITY Omicron "Ο" > + <!ENTITY Pi "Π" > + <!ENTITY Rho "Ρ" > + <!ENTITY Sigma "Σ" > + <!ENTITY Tau "Τ" > + <!ENTITY Upsilon "Υ" > + <!ENTITY Phi "Φ" > + <!ENTITY Chi "Χ" > + <!ENTITY Psi "Ψ" > + <!ENTITY Omega "Ω" > + <!ENTITY alpha "α" > + <!ENTITY beta "β" > + <!ENTITY gamma "γ" > + <!ENTITY delta "δ" > + <!ENTITY epsiv "ε" > + <!ENTITY varepsilon "ε" > + <!ENTITY epsilon "ε" > + <!ENTITY zeta "ζ" > + <!ENTITY eta "η" > + <!ENTITY theta "θ" > + <!ENTITY iota "ι" > + <!ENTITY kappa "κ" > + <!ENTITY lambda "λ" > + <!ENTITY mu "μ" > + <!ENTITY nu "ν" > + <!ENTITY xi "ξ" > + <!ENTITY omicron "ο" > + <!ENTITY pi "π" > + <!ENTITY rho "ρ" > + <!ENTITY sigmav "ς" > + <!ENTITY varsigma "ς" > + <!ENTITY sigmaf "ς" > + <!ENTITY sigma "σ" > + <!ENTITY tau "τ" > + <!ENTITY upsi "υ" > + <!ENTITY upsilon "υ" > + <!ENTITY phi "φ" > + <!ENTITY phiv "φ" > + <!ENTITY varphi "φ" > + <!ENTITY chi "χ" > + <!ENTITY psi "ψ" > + <!ENTITY omega "ω" > + <!ENTITY thetav "ϑ" > + <!ENTITY vartheta "ϑ" > + <!ENTITY thetasym "ϑ" > + <!ENTITY Upsi "ϒ" > + <!ENTITY upsih "ϒ" > + <!ENTITY straightphi "ϕ" > + <!ENTITY piv "ϖ" > + <!ENTITY varpi "ϖ" > + <!ENTITY Gammad "Ϝ" > + <!ENTITY gammad "ϝ" > + <!ENTITY digamma "ϝ" > + <!ENTITY kappav "ϰ" > + <!ENTITY varkappa "ϰ" > + <!ENTITY rhov "ϱ" > + <!ENTITY varrho "ϱ" > + <!ENTITY epsi "ϵ" > + <!ENTITY straightepsilon "ϵ" > + <!ENTITY bepsi "϶" > + <!ENTITY backepsilon "϶" > + <!ENTITY IOcy "Ё" > + <!ENTITY DJcy "Ђ" > + <!ENTITY GJcy "Ѓ" > + <!ENTITY Jukcy "Є" > + <!ENTITY DScy "Ѕ" > + <!ENTITY Iukcy "І" > + <!ENTITY YIcy "Ї" > + <!ENTITY Jsercy "Ј" > + <!ENTITY LJcy "Љ" > + <!ENTITY NJcy "Њ" > + <!ENTITY TSHcy "Ћ" > + <!ENTITY KJcy "Ќ" > + <!ENTITY Ubrcy "Ў" > + <!ENTITY DZcy "Џ" > + <!ENTITY Acy "А" > + <!ENTITY Bcy "Б" > + <!ENTITY Vcy "В" > + <!ENTITY Gcy "Г" > + <!ENTITY Dcy "Д" > + <!ENTITY IEcy "Е" > + <!ENTITY ZHcy "Ж" > + <!ENTITY Zcy "З" > + <!ENTITY Icy "И" > + <!ENTITY Jcy "Й" > + <!ENTITY Kcy "К" > + <!ENTITY Lcy "Л" > + <!ENTITY Mcy "М" > + <!ENTITY Ncy "Н" > + <!ENTITY Ocy "О" > + <!ENTITY Pcy "П" > + <!ENTITY Rcy "Р" > + <!ENTITY Scy "С" > + <!ENTITY Tcy "Т" > + <!ENTITY Ucy "У" > + <!ENTITY Fcy "Ф" > + <!ENTITY KHcy "Х" > + <!ENTITY TScy "Ц" > + <!ENTITY CHcy "Ч" > + <!ENTITY SHcy "Ш" > + <!ENTITY SHCHcy "Щ" > + <!ENTITY HARDcy "Ъ" > + <!ENTITY Ycy "Ы" > + <!ENTITY SOFTcy "Ь" > + <!ENTITY Ecy "Э" > + <!ENTITY YUcy "Ю" > + <!ENTITY YAcy "Я" > + <!ENTITY acy "а" > + <!ENTITY bcy "б" > + <!ENTITY vcy "в" > + <!ENTITY gcy "г" > + <!ENTITY dcy "д" > + <!ENTITY iecy "е" > + <!ENTITY zhcy "ж" > + <!ENTITY zcy "з" > + <!ENTITY icy "и" > + <!ENTITY jcy "й" > + <!ENTITY kcy "к" > + <!ENTITY lcy "л" > + <!ENTITY mcy "м" > + <!ENTITY ncy "н" > + <!ENTITY ocy "о" > + <!ENTITY pcy "п" > + <!ENTITY rcy "р" > + <!ENTITY scy "с" > + <!ENTITY tcy "т" > + <!ENTITY ucy "у" > + <!ENTITY fcy "ф" > + <!ENTITY khcy "х" > + <!ENTITY tscy "ц" > + <!ENTITY chcy "ч" > + <!ENTITY shcy "ш" > + <!ENTITY shchcy "щ" > + <!ENTITY hardcy "ъ" > + <!ENTITY ycy "ы" > + <!ENTITY softcy "ь" > + <!ENTITY ecy "э" > + <!ENTITY yucy "ю" > + <!ENTITY yacy "я" > + <!ENTITY iocy "ё" > + <!ENTITY djcy "ђ" > + <!ENTITY gjcy "ѓ" > + <!ENTITY jukcy "є" > + <!ENTITY dscy "ѕ" > + <!ENTITY iukcy "і" > + <!ENTITY yicy "ї" > + <!ENTITY jsercy "ј" > + <!ENTITY ljcy "љ" > + <!ENTITY njcy "њ" > + <!ENTITY tshcy "ћ" > + <!ENTITY kjcy "ќ" > + <!ENTITY ubrcy "ў" > + <!ENTITY dzcy "џ" > + <!ENTITY ensp " " > + <!ENTITY emsp " " > + <!ENTITY emsp13 " " > + <!ENTITY emsp14 " " > + <!ENTITY numsp " " > + <!ENTITY puncsp " " > + <!ENTITY thinsp " " > + <!ENTITY ThinSpace " " > + <!ENTITY hairsp " " > + <!ENTITY VeryThinSpace " " > + <!ENTITY ZeroWidthSpace "​" > + <!ENTITY NegativeVeryThinSpace "​" > + <!ENTITY NegativeThinSpace "​" > + <!ENTITY NegativeMediumSpace "​" > + <!ENTITY NegativeThickSpace "​" > + <!ENTITY zwnj "‌" > + <!ENTITY zwj "‍" > + <!ENTITY lrm "‎" > + <!ENTITY rlm "‏" > + <!ENTITY hyphen "‐" > + <!ENTITY dash "‐" > + <!ENTITY ndash "–" > + <!ENTITY mdash "—" > + <!ENTITY horbar "―" > + <!ENTITY Verbar "‖" > + <!ENTITY Vert "‖" > + <!ENTITY lsquo "‘" > + <!ENTITY OpenCurlyQuote "‘" > + <!ENTITY rsquo "’" > + <!ENTITY rsquor "’" > + <!ENTITY CloseCurlyQuote "’" > + <!ENTITY lsquor "‚" > + <!ENTITY sbquo "‚" > + <!ENTITY ldquo "“" > + <!ENTITY OpenCurlyDoubleQuote "“" > + <!ENTITY rdquo "”" > + <!ENTITY rdquor "”" > + <!ENTITY CloseCurlyDoubleQuote "”" > + <!ENTITY ldquor "„" > + <!ENTITY bdquo "„" > + <!ENTITY dagger "†" > + <!ENTITY Dagger "‡" > + <!ENTITY ddagger "‡" > + <!ENTITY bull "•" > + <!ENTITY bullet "•" > + <!ENTITY nldr "‥" > + <!ENTITY hellip "…" > + <!ENTITY mldr "…" > + <!ENTITY permil "‰" > + <!ENTITY pertenk "‱" > + <!ENTITY prime "′" > + <!ENTITY Prime "″" > + <!ENTITY tprime "‴" > + <!ENTITY bprime "‵" > + <!ENTITY backprime "‵" > + <!ENTITY lsaquo "‹" > + <!ENTITY rsaquo "›" > + <!ENTITY oline "‾" > + <!ENTITY caret "⁁" > + <!ENTITY hybull "⁃" > + <!ENTITY frasl "⁄" > + <!ENTITY bsemi "⁏" > + <!ENTITY qprime "⁗" > + <!ENTITY MediumSpace " " > + <!ENTITY NoBreak "⁠" > + <!ENTITY ApplyFunction "⁡" > + <!ENTITY af "⁡" > + <!ENTITY InvisibleTimes "⁢" > + <!ENTITY it "⁢" > + <!ENTITY InvisibleComma "⁣" > + <!ENTITY ic "⁣" > + <!ENTITY euro "€" > + <!ENTITY tdot "⃛" > + <!ENTITY TripleDot "⃛" > + <!ENTITY DotDot "⃜" > + <!ENTITY Copf "ℂ" > + <!ENTITY complexes "ℂ" > + <!ENTITY incare "℅" > + <!ENTITY gscr "ℊ" > + <!ENTITY hamilt "ℋ" > + <!ENTITY HilbertSpace "ℋ" > + <!ENTITY Hscr "ℋ" > + <!ENTITY Hfr "ℌ" > + <!ENTITY Poincareplane "ℌ" > + <!ENTITY quaternions "ℍ" > + <!ENTITY Hopf "ℍ" > + <!ENTITY planckh "ℎ" > + <!ENTITY planck "ℏ" > + <!ENTITY hbar "ℏ" > + <!ENTITY plankv "ℏ" > + <!ENTITY hslash "ℏ" > + <!ENTITY Iscr "ℐ" > + <!ENTITY imagline "ℐ" > + <!ENTITY image "ℑ" > + <!ENTITY Im "ℑ" > + <!ENTITY imagpart "ℑ" > + <!ENTITY Ifr "ℑ" > + <!ENTITY Lscr "ℒ" > + <!ENTITY lagran "ℒ" > + <!ENTITY Laplacetrf "ℒ" > + <!ENTITY ell "ℓ" > + <!ENTITY Nopf "ℕ" > + <!ENTITY naturals "ℕ" > + <!ENTITY numero "№" > + <!ENTITY copysr "℗" > + <!ENTITY weierp "℘" > + <!ENTITY wp "℘" > + <!ENTITY Popf "ℙ" > + <!ENTITY primes "ℙ" > + <!ENTITY rationals "ℚ" > + <!ENTITY Qopf "ℚ" > + <!ENTITY Rscr "ℛ" > + <!ENTITY realine "ℛ" > + <!ENTITY real "ℜ" > + <!ENTITY Re "ℜ" > + <!ENTITY realpart "ℜ" > + <!ENTITY Rfr "ℜ" > + <!ENTITY reals "ℝ" > + <!ENTITY Ropf "ℝ" > + <!ENTITY rx "℞" > + <!ENTITY trade "™" > + <!ENTITY TRADE "™" > + <!ENTITY integers "ℤ" > + <!ENTITY Zopf "ℤ" > + <!ENTITY ohm "Ω" > + <!ENTITY mho "℧" > + <!ENTITY Zfr "ℨ" > + <!ENTITY zeetrf "ℨ" > + <!ENTITY iiota "℩" > + <!ENTITY angst "Å" > + <!ENTITY bernou "ℬ" > + <!ENTITY Bernoullis "ℬ" > + <!ENTITY Bscr "ℬ" > + <!ENTITY Cfr "ℭ" > + <!ENTITY Cayleys "ℭ" > + <!ENTITY escr "ℯ" > + <!ENTITY Escr "ℰ" > + <!ENTITY expectation "ℰ" > + <!ENTITY Fscr "ℱ" > + <!ENTITY Fouriertrf "ℱ" > + <!ENTITY phmmat "ℳ" > + <!ENTITY Mellintrf "ℳ" > + <!ENTITY Mscr "ℳ" > + <!ENTITY order "ℴ" > + <!ENTITY orderof "ℴ" > + <!ENTITY oscr "ℴ" > + <!ENTITY alefsym "ℵ" > + <!ENTITY aleph "ℵ" > + <!ENTITY beth "ℶ" > + <!ENTITY gimel "ℷ" > + <!ENTITY daleth "ℸ" > + <!ENTITY CapitalDifferentialD "ⅅ" > + <!ENTITY DD "ⅅ" > + <!ENTITY DifferentialD "ⅆ" > + <!ENTITY dd "ⅆ" > + <!ENTITY ExponentialE "ⅇ" > + <!ENTITY exponentiale "ⅇ" > + <!ENTITY ee "ⅇ" > + <!ENTITY ImaginaryI "ⅈ" > + <!ENTITY ii "ⅈ" > + <!ENTITY frac13 "⅓" > + <!ENTITY frac23 "⅔" > + <!ENTITY frac15 "⅕" > + <!ENTITY frac25 "⅖" > + <!ENTITY frac35 "⅗" > + <!ENTITY frac45 "⅘" > + <!ENTITY frac16 "⅙" > + <!ENTITY frac56 "⅚" > + <!ENTITY frac18 "⅛" > + <!ENTITY frac38 "⅜" > + <!ENTITY frac58 "⅝" > + <!ENTITY frac78 "⅞" > + <!ENTITY larr "←" > + <!ENTITY leftarrow "←" > + <!ENTITY LeftArrow "←" > + <!ENTITY slarr "←" > + <!ENTITY ShortLeftArrow "←" > + <!ENTITY uarr "↑" > + <!ENTITY uparrow "↑" > + <!ENTITY UpArrow "↑" > + <!ENTITY ShortUpArrow "↑" > + <!ENTITY rarr "→" > + <!ENTITY rightarrow "→" > + <!ENTITY RightArrow "→" > + <!ENTITY srarr "→" > + <!ENTITY ShortRightArrow "→" > + <!ENTITY darr "↓" > + <!ENTITY downarrow "↓" > + <!ENTITY DownArrow "↓" > + <!ENTITY ShortDownArrow "↓" > + <!ENTITY harr "↔" > + <!ENTITY leftrightarrow "↔" > + <!ENTITY LeftRightArrow "↔" > + <!ENTITY varr "↕" > + <!ENTITY updownarrow "↕" > + <!ENTITY UpDownArrow "↕" > + <!ENTITY nwarr "↖" > + <!ENTITY UpperLeftArrow "↖" > + <!ENTITY nwarrow "↖" > + <!ENTITY nearr "↗" > + <!ENTITY UpperRightArrow "↗" > + <!ENTITY nearrow "↗" > + <!ENTITY searr "↘" > + <!ENTITY searrow "↘" > + <!ENTITY LowerRightArrow "↘" > + <!ENTITY swarr "↙" > + <!ENTITY swarrow "↙" > + <!ENTITY LowerLeftArrow "↙" > + <!ENTITY nlarr "↚" > + <!ENTITY nleftarrow "↚" > + <!ENTITY nrarr "↛" > + <!ENTITY nrightarrow "↛" > + <!ENTITY rarrw "↝" > + <!ENTITY rightsquigarrow "↝" > + <!ENTITY Larr "↞" > + <!ENTITY twoheadleftarrow "↞" > + <!ENTITY Uarr "↟" > + <!ENTITY Rarr "↠" > + <!ENTITY twoheadrightarrow "↠" > + <!ENTITY Darr "↡" > + <!ENTITY larrtl "↢" > + <!ENTITY leftarrowtail "↢" > + <!ENTITY rarrtl "↣" > + <!ENTITY rightarrowtail "↣" > + <!ENTITY LeftTeeArrow "↤" > + <!ENTITY mapstoleft "↤" > + <!ENTITY UpTeeArrow "↥" > + <!ENTITY mapstoup "↥" > + <!ENTITY map "↦" > + <!ENTITY RightTeeArrow "↦" > + <!ENTITY mapsto "↦" > + <!ENTITY DownTeeArrow "↧" > + <!ENTITY mapstodown "↧" > + <!ENTITY larrhk "↩" > + <!ENTITY hookleftarrow "↩" > + <!ENTITY rarrhk "↪" > + <!ENTITY hookrightarrow "↪" > + <!ENTITY larrlp "↫" > + <!ENTITY looparrowleft "↫" > + <!ENTITY rarrlp "↬" > + <!ENTITY looparrowright "↬" > + <!ENTITY harrw "↭" > + <!ENTITY leftrightsquigarrow "↭" > + <!ENTITY nharr "↮" > + <!ENTITY nleftrightarrow "↮" > + <!ENTITY lsh "↰" > + <!ENTITY Lsh "↰" > + <!ENTITY rsh "↱" > + <!ENTITY Rsh "↱" > + <!ENTITY ldsh "↲" > + <!ENTITY rdsh "↳" > + <!ENTITY crarr "↵" > + <!ENTITY cularr "↶" > + <!ENTITY curvearrowleft "↶" > + <!ENTITY curarr "↷" > + <!ENTITY curvearrowright "↷" > + <!ENTITY olarr "↺" > + <!ENTITY circlearrowleft "↺" > + <!ENTITY orarr "↻" > + <!ENTITY circlearrowright "↻" > + <!ENTITY lharu "↼" > + <!ENTITY LeftVector "↼" > + <!ENTITY leftharpoonup "↼" > + <!ENTITY lhard "↽" > + <!ENTITY leftharpoondown "↽" > + <!ENTITY DownLeftVector "↽" > + <!ENTITY uharr "↾" > + <!ENTITY upharpoonright "↾" > + <!ENTITY RightUpVector "↾" > + <!ENTITY uharl "↿" > + <!ENTITY upharpoonleft "↿" > + <!ENTITY LeftUpVector "↿" > + <!ENTITY rharu "⇀" > + <!ENTITY RightVector "⇀" > + <!ENTITY rightharpoonup "⇀" > + <!ENTITY rhard "⇁" > + <!ENTITY rightharpoondown "⇁" > + <!ENTITY DownRightVector "⇁" > + <!ENTITY dharr "⇂" > + <!ENTITY RightDownVector "⇂" > + <!ENTITY downharpoonright "⇂" > + <!ENTITY dharl "⇃" > + <!ENTITY LeftDownVector "⇃" > + <!ENTITY downharpoonleft "⇃" > + <!ENTITY rlarr "⇄" > + <!ENTITY rightleftarrows "⇄" > + <!ENTITY RightArrowLeftArrow "⇄" > + <!ENTITY udarr "⇅" > + <!ENTITY UpArrowDownArrow "⇅" > + <!ENTITY lrarr "⇆" > + <!ENTITY leftrightarrows "⇆" > + <!ENTITY LeftArrowRightArrow "⇆" > + <!ENTITY llarr "⇇" > + <!ENTITY leftleftarrows "⇇" > + <!ENTITY uuarr "⇈" > + <!ENTITY upuparrows "⇈" > + <!ENTITY rrarr "⇉" > + <!ENTITY rightrightarrows "⇉" > + <!ENTITY ddarr "⇊" > + <!ENTITY downdownarrows "⇊" > + <!ENTITY lrhar "⇋" > + <!ENTITY ReverseEquilibrium "⇋" > + <!ENTITY leftrightharpoons "⇋" > + <!ENTITY rlhar "⇌" > + <!ENTITY rightleftharpoons "⇌" > + <!ENTITY Equilibrium "⇌" > + <!ENTITY nlArr "⇍" > + <!ENTITY nLeftarrow "⇍" > + <!ENTITY nhArr "⇎" > + <!ENTITY nLeftrightarrow "⇎" > + <!ENTITY nrArr "⇏" > + <!ENTITY nRightarrow "⇏" > + <!ENTITY lArr "⇐" > + <!ENTITY Leftarrow "⇐" > + <!ENTITY DoubleLeftArrow "⇐" > + <!ENTITY uArr "⇑" > + <!ENTITY Uparrow "⇑" > + <!ENTITY DoubleUpArrow "⇑" > + <!ENTITY rArr "⇒" > + <!ENTITY Rightarrow "⇒" > + <!ENTITY Implies "⇒" > + <!ENTITY DoubleRightArrow "⇒" > + <!ENTITY dArr "⇓" > + <!ENTITY Downarrow "⇓" > + <!ENTITY DoubleDownArrow "⇓" > + <!ENTITY hArr "⇔" > + <!ENTITY Leftrightarrow "⇔" > + <!ENTITY DoubleLeftRightArrow "⇔" > + <!ENTITY iff "⇔" > + <!ENTITY vArr "⇕" > + <!ENTITY Updownarrow "⇕" > + <!ENTITY DoubleUpDownArrow "⇕" > + <!ENTITY nwArr "⇖" > + <!ENTITY neArr "⇗" > + <!ENTITY seArr "⇘" > + <!ENTITY swArr "⇙" > + <!ENTITY lAarr "⇚" > + <!ENTITY Lleftarrow "⇚" > + <!ENTITY rAarr "⇛" > + <!ENTITY Rrightarrow "⇛" > + <!ENTITY zigrarr "⇝" > + <!ENTITY larrb "⇤" > + <!ENTITY LeftArrowBar "⇤" > + <!ENTITY rarrb "⇥" > + <!ENTITY RightArrowBar "⇥" > + <!ENTITY duarr "⇵" > + <!ENTITY DownArrowUpArrow "⇵" > + <!ENTITY loarr "⇽" > + <!ENTITY roarr "⇾" > + <!ENTITY hoarr "⇿" > + <!ENTITY forall "∀" > + <!ENTITY ForAll "∀" > + <!ENTITY comp "∁" > + <!ENTITY complement "∁" > + <!ENTITY part "∂" > + <!ENTITY PartialD "∂" > + <!ENTITY exist "∃" > + <!ENTITY Exists "∃" > + <!ENTITY nexist "∄" > + <!ENTITY NotExists "∄" > + <!ENTITY nexists "∄" > + <!ENTITY empty "∅" > + <!ENTITY emptyset "∅" > + <!ENTITY emptyv "∅" > + <!ENTITY varnothing "∅" > + <!ENTITY nabla "∇" > + <!ENTITY Del "∇" > + <!ENTITY isin "∈" > + <!ENTITY isinv "∈" > + <!ENTITY Element "∈" > + <!ENTITY in "∈" > + <!ENTITY notin "∉" > + <!ENTITY NotElement "∉" > + <!ENTITY notinva "∉" > + <!ENTITY niv "∋" > + <!ENTITY ReverseElement "∋" > + <!ENTITY ni "∋" > + <!ENTITY SuchThat "∋" > + <!ENTITY notni "∌" > + <!ENTITY notniva "∌" > + <!ENTITY NotReverseElement "∌" > + <!ENTITY prod "∏" > + <!ENTITY Product "∏" > + <!ENTITY coprod "∐" > + <!ENTITY Coproduct "∐" > + <!ENTITY sum "∑" > + <!ENTITY Sum "∑" > + <!ENTITY minus "−" > + <!ENTITY mnplus "∓" > + <!ENTITY mp "∓" > + <!ENTITY MinusPlus "∓" > + <!ENTITY plusdo "∔" > + <!ENTITY dotplus "∔" > + <!ENTITY setmn "∖" > + <!ENTITY setminus "∖" > + <!ENTITY Backslash "∖" > + <!ENTITY ssetmn "∖" > + <!ENTITY smallsetminus "∖" > + <!ENTITY lowast "∗" > + <!ENTITY compfn "∘" > + <!ENTITY SmallCircle "∘" > + <!ENTITY radic "√" > + <!ENTITY Sqrt "√" > + <!ENTITY prop "∝" > + <!ENTITY propto "∝" > + <!ENTITY Proportional "∝" > + <!ENTITY vprop "∝" > + <!ENTITY varpropto "∝" > + <!ENTITY infin "∞" > + <!ENTITY angrt "∟" > + <!ENTITY ang "∠" > + <!ENTITY angle "∠" > + <!ENTITY angmsd "∡" > + <!ENTITY measuredangle "∡" > + <!ENTITY angsph "∢" > + <!ENTITY mid "∣" > + <!ENTITY VerticalBar "∣" > + <!ENTITY smid "∣" > + <!ENTITY shortmid "∣" > + <!ENTITY nmid "∤" > + <!ENTITY NotVerticalBar "∤" > + <!ENTITY nsmid "∤" > + <!ENTITY nshortmid "∤" > + <!ENTITY par "∥" > + <!ENTITY parallel "∥" > + <!ENTITY DoubleVerticalBar "∥" > + <!ENTITY spar "∥" > + <!ENTITY shortparallel "∥" > + <!ENTITY npar "∦" > + <!ENTITY nparallel "∦" > + <!ENTITY NotDoubleVerticalBar "∦" > + <!ENTITY nspar "∦" > + <!ENTITY nshortparallel "∦" > + <!ENTITY and "∧" > + <!ENTITY wedge "∧" > + <!ENTITY or "∨" > + <!ENTITY vee "∨" > + <!ENTITY cap "∩" > + <!ENTITY cup "∪" > + <!ENTITY int "∫" > + <!ENTITY Integral "∫" > + <!ENTITY Int "∬" > + <!ENTITY tint "∭" > + <!ENTITY iiint "∭" > + <!ENTITY conint "∮" > + <!ENTITY oint "∮" > + <!ENTITY ContourIntegral "∮" > + <!ENTITY Conint "∯" > + <!ENTITY DoubleContourIntegral "∯" > + <!ENTITY Cconint "∰" > + <!ENTITY cwint "∱" > + <!ENTITY cwconint "∲" > + <!ENTITY ClockwiseContourIntegral "∲" > + <!ENTITY awconint "∳" > + <!ENTITY CounterClockwiseContourIntegral "∳" > + <!ENTITY there4 "∴" > + <!ENTITY therefore "∴" > + <!ENTITY Therefore "∴" > + <!ENTITY becaus "∵" > + <!ENTITY because "∵" > + <!ENTITY Because "∵" > + <!ENTITY ratio "∶" > + <!ENTITY Colon "∷" > + <!ENTITY Proportion "∷" > + <!ENTITY minusd "∸" > + <!ENTITY dotminus "∸" > + <!ENTITY mDDot "∺" > + <!ENTITY homtht "∻" > + <!ENTITY sim "∼" > + <!ENTITY Tilde "∼" > + <!ENTITY thksim "∼" > + <!ENTITY thicksim "∼" > + <!ENTITY bsim "∽" > + <!ENTITY backsim "∽" > + <!ENTITY ac "∾" > + <!ENTITY mstpos "∾" > + <!ENTITY acd "∿" > + <!ENTITY wreath "≀" > + <!ENTITY VerticalTilde "≀" > + <!ENTITY wr "≀" > + <!ENTITY nsim "≁" > + <!ENTITY NotTilde "≁" > + <!ENTITY esim "≂" > + <!ENTITY EqualTilde "≂" > + <!ENTITY eqsim "≂" > + <!ENTITY sime "≃" > + <!ENTITY TildeEqual "≃" > + <!ENTITY simeq "≃" > + <!ENTITY nsime "≄" > + <!ENTITY nsimeq "≄" > + <!ENTITY NotTildeEqual "≄" > + <!ENTITY cong "≅" > + <!ENTITY TildeFullEqual "≅" > + <!ENTITY simne "≆" > + <!ENTITY ncong "≇" > + <!ENTITY NotTildeFullEqual "≇" > + <!ENTITY asymp "≈" > + <!ENTITY ap "≈" > + <!ENTITY TildeTilde "≈" > + <!ENTITY approx "≈" > + <!ENTITY thkap "≈" > + <!ENTITY thickapprox "≈" > + <!ENTITY nap "≉" > + <!ENTITY NotTildeTilde "≉" > + <!ENTITY napprox "≉" > + <!ENTITY ape "≊" > + <!ENTITY approxeq "≊" > + <!ENTITY apid "≋" > + <!ENTITY bcong "≌" > + <!ENTITY backcong "≌" > + <!ENTITY asympeq "≍" > + <!ENTITY CupCap "≍" > + <!ENTITY bump "≎" > + <!ENTITY HumpDownHump "≎" > + <!ENTITY Bumpeq "≎" > + <!ENTITY bumpe "≏" > + <!ENTITY HumpEqual "≏" > + <!ENTITY bumpeq "≏" > + <!ENTITY esdot "≐" > + <!ENTITY DotEqual "≐" > + <!ENTITY doteq "≐" > + <!ENTITY eDot "≑" > + <!ENTITY doteqdot "≑" > + <!ENTITY efDot "≒" > + <!ENTITY fallingdotseq "≒" > + <!ENTITY erDot "≓" > + <!ENTITY risingdotseq "≓" > + <!ENTITY colone "≔" > + <!ENTITY coloneq "≔" > + <!ENTITY Assign "≔" > + <!ENTITY ecolon "≕" > + <!ENTITY eqcolon "≕" > + <!ENTITY ecir "≖" > + <!ENTITY eqcirc "≖" > + <!ENTITY cire "≗" > + <!ENTITY circeq "≗" > + <!ENTITY wedgeq "≙" > + <!ENTITY veeeq "≚" > + <!ENTITY trie "≜" > + <!ENTITY triangleq "≜" > + <!ENTITY equest "≟" > + <!ENTITY questeq "≟" > + <!ENTITY ne "≠" > + <!ENTITY NotEqual "≠" > + <!ENTITY equiv "≡" > + <!ENTITY Congruent "≡" > + <!ENTITY nequiv "≢" > + <!ENTITY NotCongruent "≢" > + <!ENTITY le "≤" > + <!ENTITY leq "≤" > + <!ENTITY ge "≥" > + <!ENTITY GreaterEqual "≥" > + <!ENTITY geq "≥" > + <!ENTITY lE "≦" > + <!ENTITY LessFullEqual "≦" > + <!ENTITY leqq "≦" > + <!ENTITY gE "≧" > + <!ENTITY GreaterFullEqual "≧" > + <!ENTITY geqq "≧" > + <!ENTITY lnE "≨" > + <!ENTITY lneqq "≨" > + <!ENTITY gnE "≩" > + <!ENTITY gneqq "≩" > + <!ENTITY Lt "≪" > + <!ENTITY NestedLessLess "≪" > + <!ENTITY ll "≪" > + <!ENTITY Gt "≫" > + <!ENTITY NestedGreaterGreater "≫" > + <!ENTITY gg "≫" > + <!ENTITY twixt "≬" > + <!ENTITY between "≬" > + <!ENTITY NotCupCap "≭" > + <!ENTITY nlt "≮" > + <!ENTITY NotLess "≮" > + <!ENTITY nless "≮" > + <!ENTITY ngt "≯" > + <!ENTITY NotGreater "≯" > + <!ENTITY ngtr "≯" > + <!ENTITY nle "≰" > + <!ENTITY NotLessEqual "≰" > + <!ENTITY nleq "≰" > + <!ENTITY nge "≱" > + <!ENTITY NotGreaterEqual "≱" > + <!ENTITY ngeq "≱" > + <!ENTITY lsim "≲" > + <!ENTITY LessTilde "≲" > + <!ENTITY lesssim "≲" > + <!ENTITY gsim "≳" > + <!ENTITY gtrsim "≳" > + <!ENTITY GreaterTilde "≳" > + <!ENTITY nlsim "≴" > + <!ENTITY NotLessTilde "≴" > + <!ENTITY ngsim "≵" > + <!ENTITY NotGreaterTilde "≵" > + <!ENTITY lg "≶" > + <!ENTITY lessgtr "≶" > + <!ENTITY LessGreater "≶" > + <!ENTITY gl "≷" > + <!ENTITY gtrless "≷" > + <!ENTITY GreaterLess "≷" > + <!ENTITY ntlg "≸" > + <!ENTITY NotLessGreater "≸" > + <!ENTITY ntgl "≹" > + <!ENTITY NotGreaterLess "≹" > + <!ENTITY pr "≺" > + <!ENTITY Precedes "≺" > + <!ENTITY prec "≺" > + <!ENTITY sc "≻" > + <!ENTITY Succeeds "≻" > + <!ENTITY succ "≻" > + <!ENTITY prcue "≼" > + <!ENTITY PrecedesSlantEqual "≼" > + <!ENTITY preccurlyeq "≼" > + <!ENTITY sccue "≽" > + <!ENTITY SucceedsSlantEqual "≽" > + <!ENTITY succcurlyeq "≽" > + <!ENTITY prsim "≾" > + <!ENTITY precsim "≾" > + <!ENTITY PrecedesTilde "≾" > + <!ENTITY scsim "≿" > + <!ENTITY succsim "≿" > + <!ENTITY SucceedsTilde "≿" > + <!ENTITY npr "⊀" > + <!ENTITY nprec "⊀" > + <!ENTITY NotPrecedes "⊀" > + <!ENTITY nsc "⊁" > + <!ENTITY nsucc "⊁" > + <!ENTITY NotSucceeds "⊁" > + <!ENTITY sub "⊂" > + <!ENTITY subset "⊂" > + <!ENTITY sup "⊃" > + <!ENTITY supset "⊃" > + <!ENTITY Superset "⊃" > + <!ENTITY nsub "⊄" > + <!ENTITY nsup "⊅" > + <!ENTITY sube "⊆" > + <!ENTITY SubsetEqual "⊆" > + <!ENTITY subseteq "⊆" > + <!ENTITY supe "⊇" > + <!ENTITY supseteq "⊇" > + <!ENTITY SupersetEqual "⊇" > + <!ENTITY nsube "⊈" > + <!ENTITY nsubseteq "⊈" > + <!ENTITY NotSubsetEqual "⊈" > + <!ENTITY nsupe "⊉" > + <!ENTITY nsupseteq "⊉" > + <!ENTITY NotSupersetEqual "⊉" > + <!ENTITY subne "⊊" > + <!ENTITY subsetneq "⊊" > + <!ENTITY supne "⊋" > + <!ENTITY supsetneq "⊋" > + <!ENTITY cupdot "⊍" > + <!ENTITY uplus "⊎" > + <!ENTITY UnionPlus "⊎" > + <!ENTITY sqsub "⊏" > + <!ENTITY SquareSubset "⊏" > + <!ENTITY sqsubset "⊏" > + <!ENTITY sqsup "⊐" > + <!ENTITY SquareSuperset "⊐" > + <!ENTITY sqsupset "⊐" > + <!ENTITY sqsube "⊑" > + <!ENTITY SquareSubsetEqual "⊑" > + <!ENTITY sqsubseteq "⊑" > + <!ENTITY sqsupe "⊒" > + <!ENTITY SquareSupersetEqual "⊒" > + <!ENTITY sqsupseteq "⊒" > + <!ENTITY sqcap "⊓" > + <!ENTITY SquareIntersection "⊓" > + <!ENTITY sqcup "⊔" > + <!ENTITY SquareUnion "⊔" > + <!ENTITY oplus "⊕" > + <!ENTITY CirclePlus "⊕" > + <!ENTITY ominus "⊖" > + <!ENTITY CircleMinus "⊖" > + <!ENTITY otimes "⊗" > + <!ENTITY CircleTimes "⊗" > + <!ENTITY osol "⊘" > + <!ENTITY odot "⊙" > + <!ENTITY CircleDot "⊙" > + <!ENTITY ocir "⊚" > + <!ENTITY circledcirc "⊚" > + <!ENTITY oast "⊛" > + <!ENTITY circledast "⊛" > + <!ENTITY odash "⊝" > + <!ENTITY circleddash "⊝" > + <!ENTITY plusb "⊞" > + <!ENTITY boxplus "⊞" > + <!ENTITY minusb "⊟" > + <!ENTITY boxminus "⊟" > + <!ENTITY timesb "⊠" > + <!ENTITY boxtimes "⊠" > + <!ENTITY sdotb "⊡" > + <!ENTITY dotsquare "⊡" > + <!ENTITY vdash "⊢" > + <!ENTITY RightTee "⊢" > + <!ENTITY dashv "⊣" > + <!ENTITY LeftTee "⊣" > + <!ENTITY top "⊤" > + <!ENTITY DownTee "⊤" > + <!ENTITY bottom "⊥" > + <!ENTITY bot "⊥" > + <!ENTITY perp "⊥" > + <!ENTITY UpTee "⊥" > + <!ENTITY models "⊧" > + <!ENTITY vDash "⊨" > + <!ENTITY DoubleRightTee "⊨" > + <!ENTITY Vdash "⊩" > + <!ENTITY Vvdash "⊪" > + <!ENTITY VDash "⊫" > + <!ENTITY nvdash "⊬" > + <!ENTITY nvDash "⊭" > + <!ENTITY nVdash "⊮" > + <!ENTITY nVDash "⊯" > + <!ENTITY prurel "⊰" > + <!ENTITY vltri "⊲" > + <!ENTITY vartriangleleft "⊲" > + <!ENTITY LeftTriangle "⊲" > + <!ENTITY vrtri "⊳" > + <!ENTITY vartriangleright "⊳" > + <!ENTITY RightTriangle "⊳" > + <!ENTITY ltrie "⊴" > + <!ENTITY trianglelefteq "⊴" > + <!ENTITY LeftTriangleEqual "⊴" > + <!ENTITY rtrie "⊵" > + <!ENTITY trianglerighteq "⊵" > + <!ENTITY RightTriangleEqual "⊵" > + <!ENTITY origof "⊶" > + <!ENTITY imof "⊷" > + <!ENTITY mumap "⊸" > + <!ENTITY multimap "⊸" > + <!ENTITY hercon "⊹" > + <!ENTITY intcal "⊺" > + <!ENTITY intercal "⊺" > + <!ENTITY veebar "⊻" > + <!ENTITY barvee "⊽" > + <!ENTITY angrtvb "⊾" > + <!ENTITY lrtri "⊿" > + <!ENTITY xwedge "⋀" > + <!ENTITY Wedge "⋀" > + <!ENTITY bigwedge "⋀" > + <!ENTITY xvee "⋁" > + <!ENTITY Vee "⋁" > + <!ENTITY bigvee "⋁" > + <!ENTITY xcap "⋂" > + <!ENTITY Intersection "⋂" > + <!ENTITY bigcap "⋂" > + <!ENTITY xcup "⋃" > + <!ENTITY Union "⋃" > + <!ENTITY bigcup "⋃" > + <!ENTITY diam "⋄" > + <!ENTITY diamond "⋄" > + <!ENTITY Diamond "⋄" > + <!ENTITY sdot "⋅" > + <!ENTITY sstarf "⋆" > + <!ENTITY Star "⋆" > + <!ENTITY divonx "⋇" > + <!ENTITY divideontimes "⋇" > + <!ENTITY bowtie "⋈" > + <!ENTITY ltimes "⋉" > + <!ENTITY rtimes "⋊" > + <!ENTITY lthree "⋋" > + <!ENTITY leftthreetimes "⋋" > + <!ENTITY rthree "⋌" > + <!ENTITY rightthreetimes "⋌" > + <!ENTITY bsime "⋍" > + <!ENTITY backsimeq "⋍" > + <!ENTITY cuvee "⋎" > + <!ENTITY curlyvee "⋎" > + <!ENTITY cuwed "⋏" > + <!ENTITY curlywedge "⋏" > + <!ENTITY Sub "⋐" > + <!ENTITY Subset "⋐" > + <!ENTITY Sup "⋑" > + <!ENTITY Supset "⋑" > + <!ENTITY Cap "⋒" > + <!ENTITY Cup "⋓" > + <!ENTITY fork "⋔" > + <!ENTITY pitchfork "⋔" > + <!ENTITY epar "⋕" > + <!ENTITY ltdot "⋖" > + <!ENTITY lessdot "⋖" > + <!ENTITY gtdot "⋗" > + <!ENTITY gtrdot "⋗" > + <!ENTITY Ll "⋘" > + <!ENTITY Gg "⋙" > + <!ENTITY ggg "⋙" > + <!ENTITY leg "⋚" > + <!ENTITY LessEqualGreater "⋚" > + <!ENTITY lesseqgtr "⋚" > + <!ENTITY gel "⋛" > + <!ENTITY gtreqless "⋛" > + <!ENTITY GreaterEqualLess "⋛" > + <!ENTITY cuepr "⋞" > + <!ENTITY curlyeqprec "⋞" > + <!ENTITY cuesc "⋟" > + <!ENTITY curlyeqsucc "⋟" > + <!ENTITY nprcue "⋠" > + <!ENTITY NotPrecedesSlantEqual "⋠" > + <!ENTITY nsccue "⋡" > + <!ENTITY NotSucceedsSlantEqual "⋡" > + <!ENTITY nsqsube "⋢" > + <!ENTITY NotSquareSubsetEqual "⋢" > + <!ENTITY nsqsupe "⋣" > + <!ENTITY NotSquareSupersetEqual "⋣" > + <!ENTITY lnsim "⋦" > + <!ENTITY gnsim "⋧" > + <!ENTITY prnsim "⋨" > + <!ENTITY precnsim "⋨" > + <!ENTITY scnsim "⋩" > + <!ENTITY succnsim "⋩" > + <!ENTITY nltri "⋪" > + <!ENTITY ntriangleleft "⋪" > + <!ENTITY NotLeftTriangle "⋪" > + <!ENTITY nrtri "⋫" > + <!ENTITY ntriangleright "⋫" > + <!ENTITY NotRightTriangle "⋫" > + <!ENTITY nltrie "⋬" > + <!ENTITY ntrianglelefteq "⋬" > + <!ENTITY NotLeftTriangleEqual "⋬" > + <!ENTITY nrtrie "⋭" > + <!ENTITY ntrianglerighteq "⋭" > + <!ENTITY NotRightTriangleEqual "⋭" > + <!ENTITY vellip "⋮" > + <!ENTITY ctdot "⋯" > + <!ENTITY utdot "⋰" > + <!ENTITY dtdot "⋱" > + <!ENTITY disin "⋲" > + <!ENTITY isinsv "⋳" > + <!ENTITY isins "⋴" > + <!ENTITY isindot "⋵" > + <!ENTITY notinvc "⋶" > + <!ENTITY notinvb "⋷" > + <!ENTITY isinE "⋹" > + <!ENTITY nisd "⋺" > + <!ENTITY xnis "⋻" > + <!ENTITY nis "⋼" > + <!ENTITY notnivc "⋽" > + <!ENTITY notnivb "⋾" > + <!ENTITY barwed "⌅" > + <!ENTITY barwedge "⌅" > + <!ENTITY Barwed "⌆" > + <!ENTITY doublebarwedge "⌆" > + <!ENTITY lceil "⌈" > + <!ENTITY LeftCeiling "⌈" > + <!ENTITY rceil "⌉" > + <!ENTITY RightCeiling "⌉" > + <!ENTITY lfloor "⌊" > + <!ENTITY LeftFloor "⌊" > + <!ENTITY rfloor "⌋" > + <!ENTITY RightFloor "⌋" > + <!ENTITY drcrop "⌌" > + <!ENTITY dlcrop "⌍" > + <!ENTITY urcrop "⌎" > + <!ENTITY ulcrop "⌏" > + <!ENTITY bnot "⌐" > + <!ENTITY profline "⌒" > + <!ENTITY profsurf "⌓" > + <!ENTITY telrec "⌕" > + <!ENTITY target "⌖" > + <!ENTITY ulcorn "⌜" > + <!ENTITY ulcorner "⌜" > + <!ENTITY urcorn "⌝" > + <!ENTITY urcorner "⌝" > + <!ENTITY dlcorn "⌞" > + <!ENTITY llcorner "⌞" > + <!ENTITY drcorn "⌟" > + <!ENTITY lrcorner "⌟" > + <!ENTITY frown "⌢" > + <!ENTITY sfrown "⌢" > + <!ENTITY smile "⌣" > + <!ENTITY ssmile "⌣" > + <!ENTITY cylcty "⌭" > + <!ENTITY profalar "⌮" > + <!ENTITY topbot "⌶" > + <!ENTITY ovbar "⌽" > + <!ENTITY solbar "⌿" > + <!ENTITY angzarr "⍼" > + <!ENTITY lmoust "⎰" > + <!ENTITY lmoustache "⎰" > + <!ENTITY rmoust "⎱" > + <!ENTITY rmoustache "⎱" > + <!ENTITY tbrk "⎴" > + <!ENTITY OverBracket "⎴" > + <!ENTITY bbrk "⎵" > + <!ENTITY UnderBracket "⎵" > + <!ENTITY bbrktbrk "⎶" > + <!ENTITY OverParenthesis "⏜" > + <!ENTITY UnderParenthesis "⏝" > + <!ENTITY OverBrace "⏞" > + <!ENTITY UnderBrace "⏟" > + <!ENTITY trpezium "⏢" > + <!ENTITY elinters "⏧" > + <!ENTITY blank "␣" > + <!ENTITY oS "Ⓢ" > + <!ENTITY circledS "Ⓢ" > + <!ENTITY boxh "─" > + <!ENTITY HorizontalLine "─" > + <!ENTITY boxv "│" > + <!ENTITY boxdr "┌" > + <!ENTITY boxdl "┐" > + <!ENTITY boxur "└" > + <!ENTITY boxul "┘" > + <!ENTITY boxvr "├" > + <!ENTITY boxvl "┤" > + <!ENTITY boxhd "┬" > + <!ENTITY boxhu "┴" > + <!ENTITY boxvh "┼" > + <!ENTITY boxH "═" > + <!ENTITY boxV "║" > + <!ENTITY boxdR "╒" > + <!ENTITY boxDr "╓" > + <!ENTITY boxDR "╔" > + <!ENTITY boxdL "╕" > + <!ENTITY boxDl "╖" > + <!ENTITY boxDL "╗" > + <!ENTITY boxuR "╘" > + <!ENTITY boxUr "╙" > + <!ENTITY boxUR "╚" > + <!ENTITY boxuL "╛" > + <!ENTITY boxUl "╜" > + <!ENTITY boxUL "╝" > + <!ENTITY boxvR "╞" > + <!ENTITY boxVr "╟" > + <!ENTITY boxVR "╠" > + <!ENTITY boxvL "╡" > + <!ENTITY boxVl "╢" > + <!ENTITY boxVL "╣" > + <!ENTITY boxHd "╤" > + <!ENTITY boxhD "╥" > + <!ENTITY boxHD "╦" > + <!ENTITY boxHu "╧" > + <!ENTITY boxhU "╨" > + <!ENTITY boxHU "╩" > + <!ENTITY boxvH "╪" > + <!ENTITY boxVh "╫" > + <!ENTITY boxVH "╬" > + <!ENTITY uhblk "▀" > + <!ENTITY lhblk "▄" > + <!ENTITY block "█" > + <!ENTITY blk14 "░" > + <!ENTITY blk12 "▒" > + <!ENTITY blk34 "▓" > + <!ENTITY squ "□" > + <!ENTITY square "□" > + <!ENTITY Square "□" > + <!ENTITY squf "▪" > + <!ENTITY squarf "▪" > + <!ENTITY blacksquare "▪" > + <!ENTITY FilledVerySmallSquare "▪" > + <!ENTITY EmptyVerySmallSquare "▫" > + <!ENTITY rect "▭" > + <!ENTITY marker "▮" > + <!ENTITY fltns "▱" > + <!ENTITY xutri "△" > + <!ENTITY bigtriangleup "△" > + <!ENTITY utrif "▴" > + <!ENTITY blacktriangle "▴" > + <!ENTITY utri "▵" > + <!ENTITY triangle "▵" > + <!ENTITY rtrif "▸" > + <!ENTITY blacktriangleright "▸" > + <!ENTITY rtri "▹" > + <!ENTITY triangleright "▹" > + <!ENTITY xdtri "▽" > + <!ENTITY bigtriangledown "▽" > + <!ENTITY dtrif "▾" > + <!ENTITY blacktriangledown "▾" > + <!ENTITY dtri "▿" > + <!ENTITY triangledown "▿" > + <!ENTITY ltrif "◂" > + <!ENTITY blacktriangleleft "◂" > + <!ENTITY ltri "◃" > + <!ENTITY triangleleft "◃" > + <!ENTITY loz "◊" > + <!ENTITY lozenge "◊" > + <!ENTITY cir "○" > + <!ENTITY tridot "◬" > + <!ENTITY xcirc "◯" > + <!ENTITY bigcirc "◯" > + <!ENTITY ultri "◸" > + <!ENTITY urtri "◹" > + <!ENTITY lltri "◺" > + <!ENTITY EmptySmallSquare "◻" > + <!ENTITY FilledSmallSquare "◼" > + <!ENTITY starf "★" > + <!ENTITY bigstar "★" > + <!ENTITY star "☆" > + <!ENTITY phone "☎" > + <!ENTITY female "♀" > + <!ENTITY male "♂" > + <!ENTITY spades "♠" > + <!ENTITY spadesuit "♠" > + <!ENTITY clubs "♣" > + <!ENTITY clubsuit "♣" > + <!ENTITY hearts "♥" > + <!ENTITY heartsuit "♥" > + <!ENTITY diams "♦" > + <!ENTITY diamondsuit "♦" > + <!ENTITY sung "♪" > + <!ENTITY flat "♭" > + <!ENTITY natur "♮" > + <!ENTITY natural "♮" > + <!ENTITY sharp "♯" > + <!ENTITY check "✓" > + <!ENTITY checkmark "✓" > + <!ENTITY cross "✗" > + <!ENTITY malt "✠" > + <!ENTITY maltese "✠" > + <!ENTITY sext "✶" > + <!ENTITY VerticalSeparator "❘" > + <!ENTITY lbbrk "❲" > + <!ENTITY rbbrk "❳" > + <!ENTITY lobrk "⟦" > + <!ENTITY LeftDoubleBracket "⟦" > + <!ENTITY robrk "⟧" > + <!ENTITY RightDoubleBracket "⟧" > + <!ENTITY lang "⟨" > + <!ENTITY LeftAngleBracket "⟨" > + <!ENTITY langle "⟨" > + <!ENTITY rang "⟩" > + <!ENTITY RightAngleBracket "⟩" > + <!ENTITY rangle "⟩" > + <!ENTITY Lang "⟪" > + <!ENTITY Rang "⟫" > + <!ENTITY loang "⟬" > + <!ENTITY roang "⟭" > + <!ENTITY xlarr "⟵" > + <!ENTITY longleftarrow "⟵" > + <!ENTITY LongLeftArrow "⟵" > + <!ENTITY xrarr "⟶" > + <!ENTITY longrightarrow "⟶" > + <!ENTITY LongRightArrow "⟶" > + <!ENTITY xharr "⟷" > + <!ENTITY longleftrightarrow "⟷" > + <!ENTITY LongLeftRightArrow "⟷" > + <!ENTITY xlArr "⟸" > + <!ENTITY Longleftarrow "⟸" > + <!ENTITY DoubleLongLeftArrow "⟸" > + <!ENTITY xrArr "⟹" > + <!ENTITY Longrightarrow "⟹" > + <!ENTITY DoubleLongRightArrow "⟹" > + <!ENTITY xhArr "⟺" > + <!ENTITY Longleftrightarrow "⟺" > + <!ENTITY DoubleLongLeftRightArrow "⟺" > + <!ENTITY xmap "⟼" > + <!ENTITY longmapsto "⟼" > + <!ENTITY dzigrarr "⟿" > + <!ENTITY nvlArr "⤂" > + <!ENTITY nvrArr "⤃" > + <!ENTITY nvHarr "⤄" > + <!ENTITY Map "⤅" > + <!ENTITY lbarr "⤌" > + <!ENTITY rbarr "⤍" > + <!ENTITY bkarow "⤍" > + <!ENTITY lBarr "⤎" > + <!ENTITY rBarr "⤏" > + <!ENTITY dbkarow "⤏" > + <!ENTITY RBarr "⤐" > + <!ENTITY drbkarow "⤐" > + <!ENTITY DDotrahd "⤑" > + <!ENTITY UpArrowBar "⤒" > + <!ENTITY DownArrowBar "⤓" > + <!ENTITY Rarrtl "⤖" > + <!ENTITY latail "⤙" > + <!ENTITY ratail "⤚" > + <!ENTITY lAtail "⤛" > + <!ENTITY rAtail "⤜" > + <!ENTITY larrfs "⤝" > + <!ENTITY rarrfs "⤞" > + <!ENTITY larrbfs "⤟" > + <!ENTITY rarrbfs "⤠" > + <!ENTITY nwarhk "⤣" > + <!ENTITY nearhk "⤤" > + <!ENTITY searhk "⤥" > + <!ENTITY hksearow "⤥" > + <!ENTITY swarhk "⤦" > + <!ENTITY hkswarow "⤦" > + <!ENTITY nwnear "⤧" > + <!ENTITY nesear "⤨" > + <!ENTITY toea "⤨" > + <!ENTITY seswar "⤩" > + <!ENTITY tosa "⤩" > + <!ENTITY swnwar "⤪" > + <!ENTITY rarrc "⤳" > + <!ENTITY cudarrr "⤵" > + <!ENTITY ldca "⤶" > + <!ENTITY rdca "⤷" > + <!ENTITY cudarrl "⤸" > + <!ENTITY larrpl "⤹" > + <!ENTITY curarrm "⤼" > + <!ENTITY cularrp "⤽" > + <!ENTITY rarrpl "⥅" > + <!ENTITY harrcir "⥈" > + <!ENTITY Uarrocir "⥉" > + <!ENTITY lurdshar "⥊" > + <!ENTITY ldrushar "⥋" > + <!ENTITY LeftRightVector "⥎" > + <!ENTITY RightUpDownVector "⥏" > + <!ENTITY DownLeftRightVector "⥐" > + <!ENTITY LeftUpDownVector "⥑" > + <!ENTITY LeftVectorBar "⥒" > + <!ENTITY RightVectorBar "⥓" > + <!ENTITY RightUpVectorBar "⥔" > + <!ENTITY RightDownVectorBar "⥕" > + <!ENTITY DownLeftVectorBar "⥖" > + <!ENTITY DownRightVectorBar "⥗" > + <!ENTITY LeftUpVectorBar "⥘" > + <!ENTITY LeftDownVectorBar "⥙" > + <!ENTITY LeftTeeVector "⥚" > + <!ENTITY RightTeeVector "⥛" > + <!ENTITY RightUpTeeVector "⥜" > + <!ENTITY RightDownTeeVector "⥝" > + <!ENTITY DownLeftTeeVector "⥞" > + <!ENTITY DownRightTeeVector "⥟" > + <!ENTITY LeftUpTeeVector "⥠" > + <!ENTITY LeftDownTeeVector "⥡" > + <!ENTITY lHar "⥢" > + <!ENTITY uHar "⥣" > + <!ENTITY rHar "⥤" > + <!ENTITY dHar "⥥" > + <!ENTITY luruhar "⥦" > + <!ENTITY ldrdhar "⥧" > + <!ENTITY ruluhar "⥨" > + <!ENTITY rdldhar "⥩" > + <!ENTITY lharul "⥪" > + <!ENTITY llhard "⥫" > + <!ENTITY rharul "⥬" > + <!ENTITY lrhard "⥭" > + <!ENTITY udhar "⥮" > + <!ENTITY UpEquilibrium "⥮" > + <!ENTITY duhar "⥯" > + <!ENTITY ReverseUpEquilibrium "⥯" > + <!ENTITY RoundImplies "⥰" > + <!ENTITY erarr "⥱" > + <!ENTITY simrarr "⥲" > + <!ENTITY larrsim "⥳" > + <!ENTITY rarrsim "⥴" > + <!ENTITY rarrap "⥵" > + <!ENTITY ltlarr "⥶" > + <!ENTITY gtrarr "⥸" > + <!ENTITY subrarr "⥹" > + <!ENTITY suplarr "⥻" > + <!ENTITY lfisht "⥼" > + <!ENTITY rfisht "⥽" > + <!ENTITY ufisht "⥾" > + <!ENTITY dfisht "⥿" > + <!ENTITY lopar "⦅" > + <!ENTITY ropar "⦆" > + <!ENTITY lbrke "⦋" > + <!ENTITY rbrke "⦌" > + <!ENTITY lbrkslu "⦍" > + <!ENTITY rbrksld "⦎" > + <!ENTITY lbrksld "⦏" > + <!ENTITY rbrkslu "⦐" > + <!ENTITY langd "⦑" > + <!ENTITY rangd "⦒" > + <!ENTITY lparlt "⦓" > + <!ENTITY rpargt "⦔" > + <!ENTITY gtlPar "⦕" > + <!ENTITY ltrPar "⦖" > + <!ENTITY vzigzag "⦚" > + <!ENTITY vangrt "⦜" > + <!ENTITY angrtvbd "⦝" > + <!ENTITY ange "⦤" > + <!ENTITY range "⦥" > + <!ENTITY dwangle "⦦" > + <!ENTITY uwangle "⦧" > + <!ENTITY angmsdaa "⦨" > + <!ENTITY angmsdab "⦩" > + <!ENTITY angmsdac "⦪" > + <!ENTITY angmsdad "⦫" > + <!ENTITY angmsdae "⦬" > + <!ENTITY angmsdaf "⦭" > + <!ENTITY angmsdag "⦮" > + <!ENTITY angmsdah "⦯" > + <!ENTITY bemptyv "⦰" > + <!ENTITY demptyv "⦱" > + <!ENTITY cemptyv "⦲" > + <!ENTITY raemptyv "⦳" > + <!ENTITY laemptyv "⦴" > + <!ENTITY ohbar "⦵" > + <!ENTITY omid "⦶" > + <!ENTITY opar "⦷" > + <!ENTITY operp "⦹" > + <!ENTITY olcross "⦻" > + <!ENTITY odsold "⦼" > + <!ENTITY olcir "⦾" > + <!ENTITY ofcir "⦿" > + <!ENTITY olt "⧀" > + <!ENTITY ogt "⧁" > + <!ENTITY cirscir "⧂" > + <!ENTITY cirE "⧃" > + <!ENTITY solb "⧄" > + <!ENTITY bsolb "⧅" > + <!ENTITY boxbox "⧉" > + <!ENTITY trisb "⧍" > + <!ENTITY rtriltri "⧎" > + <!ENTITY LeftTriangleBar "⧏" > + <!ENTITY RightTriangleBar "⧐" > + <!ENTITY race "⧚" > + <!ENTITY iinfin "⧜" > + <!ENTITY infintie "⧝" > + <!ENTITY nvinfin "⧞" > + <!ENTITY eparsl "⧣" > + <!ENTITY smeparsl "⧤" > + <!ENTITY eqvparsl "⧥" > + <!ENTITY lozf "⧫" > + <!ENTITY blacklozenge "⧫" > + <!ENTITY RuleDelayed "⧴" > + <!ENTITY dsol "⧶" > + <!ENTITY xodot "⨀" > + <!ENTITY bigodot "⨀" > + <!ENTITY xoplus "⨁" > + <!ENTITY bigoplus "⨁" > + <!ENTITY xotime "⨂" > + <!ENTITY bigotimes "⨂" > + <!ENTITY xuplus "⨄" > + <!ENTITY biguplus "⨄" > + <!ENTITY xsqcup "⨆" > + <!ENTITY bigsqcup "⨆" > + <!ENTITY qint "⨌" > + <!ENTITY iiiint "⨌" > + <!ENTITY fpartint "⨍" > + <!ENTITY cirfnint "⨐" > + <!ENTITY awint "⨑" > + <!ENTITY rppolint "⨒" > + <!ENTITY scpolint "⨓" > + <!ENTITY npolint "⨔" > + <!ENTITY pointint "⨕" > + <!ENTITY quatint "⨖" > + <!ENTITY intlarhk "⨗" > + <!ENTITY pluscir "⨢" > + <!ENTITY plusacir "⨣" > + <!ENTITY simplus "⨤" > + <!ENTITY plusdu "⨥" > + <!ENTITY plussim "⨦" > + <!ENTITY plustwo "⨧" > + <!ENTITY mcomma "⨩" > + <!ENTITY minusdu "⨪" > + <!ENTITY loplus "⨭" > + <!ENTITY roplus "⨮" > + <!ENTITY Cross "⨯" > + <!ENTITY timesd "⨰" > + <!ENTITY timesbar "⨱" > + <!ENTITY smashp "⨳" > + <!ENTITY lotimes "⨴" > + <!ENTITY rotimes "⨵" > + <!ENTITY otimesas "⨶" > + <!ENTITY Otimes "⨷" > + <!ENTITY odiv "⨸" > + <!ENTITY triplus "⨹" > + <!ENTITY triminus "⨺" > + <!ENTITY tritime "⨻" > + <!ENTITY iprod "⨼" > + <!ENTITY intprod "⨼" > + <!ENTITY amalg "⨿" > + <!ENTITY capdot "⩀" > + <!ENTITY ncup "⩂" > + <!ENTITY ncap "⩃" > + <!ENTITY capand "⩄" > + <!ENTITY cupor "⩅" > + <!ENTITY cupcap "⩆" > + <!ENTITY capcup "⩇" > + <!ENTITY cupbrcap "⩈" > + <!ENTITY capbrcup "⩉" > + <!ENTITY cupcup "⩊" > + <!ENTITY capcap "⩋" > + <!ENTITY ccups "⩌" > + <!ENTITY ccaps "⩍" > + <!ENTITY ccupssm "⩐" > + <!ENTITY And "⩓" > + <!ENTITY Or "⩔" > + <!ENTITY andand "⩕" > + <!ENTITY oror "⩖" > + <!ENTITY orslope "⩗" > + <!ENTITY andslope "⩘" > + <!ENTITY andv "⩚" > + <!ENTITY orv "⩛" > + <!ENTITY andd "⩜" > + <!ENTITY ord "⩝" > + <!ENTITY wedbar "⩟" > + <!ENTITY sdote "⩦" > + <!ENTITY simdot "⩪" > + <!ENTITY congdot "⩭" > + <!ENTITY easter "⩮" > + <!ENTITY apacir "⩯" > + <!ENTITY apE "⩰" > + <!ENTITY eplus "⩱" > + <!ENTITY pluse "⩲" > + <!ENTITY Esim "⩳" > + <!ENTITY Colone "⩴" > + <!ENTITY Equal "⩵" > + <!ENTITY eDDot "⩷" > + <!ENTITY ddotseq "⩷" > + <!ENTITY equivDD "⩸" > + <!ENTITY ltcir "⩹" > + <!ENTITY gtcir "⩺" > + <!ENTITY ltquest "⩻" > + <!ENTITY gtquest "⩼" > + <!ENTITY les "⩽" > + <!ENTITY LessSlantEqual "⩽" > + <!ENTITY leqslant "⩽" > + <!ENTITY ges "⩾" > + <!ENTITY GreaterSlantEqual "⩾" > + <!ENTITY geqslant "⩾" > + <!ENTITY lesdot "⩿" > + <!ENTITY gesdot "⪀" > + <!ENTITY lesdoto "⪁" > + <!ENTITY gesdoto "⪂" > + <!ENTITY lesdotor "⪃" > + <!ENTITY gesdotol "⪄" > + <!ENTITY lap "⪅" > + <!ENTITY lessapprox "⪅" > + <!ENTITY gap "⪆" > + <!ENTITY gtrapprox "⪆" > + <!ENTITY lne "⪇" > + <!ENTITY lneq "⪇" > + <!ENTITY gne "⪈" > + <!ENTITY gneq "⪈" > + <!ENTITY lnap "⪉" > + <!ENTITY lnapprox "⪉" > + <!ENTITY gnap "⪊" > + <!ENTITY gnapprox "⪊" > + <!ENTITY lEg "⪋" > + <!ENTITY lesseqqgtr "⪋" > + <!ENTITY gEl "⪌" > + <!ENTITY gtreqqless "⪌" > + <!ENTITY lsime "⪍" > + <!ENTITY gsime "⪎" > + <!ENTITY lsimg "⪏" > + <!ENTITY gsiml "⪐" > + <!ENTITY lgE "⪑" > + <!ENTITY glE "⪒" > + <!ENTITY lesges "⪓" > + <!ENTITY gesles "⪔" > + <!ENTITY els "⪕" > + <!ENTITY eqslantless "⪕" > + <!ENTITY egs "⪖" > + <!ENTITY eqslantgtr "⪖" > + <!ENTITY elsdot "⪗" > + <!ENTITY egsdot "⪘" > + <!ENTITY el "⪙" > + <!ENTITY eg "⪚" > + <!ENTITY siml "⪝" > + <!ENTITY simg "⪞" > + <!ENTITY simlE "⪟" > + <!ENTITY simgE "⪠" > + <!ENTITY LessLess "⪡" > + <!ENTITY GreaterGreater "⪢" > + <!ENTITY glj "⪤" > + <!ENTITY gla "⪥" > + <!ENTITY ltcc "⪦" > + <!ENTITY gtcc "⪧" > + <!ENTITY lescc "⪨" > + <!ENTITY gescc "⪩" > + <!ENTITY smt "⪪" > + <!ENTITY lat "⪫" > + <!ENTITY smte "⪬" > + <!ENTITY late "⪭" > + <!ENTITY bumpE "⪮" > + <!ENTITY pre "⪯" > + <!ENTITY preceq "⪯" > + <!ENTITY PrecedesEqual "⪯" > + <!ENTITY sce "⪰" > + <!ENTITY succeq "⪰" > + <!ENTITY SucceedsEqual "⪰" > + <!ENTITY prE "⪳" > + <!ENTITY scE "⪴" > + <!ENTITY prnE "⪵" > + <!ENTITY precneqq "⪵" > + <!ENTITY scnE "⪶" > + <!ENTITY succneqq "⪶" > + <!ENTITY prap "⪷" > + <!ENTITY precapprox "⪷" > + <!ENTITY scap "⪸" > + <!ENTITY succapprox "⪸" > + <!ENTITY prnap "⪹" > + <!ENTITY precnapprox "⪹" > + <!ENTITY scnap "⪺" > + <!ENTITY succnapprox "⪺" > + <!ENTITY Pr "⪻" > + <!ENTITY Sc "⪼" > + <!ENTITY subdot "⪽" > + <!ENTITY supdot "⪾" > + <!ENTITY subplus "⪿" > + <!ENTITY supplus "⫀" > + <!ENTITY submult "⫁" > + <!ENTITY supmult "⫂" > + <!ENTITY subedot "⫃" > + <!ENTITY supedot "⫄" > + <!ENTITY subE "⫅" > + <!ENTITY subseteqq "⫅" > + <!ENTITY supE "⫆" > + <!ENTITY supseteqq "⫆" > + <!ENTITY subsim "⫇" > + <!ENTITY supsim "⫈" > + <!ENTITY subnE "⫋" > + <!ENTITY subsetneqq "⫋" > + <!ENTITY supnE "⫌" > + <!ENTITY supsetneqq "⫌" > + <!ENTITY csub "⫏" > + <!ENTITY csup "⫐" > + <!ENTITY csube "⫑" > + <!ENTITY csupe "⫒" > + <!ENTITY subsup "⫓" > + <!ENTITY supsub "⫔" > + <!ENTITY subsub "⫕" > + <!ENTITY supsup "⫖" > + <!ENTITY suphsub "⫗" > + <!ENTITY supdsub "⫘" > + <!ENTITY forkv "⫙" > + <!ENTITY topfork "⫚" > + <!ENTITY mlcp "⫛" > + <!ENTITY Dashv "⫤" > + <!ENTITY DoubleLeftTee "⫤" > + <!ENTITY Vdashl "⫦" > + <!ENTITY Barv "⫧" > + <!ENTITY vBar "⫨" > + <!ENTITY vBarv "⫩" > + <!ENTITY Vbar "⫫" > + <!ENTITY Not "⫬" > + <!ENTITY bNot "⫭" > + <!ENTITY rnmid "⫮" > + <!ENTITY cirmid "⫯" > + <!ENTITY midcir "⫰" > + <!ENTITY topcir "⫱" > + <!ENTITY nhpar "⫲" > + <!ENTITY parsim "⫳" > + <!ENTITY parsl "⫽" > + <!ENTITY fflig "ff" > + <!ENTITY filig "fi" > + <!ENTITY fllig "fl" > + <!ENTITY ffilig "ffi" > + <!ENTITY ffllig "ffl" > + <!ENTITY Ascr "𝒜" > + <!ENTITY Cscr "𝒞" > + <!ENTITY Dscr "𝒟" > + <!ENTITY Gscr "𝒢" > + <!ENTITY Jscr "𝒥" > + <!ENTITY Kscr "𝒦" > + <!ENTITY Nscr "𝒩" > + <!ENTITY Oscr "𝒪" > + <!ENTITY Pscr "𝒫" > + <!ENTITY Qscr "𝒬" > + <!ENTITY Sscr "𝒮" > + <!ENTITY Tscr "𝒯" > + <!ENTITY Uscr "𝒰" > + <!ENTITY Vscr "𝒱" > + <!ENTITY Wscr "𝒲" > + <!ENTITY Xscr "𝒳" > + <!ENTITY Yscr "𝒴" > + <!ENTITY Zscr "𝒵" > + <!ENTITY ascr "𝒶" > + <!ENTITY bscr "𝒷" > + <!ENTITY cscr "𝒸" > + <!ENTITY dscr "𝒹" > + <!ENTITY fscr "𝒻" > + <!ENTITY hscr "𝒽" > + <!ENTITY iscr "𝒾" > + <!ENTITY jscr "𝒿" > + <!ENTITY kscr "𝓀" > + <!ENTITY lscr "𝓁" > + <!ENTITY mscr "𝓂" > + <!ENTITY nscr "𝓃" > + <!ENTITY pscr "𝓅" > + <!ENTITY qscr "𝓆" > + <!ENTITY rscr "𝓇" > + <!ENTITY sscr "𝓈" > + <!ENTITY tscr "𝓉" > + <!ENTITY uscr "𝓊" > + <!ENTITY vscr "𝓋" > + <!ENTITY wscr "𝓌" > + <!ENTITY xscr "𝓍" > + <!ENTITY yscr "𝓎" > + <!ENTITY zscr "𝓏" > + <!ENTITY Afr "𝔄" > + <!ENTITY Bfr "𝔅" > + <!ENTITY Dfr "𝔇" > + <!ENTITY Efr "𝔈" > + <!ENTITY Ffr "𝔉" > + <!ENTITY Gfr "𝔊" > + <!ENTITY Jfr "𝔍" > + <!ENTITY Kfr "𝔎" > + <!ENTITY Lfr "𝔏" > + <!ENTITY Mfr "𝔐" > + <!ENTITY Nfr "𝔑" > + <!ENTITY Ofr "𝔒" > + <!ENTITY Pfr "𝔓" > + <!ENTITY Qfr "𝔔" > + <!ENTITY Sfr "𝔖" > + <!ENTITY Tfr "𝔗" > + <!ENTITY Ufr "𝔘" > + <!ENTITY Vfr "𝔙" > + <!ENTITY Wfr "𝔚" > + <!ENTITY Xfr "𝔛" > + <!ENTITY Yfr "𝔜" > + <!ENTITY afr "𝔞" > + <!ENTITY bfr "𝔟" > + <!ENTITY cfr "𝔠" > + <!ENTITY dfr "𝔡" > + <!ENTITY efr "𝔢" > + <!ENTITY ffr "𝔣" > + <!ENTITY gfr "𝔤" > + <!ENTITY hfr "𝔥" > + <!ENTITY ifr "𝔦" > + <!ENTITY jfr "𝔧" > + <!ENTITY kfr "𝔨" > + <!ENTITY lfr "𝔩" > + <!ENTITY mfr "𝔪" > + <!ENTITY nfr "𝔫" > + <!ENTITY ofr "𝔬" > + <!ENTITY pfr "𝔭" > + <!ENTITY qfr "𝔮" > + <!ENTITY rfr "𝔯" > + <!ENTITY sfr "𝔰" > + <!ENTITY tfr "𝔱" > + <!ENTITY ufr "𝔲" > + <!ENTITY vfr "𝔳" > + <!ENTITY wfr "𝔴" > + <!ENTITY xfr "𝔵" > + <!ENTITY yfr "𝔶" > + <!ENTITY zfr "𝔷" > + <!ENTITY Aopf "𝔸" > + <!ENTITY Bopf "𝔹" > + <!ENTITY Dopf "𝔻" > + <!ENTITY Eopf "𝔼" > + <!ENTITY Fopf "𝔽" > + <!ENTITY Gopf "𝔾" > + <!ENTITY Iopf "𝕀" > + <!ENTITY Jopf "𝕁" > + <!ENTITY Kopf "𝕂" > + <!ENTITY Lopf "𝕃" > + <!ENTITY Mopf "𝕄" > + <!ENTITY Oopf "𝕆" > + <!ENTITY Sopf "𝕊" > + <!ENTITY Topf "𝕋" > + <!ENTITY Uopf "𝕌" > + <!ENTITY Vopf "𝕍" > + <!ENTITY Wopf "𝕎" > + <!ENTITY Xopf "𝕏" > + <!ENTITY Yopf "𝕐" > + <!ENTITY aopf "𝕒" > + <!ENTITY bopf "𝕓" > + <!ENTITY copf "𝕔" > + <!ENTITY dopf "𝕕" > + <!ENTITY eopf "𝕖" > + <!ENTITY fopf "𝕗" > + <!ENTITY gopf "𝕘" > + <!ENTITY hopf "𝕙" > + <!ENTITY iopf "𝕚" > + <!ENTITY jopf "𝕛" > + <!ENTITY kopf "𝕜" > + <!ENTITY lopf "𝕝" > + <!ENTITY mopf "𝕞" > + <!ENTITY nopf "𝕟" > + <!ENTITY oopf "𝕠" > + <!ENTITY popf "𝕡" > + <!ENTITY qopf "𝕢" > + <!ENTITY ropf "𝕣" > + <!ENTITY sopf "𝕤" > + <!ENTITY topf "𝕥" > + <!ENTITY uopf "𝕦" > + <!ENTITY vopf "𝕧" > + <!ENTITY wopf "𝕨" > + <!ENTITY xopf "𝕩" > + <!ENTITY yopf "𝕪" > + <!ENTITY zopf "𝕫" > diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java index 69a63badd150..6164e7aac101 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java @@ -721,7 +721,14 @@ public class XmlHighlightVisitor extends XmlElementVisitor implements HighlightV @Override public boolean suitableForFile(@NotNull final PsiFile file) { - return file instanceof XmlFile; + if (file instanceof XmlFile) return true; + + for (PsiFile psiFile : file.getViewProvider().getAllFiles()) { + if (psiFile instanceof XmlFile) { + return true; + } + } + return false; } @Override diff --git a/xml/xml-analysis-impl/src/com/intellij/xml/util/CheckDtdReferencesInspection.java b/xml/xml-analysis-impl/src/com/intellij/xml/util/CheckDtdReferencesInspection.java index e266aefaf7fd..9768dd6e0f66 100644 --- a/xml/xml-analysis-impl/src/com/intellij/xml/util/CheckDtdReferencesInspection.java +++ b/xml/xml-analysis-impl/src/com/intellij/xml/util/CheckDtdReferencesInspection.java @@ -23,17 +23,14 @@ import com.intellij.codeInspection.XmlInspectionGroupNames; import com.intellij.codeInspection.XmlSuppressableInspectionTool; import com.intellij.openapi.progress.ProgressManager; import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.PsiFile; import com.intellij.psi.PsiReference; import com.intellij.psi.XmlElementVisitor; -import com.intellij.psi.xml.*; -import com.intellij.util.containers.HashMap; +import com.intellij.psi.xml.XmlElement; +import com.intellij.psi.xml.XmlElementContentSpec; +import com.intellij.psi.xml.XmlEntityRef; import com.intellij.xml.XmlBundle; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import java.util.Map; - /** * @author Maxim Mossienko */ @@ -47,49 +44,14 @@ public class CheckDtdReferencesInspection extends XmlSuppressableInspectionTool @NotNull public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) { return new XmlElementVisitor() { - - private final Map<PsiFile, Boolean> myDoctypeMap = new HashMap<PsiFile, Boolean>(); - @Override public void visitXmlElement(final XmlElement element) { - if (isHtml5Doctype(element)) { - return; - } - if (element instanceof XmlElementContentSpec || element instanceof XmlEntityRef ) { doCheckRefs(element, holder); } } - - private boolean isHtml5Doctype(XmlElement element) { - if (HtmlUtil.isHtml5Context(element)) { - return true; - } - - PsiFile file = element.getContainingFile(); - if (file instanceof XmlFile) { - if (!myDoctypeMap.containsKey(file)) { - myDoctypeMap.put(file, computeHtml5Doctype((XmlFile)file)); - } - return myDoctypeMap.get(file); - } - return false; - } - - private boolean computeHtml5Doctype(XmlFile file) { - XmlDoctype doctype = null; - //Search for doctypes from providers - for (HtmlDoctypeProvider provider : HtmlDoctypeProvider.EP_NAME.getExtensions()) { - doctype = provider.getDoctype(file); - if (doctype != null) { - break; - } - } - - return doctype != null && HtmlUtil.isHtml5Doctype(doctype); - } }; } @@ -123,11 +85,4 @@ public class CheckDtdReferencesInspection extends XmlSuppressableInspectionTool public String getDisplayName() { return XmlBundle.message("xml.inspections.check.dtd.references"); } - - @Override - @NotNull - @NonNls - public String getShortName() { - return "CheckDtdRefs"; - } } diff --git a/xml/xml-psi-impl/resources/standardSchemas/plugin.dtd b/xml/xml-psi-impl/resources/standardSchemas/plugin.dtd index c1cb3349ecbf..bb094298f648 100644 --- a/xml/xml-psi-impl/resources/standardSchemas/plugin.dtd +++ b/xml/xml-psi-impl/resources/standardSchemas/plugin.dtd @@ -149,6 +149,8 @@ relative-to-action CDATA #IMPLIED> <!ELEMENT separator EMPTY> +<!ELEMENT abbreviation EMPTY> + <!-- helpset is a name of file from PLUGIN/help/ folder Example: <helpset file="myhelp.jar" path="/Help.hs"/> --> diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java index 12b2468f6abd..2dd7767f435f 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java @@ -95,8 +95,8 @@ public class HtmlElementDescriptorImpl extends BaseXmlElementDescriptorImpl { } public XmlAttributeDescriptor getAttributeDescriptor(String attributeName, final XmlTag context) { - if (!myCaseSensitive) attributeName = attributeName.toLowerCase(); - XmlAttributeDescriptor descriptor = super.getAttributeDescriptor(attributeName, context); + String caseSensitiveAttributeName = !myCaseSensitive ? attributeName.toLowerCase() : attributeName; + XmlAttributeDescriptor descriptor = super.getAttributeDescriptor(caseSensitiveAttributeName, context); if (descriptor == null) descriptor = RelaxedHtmlFromSchemaElementDescriptor.getAttributeDescriptorFromFacelets(attributeName, context); if (descriptor == null) { @@ -106,7 +106,7 @@ public class HtmlElementDescriptorImpl extends BaseXmlElementDescriptorImpl { XmlNSDescriptor nsdescriptor = context.getNSDescriptor(XmlUtil.XML_NAMESPACE_URI, true); if (nsdescriptor instanceof XmlNSDescriptorImpl) { descriptor = ((XmlNSDescriptorImpl)nsdescriptor).getAttribute( - XmlUtil.findLocalNameByQualifiedName(attributeName), XmlUtil.XML_NAMESPACE_URI, context); + XmlUtil.findLocalNameByQualifiedName(caseSensitiveAttributeName), XmlUtil.XML_NAMESPACE_URI, context); } } } diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java index 310f5a219adc..e666cdcea090 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java @@ -26,8 +26,10 @@ import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.*; import com.intellij.util.ArrayUtil; +import com.intellij.xml.Html5SchemaProvider; import com.intellij.xml.XmlElementDescriptor; import com.intellij.xml.impl.schema.AnyXmlElementDescriptor; +import com.intellij.xml.util.HtmlUtil; import com.intellij.xml.util.XmlUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -104,7 +106,7 @@ public class XmlEntityRefImpl extends XmlElementImpl implements XmlEntityRef { public boolean execute(@NotNull PsiElement element) { if (element instanceof XmlDoctype) { XmlDoctype xmlDoctype = (XmlDoctype)element; - final String dtdUri = XmlUtil.getDtdUri(xmlDoctype); + final String dtdUri = getDtdForEntity(xmlDoctype); if (dtdUri != null) { XmlFile file = XmlUtil.getContainingFile(element); if (file == null) return true; @@ -155,7 +157,8 @@ public class XmlEntityRefImpl extends XmlElementImpl implements XmlEntityRef { final XmlElementDescriptor descriptor = rootTag.getDescriptor(); if (descriptor != null && !(descriptor instanceof AnyXmlElementDescriptor)) { - PsiElement element = descriptor.getDeclaration(); + PsiElement element = !HtmlUtil.isHtml5Context(rootTag) ? descriptor.getDeclaration() : + XmlUtil.findXmlFile((XmlFile)targetElement, Html5SchemaProvider.getCharsDtdLocation()); final PsiFile containingFile = element != null ? element.getContainingFile():null; final XmlFile descriptorFile = containingFile instanceof XmlFile ? (XmlFile)containingFile:null; @@ -179,6 +182,10 @@ public class XmlEntityRefImpl extends XmlElementImpl implements XmlEntityRef { } } + private static String getDtdForEntity(XmlDoctype xmlDoctype) { + return HtmlUtil.isHtml5Doctype(xmlDoctype) ? Html5SchemaProvider.getCharsDtdLocation() : XmlUtil.getDtdUri(xmlDoctype); + } + public XmlTag getParentTag() { final XmlElement parent = (XmlElement)getParent(); if(parent instanceof XmlTag) return (XmlTag)parent; diff --git a/xml/xml-psi-impl/src/com/intellij/xml/Html5SchemaProvider.java b/xml/xml-psi-impl/src/com/intellij/xml/Html5SchemaProvider.java index bfb1ef6c4e1b..b9072c34a0f9 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/Html5SchemaProvider.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/Html5SchemaProvider.java @@ -19,6 +19,7 @@ public abstract class Html5SchemaProvider { private static String HTML5_SCHEMA_LOCATION; private static String XHTML5_SCHEMA_LOCATION; + private static String CHARS_DTD_LOCATION; private static boolean ourInitialized; @@ -32,6 +33,12 @@ public abstract class Html5SchemaProvider { return XHTML5_SCHEMA_LOCATION; } + public static String getCharsDtdLocation() { + ensureInitialized(); + return CHARS_DTD_LOCATION; + } + + private synchronized static void ensureInitialized() { if (ourInitialized) return; ourInitialized = true; @@ -39,6 +46,7 @@ public abstract class Html5SchemaProvider { final Html5SchemaProvider[] providers = EP_NAME.getExtensions(); final URL htmlSchemaLocationURL; final URL xhtmlSchemaLocationURL; + final URL dtdCharsLocationURL; if (providers.length > 1) { LOG.error("More than one HTML5 schema providers found: " + getClassesListString(providers)); @@ -47,11 +55,13 @@ public abstract class Html5SchemaProvider { if (providers.length > 0) { htmlSchemaLocationURL = providers[0].getHtmlSchemaLocation(); xhtmlSchemaLocationURL = providers[0].getXhtmlSchemaLocation(); + dtdCharsLocationURL = providers[0].getCharsLocation(); } else { LOG.info("RelaxNG based schema for HTML5 is not supported. Old XSD schema will be used"); htmlSchemaLocationURL = Html5SchemaProvider.class.getResource(ExternalResourceManagerEx.STANDARD_SCHEMAS + "html5/xhtml5.xsd"); xhtmlSchemaLocationURL = htmlSchemaLocationURL; + dtdCharsLocationURL = htmlSchemaLocationURL; } HTML5_SCHEMA_LOCATION = VfsUtilCore.urlToPath(VfsUtilCore.fixURLforIDEA( @@ -61,6 +71,10 @@ public abstract class Html5SchemaProvider { XHTML5_SCHEMA_LOCATION = VfsUtilCore.urlToPath(VfsUtilCore.fixURLforIDEA( URLUtil.unescapePercentSequences(xhtmlSchemaLocationURL.toExternalForm()))); LOG.info("XHTML5_SCHEMA_LOCATION = " + getXhtml5SchemaLocation()); + + CHARS_DTD_LOCATION = VfsUtilCore.urlToPath(VfsUtilCore.fixURLforIDEA( + URLUtil.unescapePercentSequences(dtdCharsLocationURL.toExternalForm()))); + LOG.info("CHARS_DTD_LOCATION = " + getCharsDtdLocation()); } @NotNull @@ -69,6 +83,9 @@ public abstract class Html5SchemaProvider { @NotNull public abstract URL getXhtmlSchemaLocation(); + @NotNull + public abstract URL getCharsLocation(); + static { } |