* [gentoo-commits] proj/blogs-gentoo:master commit in: , ...
@ 2017-03-25 17:27 Anthony G. Basile
0 siblings, 0 replies; only message in thread
From: Anthony G. Basile @ 2017-03-25 17:27 UTC (permalink / raw
To: gentoo-commits
commit: e3ad53d7999e6002933959f97e3d5bee89009a83
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 17:26:44 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 17:26:51 2017 +0000
URL: https://gitweb.gentoo.org/proj/blogs-gentoo.git/commit/?id=e3ad53d7
Update plugin wordpress-mobile-pack 2.2.9
.../admin/class-admin-init.php | 33 +-
.../admin/js/UI.Modules/Theming/WMP_EDIT_THEME.js | 455 +-
.../js/UI.Modules/Theming/WMP_EDIT_THEME.min.js | 2 +-
.../admin/pages/theme-settings.php | 62 +-
plugins/wordpress-mobile-pack/admin/sass/config.rb | 21 -
.../admin/sass/core/_buttons.scss | 110 -
.../admin/sass/core/_core.scss | 448 -
.../admin/sass/core/_fonts.scss | 11 -
.../admin/sass/core/_forms.scss | 409 -
.../wordpress-mobile-pack/admin/sass/core/_ie.scss | 6 -
.../admin/sass/core/_variables.scss | 102 -
.../admin/sass/fonts/acorde-regular.eot | Bin 25550 -> 0 bytes
.../admin/sass/fonts/acorde-regular.otf | Bin 142648 -> 0 bytes
.../admin/sass/fonts/acorde-regular.svg | 1449 ---
.../admin/sass/fonts/acorde-regular.ttf | Bin 78548 -> 0 bytes
.../admin/sass/fonts/acorde-regular.woff | Bin 28940 -> 0 bytes
.../admin/sass/fonts/acorde-semibold.eot | Bin 26084 -> 0 bytes
.../admin/sass/fonts/acorde-semibold.otf | Bin 140888 -> 0 bytes
.../admin/sass/fonts/acorde-semibold.svg | 1522 ----
.../admin/sass/fonts/acorde-semibold.ttf | Bin 75088 -> 0 bytes
.../admin/sass/fonts/acorde-semibold.woff | Bin 29404 -> 0 bytes
.../admin/sass/fonts/ol-round-gothic-light.eot | Bin 15471 -> 0 bytes
.../admin/sass/fonts/ol-round-gothic-light.otf | Bin 64032 -> 0 bytes
.../admin/sass/fonts/ol-round-gothic-light.svg | 1021 ---
.../admin/sass/fonts/ol-round-gothic-light.ttf | Bin 36324 -> 0 bytes
.../admin/sass/fonts/ol-round-gothic-light.woff | Bin 17720 -> 0 bytes
.../admin/sass/fonts/open-sans-regular.eot | Bin 21096 -> 0 bytes
.../admin/sass/fonts/open-sans-regular.otf | Bin 54272 -> 0 bytes
.../admin/sass/fonts/open-sans-regular.svg | 1825 ----
.../admin/sass/fonts/open-sans-regular.ttf | Bin 45112 -> 0 bytes
.../admin/sass/fonts/open-sans-regular.woff | Bin 24728 -> 0 bytes
.../admin/sass/fonts/opensans-italic.eot | Bin 23404 -> 0 bytes
.../admin/sass/fonts/opensans-italic.svg | 1825 ----
.../admin/sass/fonts/opensans-italic.ttf | Bin 51188 -> 0 bytes
.../admin/sass/fonts/opensans-italic.woff | Bin 27212 -> 0 bytes
.../admin/sass/fonts/opensans-semibold.eot | Bin 21299 -> 0 bytes
.../admin/sass/fonts/opensans-semibold.svg | 1825 ----
.../admin/sass/fonts/opensans-semibold.ttf | Bin 45160 -> 0 bytes
.../admin/sass/fonts/opensans-semibold.woff | Bin 24912 -> 0 bytes
.../admin/sass/fonts/wp-font.eot | Bin 7112 -> 0 bytes
.../admin/sass/fonts/wp-font.svg | 38 -
.../admin/sass/fonts/wp-font.ttf | Bin 6920 -> 0 bytes
.../admin/sass/fonts/wp-font.woff | Bin 6996 -> 0 bytes
.../wordpress-mobile-pack/admin/sass/general.scss | 33 -
.../admin/sass/mixins/_display.scss | 154 -
.../admin/sass/mixins/_icon.scss | 58 -
.../admin/sass/mixins/_mixins.scss | 115 -
.../admin/sass/modules/_content.scss | 398 -
.../admin/sass/modules/_look-and-feel.scss | 287 -
.../admin/sass/modules/_perfect-scrollbar.scss | 128 -
.../admin/sass/modules/_settings.scss | 40 -
.../admin/sass/modules/_themes.scss | 265 -
.../admin/sass/modules/_whats-new.scss | 107 -
plugins/wordpress-mobile-pack/core/config.php | 2 +-
.../wordpress-mobile-pack/export/class-export.php | 35 +-
plugins/wordpress-mobile-pack/export/content.php | 2 +-
.../frontend/class-application.php | 6 +
.../frontend/themes/app1/template.php | 7 +
.../inc/class-wmp-formatter.php | 422 +-
.../inc/class-wmp-themes-config.php | 229 +-
.../library/HTMLPurifier.composer.php | 4 -
.../library/HTMLPurifier/ConfigSchema/schema.ser | Bin 15000 -> 0 bytes
.../ConfigSchema/schema/Filter.Iframe.txt | 12 -
.../library/HTMLPurifier/URIScheme/tel.php | 31 -
.../library/HTMLPurifier.auto.php | 22 +-
.../library/HTMLPurifier.autoload.php | 54 +-
.../library/HTMLPurifier.composer.php | 4 +
.../library/HTMLPurifier.func.php | 50 +-
.../library/HTMLPurifier.includes.php | 461 +-
.../library/HTMLPurifier.kses.php | 60 +-
.../library/HTMLPurifier.path.php | 22 +-
.../library/HTMLPurifier.php | 584 +-
.../library/HTMLPurifier.safe-includes.php | 458 +-
.../library/HTMLPurifier/Arborize.php | 142 +-
.../library/HTMLPurifier/AttrCollections.php | 291 +-
.../library/HTMLPurifier/AttrDef.php | 276 +-
.../library/HTMLPurifier/AttrDef/CSS.php | 217 +-
.../HTMLPurifier/AttrDef/CSS/AlphaValue.php | 68 +-
.../HTMLPurifier/AttrDef/CSS/Background.php | 222 +-
.../AttrDef/CSS/BackgroundPosition.php | 314 +-
.../library/HTMLPurifier/AttrDef/CSS/Border.php | 112 +-
.../library/HTMLPurifier/AttrDef/CSS/Color.php | 210 +-
.../library/HTMLPurifier/AttrDef/CSS/Composite.php | 96 +-
.../AttrDef/CSS/DenyElementDecorator.php | 88 +-
.../library/HTMLPurifier/AttrDef/CSS/Filter.php | 154 +-
.../library/HTMLPurifier/AttrDef/CSS/Font.php | 352 +-
.../HTMLPurifier/AttrDef/CSS/FontFamily.php | 438 +-
.../library/HTMLPurifier/AttrDef/CSS/Ident.php | 64 +-
.../AttrDef/CSS/ImportantDecorator.php | 112 +-
.../library/HTMLPurifier/AttrDef/CSS/Length.php | 154 +-
.../library/HTMLPurifier/AttrDef/CSS/ListStyle.php | 224 +-
.../library/HTMLPurifier/AttrDef/CSS/Multiple.php | 142 +-
.../library/HTMLPurifier/AttrDef/CSS/Number.php | 168 +-
.../HTMLPurifier/AttrDef/CSS/Percentage.php | 108 +-
.../HTMLPurifier/AttrDef/CSS/TextDecoration.php | 92 +-
.../library/HTMLPurifier/AttrDef/CSS/URI.php | 151 +-
.../library/HTMLPurifier/AttrDef/Clone.php | 88 +-
.../library/HTMLPurifier/AttrDef/Enum.php | 146 +-
.../library/HTMLPurifier/AttrDef/HTML/Bool.php | 99 +-
.../library/HTMLPurifier/AttrDef/HTML/Class.php | 96 +-
.../library/HTMLPurifier/AttrDef/HTML/Color.php | 102 +-
.../HTMLPurifier/AttrDef/HTML/FrameTarget.php | 76 +-
.../library/HTMLPurifier/AttrDef/HTML/ID.php | 218 +-
.../library/HTMLPurifier/AttrDef/HTML/Length.php | 112 +-
.../HTMLPurifier/AttrDef/HTML/LinkTypes.php | 144 +-
.../HTMLPurifier/AttrDef/HTML/MultiLength.php | 120 +-
.../library/HTMLPurifier/AttrDef/HTML/Nmtokens.php | 140 +-
.../library/HTMLPurifier/AttrDef/HTML/Pixels.php | 152 +-
.../library/HTMLPurifier/AttrDef/Integer.php | 182 +-
.../library/HTMLPurifier/AttrDef/Lang.php | 172 +-
.../library/HTMLPurifier/AttrDef/Switch.php | 106 +-
.../library/HTMLPurifier/AttrDef/Text.php | 42 +-
.../library/HTMLPurifier/AttrDef/URI.php | 222 +-
.../library/HTMLPurifier/AttrDef/URI/Email.php | 40 +-
.../HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php | 58 +-
.../library/HTMLPurifier/AttrDef/URI/Host.php | 265 +-
.../library/HTMLPurifier/AttrDef/URI/IPv4.php | 90 +-
.../library/HTMLPurifier/AttrDef/URI/IPv6.php | 178 +-
.../library/HTMLPurifier/AttrTransform.php | 120 +-
.../HTMLPurifier/AttrTransform/Background.php | 56 +-
.../library/HTMLPurifier/AttrTransform/BdoDir.php | 54 +-
.../library/HTMLPurifier/AttrTransform/BgColor.php | 56 +-
.../HTMLPurifier/AttrTransform/BoolToCSS.php | 94 +-
.../library/HTMLPurifier/AttrTransform/Border.php | 52 +-
.../HTMLPurifier/AttrTransform/EnumToCSS.php | 136 +-
.../HTMLPurifier/AttrTransform/ImgRequired.php | 95 +-
.../HTMLPurifier/AttrTransform/ImgSpace.php | 122 +-
.../library/HTMLPurifier/AttrTransform/Input.php | 112 +-
.../library/HTMLPurifier/AttrTransform/Lang.php | 62 +-
.../library/HTMLPurifier/AttrTransform/Length.php | 90 +-
.../library/HTMLPurifier/AttrTransform/Name.php | 66 +-
.../HTMLPurifier/AttrTransform/NameSync.php | 82 +-
.../HTMLPurifier/AttrTransform/Nofollow.php | 104 +-
.../HTMLPurifier/AttrTransform/SafeEmbed.php | 50 +-
.../HTMLPurifier/AttrTransform/SafeObject.php | 56 +-
.../HTMLPurifier/AttrTransform/SafeParam.php | 158 +-
.../HTMLPurifier/AttrTransform/ScriptRequired.php | 46 +-
.../HTMLPurifier/AttrTransform/TargetBlank.php | 90 +-
.../AttrTransform/TargetNoreferrer.php | 37 +
.../HTMLPurifier/AttrTransform/Textarea.php | 54 +-
.../library/HTMLPurifier/AttrTypes.php | 192 +-
.../library/HTMLPurifier/AttrValidator.php | 356 +-
.../library/HTMLPurifier/Bootstrap.php | 248 +-
.../library/HTMLPurifier/CSSDefinition.php | 961 +-
.../library/HTMLPurifier/ChildDef.php | 104 +-
.../library/HTMLPurifier/ChildDef/Chameleon.php | 134 +-
.../library/HTMLPurifier/ChildDef/Custom.php | 204 +-
.../library/HTMLPurifier/ChildDef/Empty.php | 76 +-
.../library/HTMLPurifier/ChildDef/List.php | 178 +-
.../library/HTMLPurifier/ChildDef/Optional.php | 90 +-
.../library/HTMLPurifier/ChildDef/Required.php | 236 +-
.../HTMLPurifier/ChildDef/StrictBlockquote.php | 220 +-
.../library/HTMLPurifier/ChildDef/Table.php | 448 +-
.../library/HTMLPurifier/Config.php | 1831 ++--
.../library/HTMLPurifier/ConfigSchema.php | 352 +-
.../ConfigSchema/Builder/ConfigSchema.php | 96 +-
.../HTMLPurifier/ConfigSchema/Builder/Xml.php | 288 +-
.../HTMLPurifier/ConfigSchema/Exception.php | 22 +-
.../HTMLPurifier/ConfigSchema/Interchange.php | 94 +-
.../ConfigSchema/Interchange/Directive.php | 178 +-
.../HTMLPurifier/ConfigSchema/Interchange/Id.php | 116 +-
.../ConfigSchema/InterchangeBuilder.php | 452 +-
.../HTMLPurifier/ConfigSchema/Validator.php | 496 +-
.../HTMLPurifier/ConfigSchema/ValidatorAtom.php | 260 +-
.../library/HTMLPurifier/ConfigSchema/schema.ser | Bin 0 -> 15598 bytes
.../ConfigSchema/schema/Attr.AllowedClasses.txt | 16 +-
.../schema/Attr.AllowedFrameTargets.txt | 24 +-
.../ConfigSchema/schema/Attr.AllowedRel.txt | 18 +-
.../ConfigSchema/schema/Attr.AllowedRev.txt | 18 +-
.../ConfigSchema/schema/Attr.ClassUseCDATA.txt | 38 +-
.../ConfigSchema/schema/Attr.DefaultImageAlt.txt | 22 +-
.../schema/Attr.DefaultInvalidImage.txt | 18 +-
.../schema/Attr.DefaultInvalidImageAlt.txt | 16 +-
.../ConfigSchema/schema/Attr.DefaultTextDir.txt | 20 +-
.../ConfigSchema/schema/Attr.EnableID.txt | 32 +-
.../ConfigSchema/schema/Attr.ForbiddenClasses.txt | 16 +-
.../ConfigSchema/schema/Attr.ID.HTML5.txt | 10 +
.../ConfigSchema/schema/Attr.IDBlacklist.txt | 10 +-
.../ConfigSchema/schema/Attr.IDBlacklistRegexp.txt | 18 +-
.../ConfigSchema/schema/Attr.IDPrefix.txt | 24 +-
.../ConfigSchema/schema/Attr.IDPrefixLocal.txt | 28 +-
.../schema/AutoFormat.AutoParagraph.txt | 62 +-
.../ConfigSchema/schema/AutoFormat.Custom.txt | 24 +-
.../schema/AutoFormat.DisplayLinkURI.txt | 22 +-
.../ConfigSchema/schema/AutoFormat.Linkify.txt | 24 +-
.../schema/AutoFormat.PurifierLinkify.DocURL.txt | 24 +-
.../schema/AutoFormat.PurifierLinkify.txt | 24 +-
.../schema/AutoFormat.RemoveEmpty.Predicate.txt | 14 +
...utoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt | 22 +-
.../schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt | 30 +-
.../ConfigSchema/schema/AutoFormat.RemoveEmpty.txt | 92 +-
.../AutoFormat.RemoveSpansWithoutAttributes.txt | 22 +-
.../ConfigSchema/schema/CSS.AllowDuplicates.txt | 11 +
.../ConfigSchema/schema/CSS.AllowImportant.txt | 16 +-
.../ConfigSchema/schema/CSS.AllowTricky.txt | 22 +-
.../ConfigSchema/schema/CSS.AllowedFonts.txt | 24 +-
.../ConfigSchema/schema/CSS.AllowedProperties.txt | 36 +-
.../ConfigSchema/schema/CSS.DefinitionRev.txt | 22 +-
.../schema/CSS.ForbiddenProperties.txt | 26 +-
.../ConfigSchema/schema/CSS.MaxImgLength.txt | 32 +-
.../ConfigSchema/schema/CSS.Proprietary.txt | 20 +-
.../ConfigSchema/schema/CSS.Trusted.txt | 18 +-
.../ConfigSchema/schema/Cache.DefinitionImpl.txt | 28 +-
.../ConfigSchema/schema/Cache.SerializerPath.txt | 26 +-
.../schema/Cache.SerializerPermissions.txt | 27 +-
.../ConfigSchema/schema/Core.AggressivelyFixLt.txt | 36 +-
.../schema/Core.AllowHostnameUnderscore.txt | 32 +-
.../ConfigSchema/schema/Core.CollectErrors.txt | 24 +-
.../ConfigSchema/schema/Core.ColorKeywords.txt | 58 +-
.../schema/Core.ConvertDocumentToFragment.txt | 28 +-
.../Core.DirectLexLineNumberSyncInterval.txt | 34 +-
.../ConfigSchema/schema/Core.DisableExcludes.txt | 28 +-
.../ConfigSchema/schema/Core.EnableIDNA.txt | 18 +-
.../ConfigSchema/schema/Core.Encoding.txt | 30 +-
.../schema/Core.EscapeInvalidChildren.txt | 24 +-
.../ConfigSchema/schema/Core.EscapeInvalidTags.txt | 14 +-
.../schema/Core.EscapeNonASCIICharacters.txt | 26 +-
.../ConfigSchema/schema/Core.HiddenElements.txt | 38 +-
.../ConfigSchema/schema/Core.Language.txt | 20 +-
.../ConfigSchema/schema/Core.LexerImpl.txt | 68 +-
.../schema/Core.MaintainLineNumbers.txt | 32 +-
.../ConfigSchema/schema/Core.NormalizeNewlines.txt | 22 +-
.../ConfigSchema/schema/Core.RemoveInvalidImg.txt | 24 +-
.../schema/Core.RemoveProcessingInstructions.txt | 22 +-
.../schema/Core.RemoveScriptContents.txt | 24 +-
.../ConfigSchema/schema/Filter.Custom.txt | 22 +-
| 28 +-
| 58 +-
| 32 +-
| 148 +-
.../ConfigSchema/schema/Filter.YouTube.txt | 32 +-
.../ConfigSchema/schema/HTML.Allowed.txt | 50 +-
.../ConfigSchema/schema/HTML.AllowedAttributes.txt | 38 +-
| 20 +-
| 30 +-
.../ConfigSchema/schema/HTML.AllowedElements.txt | 46 +-
.../ConfigSchema/schema/HTML.AllowedModules.txt | 40 +-
.../schema/HTML.Attr.Name.UseCDATA.txt | 22 +-
.../ConfigSchema/schema/HTML.BlockWrapper.txt | 36 +-
.../ConfigSchema/schema/HTML.CoreModules.txt | 46 +-
.../ConfigSchema/schema/HTML.CustomDoctype.txt | 18 +-
.../ConfigSchema/schema/HTML.DefinitionID.txt | 66 +-
.../ConfigSchema/schema/HTML.DefinitionRev.txt | 32 +-
.../ConfigSchema/schema/HTML.Doctype.txt | 22 +-
.../schema/HTML.FlashAllowFullScreen.txt | 22 +-
.../schema/HTML.ForbiddenAttributes.txt | 42 +-
.../ConfigSchema/schema/HTML.ForbiddenElements.txt | 40 +-
.../ConfigSchema/schema/HTML.MaxImgLength.txt | 28 +-
.../ConfigSchema/schema/HTML.Nofollow.txt | 14 +-
.../ConfigSchema/schema/HTML.Parent.txt | 24 +-
.../ConfigSchema/schema/HTML.Proprietary.txt | 24 +-
.../ConfigSchema/schema/HTML.SafeEmbed.txt | 26 +-
.../ConfigSchema/schema/HTML.SafeIframe.txt | 26 +-
.../ConfigSchema/schema/HTML.SafeObject.txt | 26 +-
.../ConfigSchema/schema/HTML.SafeScripting.txt | 20 +-
.../ConfigSchema/schema/HTML.Strict.txt | 18 +-
.../ConfigSchema/schema/HTML.TargetBlank.txt | 16 +-
.../ConfigSchema/schema/HTML.TargetNoreferrer.txt | 9 +
.../ConfigSchema/schema/HTML.TidyAdd.txt | 16 +-
.../ConfigSchema/schema/HTML.TidyLevel.txt | 48 +-
.../ConfigSchema/schema/HTML.TidyRemove.txt | 16 +-
.../ConfigSchema/schema/HTML.Trusted.txt | 18 +-
.../ConfigSchema/schema/HTML.XHTML.txt | 22 +-
| 20 +-
.../ConfigSchema/schema/Output.FixInnerHTML.txt | 30 +-
.../ConfigSchema/schema/Output.FlashCompat.txt | 22 +-
.../ConfigSchema/schema/Output.Newline.txt | 26 +-
.../ConfigSchema/schema/Output.SortAttr.txt | 28 +-
.../ConfigSchema/schema/Output.TidyFormat.txt | 50 +-
.../ConfigSchema/schema/Test.ForceNoIconv.txt | 14 +-
.../ConfigSchema/schema/URI.AllowedSchemes.txt | 35 +-
.../HTMLPurifier/ConfigSchema/schema/URI.Base.txt | 34 +-
.../ConfigSchema/schema/URI.DefaultScheme.txt | 20 +-
.../ConfigSchema/schema/URI.DefinitionID.txt | 22 +-
.../ConfigSchema/schema/URI.DefinitionRev.txt | 22 +-
.../ConfigSchema/schema/URI.Disable.txt | 28 +-
.../ConfigSchema/schema/URI.DisableExternal.txt | 22 +-
.../schema/URI.DisableExternalResources.txt | 26 +-
.../ConfigSchema/schema/URI.DisableResources.txt | 30 +-
.../HTMLPurifier/ConfigSchema/schema/URI.Host.txt | 38 +-
.../ConfigSchema/schema/URI.HostBlacklist.txt | 18 +-
.../ConfigSchema/schema/URI.MakeAbsolute.txt | 26 +-
.../HTMLPurifier/ConfigSchema/schema/URI.Munge.txt | 166 +-
.../ConfigSchema/schema/URI.MungeResources.txt | 34 +-
.../ConfigSchema/schema/URI.MungeSecretKey.txt | 60 +-
.../schema/URI.OverrideAllowedSchemes.txt | 18 +-
.../ConfigSchema/schema/URI.SafeIframeRegexp.txt | 44 +-
.../HTMLPurifier/ConfigSchema/schema/info.ini | 6 +-
.../library/HTMLPurifier/ContentSets.php | 340 +-
.../library/HTMLPurifier/Context.php | 190 +-
.../library/HTMLPurifier/Definition.php | 110 +-
.../library/HTMLPurifier/DefinitionCache.php | 258 +-
.../HTMLPurifier/DefinitionCache/Decorator.php | 224 +-
.../DefinitionCache/Decorator/Cleanup.php | 156 +-
.../DefinitionCache/Decorator/Memory.php | 170 +-
.../DefinitionCache/Decorator/Template.php.in | 164 +-
.../library/HTMLPurifier/DefinitionCache/Null.php | 152 +-
.../HTMLPurifier/DefinitionCache/Serializer.php | 598 +-
.../HTMLPurifier/DefinitionCache/Serializer/README | 6 +-
.../HTMLPurifier/DefinitionCacheFactory.php | 212 +-
.../library/HTMLPurifier/Doctype.php | 146 +-
.../library/HTMLPurifier/DoctypeRegistry.php | 284 +-
.../library/HTMLPurifier/ElementDef.php | 432 +-
.../library/HTMLPurifier/Encoder.php | 1222 +--
.../library/HTMLPurifier/EntityLookup.php | 96 +-
.../library/HTMLPurifier/EntityLookup/entities.ser | 0
.../library/HTMLPurifier/EntityParser.php | 306 +-
.../library/HTMLPurifier/ErrorCollector.php | 488 +-
.../library/HTMLPurifier/ErrorStruct.php | 148 +-
.../library/HTMLPurifier/Exception.php | 24 +-
.../library/HTMLPurifier/Filter.php | 112 +-
| 676 +-
.../library/HTMLPurifier/Filter/YouTube.php | 130 +-
.../library/HTMLPurifier/Generator.php | 572 +-
.../library/HTMLPurifier/HTMLDefinition.php | 986 +-
.../library/HTMLPurifier/HTMLModule.php | 568 +-
.../library/HTMLPurifier/HTMLModule/Bdo.php | 88 +-
.../HTMLPurifier/HTMLModule/CommonAttributes.php | 62 +-
.../library/HTMLPurifier/HTMLModule/Edit.php | 110 +-
.../library/HTMLPurifier/HTMLModule/Forms.php | 380 +-
.../library/HTMLPurifier/HTMLModule/Hypertext.php | 80 +-
.../library/HTMLPurifier/HTMLModule/Iframe.php | 102 +-
.../library/HTMLPurifier/HTMLModule/Image.php | 98 +-
.../library/HTMLPurifier/HTMLModule/Legacy.php | 372 +-
.../library/HTMLPurifier/HTMLModule/List.php | 102 +-
.../library/HTMLPurifier/HTMLModule/Name.php | 52 +-
.../library/HTMLPurifier/HTMLModule/Nofollow.php | 50 +-
.../HTMLModule/NonXMLCommonAttributes.php | 40 +-
.../library/HTMLPurifier/HTMLModule/Object.php | 124 +-
.../HTMLPurifier/HTMLModule/Presentation.php | 84 +-
.../HTMLPurifier/HTMLModule/Proprietary.php | 80 +-
.../library/HTMLPurifier/HTMLModule/Ruby.php | 72 +-
.../library/HTMLPurifier/HTMLModule/SafeEmbed.php | 80 +-
.../library/HTMLPurifier/HTMLModule/SafeObject.php | 124 +-
.../HTMLPurifier/HTMLModule/SafeScripting.php | 80 +-
.../library/HTMLPurifier/HTMLModule/Scripting.php | 146 +-
.../HTMLPurifier/HTMLModule/StyleAttribute.php | 66 +-
.../library/HTMLPurifier/HTMLModule/Tables.php | 150 +-
.../library/HTMLPurifier/HTMLModule/Target.php | 56 +-
.../HTMLPurifier/HTMLModule/TargetBlank.php | 48 +-
.../HTMLPurifier/HTMLModule/TargetNoreferrer.php | 21 +
.../library/HTMLPurifier/HTMLModule/Text.php | 174 +-
.../library/HTMLPurifier/HTMLModule/Tidy.php | 460 +-
.../library/HTMLPurifier/HTMLModule/Tidy/Name.php | 66 +-
.../HTMLPurifier/HTMLModule/Tidy/Proprietary.php | 68 +-
.../HTMLPurifier/HTMLModule/Tidy/Strict.php | 86 +-
.../HTMLPurifier/HTMLModule/Tidy/Transitional.php | 32 +-
.../library/HTMLPurifier/HTMLModule/Tidy/XHTML.php | 52 +-
.../HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php | 358 +-
.../HTMLModule/XMLCommonAttributes.php | 40 +-
.../library/HTMLPurifier/HTMLModuleManager.php | 923 +-
.../library/HTMLPurifier/IDAccumulator.php | 114 +-
.../library/HTMLPurifier/Injector.php | 562 +-
.../HTMLPurifier/Injector/AutoParagraph.php | 712 +-
.../HTMLPurifier/Injector/DisplayLinkURI.php | 80 +-
.../library/HTMLPurifier/Injector/Linkify.php | 123 +-
.../HTMLPurifier/Injector/PurifierLinkify.php | 142 +-
.../library/HTMLPurifier/Injector/RemoveEmpty.php | 213 +-
.../Injector/RemoveSpansWithoutAttributes.php | 168 +-
.../library/HTMLPurifier/Injector/SafeObject.php | 245 +-
.../library/HTMLPurifier/Language.php | 408 +-
.../HTMLPurifier/Language/classes/en-x-test.php | 18 +-
.../HTMLPurifier/Language/messages/en-x-test.php | 22 +-
.../Language/messages/en-x-testmini.php | 24 +-
.../library/HTMLPurifier/Language/messages/en.php | 110 +-
.../library/HTMLPurifier/LanguageFactory.php | 418 +-
.../library/HTMLPurifier/Length.php | 320 +-
.../library/HTMLPurifier/Lexer.php | 719 +-
.../library/HTMLPurifier/Lexer/DOMLex.php | 559 +-
.../library/HTMLPurifier/Lexer/DirectLex.php | 1078 +--
.../library/HTMLPurifier/Lexer/PH5P.php | 9575 ++++++++++----------
.../library/HTMLPurifier/Node.php | 98 +-
| 72 +-
.../library/HTMLPurifier/Node/Element.php | 118 +-
.../library/HTMLPurifier/Node/Text.php | 108 +-
.../library/HTMLPurifier/PercentEncoder.php | 222 +-
.../library/HTMLPurifier/Printer.php | 436 +-
.../library/HTMLPurifier/Printer/CSSDefinition.php | 88 +-
.../library/HTMLPurifier/Printer/ConfigForm.css | 20 +-
.../library/HTMLPurifier/Printer/ConfigForm.js | 10 +-
.../library/HTMLPurifier/Printer/ConfigForm.php | 898 +-
.../HTMLPurifier/Printer/HTMLDefinition.php | 648 +-
.../library/HTMLPurifier/PropertyList.php | 244 +-
.../library/HTMLPurifier/PropertyListIterator.php | 84 +-
.../library/HTMLPurifier/Queue.php | 112 +-
.../library/HTMLPurifier/Strategy.php | 52 +-
.../library/HTMLPurifier/Strategy/Composite.php | 60 +-
.../library/HTMLPurifier/Strategy/Core.php | 34 +-
.../library/HTMLPurifier/Strategy/FixNesting.php | 362 +-
.../HTMLPurifier/Strategy/MakeWellFormed.php | 1200 +--
.../Strategy/RemoveForeignElements.php | 414 +-
.../HTMLPurifier/Strategy/ValidateAttributes.php | 90 +-
.../library/HTMLPurifier/StringHash.php | 94 +-
.../library/HTMLPurifier/StringHashParser.php | 272 +-
.../library/HTMLPurifier/TagTransform.php | 74 +-
.../library/HTMLPurifier/TagTransform/Font.php | 228 +-
.../library/HTMLPurifier/TagTransform/Simple.php | 88 +-
.../library/HTMLPurifier/Token.php | 200 +-
| 76 +-
.../library/HTMLPurifier/Token/Empty.php | 30 +-
.../library/HTMLPurifier/Token/End.php | 48 +-
.../library/HTMLPurifier/Token/Start.php | 20 +-
.../library/HTMLPurifier/Token/Tag.php | 136 +-
.../library/HTMLPurifier/Token/Text.php | 106 +-
.../library/HTMLPurifier/TokenFactory.php | 236 +-
.../library/HTMLPurifier/URI.php | 628 +-
.../library/HTMLPurifier/URIDefinition.php | 224 +-
.../library/HTMLPurifier/URIFilter.php | 148 +-
.../HTMLPurifier/URIFilter/DisableExternal.php | 108 +-
.../URIFilter/DisableExternalResources.php | 50 +-
.../HTMLPurifier/URIFilter/DisableResources.php | 44 +-
.../HTMLPurifier/URIFilter/HostBlacklist.php | 92 +-
.../HTMLPurifier/URIFilter/MakeAbsolute.php | 316 +-
.../library/HTMLPurifier/URIFilter/Munge.php | 230 +-
.../library/HTMLPurifier/URIFilter/SafeIframe.php | 136 +-
.../library/HTMLPurifier/URIParser.php | 142 +-
.../library/HTMLPurifier/URIScheme.php | 204 +-
.../library/HTMLPurifier/URIScheme/callto.php | 62 +-
.../library/HTMLPurifier/URIScheme/data.php | 263 +-
.../library/HTMLPurifier/URIScheme/file.php | 88 +-
.../library/HTMLPurifier/URIScheme/ftp.php | 116 +-
.../library/HTMLPurifier/URIScheme/http.php | 72 +-
.../library/HTMLPurifier/URIScheme/https.php | 36 +-
.../library/HTMLPurifier/URIScheme/mailto.php | 80 +-
.../library/HTMLPurifier/URIScheme/news.php | 70 +-
.../library/HTMLPurifier/URIScheme/nntp.php | 64 +-
.../library/HTMLPurifier/URIScheme/skype.php | 64 +-
.../library/HTMLPurifier/URIScheme/sms.php | 62 +-
.../library/HTMLPurifier/URIScheme/tel.php | 46 +
.../library/HTMLPurifier/URIScheme/whatsapp.php | 62 +-
.../library/HTMLPurifier/URISchemeRegistry.php | 162 +-
.../library/HTMLPurifier/UnitConverter.php | 614 +-
.../library/HTMLPurifier/VarParser.php | 396 +-
.../library/HTMLPurifier/VarParser/Flexible.php | 260 +-
.../library/HTMLPurifier/VarParser/Native.php | 76 +-
.../library/HTMLPurifier/VarParserException.php | 22 +-
.../library/HTMLPurifier/Zipper.php | 314 +-
plugins/wordpress-mobile-pack/readme.txt | 14 +-
.../wordpress-mobile-pack.php | 6 +-
439 files changed, 32484 insertions(+), 44430 deletions(-)
diff --git a/plugins/wordpress-mobile-pack/admin/class-admin-init.php b/plugins/wordpress-mobile-pack/admin/class-admin-init.php
index e85f61b..2e374f0 100755
--- a/plugins/wordpress-mobile-pack/admin/class-admin-init.php
+++ b/plugins/wordpress-mobile-pack/admin/class-admin-init.php
@@ -104,15 +104,6 @@ if ( ! class_exists( 'WMobilePack_Admin_Init' ) ) {
/**
- *
- * The oldest Wordpress version that will enable the custom select
- * @var float
- */
- public static $customselect_enable = 3.6;
-
-
-
- /**
* Class constructor
*
* Init admin menu and enqueue general Javascript & CSS files
@@ -210,13 +201,8 @@ if ( ! class_exists( 'WMobilePack_Admin_Init' ) ) {
wp_enqueue_style(WMobilePack_Options::$prefix.'css_general', plugins_url(WMP_DOMAIN.'/admin/css/general.css'), array(), WMP_VERSION);
// enqueue scripts
- $blog_version = floatval(get_bloginfo('version'));
- if ($blog_version < 3.6)
- $dependencies = array('jquery');
- else
- $dependencies = array('jquery-core', 'jquery-migrate');
+ $dependencies = array('jquery-core', 'jquery-migrate');
- // enqueue scripts
wp_enqueue_script(WMobilePack_Options::$prefix.'js_validate', plugins_url(WMP_DOMAIN.'/admin/js/UI.Interface/Lib/jquery.validate.min.js'), $dependencies, '1.11.1');
wp_enqueue_script(WMobilePack_Options::$prefix.'js_validate_additional', plugins_url(WMP_DOMAIN.'/admin/js/UI.Interface/Lib/validate-additional-methods.min.js'), $dependencies, '1.11.1');
wp_enqueue_script(WMobilePack_Options::$prefix.'js_loader', plugins_url(WMP_DOMAIN.'/admin/js/UI.Interface/Loader.min.js'), $dependencies, WMP_VERSION);
@@ -255,18 +241,13 @@ if ( ! class_exists( 'WMobilePack_Admin_Init' ) ) {
public function wmp_admin_load_theme_settings_js()
{
- $blog_version = floatval(get_bloginfo('version'));
-
- // activate custom select for newer wp versions
- if ($blog_version >= self::$customselect_enable) {
+ wp_enqueue_style(WMobilePack_Options::$prefix.'css_select_box_it', plugins_url(WMP_DOMAIN.'/admin/css/jquery.selectBoxIt.css'), array(), '3.8.1');
+ wp_enqueue_script(WMobilePack_Options::$prefix.'js_select_box_it', plugins_url(WMP_DOMAIN.'/admin/js/UI.Interface/Lib/jquery.selectBoxIt.min.js'), array('jquery','jquery-ui-core', 'jquery-ui-widget'), '3.8.1');
- wp_enqueue_style(WMobilePack_Options::$prefix.'css_select_box_it', plugins_url(WMP_DOMAIN.'/admin/css/jquery.selectBoxIt.css'), array(), '3.8.1');
- wp_enqueue_script(WMobilePack_Options::$prefix.'js_select_box_it', plugins_url(WMP_DOMAIN.'/admin/js/UI.Interface/Lib/jquery.selectBoxIt.min.js'), array('jquery','jquery-ui-core', 'jquery-ui-widget'), '3.8.1');
-
- $allowed_fonts = WMobilePack_Themes_Config::$allowed_fonts;
- foreach ($allowed_fonts as $key => $font_family)
- wp_enqueue_style(WMobilePack_Options::$prefix.'css_font'.($key+1), plugins_url(WMP_DOMAIN.'/frontend/fonts/font-'.($key+1).'.css'), array(), WMP_VERSION);
- }
+ $allowed_fonts = WMobilePack_Themes_Config::$allowed_fonts;
+ foreach ($allowed_fonts as $key => $font_family) {
+ wp_enqueue_style(WMobilePack_Options::$prefix.'css_font'.($key+1), plugins_url(WMP_DOMAIN.'/frontend/fonts/font-'.($key+1).'.css'), array(), WMP_VERSION);
+ }
wp_enqueue_style('wp-color-picker');
diff --git a/plugins/wordpress-mobile-pack/admin/js/UI.Modules/Theming/WMP_EDIT_THEME.js b/plugins/wordpress-mobile-pack/admin/js/UI.Modules/Theming/WMP_EDIT_THEME.js
index 07cc8eb..f4d0cc1 100755
--- a/plugins/wordpress-mobile-pack/admin/js/UI.Modules/Theming/WMP_EDIT_THEME.js
+++ b/plugins/wordpress-mobile-pack/admin/js/UI.Modules/Theming/WMP_EDIT_THEME.js
@@ -1,229 +1,226 @@
-/*****************************************************************************************************/
-/* */
-/* 'EDIT THEME COLORS AND FONTS' */
-/* */
-/*****************************************************************************************************/
-
-function WMP_EDIT_THEME(){
-
- var JSObject = this;
-
- this.type = "wmp_edittheme";
-
- this.form;
- this.DOMDoc;
-
- this.send_btn;
- this.enableCustomSelects = 0;
-
-
- /*****************************************************************************************************/
- /* */
- /* FUNCTION INIT - called from WMPJSInterface */
- /* */
- /*****************************************************************************************************/
- this.init = function(){
-
- // save a reference to WMPJSInterface Object
- WMPJSInterface = window.parent.WMPJSInterface;
-
- // save a reference to "SEND" Button
- this.send_btn = jQuery('#'+this.type+'_send_btn',this.DOMDoc).get(0);
-
- // save a reference to the FORM and remove the default submit action
- this.form = this.DOMDoc.getElementById(this.type+'_form');
-
- // add actions to send, cancel, ... buttons
- this.addButtonsActions();
-
- if (this.form == null){
- return;
- }
-
- this.initCustomColors();
- this.initCustomSelects();
- }
-
-
- /*****************************************************************************************************/
- /* */
- /* ENABLE COLOR PICKERS */
- /* */
- /*****************************************************************************************************/
- this.initCustomColors = function(){
-
- // enable color picker for the color inputs
- jQuery('input[name^="' + JSObject.type + '_customcolor"]').wpColorPicker();
-
- // toggle display for the custom colors section
- jQuery('input[name="' + JSObject.type + '_colorscheme"]').click(function(){
-
- if (jQuery(this).val() == 0){
- jQuery('.color-schemes-custom').show();
- } else {
- jQuery('.color-schemes-custom').hide();
- }
- });
- }
-
-
- /*****************************************************************************************************/
- /* */
- /* FUNCTION ENABLE CUSTOM SELECTS */
- /* */
- /*****************************************************************************************************/
- this.initCustomSelects = function(){
-
- if (this.enableCustomSelects == 1){
-
- jQuery("#" + JSObject.type + "_fontheadlines").selectBoxIt();
- jQuery("#" + JSObject.type + "_fontsubtitles").selectBoxIt();
- jQuery("#" + JSObject.type + "_fontparagraphs").selectBoxIt();
- }
- }
-
-
- /*****************************************************************************************************/
- /* */
- /* FUNCTION ADD BUTTONS ACTIONS */
- /* */
- /*****************************************************************************************************/
- this.addButtonsActions = function(){
-
- /*******************************************************/
- /* SEND "BUTTON" */
- /*******************************************************/
- jQuery(this.send_btn).unbind("click");
- jQuery(this.send_btn).bind("click",function(){
- JSObject.disableButton(this);
- JSObject.sendData();
- })
- JSObject.enableButton(this.send_btn);
-
- }
-
-
- /*****************************************************************************************************/
- /* */
- /* FUNCTION ENABLE BUTTON */
- /* */
- /*****************************************************************************************************/
- this.enableButton = function(btn){
- jQuery(btn).css('cursor','pointer');
- jQuery(btn).animate({opacity:1},100);
- }
-
-
- /*****************************************************************************************************/
- /* */
- /* FUNCTION DISABLE BUTTON */
- /* */
- /*****************************************************************************************************/
- this.disableButton = function(btn){
- jQuery(btn).unbind("click");
- jQuery(btn).animate({opacity:0.4},100);
- jQuery(btn).css('cursor','default');
- }
-
-
- /*****************************************************************************************************/
- /* */
- /* FUNCTION SUBMIT FORM THROUGH an IFRAME as target */
- /* */
- /*****************************************************************************************************/
- this.submitForm = function(){
- return WMPJSInterface.AjaxUpload.dosubmit(JSObject.form, {'onStart' : JSObject.startUploadingData, 'onComplete' : JSObject.completeUploadingData});
- }
-
-
- /*****************************************************************************************************/
- /* */
- /* FUNCTION SEND DATA */
- /* */
- /*****************************************************************************************************/
- this.sendData = function(){
-
- jQuery("#"+this.form.id,this.DOMDoc).unbind("submit");
- jQuery("#"+this.form.id,this.DOMDoc).bind("submit",function(){JSObject.submitForm();});
- jQuery("#"+this.form.id,this.DOMDoc).submit();
-
- JSObject.disableButton(JSObject.send_btn);
- }
-
-
- /*****************************************************************************************************/
- /* */
- /* FUNCTION START UPLOADING DATA */
- /* */
- /*****************************************************************************************************/
- this.startUploadingData = function(){
-
- WMPJSInterface.Preloader.start();
-
- //disable form elements
- setTimeout(function(){
- var aElems = JSObject.form.elements;
- nElems = aElems.length;
-
- for (j=0; j<nElems; j++) {
- aElems[j].disabled = true;
- }
- },300);
-
- return true;
- }
-
-
-
- /*****************************************************************************************************/
- /* */
- /* FUNCTION COMPLETE UPLOADING DATA */
- /* */
- /*****************************************************************************************************/
- this.completeUploadingData = function(responseJSON){
-
- jQuery("#"+JSObject.form.id,JSObject.DOMDoc).unbind("submit");
- jQuery("#"+JSObject.form.id,JSObject.DOMDoc).bind("submit",function(){return false;});
-
- // remove preloader
- WMPJSInterface.Preloader.remove(100);
-
- var JSON = eval ("("+responseJSON+")");
- var response = Boolean(Number(String(JSON.status)));
-
- if (response == true && JSON.messages.length == 0){
-
- // show message
- var message = 'Your app has been successfully modified!';
- WMPJSInterface.Loader.display({message: message});
-
- } else {
-
- // show messages
- if (JSON.messages.length == 0) {
-
- var message = 'There was an error. Please reload the page and try again.';
- WMPJSInterface.Loader.display({message: message});
-
- } else {
-
- for (var i = 0; i < JSON.messages.length; i++ )
- WMPJSInterface.Loader.display({message: JSON.messages[i]});
- }
- }
-
- // enable form elements
- setTimeout(function(){
- var aElems = JSObject.form.elements;
- nElems = aElems.length;
- for (j=0; j<nElems; j++) {
- aElems[j].disabled = false;
- }
- },300);
-
- //enable buttons
- JSObject.addButtonsActions();
-
- }
-
-}
\ No newline at end of file
+/*****************************************************************************************************/
+/* */
+/* 'EDIT THEME COLORS AND FONTS' */
+/* */
+/*****************************************************************************************************/
+
+function WMP_EDIT_THEME() {
+
+ var JSObject = this;
+
+ this.type = 'wmp_edittheme';
+
+ this.form;
+ this.DOMDoc;
+
+ this.send_btn;
+
+
+ /*****************************************************************************************************/
+ /* */
+ /* FUNCTION INIT - called from WMPJSInterface */
+ /* */
+ /*****************************************************************************************************/
+ this.init = function () {
+
+ // save a reference to WMPJSInterface Object
+ WMPJSInterface = window.parent.WMPJSInterface;
+
+ // save a reference to "SEND" Button
+ this.send_btn = jQuery('#' + this.type + '_send_btn', this.DOMDoc).get(0);
+
+ // save a reference to the FORM and remove the default submit action
+ this.form = this.DOMDoc.getElementById(this.type + '_form');
+
+ // add actions to send, cancel, ... buttons
+ this.addButtonsActions();
+
+ if (this.form == null) {
+ return;
+ }
+
+ this.initCustomColors();
+ this.initCustomSelects();
+ };
+
+
+ /*****************************************************************************************************/
+ /* */
+ /* ENABLE COLOR PICKERS */
+ /* */
+ /*****************************************************************************************************/
+ this.initCustomColors = function () {
+
+ // enable color picker for the color inputs
+ jQuery('input[name^="' + JSObject.type + '_customcolor"]').wpColorPicker();
+
+ // toggle display for the custom colors section
+ jQuery('input[name="' + JSObject.type + '_colorscheme"]').click(function () {
+
+ if (jQuery(this).val() == 0) {
+ jQuery('.color-schemes-custom').show();
+ } else {
+ jQuery('.color-schemes-custom').hide();
+ }
+ });
+ };
+
+
+ /*****************************************************************************************************/
+ /* */
+ /* FUNCTION ENABLE CUSTOM SELECTS */
+ /* */
+ /*****************************************************************************************************/
+ this.initCustomSelects = function () {
+
+ jQuery('#' + JSObject.type + '_fontheadlines').selectBoxIt();
+ jQuery('#' + JSObject.type + '_fontsubtitles').selectBoxIt();
+ jQuery('#' + JSObject.type + '_fontparagraphs').selectBoxIt();
+
+ };
+
+
+ /*****************************************************************************************************/
+ /* */
+ /* FUNCTION ADD BUTTONS ACTIONS */
+ /* */
+ /*****************************************************************************************************/
+ this.addButtonsActions = function () {
+
+ /*******************************************************/
+ /* SEND 'BUTTON' */
+ /*******************************************************/
+ jQuery(this.send_btn).unbind('click');
+ jQuery(this.send_btn).bind('click', function () {
+ JSObject.disableButton(this);
+ JSObject.sendData();
+ });
+ JSObject.enableButton(this.send_btn);
+
+ };
+
+
+ /*****************************************************************************************************/
+ /* */
+ /* FUNCTION ENABLE BUTTON */
+ /* */
+ /*****************************************************************************************************/
+ this.enableButton = function (btn) {
+ jQuery(btn).css('cursor', 'pointer');
+ jQuery(btn).animate({ opacity: 1 }, 100);
+ };
+
+
+ /*****************************************************************************************************/
+ /* */
+ /* FUNCTION DISABLE BUTTON */
+ /* */
+ /*****************************************************************************************************/
+ this.disableButton = function (btn) {
+ jQuery(btn).unbind('click');
+ jQuery(btn).animate({ opacity: 0.4 }, 100);
+ jQuery(btn).css('cursor', 'default');
+ };
+
+
+ /*****************************************************************************************************/
+ /* */
+ /* FUNCTION SUBMIT FORM THROUGH an IFRAME as target */
+ /* */
+ /*****************************************************************************************************/
+ this.submitForm = function () {
+ return WMPJSInterface.AjaxUpload.dosubmit(JSObject.form, { 'onStart': JSObject.startUploadingData, 'onComplete': JSObject.completeUploadingData });
+ };
+
+
+ /*****************************************************************************************************/
+ /* */
+ /* FUNCTION SEND DATA */
+ /* */
+ /*****************************************************************************************************/
+ this.sendData = function () {
+
+ jQuery('#' + this.form.id, this.DOMDoc).unbind('submit');
+ jQuery('#' + this.form.id, this.DOMDoc).bind('submit', function () { JSObject.submitForm(); });
+ jQuery('#' + this.form.id, this.DOMDoc).submit();
+
+ JSObject.disableButton(JSObject.send_btn);
+ };
+
+
+ /*****************************************************************************************************/
+ /* */
+ /* FUNCTION START UPLOADING DATA */
+ /* */
+ /*****************************************************************************************************/
+ this.startUploadingData = function () {
+
+ WMPJSInterface.Preloader.start();
+
+ //disable form elements
+ setTimeout(function () {
+ var aElems = JSObject.form.elements;
+ nElems = aElems.length;
+
+ for (j = 0; j < nElems; j++) {
+ aElems[j].disabled = true;
+ }
+ }, 300);
+
+ return true;
+ };
+
+
+
+ /*****************************************************************************************************/
+ /* */
+ /* FUNCTION COMPLETE UPLOADING DATA */
+ /* */
+ /*****************************************************************************************************/
+ this.completeUploadingData = function (responseJSON) {
+
+ jQuery('#' + JSObject.form.id, JSObject.DOMDoc).unbind('submit');
+ jQuery('#' + JSObject.form.id, JSObject.DOMDoc).bind('submit', function () { return false; });
+
+ // remove preloader
+ WMPJSInterface.Preloader.remove(100);
+
+ var parsedJSON = JSON.parse(responseJSON);
+ var response = Boolean(Number(String(parsedJSON.status)));
+
+ if (response == true && parsedJSON.messages.length == 0) {
+
+ // show message
+ var message = 'Your app has been successfully modified!';
+ WMPJSInterface.Loader.display({ message: message });
+
+ } else {
+
+ // show messages
+ if (parsedJSON.messages.length == 0) {
+
+ var message = 'There was an error. Please reload the page and try again.';
+ WMPJSInterface.Loader.display({ message: message });
+
+ } else {
+
+ for (var i = 0; i < parsedJSON.messages.length; i++)
+ WMPJSInterface.Loader.display({ message: parsedJSON.messages[i] });
+ }
+ }
+
+ // enable form elements
+ setTimeout(function () {
+ var aElems = JSObject.form.elements;
+ nElems = aElems.length;
+ for (j = 0; j < nElems; j++) {
+ aElems[j].disabled = false;
+ }
+ }, 300);
+
+ //enable buttons
+ JSObject.addButtonsActions();
+
+ };
+
+}
diff --git a/plugins/wordpress-mobile-pack/admin/js/UI.Modules/Theming/WMP_EDIT_THEME.min.js b/plugins/wordpress-mobile-pack/admin/js/UI.Modules/Theming/WMP_EDIT_THEME.min.js
index a5b56d9..929016d 100755
--- a/plugins/wordpress-mobile-pack/admin/js/UI.Modules/Theming/WMP_EDIT_THEME.min.js
+++ b/plugins/wordpress-mobile-pack/admin/js/UI.Modules/Theming/WMP_EDIT_THEME.min.js
@@ -1 +1 @@
-function WMP_EDIT_THEME(){var JSObject=this;this.type="wmp_edittheme",this.form,this.DOMDoc,this.send_btn,this.enableCustomSelects=0,this.init=function(){WMPJSInterface=window.parent.WMPJSInterface,this.send_btn=jQuery("#"+this.type+"_send_btn",this.DOMDoc).get(0),this.form=this.DOMDoc.getElementById(this.type+"_form"),this.addButtonsActions(),null!=this.form&&(this.initCustomColors(),this.initCustomSelects())},this.initCustomColors=function(){jQuery('input[name^="'+JSObject.type+'_customcolor"]').wpColorPicker(),jQuery('input[name="'+JSObject.type+'_colorscheme"]').click(function(){0==jQuery(this).val()?jQuery(".color-schemes-custom").show():jQuery(".color-schemes-custom").hide()})},this.initCustomSelects=function(){1==this.enableCustomSelects&&(jQuery("#"+JSObject.type+"_fontheadlines").selectBoxIt(),jQuery("#"+JSObject.type+"_fontsubtitles").selectBoxIt(),jQuery("#"+JSObject.type+"_fontparagraphs").selectBoxIt())},this.addButtonsActions=function(){jQuery(this.send_btn).unbind("cl
ick"),jQuery(this.send_btn).bind("click",function(){JSObject.disableButton(this),JSObject.sendData()}),JSObject.enableButton(this.send_btn)},this.enableButton=function(e){jQuery(e).css("cursor","pointer"),jQuery(e).animate({opacity:1},100)},this.disableButton=function(e){jQuery(e).unbind("click"),jQuery(e).animate({opacity:.4},100),jQuery(e).css("cursor","default")},this.submitForm=function(){return WMPJSInterface.AjaxUpload.dosubmit(JSObject.form,{onStart:JSObject.startUploadingData,onComplete:JSObject.completeUploadingData})},this.sendData=function(){jQuery("#"+this.form.id,this.DOMDoc).unbind("submit"),jQuery("#"+this.form.id,this.DOMDoc).bind("submit",function(){JSObject.submitForm()}),jQuery("#"+this.form.id,this.DOMDoc).submit(),JSObject.disableButton(JSObject.send_btn)},this.startUploadingData=function(){return WMPJSInterface.Preloader.start(),setTimeout(function(){var e=JSObject.form.elements;for(nElems=e.length,j=0;j<nElems;j++)e[j].disabled=!0},300),!0},this.completeUpload
ingData=function(responseJSON){jQuery("#"+JSObject.form.id,JSObject.DOMDoc).unbind("submit"),jQuery("#"+JSObject.form.id,JSObject.DOMDoc).bind("submit",function(){return!1}),WMPJSInterface.Preloader.remove(100);var JSON=eval("("+responseJSON+")"),response=Boolean(Number(String(JSON.status)));if(1==response&&0==JSON.messages.length){var message="Your app has been successfully modified!";WMPJSInterface.Loader.display({message:message})}else if(0==JSON.messages.length){var message="There was an error. Please reload the page and try again.";WMPJSInterface.Loader.display({message:message})}else for(var i=0;i<JSON.messages.length;i++)WMPJSInterface.Loader.display({message:JSON.messages[i]});setTimeout(function(){var e=JSObject.form.elements;for(nElems=e.length,j=0;j<nElems;j++)e[j].disabled=!1},300),JSObject.addButtonsActions()}}
\ No newline at end of file
+function WMP_EDIT_THEME(){var a=this;this.type="wmp_edittheme",this.form,this.DOMDoc,this.send_btn,this.init=function(){WMPJSInterface=window.parent.WMPJSInterface,this.send_btn=jQuery("#"+this.type+"_send_btn",this.DOMDoc).get(0),this.form=this.DOMDoc.getElementById(this.type+"_form"),this.addButtonsActions(),null!=this.form&&(this.initCustomColors(),this.initCustomSelects())},this.initCustomColors=function(){jQuery('input[name^="'+a.type+'_customcolor"]').wpColorPicker(),jQuery('input[name="'+a.type+'_colorscheme"]').click(function(){0==jQuery(this).val()?jQuery(".color-schemes-custom").show():jQuery(".color-schemes-custom").hide()})},this.initCustomSelects=function(){jQuery("#"+a.type+"_fontheadlines").selectBoxIt(),jQuery("#"+a.type+"_fontsubtitles").selectBoxIt(),jQuery("#"+a.type+"_fontparagraphs").selectBoxIt()},this.addButtonsActions=function(){jQuery(this.send_btn).unbind("click"),jQuery(this.send_btn).bind("click",function(){a.disableButton(this),a.sendData()}),a.enableBut
ton(this.send_btn)},this.enableButton=function(a){jQuery(a).css("cursor","pointer"),jQuery(a).animate({opacity:1},100)},this.disableButton=function(a){jQuery(a).unbind("click"),jQuery(a).animate({opacity:.4},100),jQuery(a).css("cursor","default")},this.submitForm=function(){return WMPJSInterface.AjaxUpload.dosubmit(a.form,{onStart:a.startUploadingData,onComplete:a.completeUploadingData})},this.sendData=function(){jQuery("#"+this.form.id,this.DOMDoc).unbind("submit"),jQuery("#"+this.form.id,this.DOMDoc).bind("submit",function(){a.submitForm()}),jQuery("#"+this.form.id,this.DOMDoc).submit(),a.disableButton(a.send_btn)},this.startUploadingData=function(){return WMPJSInterface.Preloader.start(),setTimeout(function(){var b=a.form.elements;for(nElems=b.length,j=0;j<nElems;j++)b[j].disabled=!0},300),!0},this.completeUploadingData=function(b){jQuery("#"+a.form.id,a.DOMDoc).unbind("submit"),jQuery("#"+a.form.id,a.DOMDoc).bind("submit",function(){return!1}),WMPJSInterface.Preloader.remove(100
);var c=JSON.parse(b),d=Boolean(Number(String(c.status)));if(1==d&&0==c.messages.length){var e="Your app has been successfully modified!";WMPJSInterface.Loader.display({message:e})}else if(0==c.messages.length){var e="There was an error. Please reload the page and try again.";WMPJSInterface.Loader.display({message:e})}else for(var f=0;f<c.messages.length;f++)WMPJSInterface.Loader.display({message:c.messages[f]});setTimeout(function(){var b=a.form.elements;for(nElems=b.length,j=0;j<nElems;j++)b[j].disabled=!1},300),a.addButtonsActions()}}
diff --git a/plugins/wordpress-mobile-pack/admin/pages/theme-settings.php b/plugins/wordpress-mobile-pack/admin/pages/theme-settings.php
index be0fb02..11a0e28 100755
--- a/plugins/wordpress-mobile-pack/admin/pages/theme-settings.php
+++ b/plugins/wordpress-mobile-pack/admin/pages/theme-settings.php
@@ -31,14 +31,7 @@
$selected_theme = WMobilePack_Options::get_setting('theme');
- $enable_custom_selects = false;
-
- $blog_version = floatval(get_bloginfo('version'));
-
- if ($blog_version >= WMobilePack_Admin_Init::$customselect_enable)
- $enable_custom_selects = true;
-
- if (array_key_exists($selected_theme, WMobilePack_Themes_Config::$color_schemes)):
+ if (array_key_exists($selected_theme, WMobilePack_Themes_Config::$color_schemes)):
$theme_settings = WMobilePack_Themes_Config::$color_schemes[$selected_theme];
?>
<div class="details">
@@ -157,20 +150,9 @@
<select name="wmp_edittheme_fontheadlines" id="wmp_edittheme_fontheadlines">
- <?php
- foreach (WMobilePack_Themes_Config::$allowed_fonts as $key => $font_family):
-
- if ($enable_custom_selects):
- ?>
- <option value="<?php echo $key+1;?>" data-text='<span style="font-family:<?php echo str_replace(" ", "", $font_family);?>"><?php echo $font_family;?></span>' <?php if ($font_headlines == $key+1) echo "selected";?>></option>
-
- <?php else:?>
-
- <option value="<?php echo $key+1;?>" <?php if ($font_headlines == $key+1) echo "selected";?>><?php echo $font_family;?></option>
- <?php
- endif;
- endforeach;
- ?>
+ <?php foreach (WMobilePack_Themes_Config::$allowed_fonts as $key => $font_family): ?>
+ <option value="<?php echo $key+1;?>" data-text='<span style="font-family:<?php echo str_replace(" ", "", $font_family);?>"><?php echo $font_family;?></span>' <?php if ($font_headlines == $key+1) echo "selected";?>></option>
+ <?php endforeach; ?>
</select>
<div class="spacer-10"></div>
@@ -183,20 +165,9 @@
<label for="wmp_edittheme_fontsubtitles">Subtitles</label>
<select name="wmp_edittheme_fontsubtitles" id="wmp_edittheme_fontsubtitles">
- <?php
- foreach (WMobilePack_Themes_Config::$allowed_fonts as $key => $font_family):
-
- if ($enable_custom_selects):
- ?>
- <option value="<?php echo $key+1;?>" data-text='<span style="font-family:<?php echo str_replace(" ", "", $font_family);?>"><?php echo $font_family;?></span>' <?php if ($font_subtitles == $key+1) echo "selected";?>></option>
-
- <?php else:?>
-
- <option value="<?php echo $key+1;?>" <?php if ($font_subtitles == $key+1) echo "selected";?>><?php echo $font_family;?></option>
- <?php
- endif;
- endforeach;
- ?>
+ <?php foreach (WMobilePack_Themes_Config::$allowed_fonts as $key => $font_family): ?>
+ <option value="<?php echo $key+1;?>" data-text='<span style="font-family:<?php echo str_replace(" ", "", $font_family);?>"><?php echo $font_family;?></span>' <?php if ($font_subtitles == $key+1) echo "selected";?>></option>
+ <?php endforeach; ?>
</select>
<div class="spacer-10"></div>
@@ -208,20 +179,9 @@
<label for="wmp_edittheme_fontparagraphs">Paragraphs</label>
<select name="wmp_edittheme_fontparagraphs" id="wmp_edittheme_fontparagraphs">
- <?php
- foreach (WMobilePack_Themes_Config::$allowed_fonts as $key => $font_family):
-
- if ($enable_custom_selects):
- ?>
- <option value="<?php echo $key+1;?>" data-text='<span style="font-family:<?php echo str_replace(" ", "", $font_family);?>"><?php echo $font_family;?></span>' <?php if ($font_paragraphs == $key+1) echo "selected";?>></option>
-
- <?php else:?>
-
- <option value="<?php echo $key+1;?>" <?php if ($font_paragraphs == $key+1) echo "selected";?>><?php echo $font_family;?></option>
- <?php
- endif;
- endforeach;
- ?>
+ <?php foreach (WMobilePack_Themes_Config::$allowed_fonts as $key => $font_family): ?>
+ <option value="<?php echo $key+1;?>" data-text='<span style="font-family:<?php echo str_replace(" ", "", $font_family);?>"><?php echo $font_family;?></span>' <?php if ($font_paragraphs == $key+1) echo "selected";?>></option>
+ <?php endforeach; ?>
</select>
<div class="spacer-20"></div>
</div>
@@ -451,7 +411,7 @@
if (window.WMPJSInterface && window.WMPJSInterface != null){
jQuery(document).ready(function(){
- window.WMPJSInterface.add("UI_customizetheme","WMP_EDIT_THEME",{'DOMDoc':window.document, 'enableCustomSelects': <?php echo intval($enable_custom_selects);?>}, window);
+ window.WMPJSInterface.add("UI_customizetheme","WMP_EDIT_THEME",{'DOMDoc':window.document}, window);
window.WMPJSInterface.add("UI_editimages","WMP_EDIT_IMAGES",{'DOMDoc':window.document}, window);
window.WMPJSInterface.add("UI_editcover","WMP_EDIT_COVER",{'DOMDoc':window.document}, window);
diff --git a/plugins/wordpress-mobile-pack/admin/sass/config.rb b/plugins/wordpress-mobile-pack/admin/sass/config.rb
deleted file mode 100755
index 52e432e..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/config.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# Require any additional compass plugins here.
-
-# Get the directory that this configuration file exists in
-dir = File.dirname(__FILE__)
-
-# Set this to the root of your project when deployed:
-http_path = "/"
-
-sass_path = dir
-css_path = File.join(dir, "..", "css")
-fonts_path = File.join(dir, "fonts")
-images_path = File.join(dir, "..", "images")
-
-javascripts_path = File.join(dir, "..", "javascripts")
-
-
-output_style = :compressed
-environment = :production
-
-# output_style = :expanded
-# environment = :development
diff --git a/plugins/wordpress-mobile-pack/admin/sass/core/_buttons.scss b/plugins/wordpress-mobile-pack/admin/sass/core/_buttons.scss
deleted file mode 100755
index 0a35abf..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/core/_buttons.scss
+++ /dev/null
@@ -1,110 +0,0 @@
-#wmpack-admin{
- .btn{
- @include wbz-display-box();
- @include wbz-box-orient(horizontal);
- @include wbz-box-pack(center);
- @include wbz-box-align(center);
-
- display:flex;
-
- font-family: 'AcordeRegular', sans-serif;
- width: $btn-size-normal;
- height: $btn-height;
- line-height: $btn-height;
- min-height: $btn-height;
- background: #ffffff;
- color: $btn-color;
- font-size: $btn-font-size;
- @include wbz-border-radius($btn-radius);
- border: $btn-border;
- padding: 0 15px;
- margin: 0;
- text-decoration: none;
-
- &.smallest{
- width: $btn-size-smallest;
- }
- &.smaller{
- width: $btn-size-smaller;
- }
- &.small{
- width: $btn-size-small;
- }
- &.big{
- width: $btn-size-big;
- }
- &.bigger{
- width: $btn-size-bigger;
- }
-
- strong{
- @include wbz-display-inline-box();
- font-family: 'AcordeSemiBold', sans-serif;
- font-weight: normal;
- font-style: normal;
- }
- &:hover{
- background: #fafafa;
- border: 1px solid darken($btn-border, $darken-amounth/2);
- }
- &.green{
- background: $base-green;
- color: #ffffff;
- border: 1px solid darken($base-green, $darken-amounth/2);
-
- &:hover{
- background: darken($base-green, $darken-amounth/2);
- border: 1px solid darken($base-green, $darken-amounth);
- }
- }
-
- &.blue{
- background: $base-blue;
- color: #ffffff;
- border: 1px solid darken($base-blue, $darken-amounth/2);
-
- &:hover{
- background: darken($base-blue, $darken-amounth/2);
- border: 1px solid darken($base-blue, $darken-amounth);
- }
- &.spaced-right{
- margin-right:20px;
- }
- }
- &.orange{
- background: $base-orange;
- color: #ffffff;
- border: 1px solid darken($base-orange, $darken-amounth/2);
-
- &:hover{
- background: darken($base-orange, $darken-amounth/2);
- border: 1px solid darken($base-orange, $darken-amounth);
- }
- }
- &.grey{
- background: $base-grey;
- color: #939494;
- text-transform: uppercase;
- border: 1px solid darken($base-grey, $darken-amounth/2);
-
- &:hover{
- background: darken($base-grey, $darken-amounth/2);
- border: 1px solid darken($base-grey, $darken-amounth);
- }
- }
- &.turquoise {
- background: $base-turquoise;
- color: #ffffff;
- border: 1px solid darken($base-turquoise, $darken-amounth/2);
-
- &:hover{
- background: darken($base-turquoise, $darken-amounth/2);
- border: 1px solid darken($base-turquoise, $darken-amounth);
- }
- }
- }
-
- .inline-btns-container{
- @include wbz-display-inline-box();
- }
-}
diff --git a/plugins/wordpress-mobile-pack/admin/sass/core/_core.scss b/plugins/wordpress-mobile-pack/admin/sass/core/_core.scss
deleted file mode 100755
index 383c3c7..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/core/_core.scss
+++ /dev/null
@@ -1,448 +0,0 @@
-#wmpack-admin{
- *, *:after, *:before {
- font-weight: normal;
- @include wbz-box-sizing(border-box);
- -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
- -webkit-touch-callout: none;
- -ms-touch-action: none;
- -webkit-user-drag: none;
- }
- h1{
- font-family: 'OlRoundGothicLight', sans-serif;
- font-size: $h1-font-size;
- line-height: $h1-font-size;
- font-weight: normal;
- color: $base-text-color;
- margin:0px;
- padding:0px;
- }
- h2{
- font-family: 'AcordeRegular', sans-serif;
- font-size: $h2-font-size;
- line-height: $h2-font-size;
- color: $base-text-color;
- letter-spacing: 0.5px;
- margin:0px;
- padding:0px;
- }
- .underlined{
- border-bottom: 1px solid #EDF0F0;
- margin: 0 0 30px;
- padding: 0 0 10px;
- }
- p, span, a{
- font-family: 'OpenSansRegular', sans-serif;
- font-size: 14px;
- line-height: 19px;
- color: $base-text-color;
- }
- p, span {
- margin:0;
- padding:0;
- }
- strong{
- font-weight: bold;
- }
- a{
- color: $base-blue;
- text-decoration: none;
- &:hover{
- color: darken($base-blue, $darken-amounth);
- }
- &:focus {
- outline: none;
- }
- }
- .left{
- float:left;
- }
- .right{
- float:right;
- }
- .notification{
- @include wbz-display-box();
- @include wbz-box-pack(center);
- @include wbz-box-align(center);
- position: relative;
- width: 0px;
- height: 0px;
-
- .count{
- @include wbz-border-radius(25px);
- background: $base-red;
- font-family: 'OpenSansRegular', sans-serif;
- text-align: center;
- color: #ffffff;
- font-size: 12px;
- line-height: 25px;
- width: 25px;
- height: 25px;
- }
- }
-
- @for $i from 0 through 100{
- .spacer-#{$i} {
- @include wbz-spacer(#{$i}px);
- }
- }
- .grey-line{
- @include wbz-spacer(1px);
- border-top: 1px solid $body-color;
- }
- .grey-dotted-line{
- @include wbz-spacer(1px);
- border-top: 1px dotted $base-p-color;
- }
- .relative{
- width: 0;
- height: 0;
- position: relative;
- }
- .corner{
- &.active{
- .indicator{
- width: 0;
- height: 0;
- border-top: 44px solid $base-green;
- border-left: 44px solid transparent;
- position: absolute;
- right: 0px;
- }
- }
- &.inactive{
- .indicator{
- width: 0;
- height: 0;
- border-top: 44px solid #ffffff;
- border-left: 44px solid transparent;
- position: absolute;
- right: 0px;
- }
- }
- }
- .notice{
- padding: 25px;
- margin: 0 0 15px 0;
- background: $notice-bg;
- border: 1px solid $notice-border;
- @include wbz-border-radius($notice-radius);
- position: relative;
-
- a {
- font-family: "OpenSansRegular", sans-serif;
- font-size: 13px;
- line-height: 20px;
- color: #819196;
- text-decoration: underline;
- }
-
- &.notice-left{
- &::before{
- left: -10px;
- right: auto;
- top: 50px;
- bottom: auto;
- border-color: transparent $notice-border;
- border-width: 10px 10px 10px 0;
- }
- &::after{
- left: -9px;
- right: auto;
- top: 50px;
- bottom: auto;
- border-color: transparent $notice-bg;
- border-width: 10px 10px 10px 0;
- }
- }
- &::before{
- content: "";
- position: absolute;
- top: -10px;
- bottom: auto;
- left: 50px;
- right: auto;
- border-style: solid;
- border-color: $notice-border transparent;
- border-width: 0 10px 10px;
- display: block;
- width: 0;
- }
- &::after{
- content: "";
- position: absolute;
- bottom: auto;
- top: -9px;
- left: 50px;
- right: auto;
- border-style: solid;
- border-color: $notice-bg transparent;
- border-width: 0 10px 10px;
- display: block;
- width: 0;
- }
- span{
- font-family: "OpenSansRegular", sans-serif;
- font-size: 13px;
- line-height: 20px;
- color: $notice-color;
- }
- }
-}
-body{
- min-width: $total-width;
-}
-#wp-content{
- background:$body-color;
-}
-
-#wmpack-admin{
- width: 100%;
-
- .left-side{
- padding-right: 13px;
- display: table-cell;
-
- nav.menu{
- width: 100%;
- height: 69px;
- position: relative;
- padding: 0px;
- min-width: 805px;
-
- .ribbon{
- .indicator{
- background: url(../images/ribbon-premium.png);
- width: 67px;
- height: 68px;
- position: absolute;
- top: -4px;
- right: -5px;
- }
- }
- ul{
- list-style-type: none;
- display: flex;
- flex-direction: row;
- height: 69px;
- border-bottom: 1px solid #DADDDE;
-
- li{
- height: 68px;
- flex: 1 0 auto;
- max-width: 200px;
- background-color: #f5f7f7;
- vertical-align: middle;
- text-align: center;
- border-right: #daddde 1px solid;
- border-bottom: #daddde 1px solid;
-
- a{
- color: $base-text-color;
- font-family: 'AcordeRegular';
- font-size: 17px;
- line-height: normal;
- padding: 20px 0;
- width: 100%;
- display: block;
- border-top: 4px solid #f5f7f7;
- }
-
- &:hover{
- border-bottom: 1px solid #dce0e0;
- background-color: #dce0e0;
-
- a{
- border-top: 4px solid #dce0e0;
- }
- }
- &.selected{
- border-bottom: 1px solid #ffffff;
- background-color: #ffffff;
- height: 69px;
-
- a{
- color: $base-green;
- border-top: 4px solid $base-green;
- border-bottom: 1px solid #ffffff;
- }
- }
- }
- }
- }
- }
- .right-side{
- width:252px;
- display: table-cell;
- vertical-align: top;
- padding: 0 10px 0 0;
-
- .updates{
- padding: 15px 5px 15px 15px;
- background-color: $box-color;
-
- .details{
- height: 333px;
- position: relative;
- overflow: hidden;
- }
- p{
- font-size: 13px;
- color: $base-p-color;
- margin-right:10px;
-
- &.news-title {
- font-size: 16px;
- margin-bottom: 10px;
-
- a {
- font-size: 16px;
- outline: none;
- }
- }
- }
- a{
- font-size: 13px;
- }
- }
- .appticles-updates{
- padding: 10px 15px;
- background-color: #2a2d33;
- border-top: #fff 1px solid;
- height: 43px;
- @include wbz-border-radius(0px 0px 4px 4px);
-
- div{
- float: left;
-
- p{
- margin: 0;
- }
- &.social{
- float: right;
-
- .facebook, .twitter, .google-plus {
- width: 18px;
- height: 18px;
- background: #8c8d8d;
- color: #2a2d33;
- margin: 0 6px;
- @include wbz-border-radius(18px);
- display: block;
- float: left;
-
- &::before{
- left: 5px;
- top: -1px;
- }
- }
-
- .facebook {
- @include wbz-inline-icon(facebook,10px);
- }
-
- .twitter {
- @include wbz-inline-icon(twitter,10px);
- }
-
- .google-plus {
- @include wbz-inline-icon(google-plus,10px);
- }
- }
- }
- }
- .white-paper{
- width: 252px;
- height: 250px;
- border: #bfbfbf 1px solid;
- display: table-cell;
- text-align: center;
- vertical-align: middle;
- background-color: #fff;
-
- p{
- font-family: 'AcordeRegular', sans-serif;
- font-size: 20px;
- line-height: normal;
- color: $base-text-color;
- }
- }
- .form-box{
- padding: 15px;
- background-color: $box-color;
-
- p{
- font-size: 13px;
- }
-
- .field-message {
- padding: 1px 0;
- }
- }
-
- .ask-review {
- p, a {
- font-size: 12px;
- }
- p {
- padding: 0px 5px;
- }
- }
- }
-
- .added{
- margin: 0 auto;
- width: 190px;
-
- .switcher{
- width: 190px;
-
- .msg{
- font-family: 'AcordeSemiBold', sans-serif;
- width: 150px;
- height: $input-height;
- background: $input-background;
- color: $input-color;
- font-size: $input-font-size;
- @include wbz-border-radius($input-radius 0 0 $input-radius);
- @include wbz-box-shadow(none);
- border: 1px solid $input-border;
- border-right: 0px;
- padding: 0 10px;
- line-height: 38px;
- text-align: center;
- float: left;
- }
- .check{
- @include wbz-border-radius(0 $input-radius $input-radius 0);
- height: $input-height;
- border: 1px solid darken($input-border, 10%);
- border-left: 0px;
- width: 40px;
- float: right;
- @include wbz-inline-icon(active, 17px);
- color: #ffffff;
-
- &::before{
- height: 38px;
- width: 40px;
- right: -9px;
- top: -2px;
- line-height: 38px;
- }
- }
- &.blue{
- .check{
- background: $base-blue;
- border: 1px solid darken($base-blue, 10%);
- border-left: 0px;
- }
- }
- }
- }
-}
-
-.wp-admin{
- .mfp-bg, .mfp-wrap{
- z-index:10000;
- }
-}
diff --git a/plugins/wordpress-mobile-pack/admin/sass/core/_fonts.scss b/plugins/wordpress-mobile-pack/admin/sass/core/_fonts.scss
deleted file mode 100755
index e4f0ead..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/core/_fonts.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@import 'compass/css3';
-
-@include font-face('AcordeRegular', inline-font-files('acorde-regular.woff', woff, 'acorde-regular.ttf', truetype,'acorde-regular.svg', svg,"acorde-regular.eot",eot));
-@include font-face('AcordeSemiBold', inline-font-files('acorde-semibold.woff', woff, 'acorde-semibold.ttf', truetype,'acorde-semibold.svg', svg,"acorde-semibold.eot",eot));
-@include font-face('OlRoundGothicLight', inline-font-files('ol-round-gothic-light.woff', woff, 'ol-round-gothic-light.ttf', truetype,'ol-round-gothic-light.svg', svg,"ol-round-gothic-light.eot",eot));
-@include font-face('OpenSansRegular', inline-font-files('open-sans-regular.woff', woff, 'open-sans-regular.ttf', truetype,'open-sans-regular.svg', svg,"open-sans-regular.eot",eot));
-@include font-face('OpenSansSemiBold', inline-font-files('opensans-semibold.woff',woff, 'opensans-semibold.ttf',truetype, 'opensans-semibold.svg', svg, "opensans-semibold.eot",eot));
-@include font-face('OpenSansItalic', inline-font-files('opensans-italic.woff',woff, 'opensans-italic.ttf',truetype, 'opensans-italic.svg',svg, 'opensans-italic.eot',eot));
-
-
-@include font-face('Appticles', inline-font-files('wp-font.woff', woff, 'wp-font.ttf', truetype,'wp-font.svg', svg,"wp-font.eot",eot));
\ No newline at end of file
diff --git a/plugins/wordpress-mobile-pack/admin/sass/core/_forms.scss b/plugins/wordpress-mobile-pack/admin/sass/core/_forms.scss
deleted file mode 100755
index f04d7a0..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/core/_forms.scss
+++ /dev/null
@@ -1,409 +0,0 @@
-#wmpack-admin{
- form{
- text-align: left;
- }
- input[type="text"],
- input[type="password"],
- input[type="file"],
- input[type="email"]{
-
- &:not(.wp-color-picker) {
- font-family: 'AcordeSemiBold', sans-serif;
- width: $input-size-normal;
- height: $input-height;
- background: $input-background;
- color: $input-color;
- font-size: $input-font-size;
- @include wbz-border-radius($input-radius);
- @include wbz-box-shadow(none);
- border: 1px solid $input-border;
- padding: 0 15px;
-
- &.smaller {
- width: $input-size-smaller;
- }
- &.small {
- width: $input-size-small;
- }
- &.big {
- width: $input-size-big;
- }
- &:focus {
- outline: none;
- border: 1px solid darken($input-border, $darken-amounth);
- }
- &.error {
- border-color: $error-color;
- background: $error-bg;
- }
- &.indent {
- margin: 0 0 0 30px;
- }
- }
- }
- select {
- font-family: 'AcordeSemiBold', sans-serif;
- width: $input-size-normal;
- height: $input-height;
- background: $input-background;
- color: $input-color;
- font-size: $input-font-size;
- @include wbz-border-radius($input-radius);
- @include wbz-box-shadow(none);
- border: 1px solid $input-border;
- padding: 0 15px;
-
- &.smaller{
- width: $input-size-smaller;
- }
- &.small{
- width: $input-size-small;
- }
- &.big{
- width: $input-size-big;
- }
- &:focus{
- outline:none;
- border:1px solid darken($input-border,$darken-amounth);
- }
- }
-
-
- .selectboxit-container{
-
- .selectboxit{
- font-family: 'AcordeSemiBold', sans-serif;
- width: $input-size-normal;
- height: $input-height;
- background: $input-background;
- color: $input-color;
- font-size: $input-font-size;
- @include wbz-border-radius($input-radius);
- @include wbz-box-shadow(none);
- border: 1px solid $input-border;
- padding: 0 15px;
- width: 220px!important;
-
- &:focus{
- outline:none;
- border:1px solid darken($input-border,$darken-amounth);
- }
-
- span, .selectboxit-options a {
- height: 36px;
- line-height:33px;
- }
- }
-
- .selectboxit-arrow-container{
- width: 25px;
- }
-
- .selectboxit-options{
- border-radius: 0;
- width: 220px;
-
- .selectboxit-option{
- height: 36px;
- border-bottom: $btn-border 1px solid;
-
- }
-
- a{
- height: 36px;
- line-height: 33px;
- }
- .selectboxit-option-first,.selectboxit-option-last{
- border-radius: 0;
- }
- }
-
- span{
- height: 36px;
- line-height: 33px;
- }
-
- .selectboxit-list{
- > .selectboxit-focus{
- > .selectboxit-option-anchor{
- background: darken($base-grey, $darken-amounth/2);
- }
- }
- }
- }
-
- input[type="radio"],
- input[type="checkbox"]{
- width: 16px;
- height: 16px;
- float: left;
- margin: 0 10px 0 30px;
-
- &::before{
- margin: 4px;
- }
- }
- input[type=checkbox]{
- &:checked {
- &::before{
- margin: 0px;
- float: left;
- display: inline-block;
- vertical-align: middle;
- width: 16px;
- font:normal 21px/1 'dashicons';
- speak: none;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- position: relative;
- top: -3px;
- left: -4px;
- }
- }
- }
- textarea{
- font-family: 'AcordeSemiBold', sans-serif;
- width: $input-size-normal;
- height: $textarea-height;
- background: $input-background;
- color: $input-color;
- font-size: $input-font-size;
- @include wbz-border-radius($input-radius);
- @include wbz-box-shadow(none);
- border: 1px solid $input-border;
- padding: 10px 15px;
- resize: none;
-
- &.smaller{
- width: $input-size-smaller;
- }
- &.small{
- width: $input-size-small;
- }
- &.big{
- width: $input-size-big;
- }
- &:focus{
- outline:none;
- border:1px solid darken($input-border,$darken-amounth);
- }
- &.error{
- border-color: $error-color;
- background: $error-bg;
- }
- }
-
- label{
- @include wbz-display-box();
- font-family: 'AcordeRegular', sans-serif;
- color: $label-color;
- font-size: $label-font-size;
- }
-
- ::-webkit-input-placeholder{
- padding: 2px 0 0 0;
- color: #b2b5bc;
- font-size: 13px;
- }
- :-moz-placeholder{
- padding: 2px 0 0 0;
- color: #b2b5bc;
- font-size: 13px;
- }
- ::-moz-placeholder{
- padding: 2px 0 0 0;
- color: #b2b5bc;
- font-size: 13px;
- }
- :-ms-input-placeholder{
- color: #b2b5bc!important;
- font-size: 13px;
- }
-
- .field-message{
- @include wbz-display-box();
- margin: 0px 0 0px 15px;
- @include wbz-box-shadow(none);
- background: transparent;
- border: 0;
-
- span{
- font-family: "OpenSansRegular", sans-serif;
- font-size: 13px;
- line-height: 20px;
- }
- &.error{
- span{
- color: $error-color;
- }
- }
- &.success{
- span{
- color: $success-color;
- }
- }
- &.warning{
- span{
- color: $warning-color;
- }
- }
- }
- .message-container{
- display: block;
- text-align: left;
- width: 100%;
-
- a {
- font-family: "OpenSansRegular", sans-serif;
- font-size: 13px;
- line-height: 20px;
- }
-
- &.error{
- background:none;
- border:none;
-
- }
-
- .wrapper{
- @include wbz-display-box();
- @include wbz-box-orient(vertical);
- @include wbz-box-flex(1);
- width: 100%;
- padding: 25px 50px;
- margin: 10px 0;
-
- .relative{
- width: 100%;
- }
- }
- .title{
- width: 100%;
- @include wbz-display-box();
- @include wbz-box-orient(horizontal, important);
-
- h2{
- font-family: 'OlRoundGothicLight', sans-serif;
- @include wbz-display-box();
- @include wbz-box-flex(1);
- margin: 0 0 15px 0!important;
- font-size: 25px;
- }
- }
- span{
- font-family: "OpenSansRegular", sans-serif;
- font-size: 13px;
- line-height: 20px;
- }
- .close-x{
- @include wbz-inline-icon(close-x, 25px);
- @include wbz-display-box();
- @include wbz-box-pack(end);
- @include wbz-box-align(center);
- width: 25px;
- height: 25px;
- padding: 0 15px;
- top: -10px;
- right: -25px;
- position: absolute;
-
- &:hover{
- cursor: pointer;
- color: #ffc26b;
- }
- &::before{
- width: 25px;
- height: 25px;
- }
- }
- &.error{
- .wrapper{
- border: 1px solid $error-border;
- background: $error-bg;
- }
- .title{
- h2{
- color: $error-color;
-
- &.underlined{
- border-bottom: 1px solid $error-border;
- }
- }
- }
- span{
- color: $error-color;
- }
- .close-x{
- color: $error-border;
-
- &:hover{
- color: darken($error-border,$darken-amounth/2);
- }
- }
- }
- &.success{
- .wrapper{
- border: 1px solid $success-border;
- background: $success-bg;
- }
- .title{
- h2{
- color: $success-color;
-
- &.underlined{
- border-bottom: 1px solid $success-border;
- }
- }
- }
- span{
- color: $success-color;
- }
- .close-x{
- color: $success-border;
-
- &:hover{
- color: darken($success-border,$darken-amounth/2);
- }
- }
- }
- &.warning{
- .wrapper{
- border: 1px solid $warning-border;
- background: $warning-bg;
- }
- .title{
- h2{
- color: $warning-color;
-
- &.underlined{
- border-bottom: 1px solid $warning-border;
- }
- }
- }
- span{
- color: $warning-color;
-
- a {
- color: darken($warning-color,20%) !important;
- text-decoration: underline !important;
- }
- }
- .close-x{
- color: $warning-border;
-
- &:hover{
- color: darken($warning-border,$darken-amounth/2);
- }
- }
- }
- }
-}
-
-.wmp_upgrade_notice.notice {
- background: $warning-color;
- color: #FFFFFF;
-
- .notice-dismiss:before {
- color: #FFFFFF;
- }
-}
\ No newline at end of file
diff --git a/plugins/wordpress-mobile-pack/admin/sass/core/_ie.scss b/plugins/wordpress-mobile-pack/admin/sass/core/_ie.scss
deleted file mode 100755
index 8738b3c..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/core/_ie.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@media screen and (min-width: 0 \0) {
- body #main {
- min-height: auto;
- height: 100% !important;
- }
-}
\ No newline at end of file
diff --git a/plugins/wordpress-mobile-pack/admin/sass/core/_variables.scss b/plugins/wordpress-mobile-pack/admin/sass/core/_variables.scss
deleted file mode 100755
index 6b380bf..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/core/_variables.scss
+++ /dev/null
@@ -1,102 +0,0 @@
-//color manipulation
-$darken-amounth: 20%;
-$lighten-amounth: 20%;
-
-$base-green: #9aca40;
-$base-purple: #ae113d;
-$base-orange: #ffbb42;
-$base-red: #ff4e40;
-$base-blue: #1ca8dd;
-$base-dark-blue: #2a2d33;
-$base-grey: #fcfcfc;
-$base-turquoise: #66cc80;
-
-
-$facebook-color: #3b5699;
-$twitter-color: #55acee;
-$google-color: #dd4b39;
-$rss-color: #ff9900;
-$wordpress-color: #333333;
-$tumblr-color: #385774;
-
-$base-color: #eeeff1;
-$base-color-lighter: #f5f7f7;
-$base-color-darken: #dce0e0;
-
-$body-color: #edf0f0;
-$box-color: #ffffff;
-$main-menu-background: $base-dark-blue;
-
-//text styling
-$base-text-color: #4b4b4b;
-$base-p-color: #8c8d8d;
-$h1-font-size: 47px;
-$h2-font-size: 20px;
-$h3-font-size: 18px;
-
-//buttons
-$btn-radius: 3px;
-$btn-background: #ffffff;
-$btn-color: $base-dark-blue;
-$btn-font-size: 14px;
-$btn-border: #daddde;
-$btn-height: 36px;
-$btn-size-smallest: 50px;
-$btn-size-smaller: 120px;
-$btn-size-small: 220px;
-$btn-size-normal: 240px;
-$btn-size-big: 320px;
-$btn-size-bigger: 455px;
-
-
-$btn-action-border: 1px solid #7ca62c;
-
-//forms
-$input-background: #fafafa;
-$input-color: $base-dark-blue;
-$input-font-size: 14px;
-$input-height: 36px;
-$textarea-height: 100px;
-$input-size-smaller: 120px;
-$input-size-small: 220px;
-$input-size-normal: 240px;
-$input-size-big: 320px;
-$input-size-bigger: 455px;
-$input-size-biggest: 550px;
-$input-radius: 3px;
-$input-border: #daddde;
-$label-color: $base-dark-blue;
-$label-font-size: 15px;
-
- //errors
- $error-bg: #fef7f7;
- $error-color: #d0160a;
- $error-border: #ecc2c3;
-
- //messages
- $success-bg: #f7fef7;
- $success-color: #4cae4c;
- $success-border: #5cb85c;
-
- //warnings
- $warning-bg: #fffce1;
- $warning-color: #f89406;
- $warning-border: #ffd79e;
-
- //notices
- $notice-bg: #f6f9f9;
- $notice-border: #dfeaea;
- $notice-color: #819196;
- $notice-radius: 3px;
-
-//structure variables
-$total-width: 1180px;
-$left-menu-width: 110px;
-$inner-width: 1070px;
-$header-height: 90px;
-$section-spacer: 10px;
-
-
-$inner-width-centered: 850px;
-$inner-width-popup: 525px;
-$inner-width-account: 455px;
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-regular.eot b/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-regular.eot
deleted file mode 100755
index ac1a457..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-regular.eot and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-regular.otf b/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-regular.otf
deleted file mode 100755
index 0f3276a..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-regular.otf and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-regular.svg b/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-regular.svg
deleted file mode 100755
index c8635f5..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-regular.svg
+++ /dev/null
@@ -1,1449 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="acorderegular" horiz-adv-x="1024" >
-<font-face units-per-em="2048" ascent="1597" descent="-451" />
-<missing-glyph horiz-adv-x="450" />
-<glyph unicode="fi" horiz-adv-x="1206" d="M53 909v135h164v160q0 145 89.5 229.5t254.5 84.5q85 0 152 -15l-27 -147q-62 16 -125 16q-95 0 -132.5 -44t-37.5 -138v-146h653v-1044h-174v909h-479v-909h-174v909h-164zM844 1362q0 50 33 82.5t81 32.5t81.5 -32.5t33.5 -82.5q0 -47 -34 -81t-81 -34t-80.5 34 t-33.5 81z" />
-<glyph unicode="fl" horiz-adv-x="1214" d="M53 909v135h164v160q0 144 107.5 229t298.5 85q118 0 270 -31l154 12v-1102q0 -101 2.5 -200t4.5 -148l3 -49q-52 -10 -78 -10q-107 0 -107 121v1222q-125 39 -249 39q-122 0 -177 -45.5t-55 -136.5v-146h314v-135h-314v-909h-174v909h-164z" />
-<glyph unicode="ffi" horiz-adv-x="1859" d="M53 909v135h164v160q0 145 89.5 229.5t254.5 84.5q105 0 211 -29l-27 -148q-88 31 -184 31q-95 0 -132.5 -44t-37.5 -138v-146h479v160q0 145 89.5 229.5t254.5 84.5q84 0 152 -15l-27 -147q-62 16 -125 16q-95 0 -132.5 -44t-37.5 -138v-146h654v-1044h-174v909h-480 v-909h-174v909h-479v-909h-174v909h-164zM1497 1362q0 50 33.5 82.5t81.5 32.5t81 -32.5t33 -82.5q0 -47 -33.5 -81t-80.5 -34t-81 34t-34 81z" />
-<glyph unicode="ffl" horiz-adv-x="1867" d="M53 909v135h164v160q0 145 89.5 229.5t254.5 84.5q105 0 211 -29l-27 -148q-88 31 -184 31q-95 0 -132.5 -44t-37.5 -138v-146h479v160q0 144 107.5 229t298.5 85q118 0 270 -31l154 12v-1102q0 -101 2.5 -200t5.5 -148l2 -49q-52 -10 -78 -10q-106 0 -106 121v1222 q-125 39 -250 39q-122 0 -177 -45.5t-55 -136.5v-146h314v-135h-314v-909h-174v909h-479v-909h-174v909h-164z" />
-<glyph horiz-adv-x="2048" />
-<glyph horiz-adv-x="2048" />
-<glyph unicode="
" horiz-adv-x="2048" />
-<glyph unicode=" " horiz-adv-x="450" />
-<glyph unicode="	" horiz-adv-x="450" />
-<glyph unicode=" " horiz-adv-x="450" />
-<glyph unicode="!" horiz-adv-x="540" d="M147 94q0 54 35.5 88.5t87.5 34.5t87.5 -34.5t35.5 -88.5q0 -51 -36 -87t-87 -36t-87 36t-36 87zM170 1475h201l-21 -1106h-160z" />
-<glyph unicode=""" horiz-adv-x="743" d="M109 1516h184l-23 -478h-139zM451 1516h184l-23 -478h-139z" />
-<glyph unicode="#" horiz-adv-x="1368" d="M68 428v131h280l41 336h-244v131h261l49 408h159l-49 -408h312l49 408h159l-49 -408h264v-131h-280l-41 -336h244v-131h-260l-52 -428h-159l51 428h-311l-52 -428h-159l51 428h-264zM508 559h311l41 336h-311z" />
-<glyph unicode="$" horiz-adv-x="1026" d="M68 53l34 164q176 -98 357 -98h10v551q-37 17 -54.5 25.5t-52 25.5t-52.5 28.5t-47.5 30.5t-45.5 35.5t-38 39.5t-33.5 46.5t-23.5 51.5t-17 60t-5 68q0 144 101 246.5t268 130.5v160h121v-152q179 -4 317 -57l-30 -168q-148 69 -287 74v-510q48 -22 77 -36t72.5 -38.5 t70 -45.5t57.5 -53.5t48.5 -66t29 -78.5t11.5 -96q0 -150 -99 -262t-267 -147v-166h-121v151h-23q-206 0 -378 86zM283 1092q0 -78 48 -131.5t138 -100.5v447q-186 -39 -186 -215zM590 135q88 25 136 86.5t48 153.5q0 81 -47.5 135.5t-136.5 101.5v-477z" />
-<glyph unicode="%" horiz-adv-x="1802" d="M68 1075q0 165 96 269t258 104q179 0 266.5 -101t87.5 -272q0 -158 -97 -265.5t-257 -107.5q-168 0 -261 106t-93 267zM219 1075q0 -112 58.5 -178t144.5 -66q93 0 148 65t55 179q0 120 -54 182t-149 62t-149 -62t-54 -182zM371 -72l948 1643l111 -66l-949 -1642z M1024 358q0 165 96 269t258 104q179 0 267 -101t88 -272q0 -158 -97.5 -265t-257.5 -107q-168 0 -261 105.5t-93 266.5zM1176 358q0 -112 58 -177.5t144 -65.5q93 0 148 64.5t55 178.5q0 120 -54 182t-149 62t-148.5 -62t-53.5 -182z" />
-<glyph unicode="&" horiz-adv-x="1523" d="M88 408q0 82 21 150.5t61.5 121t84 89.5t103.5 75q-102 162 -102 295q0 87 30 153t80.5 102.5t108 54t121.5 17.5q133 0 210 -66.5t77 -189.5q0 -215 -293 -397q168 -206 438 -405q83 154 107 329l172 -37q-10 -88 -46 -192t-96 -199q205 -136 351 -188l-78 -154 q-155 61 -377 211q-200 -203 -488 -203q-118 0 -212 35.5t-152.5 96t-89.5 137.5t-31 164zM266 432q0 -138 95 -224.5t243 -86.5q184 0 326 149q-310 232 -488 455q-86 -57 -131 -124.5t-45 -168.5zM428 1157q0 -100 78 -227q112 68 158.5 133.5t46.5 136.5 q0 66 -40.5 101.5t-97.5 35.5q-145 0 -145 -180z" />
-<glyph unicode="'" horiz-adv-x="401" d="M109 1516h184l-23 -478h-139z" />
-<glyph unicode="(" horiz-adv-x="612" d="M115 537q0 167 24 321.5t67 281.5t84.5 219t94.5 185h164q-49 -89 -90.5 -187t-81.5 -223.5t-63 -273.5t-23 -299q0 -147 23 -293t63 -270t81.5 -221.5t90.5 -186.5h-170q-264 465 -264 947z" />
-<glyph unicode=")" horiz-adv-x="610" d="M63 -410q259 472 259 983q0 499 -259 971h170q265 -466 265 -946q0 -167 -24 -321.5t-67.5 -282t-85 -219t-94.5 -185.5h-164z" />
-<glyph unicode="*" horiz-adv-x="972" d="M68 1153l49 150l301 -119l-19 332h166l-18 -334l309 118l49 -145l-323 -86l213 -262l-129 -94l-185 280l-180 -280l-125 94l209 258z" />
-<glyph unicode="+" horiz-adv-x="1089" d="M68 446v154h393v404h168v-404h393v-154h-393v-405h-168v405h-393z" />
-<glyph unicode="," horiz-adv-x="491" d="M68 -221q65 13 101 67.5t36 135.5q-31 5 -56.5 34.5t-25.5 77.5q0 54 35.5 88.5t87.5 34.5q55 0 89 -36.5t34 -117.5q0 -148 -75 -253.5t-194 -133.5z" />
-<glyph unicode="-" horiz-adv-x="794" d="M137 481v156h520v-156h-520z" />
-<glyph unicode="." horiz-adv-x="491" d="M123 94q0 54 35.5 88.5t87.5 34.5t87.5 -34.5t35.5 -88.5q0 -51 -36 -87t-87 -36t-87 36t-36 87z" />
-<glyph unicode="/" horiz-adv-x="808" d="M68 -414l501 1872h172l-501 -1872h-172z" />
-<glyph unicode="0" horiz-adv-x="1185" d="M94 522q0 238 136 392.5t362 154.5q129 0 226 -41.5t155.5 -116t87.5 -172.5t29 -217q0 -148 -59.5 -271.5t-174.5 -199.5t-264 -76q-120 0 -216.5 44t-157 120t-92.5 174t-32 209zM268 522q0 -181 94 -289t230 -108q148 0 235.5 105.5t87.5 291.5q0 196 -86.5 297 t-236.5 101q-151 0 -237.5 -101t-86.5 -297z" />
-<glyph unicode="1" horiz-adv-x="714" d="M31 815l344 229h155v-1044h-174v674q0 100 11 186q-47 -41 -88 -63l-191 -107z" />
-<glyph unicode="2" horiz-adv-x="999" d="M96 969q155 100 371 100q190 0 291.5 -80.5t101.5 -238.5q0 -46 -11 -91t-24.5 -79t-41.5 -73.5t-45 -61.5t-54 -57.5t-49.5 -46.5t-48.5 -42q-132 -112 -230 -164q110 10 265 10h301v-145h-820v129q230 151 381 287q42 39 69 66t61 69t51.5 85t17.5 87q0 98 -62.5 149.5 t-179.5 51.5q-166 0 -295 -95z" />
-<glyph unicode="3" horiz-adv-x="991" d="M49 -328l27 156q144 -66 327 -66q157 0 243.5 75.5t86.5 203.5q0 119 -103 187.5t-278 68.5q-78 0 -139 -6l-14 139q239 0 361 72t122 225q0 197 -252 197q-166 0 -295 -95l-49 140q155 100 371 100q197 0 300 -78.5t103 -236.5q0 -135 -69 -228t-191 -137 q168 -30 239.5 -114t71.5 -230q0 -186 -147 -307t-367 -121q-210 0 -348 55z" />
-<glyph unicode="4" horiz-adv-x="1075" d="M49 20v123l389 901h176l-303 -722q-40 -94 -82 -166q82 10 164 10h283v489h174v-489h180v-146h-180v-378h-174v378h-627z" />
-<glyph unicode="5" horiz-adv-x="1021" d="M66 -328l26 156q144 -66 328 -66q163 0 251.5 81.5t88.5 215.5q0 135 -76 212t-217 77q-146 0 -250 -82l-113 60l58 718h731v-151h-264q-188 0 -310 12l-32 -403q-2 -25 -11 -70q108 68 254 68q85 0 158 -27t129.5 -77.5t88.5 -130.5t32 -179q0 -212 -147.5 -340.5 t-376.5 -128.5q-210 0 -348 55z" />
-<glyph unicode="6" horiz-adv-x="1116" d="M102 610q0 166 34 301t95 230t147.5 160t191 95.5t225.5 30.5q86 0 159 -16l13 -154q-94 25 -170 25q-85 0 -154.5 -16t-133 -56.5t-109 -105.5t-76 -167t-39.5 -237q109 168 356 168q176 0 282.5 -107t106.5 -317q0 -212 -128.5 -340.5t-338.5 -128.5q-227 0 -344 150.5 t-117 484.5zM281 526q9 -203 93.5 -304t209.5 -101q126 0 197 79.5t71 217.5q0 154 -69.5 226.5t-186.5 72.5q-109 0 -188.5 -53t-126.5 -138z" />
-<glyph unicode="7" horiz-adv-x="997" d="M51 893v151h914v-114l-232 -414q-105 -190 -214.5 -447.5t-151.5 -426.5h-179q31 158 115 360t221 479q134 273 252 424q-106 -12 -239 -12h-486z" />
-<glyph unicode="8" horiz-adv-x="1114" d="M96 348q0 143 81.5 242t201.5 139q-108 62 -168.5 143t-60.5 197q0 105 60 188t156 126.5t207 43.5q195 0 301.5 -89.5t106.5 -250.5q0 -64 -23 -119.5t-63 -96.5t-83.5 -70t-94.5 -51q71 -35 119.5 -67t91.5 -76t64.5 -101.5t21.5 -128.5q0 -78 -31.5 -150t-89.5 -128.5 t-147 -90t-195 -33.5q-214 0 -334.5 99.5t-120.5 273.5zM274 369q0 -116 82.5 -182t202.5 -66q132 0 204.5 63t72.5 172q0 55 -20.5 99.5t-65 80.5t-95.5 63.5t-129 59.5l-12 5q-115 -30 -177.5 -104.5t-62.5 -190.5zM328 1077q0 -41 12.5 -75t31 -58t56 -48.5t69.5 -41 t89 -43.5q102 30 159.5 96.5t57.5 163.5q0 89 -65.5 150t-176.5 61q-106 0 -169.5 -54t-63.5 -151z" />
-<glyph unicode="9" horiz-adv-x="1075" d="M59 600q0 212 128.5 340.5t338.5 128.5q227 0 344 -150.5t117 -484.5q0 -206 -51.5 -364t-145 -256t-218.5 -147.5t-277 -49.5q-87 0 -160 16l-12 154q94 -25 170 -25q85 0 153.5 16t132.5 56.5t109 105.5t76 167t41 237q-109 -168 -356 -168q-176 0 -283 107t-107 317z M238 627q0 -154 69.5 -226.5t186.5 -72.5q108 0 187 52t126 136q-9 205 -92.5 306.5t-208.5 101.5q-126 0 -197 -79.5t-71 -217.5z" />
-<glyph unicode=":" horiz-adv-x="585" d="M170 94q0 54 35.5 88.5t87.5 34.5t87.5 -34.5t35.5 -88.5q0 -51 -36 -87t-87 -36t-87 36t-36 87zM170 801q0 54 35.5 88.5t87.5 34.5t87.5 -34.5t35.5 -88.5q0 -51 -36 -87t-87 -36t-87 36t-36 87z" />
-<glyph unicode=";" horiz-adv-x="585" d="M115 -221q65 13 101 67.5t36 135.5q-31 5 -56.5 34.5t-25.5 77.5q0 54 35.5 88.5t87.5 34.5q55 0 89 -36.5t34 -117.5q0 -148 -75 -253.5t-194 -133.5zM170 801q0 54 35.5 88.5t87.5 34.5t87.5 -34.5t35.5 -88.5q0 -51 -36 -87t-87 -36t-87 36t-36 87z" />
-<glyph unicode="<" horiz-adv-x="1091" d="M45 500v98l934 477v-174l-707 -352l707 -346v-180z" />
-<glyph unicode="=" horiz-adv-x="1216" d="M131 281v151h954v-151h-954zM131 612v152h954v-152h-954z" />
-<glyph unicode=">" horiz-adv-x="1091" d="M113 23v174l706 350l-706 348v180l934 -477v-98z" />
-<glyph unicode="?" horiz-adv-x="913" d="M57 1386q63 49 164 85t209 36q187 0 296.5 -89t109.5 -251q0 -55 -15.5 -105t-35.5 -85.5t-62 -80.5t-71.5 -71t-88.5 -75q-66 -56 -91.5 -120.5t-25.5 -144.5q0 -71 9 -108l-174 -17q-9 56 -9 134q0 100 43 196t138 166q116 86 158 146t42 153q0 95 -71 148t-181 53 q-148 0 -295 -111zM248 94q0 54 35.5 88.5t87.5 34.5t87.5 -34.5t35.5 -88.5q0 -51 -36 -87t-87 -36t-87 36t-36 87z" />
-<glyph unicode="@" horiz-adv-x="1769" d="M61 317q0 201 65 368t181 282.5t280.5 179t360.5 63.5q119 0 226.5 -25.5t200.5 -79.5t160.5 -132.5t106.5 -190.5t39 -247q0 -117 -39 -221.5t-104.5 -178.5t-154.5 -117t-187 -43q-93 0 -148 38t-55 112q0 31 13 72l45 135q-149 -357 -361 -357q-102 0 -157.5 60 t-55.5 203q0 164 60.5 303.5t175 225t258.5 85.5q156 0 276 -59l-98 -547q-8 -40 -8 -74q0 -44 21.5 -63t74.5 -19q44 0 91.5 29.5t89.5 82.5t68.5 138.5t26.5 185.5q0 130 -48 233t-132 167.5t-194 98.5t-238 34q-194 0 -344.5 -88t-234.5 -251.5t-84 -377.5 q0 -157 49.5 -279.5t136.5 -197t199.5 -112.5t244.5 -38q179 0 357 54l26 -129q-185 -64 -407 -64q-128 0 -241.5 26t-213.5 83.5t-172.5 142.5t-114 210t-41.5 279zM641 266q0 -79 21 -117t71 -38q94 0 190 139t134 356l16 92q-66 27 -135 27q-70 0 -128 -42.5t-94 -110.5 t-55.5 -147.5t-19.5 -158.5z" />
-<glyph unicode="A" horiz-adv-x="1236" d="M6 0l537 1434h170l501 -1434h-188l-121 360h-590l-127 -360h-182zM369 512h485l-160 477q-39 115 -73 252q-25 -88 -82 -252z" />
-<glyph unicode="B" horiz-adv-x="1191" d="M188 4v1426q164 16 361 16q232 0 352.5 -81.5t120.5 -274.5q0 -98 -53 -184.5t-150 -139.5q271 -69 271 -342q0 -192 -144.5 -314t-396.5 -122q-197 0 -361 16zM367 143q82 -8 165 -8q184 0 279.5 63t95.5 203q0 79 -29 134t-82.5 84.5t-117.5 42t-146 12.5 q-104 0 -165 -6v-525zM367 813q41 -4 165 -4q308 0 308 262q0 68 -25 114.5t-71 70t-96.5 33t-115.5 9.5q-83 0 -165 -8v-477z" />
-<glyph unicode="C" horiz-adv-x="1193" d="M102 717q0 221 84.5 391t240.5 264t361 94q191 0 345 -57l-41 -164q-55 27 -137 45.5t-162 18.5q-250 0 -377 -152t-127 -436q0 -286 138 -442t370 -156q166 0 295 61l41 -147q-137 -70 -345 -70q-336 0 -511 191.5t-175 558.5z" />
-<glyph unicode="D" horiz-adv-x="1368" d="M188 4v1426q164 16 361 16q165 0 295 -39.5t226 -120t147 -212t51 -306.5q0 -185 -57 -334.5t-156 -246t-228.5 -148t-277.5 -51.5q-197 0 -361 16zM367 150q92 -9 165 -9q266 0 407.5 160.5t141.5 456.5q0 139 -42 243.5t-117.5 167t-173 93t-216.5 30.5q-83 0 -165 -8 v-1134z" />
-<glyph unicode="E" horiz-adv-x="1130" d="M188 0v1434h822v-154h-643v-463h577v-147h-577v-516h649v-154h-828z" />
-<glyph unicode="F" horiz-adv-x="1089" d="M188 0v1434h822v-154h-643v-483h591v-148h-591v-649h-179z" />
-<glyph unicode="G" horiz-adv-x="1370" d="M102 717q0 223 86 392t250.5 263t386.5 94q220 0 385 -61l-41 -164q-56 28 -151 48t-189 20q-540 0 -540 -588q0 -287 139.5 -442.5t378.5 -155.5q145 0 260 41v452h-291v146h469v-682q-87 -51 -208 -82t-238 -31q-343 0 -520 191t-177 559z" />
-<glyph unicode="H" horiz-adv-x="1425" d="M188 0v1434h179v-600h692v600h178v-1434h-178v680h-692v-680h-179z" />
-<glyph unicode="I" horiz-adv-x="555" d="M188 0v1434h179v-1434h-179z" />
-<glyph unicode="J" horiz-adv-x="555" d="M-41 -209q143 0 193 92q23 41 29.5 109t6.5 198v1244h179v-1258q0 -158 -13 -231.5t-51 -137.5q-91 -151 -321 -151z" />
-<glyph unicode="K" horiz-adv-x="1189" d="M188 0v1434h179v-670l575 670h215l-604 -689l651 -745h-237l-600 711v-711h-179z" />
-<glyph unicode="L" horiz-adv-x="1030" d="M188 0v1434h179v-1280h643v-154h-822z" />
-<glyph unicode="M" horiz-adv-x="1808" d="M135 0l135 1434h191l370 -1020q41 -109 68 -213q42 131 72 213l385 1020h190l123 -1434h-180l-53 717q-18 231 -21 459q-42 -136 -86 -254l-352 -922h-164l-338 922q-47 128 -86 256q-8 -187 -29 -461l-59 -717h-166z" />
-<glyph unicode="N" horiz-adv-x="1439" d="M188 0v1434h177l557 -869q73 -112 174 -309q-11 194 -11 502v676h166v-1434h-176l-557 868q-89 136 -174 310q10 -265 10 -502v-676h-166z" />
-<glyph unicode="O" horiz-adv-x="1490" d="M102 717q0 216 78 386t225 266.5t340 96.5q165 0 290 -55.5t201.5 -157t114.5 -236t38 -300.5q0 -207 -78 -377t-226 -271.5t-340 -101.5q-154 0 -277.5 58.5t-202.5 161.5t-121 238t-42 292zM289 717q0 -141 38 -256t102 -187.5t145 -111.5t171 -39q200 0 328.5 156 t128.5 438q0 150 -35 265.5t-97.5 186t-144.5 106.5t-180 36t-179.5 -36t-144 -106.5t-97.5 -186t-35 -265.5z" />
-<glyph unicode="P" horiz-adv-x="1132" d="M188 0v1430q164 16 361 16q264 0 393 -104t129 -326q0 -223 -148.5 -362.5t-402.5 -139.5q-92 0 -153 6v-520h-179zM367 668q61 -6 165 -6q357 0 357 335q0 301 -357 301q-83 0 -165 -8v-622z" />
-<glyph unicode="Q" horiz-adv-x="1490" d="M102 717q0 216 78 386t225 266.5t340 96.5q165 0 290 -55.5t201.5 -157t114.5 -236t38 -300.5q0 -173 -55.5 -321.5t-161 -254.5t-246.5 -147q164 -92 399 -92q67 0 107 6l-21 -166q-30 -6 -76 -6q-183 0 -343.5 60.5t-239.5 170.5q-126 0 -232 38t-182.5 106.5 t-130 162.5t-79.5 206t-26 237zM289 717q0 -141 38 -256t102 -187.5t145 -111.5t171 -39q200 0 328.5 156t128.5 438q0 150 -35 265.5t-97.5 186t-144.5 106.5t-180 36t-179.5 -36t-144 -106.5t-97.5 -186t-35 -265.5z" />
-<glyph unicode="R" horiz-adv-x="1183" d="M188 0v1430q164 16 361 16q236 0 360.5 -91.5t124.5 -291.5q0 -126 -64.5 -217.5t-170.5 -138.5q64 -30 107.5 -92.5t76.5 -168.5l137 -446h-188l-123 406q-38 126 -98.5 169t-178.5 43q-104 0 -165 -6v-612h-179zM367 758q41 -4 165 -4q141 0 230.5 73.5t89.5 212.5 q0 258 -320 258q-83 0 -165 -8v-532z" />
-<glyph unicode="S" horiz-adv-x="1058" d="M84 53l35 164q87 -48 170.5 -73t185.5 -25q149 0 232.5 67t83.5 189q0 54 -23 98t-62 75.5t-89.5 59t-106.5 52.5t-112 51.5t-106.5 60.5t-89.5 75.5t-62 101.5t-23 132q0 166 133 275.5t338 109.5q186 0 336 -57l-31 -168q-155 74 -313 74q-134 0 -207.5 -57t-73.5 -166 q0 -52 23 -94.5t62 -72.5t89.5 -56.5t106.5 -51.5t112 -51t106.5 -61t89.5 -77t62 -102.5t23 -134.5q0 -181 -140.5 -302.5t-369.5 -121.5q-207 0 -379 86z" />
-<glyph unicode="T" horiz-adv-x="1087" d="M23 1280v154h1042v-154h-432v-1280h-178v1280h-432z" />
-<glyph unicode="U" horiz-adv-x="1388" d="M172 487v947h178v-897q0 -208 89.5 -311t260.5 -103q163 0 252.5 96t89.5 285v930h175v-942q0 -87 -18.5 -163.5t-60 -143.5t-103 -115t-152 -75.5t-201.5 -27.5q-244 0 -377 136t-133 384z" />
-<glyph unicode="V" horiz-adv-x="1232" d="M20 1434h191l332 -990q40 -119 69 -249q42 135 82 249l350 990h185l-537 -1434h-170z" />
-<glyph unicode="W" horiz-adv-x="1933" d="M31 1434h184l274 -992q33 -124 56 -235q25 123 59 235l293 992h162l274 -992q33 -124 56 -235q25 123 59 235l293 992h178l-453 -1434h-180l-270 991q-25 96 -45 189q-17 -85 -47 -189l-295 -991h-180z" />
-<glyph unicode="X" horiz-adv-x="1179" d="M31 0l448 748l-411 686h206l318 -543l315 543h197l-406 -674l457 -760h-207l-362 616l-359 -616h-196z" />
-<glyph unicode="Y" horiz-adv-x="1124" d="M-2 1434h211l274 -543q48 -96 80 -178q26 66 86 178l285 543h203l-488 -869v-565h-178v565z" />
-<glyph unicode="Z" horiz-adv-x="1171" d="M92 0v137l590 875q68 103 203 276q-98 -8 -199 -8h-594v154h987v-138l-590 -874q-96 -140 -204 -279q90 11 200 11h594v-154h-987z" />
-<glyph unicode="[" horiz-adv-x="606" d="M174 -410v1954h373v-135h-209v-1683h209v-136h-373z" />
-<glyph unicode="\" horiz-adv-x="808" d="M68 1458h172l501 -1872h-172z" />
-<glyph unicode="]" horiz-adv-x="606" d="M59 -274h209v1683h-209v135h373v-1954h-373v136z" />
-<glyph unicode="^" horiz-adv-x="1241" d="M113 594l430 881h166l409 -881h-190l-305 719l-328 -719h-182z" />
-<glyph unicode="_" horiz-adv-x="1048" d="M12 -195h1024v-145h-1024v145z" />
-<glyph unicode="`" d="M305 1399l111 139l305 -242l-84 -106z" />
-<glyph unicode="a" horiz-adv-x="1026" d="M78 281q0 109 66 184.5t177.5 110t262.5 34.5q63 0 121 -10v105q0 219 -228 219q-166 0 -295 -95l-49 140q155 100 371 100q180 0 275 -77t95 -255v-340q0 -101 3 -200t5 -148l3 -49q-52 -10 -78 -10q-100 0 -100 121v22q-115 -158 -330 -158q-129 0 -214 77t-85 229z M256 289q0 -81 46 -126.5t126 -45.5q163 0 277 159v201q-62 6 -158 6q-131 0 -211 -46.5t-80 -147.5z" />
-<glyph unicode="b" horiz-adv-x="1146" d="M156 49v1438l174 12v-381q0 -120 -11 -213q113 164 334 164q84 0 155 -30.5t126.5 -91t87 -161t31.5 -231.5q0 -135 -42 -245.5t-116 -183t-173 -112t-214 -39.5q-179 0 -352 74zM330 160q83 -39 202 -39q146 0 244 107t98 302q0 192 -71.5 290t-200.5 98 q-161 0 -272 -156v-602z" />
-<glyph unicode="c" horiz-adv-x="940" d="M92 522q0 238 146 392.5t368 154.5q152 0 264 -53l-34 -150q-110 52 -226 52q-155 0 -247.5 -96t-92.5 -300q0 -93 20.5 -164t54.5 -115t82.5 -72t98.5 -39t109 -11q111 0 199 49l36 -141q-123 -54 -266 -54q-92 0 -166 15.5t-140 54.5t-110.5 100t-70 156.5t-25.5 220.5 z" />
-<glyph unicode="d" horiz-adv-x="1153" d="M94 489q0 135 42 245.5t116 183t173 112t214 39.5q93 0 186 -22q-8 65 -8 198v242l174 12v-1102q0 -101 2.5 -200t4.5 -148l3 -49q-52 -10 -77 -10q-101 0 -101 121v22q-115 -158 -329 -158q-84 0 -155 30.5t-126.5 91t-87 161t-31.5 231.5zM272 514q0 -192 72 -289.5 t201 -97.5q160 0 272 154v604q-90 39 -203 39q-146 0 -244 -107.5t-98 -302.5z" />
-<glyph unicode="e" horiz-adv-x="1056" d="M94 522q0 242 131 394.5t348 152.5q181 0 287.5 -113t106.5 -331q0 -53 -6 -105h-691q0 -92 21 -163t55.5 -115.5t84 -72.5t102 -39t114.5 -11q139 0 258 53l31 -137q-128 -60 -320 -60q-95 0 -171 15.5t-143 54.5t-112 100.5t-70.5 156.5t-25.5 220zM279 655h514 q0 122 -68.5 197.5t-169.5 75.5q-108 0 -181.5 -67t-94.5 -206z" />
-<glyph unicode="f" horiz-adv-x="739" d="M53 909v135h164v160q0 145 89.5 229.5t254.5 84.5q105 0 211 -29l-27 -148q-88 31 -184 31q-95 0 -132.5 -44t-37.5 -138v-146h314v-135h-314v-909h-174v909h-164z" />
-<glyph unicode="g" horiz-adv-x="1124" d="M78 -143q0 79 50.5 147.5t123.5 97.5q-129 52 -129 174q0 61 32.5 111t86.5 80q-92 96 -92 246q0 159 112 257.5t279 98.5q107 0 178 -27q175 0 360 9v-123q-66 -4 -114 -4q-60 0 -93 2q60 -85 60 -213q0 -155 -113 -256t-278 -101q-122 0 -215 41q-60 -24 -60 -84 q0 -36 34 -59.5t89.5 -33.5t126.5 -19.5t145.5 -16.5t145.5 -26.5t126.5 -47t89.5 -80.5t34 -126q0 -169 -138.5 -273t-379.5 -104q-118 0 -209 26.5t-144.5 73t-80.5 104.5t-27 126zM244 -131q0 -103 92 -157t229 -54q87 0 158 20t119.5 68.5t48.5 118.5q0 28 -7.5 51 t-25.5 40.5t-36.5 30.5t-52 22.5t-59 16t-70.5 12.5t-74 9t-82 8t-83 8q-157 -56 -157 -194zM317 713q0 -103 63.5 -166.5t160.5 -63.5q101 0 162 63t61 167q0 109 -60 169t-163 60t-163.5 -60t-60.5 -169z" />
-<glyph unicode="h" horiz-adv-x="1146" d="M162 0v1487l174 12v-381q0 -128 -10 -213q113 164 333 164q69 0 127 -19t106.5 -59t76.5 -111.5t28 -168.5v-711h-174v664q0 254 -215 254q-161 0 -272 -156v-762h-174z" />
-<glyph unicode="i" horiz-adv-x="497" d="M135 1362q0 50 33.5 82.5t81.5 32.5t81.5 -32.5t33.5 -82.5q0 -47 -34 -81t-81 -34t-81 34t-34 81zM162 0v1044h174v-1044h-174z" />
-<glyph unicode="j" horiz-adv-x="497" d="M-61 -342q136 0 186 92q23 41 30 110t7 197v987h174v-997q0 -158 -13 -231.5t-51 -137.5q-91 -151 -311 -151zM135 1362q0 50 33.5 82.5t81.5 32.5t81.5 -32.5t33.5 -82.5q0 -47 -34 -81t-81 -34t-81 34t-34 81z" />
-<glyph unicode="k" d="M162 0v1487l174 12v-893l409 438h216l-439 -458l498 -586h-229l-455 553v-553h-174z" />
-<glyph unicode="l" horiz-adv-x="505" d="M164 111v1376l174 12v-1102q0 -101 2.5 -200t5.5 -148l2 -49q-52 -10 -78 -10q-106 0 -106 121z" />
-<glyph unicode="m" horiz-adv-x="1794" d="M154 1044q57 11 77 11q101 0 101 -121v-21q112 156 325 156q99 0 177.5 -41t119.5 -129q128 170 357 170q69 0 126.5 -19t105.5 -59t75 -111.5t27 -168.5v-711h-175v664q0 133 -54 193.5t-156 60.5q-152 0 -273 -154q4 -32 4 -53v-711h-174v664q0 254 -211 254 q-162 0 -268 -154v-764h-174v647q0 101 -2.5 200t-5.5 148z" />
-<glyph unicode="n" horiz-adv-x="1148" d="M154 1044q57 11 77 11q101 0 101 -121v-23q118 158 330 158q69 0 127 -19t106.5 -59t76 -111.5t27.5 -168.5v-711h-174v664q0 254 -215 254q-161 0 -272 -156v-762h-174v647q0 101 -2.5 200t-5.5 148z" />
-<glyph unicode="o" horiz-adv-x="1142" d="M94 522q0 156 54.5 278.5t164 195.5t258.5 73q128 0 222.5 -41.5t149 -117t80.5 -172t26 -216.5q0 -111 -32 -209.5t-91.5 -174t-151 -119.5t-203.5 -44q-120 0 -213 44t-149.5 120t-85.5 173t-29 210zM272 522q0 -185 83 -293t216 -108q145 0 222 105.5t77 295.5 q0 199 -76 300.5t-223 101.5t-223 -101.5t-76 -300.5z" />
-<glyph unicode="p" horiz-adv-x="1155" d="M154 1044q57 11 77 11q101 0 101 -121v-23q118 158 330 158q84 0 155 -30.5t126.5 -91t86.5 -161t31 -231.5q0 -135 -42 -245.5t-116 -183t-173 -112t-214 -39.5q-92 0 -186 23q8 -98 8 -199v-241l-174 -13v1102q0 101 -2.5 200t-5.5 148zM338 160q83 -39 203 -39 q146 0 244 107t98 302q0 192 -72 290t-201 98q-161 0 -272 -156v-602z" />
-<glyph unicode="q" horiz-adv-x="1146" d="M94 489q0 135 42 245.5t116 183t173 112t214 39.5q179 0 352 -74v-1437l-174 -13v381q0 129 10 211q-118 -162 -333 -162q-84 0 -155 30.5t-126.5 91t-87 161t-31.5 231.5zM272 514q0 -192 72 -289.5t201 -97.5q160 0 272 154v604q-90 39 -203 39q-146 0 -244 -107.5 t-98 -302.5z" />
-<glyph unicode="r" horiz-adv-x="737" d="M154 1044q57 11 77 11q101 0 101 -121v-66q85 201 280 201q54 0 101 -14l-21 -174q-57 24 -121 24q-161 0 -233 -221v-684h-174v647q0 101 -2.5 200t-5.5 148z" />
-<glyph unicode="s" horiz-adv-x="835" d="M82 35l31 151q128 -69 256 -69q96 0 149 35.5t53 107.5q0 48 -25.5 84.5t-66.5 60.5t-90.5 46t-99.5 48t-91 58t-66.5 83t-25.5 118q0 135 101.5 223t263.5 88q133 0 248 -45l-27 -154q-114 58 -231 58q-88 0 -134 -38t-46 -108q0 -44 26 -78t67 -56.5t91 -44 t100.5 -47.5t91.5 -58.5t67 -86t26 -122.5q0 -137 -108.5 -225.5t-276.5 -88.5q-160 0 -283 60z" />
-<glyph unicode="t" horiz-adv-x="761" d="M53 909v135h164l16 254l150 41v-295h313v-135h-313v-600q0 -108 41 -148t115 -40q80 0 161 51l19 -131q-95 -66 -219 -66q-131 0 -211 65.5t-80 207.5v661h-156z" />
-<glyph unicode="u" horiz-adv-x="1146" d="M150 334v710h174v-663q0 -254 215 -254q160 0 272 154v763h174v-647q0 -101 2.5 -200t4.5 -148l3 -49q-52 -10 -77 -10q-101 0 -101 121v22q-115 -158 -330 -158q-69 0 -127 19t-106.5 59.5t-76 112t-27.5 168.5z" />
-<glyph unicode="v" horiz-adv-x="1021" d="M27 1044h188l236 -665q32 -90 59 -211q29 122 63 211l240 665h184l-409 -1044h-170z" />
-<glyph unicode="w" horiz-adv-x="1587" d="M33 1044h180l197 -667q27 -87 47 -213q19 102 53 213l201 667h172l196 -667q27 -87 47 -213q18 93 54 213l200 667h176l-348 -1044h-178l-192 668q-28 94 -45 200q-16 -80 -50 -200l-202 -668h-179z" />
-<glyph unicode="x" horiz-adv-x="1009" d="M37 0l358 541l-334 503h209l240 -374l233 374h193l-324 -489l369 -555h-209l-274 424l-269 -424h-192z" />
-<glyph unicode="y" d="M27 1044h188l236 -665q39 -111 65 -240q25 110 70 240l227 665h184l-385 -1044q-95 -257 -197.5 -365t-267.5 -108q-28 0 -49 6l-24 145q24 -6 55 -6q57 0 99 14t87 61t80 130l39 92q-24 47 -51 123z" />
-<glyph unicode="z" horiz-adv-x="972" d="M94 0v123l461 649q55 77 107 135q-102 -8 -207 -8h-361v145h789v-100l-484 -672q-60 -82 -106 -137q82 10 207 10h383v-145h-789z" />
-<glyph unicode="{" horiz-adv-x="661" d="M33 520v135q205 0 205 238v287q0 174 71.5 269t210.5 95h80v-135q-118 0 -158.5 -46.5t-40.5 -174.5v-234q0 -168 -39.5 -249.5t-125.5 -116.5q85 -29 125 -113t40 -254v-274q0 -128 40.5 -174.5t158.5 -46.5v-136h-80q-145 0 -213.5 83.5t-68.5 281.5v328 q0 115 -57.5 176t-147.5 61z" />
-<glyph unicode="|" horiz-adv-x="489" d="M172 -455v1979h145v-1979h-145z" />
-<glyph unicode="}" horiz-adv-x="661" d="M61 -274q118 0 158.5 46.5t40.5 174.5v274q0 168 40 250t126 117q-85 29 -125.5 113t-40.5 253v234q0 128 -40.5 174.5t-158.5 46.5v135h80q145 0 214 -83.5t69 -280.5v-287q0 -115 58 -176.5t147 -61.5v-135q-205 0 -205 -237v-328q0 -174 -72 -269.5t-211 -95.5h-80 v136z" />
-<glyph unicode="~" horiz-adv-x="1234" d="M129 537q35 54 103 92.5t145 38.5q94 0 254 -44t223 -44q61 0 119 31.5t92 74.5l43 -135q-35 -54 -103 -92.5t-145 -38.5q-94 0 -254 44t-223 44q-61 0 -118.5 -32t-92.5 -75z" />
-<glyph unicode="¡" horiz-adv-x="454" d="M104 950q0 54 35.5 88.5t87.5 34.5t87.5 -34.5t35.5 -88.5q0 -51 -36 -87t-87 -36t-87 36t-36 87zM127 -430l20 1106h160l21 -1106h-201z" />
-<glyph unicode="¢" horiz-adv-x="923" d="M68 522q0 214 119 362t309 177v178h120v-172q129 -5 230 -51l-35 -150q-104 44 -195 49v-794q108 0 193 49l37 -141q-104 -47 -230 -52v-161h-120v164q-98 9 -173 41t-134 93.5t-90 164t-31 243.5zM246 522q0 -330 250 -389v774q-117 -25 -183.5 -119t-66.5 -266z" />
-<glyph unicode="£" horiz-adv-x="1060" d="M59 0v117q57 10 95 46.5t62 116t30 205.5l8 185h-166v147h174l12 215q12 212 126.5 323t291.5 111q149 0 279 -43l-21 -166q-133 58 -260 58q-46 0 -80.5 -9t-71.5 -35.5t-59.5 -84.5t-27.5 -146l-13 -223h457v-147h-465l-10 -219q-10 -198 -107 -310q102 13 187 13h467 v-154h-908z" />
-<glyph unicode="¤" horiz-adv-x="1122" d="M82 66l156 180q-86 112 -86 276q0 162 86 275l-156 182l111 94l151 -184q98 53 217 53q128 0 221 -49l148 180l110 -94l-151 -176q82 -110 82 -281q0 -155 -90 -272l159 -184l-110 -95l-154 187q-94 -56 -215 -56q-124 0 -217 52l-151 -183zM315 522q0 -127 71.5 -203.5 t174.5 -76.5q112 0 179 75t67 205q0 139 -66 210t-180 71t-180 -71t-66 -210z" />
-<glyph unicode="¥" horiz-adv-x="1275" d="M72 1434h211l274 -543q48 -96 80 -178q26 66 86 178l285 543h202l-305 -543q-58 -101 -127 -199h301v-135h-356v-129h356v-135h-356v-293h-178v293h-357v135h357v129h-357v135h299q-68 99 -120 199z" />
-<glyph unicode="¦" horiz-adv-x="501" d="M178 262h146v-717h-146v717zM178 807v717h146v-717h-146z" />
-<glyph unicode="§" horiz-adv-x="903" d="M63 -319l25 163q63 -35 143.5 -58.5t151.5 -23.5q94 0 147.5 38.5t53.5 109.5q0 45 -28 89.5t-72.5 83.5t-98.5 80t-108 85.5t-98.5 92t-72.5 107t-28 123.5q0 107 49 187t147 119q-131 128 -131 274q0 136 103.5 225.5t269.5 89.5q149 0 279 -43l-21 -166 q-133 58 -260 58q-88 0 -140 -36.5t-52 -111.5q0 -45 28 -89.5t72.5 -83.5t98 -80t107.5 -85.5t98.5 -92t72.5 -107t28 -123.5q0 -105 -49.5 -186t-146.5 -121q131 -131 131 -273q0 -140 -104.5 -227.5t-280.5 -87.5q-177 0 -314 70zM250 598q0 -30 13 -59.5t29.5 -52.5 t50 -53t56.5 -48t68.5 -51.5t67.5 -50.5q58 24 89 76.5t31 117.5q0 30 -13 60t-28.5 52.5t-50.5 54t-56 48t-69 52.5t-67 51q-58 -24 -89.5 -77t-31.5 -120z" />
-<glyph unicode="¨" d="M223 1354q0 46 31 76t76 30q44 0 75 -31t31 -75t-31 -75.5t-75 -31.5t-75.5 31.5t-31.5 75.5zM588 1354q0 47 30.5 76.5t75.5 29.5t76 -30t31 -76q0 -44 -31.5 -75.5t-75.5 -31.5t-75 31.5t-31 75.5z" />
-<glyph unicode="©" horiz-adv-x="1681" d="M70 717q0 218 103.5 395.5t279.5 276t387 98.5q220 0 396 -99t275 -275t99 -396q0 -218 -103.5 -395.5t-279.5 -276t-387 -98.5t-387 98.5t-279.5 276t-103.5 395.5zM219 717q0 -180 83 -325.5t225 -226.5t313 -81t313 81t224.5 226.5t82.5 325.5t-82.5 325.5 t-224.5 226.5t-313 81t-313 -81t-225 -226.5t-83 -325.5zM510 713q0 171 106.5 275t280.5 104q95 0 186 -27l-26 -123q-67 29 -148 29q-123 0 -186.5 -65.5t-63.5 -190.5q0 -124 69 -189t183 -65q83 0 146 26l26 -112q-81 -33 -192 -33q-381 0 -381 371z" />
-<glyph unicode="ª" horiz-adv-x="868" d="M141 928q0 113 93.5 169t254.5 56q35 0 70 -6v53q0 131 -145 131q-118 0 -201 -59l-35 112q110 66 262 66q128 0 196.5 -52t68.5 -175v-201q0 -74 1.5 -143.5t3.5 -102.5l1 -33q-36 -8 -68 -8q-82 0 -82 92q-79 -102 -219 -102q-88 0 -144.5 51.5t-56.5 151.5zM145 514 v111h562v-111h-562zM291 938q0 -96 100 -96q97 0 168 100v111q-54 4 -90 4q-82 0 -130 -29t-48 -90z" />
-<glyph unicode="«" horiz-adv-x="972" d="M82 522l242 428l143 -61l-203 -365l203 -368l-148 -62zM483 522l242 428l143 -61l-202 -365l202 -368l-147 -62z" />
-<glyph unicode="¬" horiz-adv-x="1015" d="M100 469v145h799v-454h-166v309h-633z" />
-<glyph unicode="­" horiz-adv-x="794" d="M137 481v156h520v-156h-520z" />
-<glyph unicode="®" horiz-adv-x="1681" d="M70 717q0 218 103.5 395.5t279.5 276t387 98.5q220 0 396 -99t275 -275t99 -396q0 -218 -103.5 -395.5t-279.5 -276t-387 -98.5t-387 98.5t-279.5 276t-103.5 395.5zM219 717q0 -180 83 -325.5t225 -226.5t313 -81t313 81t224.5 226.5t82.5 325.5t-82.5 325.5 t-224.5 226.5t-313 81t-313 -81t-225 -226.5t-83 -325.5zM590 358v715q108 8 211 8q150 0 224.5 -43t74.5 -149q0 -118 -123 -176q66 -28 102 -140l68 -215h-152l-61 195q-18 57 -45 76.5t-80 19.5q-38 0 -74 -4v-287h-145zM735 752q18 -2 74 -2q64 0 103.5 29.5t39.5 86.5 q0 109 -143 109q-38 0 -74 -4v-219z" />
-<glyph unicode="¯" d="M231 1286v135h562v-135h-562z" />
-<glyph unicode="°" horiz-adv-x="753" d="M84 1280q0 127 86.5 203t206.5 76q138 0 215.5 -73.5t77.5 -205.5q0 -117 -88 -198t-205 -81q-126 0 -209.5 79.5t-83.5 199.5zM231 1280q0 -58 44.5 -101.5t101.5 -43.5q60 0 102.5 43t42.5 102q0 66 -41.5 105.5t-103.5 39.5t-104 -39.5t-42 -105.5z" />
-<glyph unicode="±" horiz-adv-x="1089" d="M88 -57v153h913v-153h-913zM88 532v154h373v358h168v-358h372v-154h-372v-358h-168v358h-373z" />
-<glyph unicode="²" horiz-adv-x="706" d="M59 741v107q134 100 236 211q156 169 156 299q0 137 -162 137q-107 0 -187 -51l-32 115q104 57 252 57q284 0 284 -236q0 -111 -50.5 -200.5t-152.5 -198.5q-59 -62 -151 -127q82 10 186 10h209v-123h-588z" />
-<glyph unicode="³" horiz-adv-x="704" d="M57 760l17 125q93 -41 211 -41q92 0 142 40.5t50 106.5q0 64 -60.5 101.5t-164.5 37.5q-50 0 -94 -6l-8 111q296 0 296 160q0 104 -149 104q-106 0 -186 -51l-33 111q104 57 252 57q272 0 272 -193q0 -77 -44 -131.5t-120 -83.5q102 -20 148.5 -70.5t46.5 -136.5 q0 -119 -98.5 -196.5t-245.5 -77.5q-131 0 -232 33z" />
-<glyph unicode="´" d="M305 1296l305 242l111 -139l-332 -209z" />
-<glyph unicode="µ" horiz-adv-x="1103" d="M113 -455v1499h174v-663q0 -135 60 -194.5t183 -59.5q154 0 265 156v761h174v-647q0 -101 2.5 -200t4.5 -148l3 -49q-52 -10 -78 -10q-100 0 -100 121v22q-115 -158 -330 -158q-108 0 -203 62q19 -93 19 -205v-274z" />
-<glyph unicode="¶" horiz-adv-x="1232" d="M66 1001q0 190 125 311.5t307 121.5h153v-1803h-153v938q-186 0 -309 115t-123 317zM811 -369v1803h352v-131h-198v-1672h-154z" />
-<glyph unicode="·" horiz-adv-x="532" d="M143 559q0 54 35.5 88.5t87.5 34.5t87.5 -34.5t35.5 -88.5q0 -51 -36 -87t-87 -36t-87 36t-36 87z" />
-<glyph unicode="¸" d="M315 -418l29 113q66 -41 133 -41q47 0 70.5 21t23.5 55q0 58 -61 80q-35 12 -109 16l29 194h121l-16 -120l26 -4q68 -11 108 -50.5t40 -107.5q0 -87 -61.5 -140t-166.5 -53q-84 0 -166 37z" />
-<glyph unicode="¹" horiz-adv-x="528" d="M23 1452l249 150h134v-861h-154v586q0 65 8 135q-31 -35 -88 -61l-111 -51z" />
-<glyph unicode="º" horiz-adv-x="956" d="M143 1087q0 161 89 262t245 101q175 0 254.5 -97.5t79.5 -265.5q0 -155 -89.5 -258.5t-244.5 -103.5q-83 0 -148 28.5t-105 78.5t-60.5 114.5t-20.5 140.5zM154 514v111h647v-111h-647zM297 1087q0 -113 50 -178t130 -65q88 0 134 63t46 180q0 244 -180 244t-180 -244z " />
-<glyph unicode="»" horiz-adv-x="972" d="M104 156l203 364l-203 369l148 61l237 -428l-241 -428zM506 156l203 364l-203 369l147 61l238 -428l-242 -428z" />
-<glyph unicode="¼" horiz-adv-x="1716" d="M20 1284l250 150h133v-861h-153v586q0 65 8 135q-31 -35 -88 -61l-111 -51zM225 -72l949 1643l110 -66l-948 -1642zM1022 242v102l223 516h148l-170 -403q-24 -55 -49 -103q62 4 98 4h149v275h148v-275h104v-116h-104v-242h-148v242h-399z" />
-<glyph unicode="½" horiz-adv-x="1681" d="M20 1284l250 150h133v-861h-153v586q0 65 8 135q-31 -35 -88 -61l-111 -51zM225 -72l949 1643l110 -66l-948 -1642zM1034 0v106q134 100 236 211q155 168 155 299q0 138 -161 138q-106 0 -187 -52l-33 115q104 57 252 57q285 0 285 -235q0 -111 -50.5 -200.5 t-152.5 -198.5q-59 -62 -151 -127q82 10 186 10h209v-123h-588z" />
-<glyph unicode="¾" horiz-adv-x="1894" d="M57 592l17 125q93 -41 211 -41q92 0 142 40.5t50 106.5q0 65 -60.5 102.5t-164.5 37.5q-43 0 -94 -7l-8 111q296 0 296 160q0 104 -149 104q-106 0 -186 -51l-33 111q104 57 252 57q272 0 272 -193q0 -77 -44 -131.5t-120 -83.5q102 -20 148.5 -70t46.5 -136 q0 -119 -98.5 -197t-245.5 -78q-131 0 -232 33zM403 -72l949 1643l110 -66l-948 -1642zM1200 242v102l223 516h148l-170 -403q-24 -55 -49 -103q62 4 98 4h149v275h148v-275h104v-116h-104v-242h-148v242h-399z" />
-<glyph unicode="¿" horiz-adv-x="911" d="M102 -123q0 55 15.5 105t35.5 86t62 80.5t72 71t88 75.5q66 56 91.5 120t25.5 144q0 71 -9 109l174 16q9 -56 9 -133q0 -100 -43 -196.5t-138 -166.5q-116 -86 -158 -146.5t-42 -152.5q0 -95 71 -147.5t181 -52.5q148 0 294 110l50 -141q-63 -49 -164 -85t-209 -36 q-187 0 -296.5 89t-109.5 251zM444 950q0 54 35.5 88.5t87.5 34.5t87.5 -34.5t35.5 -88.5q0 -51 -36 -87t-87 -36t-87 36t-36 87z" />
-<glyph unicode="À" horiz-adv-x="1236" d="M6 0l537 1434h170l501 -1434h-188l-121 360h-590l-127 -360h-182zM369 512h485l-160 477q-39 115 -73 252q-25 -88 -82 -252zM412 1747l110 139l305 -241l-84 -107z" />
-<glyph unicode="Á" horiz-adv-x="1236" d="M6 0l537 1434h170l501 -1434h-188l-121 360h-590l-127 -360h-182zM369 512h485l-160 477q-39 115 -73 252q-25 -88 -82 -252zM469 1645l305 241l111 -139l-332 -209z" />
-<glyph unicode="Â" horiz-adv-x="1236" d="M6 0l537 1434h170l501 -1434h-188l-121 360h-590l-127 -360h-182zM301 1681l324 189l329 -184l-84 -117l-249 135l-236 -135zM369 512h485l-160 477q-39 115 -73 252q-25 -88 -82 -252z" />
-<glyph unicode="Ã" horiz-adv-x="1236" d="M6 0l537 1434h170l501 -1434h-188l-121 360h-590l-127 -360h-182zM301 1722q68 95 176 95q63 0 153 -29t144 -29q82 0 141 62l41 -113q-29 -41 -74.5 -67.5t-101.5 -26.5q-63 0 -153 28.5t-144 28.5q-83 0 -141 -61zM369 512h485l-160 477q-39 115 -73 252 q-25 -88 -82 -252z" />
-<glyph unicode="Ä" horiz-adv-x="1236" d="M6 0l537 1434h170l501 -1434h-188l-121 360h-590l-127 -360h-182zM340 1702q0 47 30.5 76.5t75.5 29.5q44 0 75.5 -31t31.5 -75t-31.5 -75.5t-75.5 -31.5t-75 31.5t-31 75.5zM369 512h485l-160 477q-39 115 -73 252q-25 -88 -82 -252zM705 1702q0 47 30.5 76.5t75.5 29.5 t76 -30t31 -76q0 -44 -31.5 -75.5t-75.5 -31.5t-75 31.5t-31 75.5z" />
-<glyph unicode="Å" horiz-adv-x="1236" d="M6 0l537 1434h170l501 -1434h-188l-121 360h-590l-127 -360h-182zM369 512h485l-160 477q-39 115 -73 252q-25 -88 -82 -252zM434 1731q0 86 56.5 140t138.5 54q81 0 137.5 -54t56.5 -140q0 -80 -57.5 -137.5t-136.5 -57.5t-137 58t-58 137zM539 1731q0 -37 26.5 -64 t63.5 -27t63.5 27t26.5 64q0 40 -26 65t-64 25t-64 -25t-26 -65z" />
-<glyph unicode="Æ" horiz-adv-x="1785" d="M-35 0l823 1434h877v-154h-643v-463h577v-147h-577v-516h649v-154h-823v360h-490l-198 -360h-195zM442 512h406v307q0 255 8 451q-107 -210 -194 -365z" />
-<glyph unicode="Ç" horiz-adv-x="1193" d="M102 717q0 221 84.5 391t240.5 264t361 94q191 0 345 -57l-41 -164q-55 27 -137 45.5t-162 18.5q-250 0 -377 -152t-127 -436q0 -286 138 -442t370 -156q166 0 295 61l41 -147q-137 -70 -345 -70q-12 0 -32.5 1t-30.5 1l-10 -73l26 -5q68 -11 108 -50t40 -107 q0 -87 -61 -140t-166 -53q-84 0 -166 37l28 113q66 -41 133 -41q47 0 71 21t24 55q0 57 -62 79q-39 13 -108 17l22 162q-247 47 -374.5 233t-127.5 500z" />
-<glyph unicode="È" horiz-adv-x="1130" d="M188 0v1434h822v-154h-643v-463h577v-147h-577v-516h649v-154h-828zM356 1747l111 139l305 -241l-84 -107z" />
-<glyph unicode="É" horiz-adv-x="1130" d="M188 0v1434h822v-154h-643v-463h577v-147h-577v-516h649v-154h-828zM446 1645l306 241l110 -139l-332 -209z" />
-<glyph unicode="Ê" horiz-adv-x="1130" d="M188 0v1434h822v-154h-643v-463h577v-147h-577v-516h649v-154h-828zM272 1681l324 189l330 -184l-84 -117l-250 135l-236 -135z" />
-<glyph unicode="Ë" horiz-adv-x="1130" d="M188 0v1434h822v-154h-643v-463h577v-147h-577v-516h649v-154h-828zM311 1702q0 46 31 76t76 30q44 0 75 -31t31 -75t-31 -75.5t-75 -31.5t-75.5 31.5t-31.5 75.5zM676 1702q0 47 30.5 76.5t75.5 29.5t76 -30t31 -76q0 -44 -31.5 -75.5t-75.5 -31.5t-75 31.5t-31 75.5z " />
-<glyph unicode="Ì" horiz-adv-x="555" d="M51 1747l111 139l305 -241l-84 -107zM188 0v1434h179v-1434h-179z" />
-<glyph unicode="Í" horiz-adv-x="555" d="M109 1645l305 241l110 -139l-331 -209zM188 0v1434h179v-1434h-179z" />
-<glyph unicode="Î" horiz-adv-x="555" d="M-49 1681l323 189l330 -184l-84 -117l-250 135l-235 -135zM188 0v1434h179v-1434h-179z" />
-<glyph unicode="Ï" horiz-adv-x="555" d="M-10 1702q0 47 30.5 76.5t75.5 29.5q44 0 75.5 -31t31.5 -75t-31.5 -75.5t-75.5 -31.5t-75 31.5t-31 75.5zM188 0v1434h179v-1434h-179zM354 1702q0 46 31 76t76 30t75.5 -29.5t30.5 -76.5q0 -44 -31 -75.5t-75 -31.5t-75.5 31.5t-31.5 75.5z" />
-<glyph unicode="Ð" horiz-adv-x="1368" d="M41 686v148h147v596q164 16 361 16q165 0 295 -39.5t226 -120t147 -212t51 -306.5q0 -185 -57 -334.5t-156 -246t-228.5 -148t-277.5 -51.5q-197 0 -361 16v682h-147zM367 150q92 -9 165 -9q266 0 407.5 160.5t141.5 456.5q0 139 -42 243.5t-117.5 167t-173 93 t-216.5 30.5q-83 0 -165 -8v-450h317v-148h-317v-536z" />
-<glyph unicode="Ñ" horiz-adv-x="1439" d="M188 0v1434h177l557 -869q73 -112 174 -309q-11 194 -11 502v676h166v-1434h-176l-557 868q-89 136 -174 310q10 -265 10 -502v-676h-166zM393 1722q68 95 176 95q63 0 153 -29t144 -29q83 0 142 62l41 -113q-29 -41 -75 -67.5t-102 -26.5q-63 0 -153 28.5t-144 28.5 q-83 0 -141 -61z" />
-<glyph unicode="Ò" horiz-adv-x="1490" d="M102 717q0 216 78 386t225 266.5t340 96.5q165 0 290 -55.5t201.5 -157t114.5 -236t38 -300.5q0 -207 -78 -377t-226 -271.5t-340 -101.5q-154 0 -277.5 58.5t-202.5 161.5t-121 238t-42 292zM289 717q0 -141 38 -256t102 -187.5t145 -111.5t171 -39q200 0 328.5 156 t128.5 438q0 150 -35 265.5t-97.5 186t-144.5 106.5t-180 36t-179.5 -36t-144 -106.5t-97.5 -186t-35 -265.5zM516 1747l111 139l305 -241l-84 -107z" />
-<glyph unicode="Ó" horiz-adv-x="1490" d="M102 717q0 216 78 386t225 266.5t340 96.5q165 0 290 -55.5t201.5 -157t114.5 -236t38 -300.5q0 -207 -78 -377t-226 -271.5t-340 -101.5q-154 0 -277.5 58.5t-202.5 161.5t-121 238t-42 292zM289 717q0 -141 38 -256t102 -187.5t145 -111.5t171 -39q200 0 328.5 156 t128.5 438q0 150 -35 265.5t-97.5 186t-144.5 106.5t-180 36t-179.5 -36t-144 -106.5t-97.5 -186t-35 -265.5zM600 1645l305 241l111 -139l-332 -209z" />
-<glyph unicode="Ô" horiz-adv-x="1490" d="M102 717q0 216 78 386t225 266.5t340 96.5q165 0 290 -55.5t201.5 -157t114.5 -236t38 -300.5q0 -207 -78 -377t-226 -271.5t-340 -101.5q-154 0 -277.5 58.5t-202.5 161.5t-121 238t-42 292zM289 717q0 -141 38 -256t102 -187.5t145 -111.5t171 -39q200 0 328.5 156 t128.5 438q0 150 -35 265.5t-97.5 186t-144.5 106.5t-180 36t-179.5 -36t-144 -106.5t-97.5 -186t-35 -265.5zM420 1681l323 189l330 -184l-84 -117l-250 135l-235 -135z" />
-<glyph unicode="Õ" horiz-adv-x="1490" d="M102 717q0 216 78 386t225 266.5t340 96.5q165 0 290 -55.5t201.5 -157t114.5 -236t38 -300.5q0 -207 -78 -377t-226 -271.5t-340 -101.5q-154 0 -277.5 58.5t-202.5 161.5t-121 238t-42 292zM289 717q0 -141 38 -256t102 -187.5t145 -111.5t171 -39q200 0 328.5 156 t128.5 438q0 150 -35 265.5t-97.5 186t-144.5 106.5t-180 36t-179.5 -36t-144 -106.5t-97.5 -186t-35 -265.5zM418 1722q68 95 176 95q63 0 153 -29t144 -29q82 0 141 62l41 -113q-29 -41 -74.5 -67.5t-101.5 -26.5q-63 0 -153 28.5t-144 28.5q-83 0 -141 -61z" />
-<glyph unicode="Ö" horiz-adv-x="1490" d="M102 717q0 216 78 386t225 266.5t340 96.5q165 0 290 -55.5t201.5 -157t114.5 -236t38 -300.5q0 -207 -78 -377t-226 -271.5t-340 -101.5q-154 0 -277.5 58.5t-202.5 161.5t-121 238t-42 292zM289 717q0 -141 38 -256t102 -187.5t145 -111.5t171 -39q200 0 328.5 156 t128.5 438q0 150 -35 265.5t-97.5 186t-144.5 106.5t-180 36t-179.5 -36t-144 -106.5t-97.5 -186t-35 -265.5zM457 1702q0 47 30.5 76.5t75.5 29.5q44 0 75.5 -31t31.5 -75t-31.5 -75.5t-75.5 -31.5t-75 31.5t-31 75.5zM821 1702q0 46 31 76t76 30t75.5 -29.5t30.5 -76.5 q0 -44 -31 -75.5t-75 -31.5t-75.5 31.5t-31.5 75.5z" />
-<glyph unicode="×" horiz-adv-x="970" d="M84 231l287 287l-285 285l119 119l284 -285l287 287l109 -109l-287 -287l287 -286l-119 -119l-287 287l-286 -287z" />
-<glyph unicode="Ø" horiz-adv-x="1490" d="M102 717q0 216 78 386t225 266.5t340 96.5q207 0 355 -90l133 205l104 -70l-139 -215q191 -194 191 -579q0 -207 -78 -377t-226 -271.5t-340 -101.5q-200 0 -348 96l-137 -210l-104 69l145 223q-97 102 -148 250t-51 322zM289 717q0 -252 114 -412l601 924 q-110 82 -259 82q-98 0 -179.5 -36t-144 -106.5t-97.5 -186t-35 -265.5zM494 211q110 -88 251 -88q200 0 328.5 156t128.5 438q0 264 -108 420z" />
-<glyph unicode="Ù" horiz-adv-x="1388" d="M172 487v947h178v-897q0 -208 89.5 -311t260.5 -103q163 0 252.5 96t89.5 285v930h175v-942q0 -87 -18.5 -163.5t-60 -143.5t-103 -115t-152 -75.5t-201.5 -27.5q-244 0 -377 136t-133 384zM451 1747l110 139l305 -241l-84 -107z" />
-<glyph unicode="Ú" horiz-adv-x="1388" d="M172 487v947h178v-897q0 -208 89.5 -311t260.5 -103q163 0 252.5 96t89.5 285v930h175v-942q0 -87 -18.5 -163.5t-60 -143.5t-103 -115t-152 -75.5t-201.5 -27.5q-244 0 -377 136t-133 384zM547 1645l305 241l111 -139l-332 -209z" />
-<glyph unicode="Û" horiz-adv-x="1388" d="M172 487v947h178v-897q0 -208 89.5 -311t260.5 -103q163 0 252.5 96t89.5 285v930h175v-942q0 -87 -18.5 -163.5t-60 -143.5t-103 -115t-152 -75.5t-201.5 -27.5q-244 0 -377 136t-133 384zM371 1681l323 189l330 -184l-84 -117l-250 135l-235 -135z" />
-<glyph unicode="Ü" horiz-adv-x="1388" d="M172 487v947h178v-897q0 -208 89.5 -311t260.5 -103q163 0 252.5 96t89.5 285v930h175v-942q0 -87 -18.5 -163.5t-60 -143.5t-103 -115t-152 -75.5t-201.5 -27.5q-244 0 -377 136t-133 384zM408 1702q0 47 30.5 76.5t75.5 29.5q44 0 75.5 -31t31.5 -75t-31.5 -75.5 t-75.5 -31.5t-75 31.5t-31 75.5zM772 1702q0 46 31 76t76 30t75.5 -29.5t30.5 -76.5q0 -44 -31 -75.5t-75 -31.5t-75.5 31.5t-31.5 75.5z" />
-<glyph unicode="Ý" horiz-adv-x="1124" d="M-2 1434h211l274 -543q48 -96 80 -178q26 66 86 178l285 543h203l-488 -869v-565h-178v565zM469 1645l305 241l111 -139l-332 -209z" />
-<glyph unicode="Þ" horiz-adv-x="1136" d="M188 0v1434h179v-217q110 4 182 4q264 0 393 -104t129 -326q0 -223 -148.5 -362.5t-402.5 -139.5q-92 0 -153 6v-295h-179zM367 442q62 -6 165 -6q357 0 357 336q0 301 -357 301q-83 0 -165 -8v-623z" />
-<glyph unicode="ß" horiz-adv-x="1132" d="M162 0v1094q0 108 35 190.5t96.5 132.5t141.5 75.5t175 25.5q156 0 251 -77.5t95 -201.5q0 -96 -38 -161t-119 -130q-53 -41 -77 -79t-24 -87q0 -35 20.5 -64t53.5 -51.5t72.5 -45.5t79.5 -51.5t73 -63.5t53.5 -87.5t20.5 -117.5q0 -135 -102.5 -230.5t-266.5 -95.5 q-125 0 -233 43l31 150q104 -51 223 -51q77 0 123.5 44.5t46.5 110.5q0 54 -27.5 98t-68.5 72.5t-88.5 61t-88.5 63t-68.5 80.5t-27.5 111q0 78 33 140.5t117 125.5q57 42 80.5 82t23.5 100q0 75 -51 121.5t-139 46.5q-122 0 -187 -73t-65 -236v-1065h-174z" />
-<glyph unicode="à" horiz-adv-x="1026" d="M78 281q0 109 66 184.5t177.5 110t262.5 34.5q63 0 121 -10v105q0 219 -228 219q-166 0 -295 -95l-49 140q155 100 371 100q180 0 275 -77t95 -255v-340q0 -101 3 -200t5 -148l3 -49q-52 -10 -78 -10q-100 0 -100 121v22q-115 -158 -330 -158q-129 0 -214 77t-85 229z M256 289q0 -81 46 -126.5t126 -45.5q163 0 277 159v201q-62 6 -158 6q-131 0 -211 -46.5t-80 -147.5zM272 1399l111 139l305 -242l-84 -106z" />
-<glyph unicode="á" horiz-adv-x="1026" d="M78 281q0 109 66 184.5t177.5 110t262.5 34.5q63 0 121 -10v105q0 219 -228 219q-166 0 -295 -95l-49 140q155 100 371 100q180 0 275 -77t95 -255v-340q0 -101 3 -200t5 -148l3 -49q-52 -10 -78 -10q-100 0 -100 121v22q-115 -158 -330 -158q-129 0 -214 77t-85 229z M256 289q0 -81 46 -126.5t126 -45.5q163 0 277 159v201q-62 6 -158 6q-131 0 -211 -46.5t-80 -147.5zM360 1296l306 242l110 -139l-332 -209z" />
-<glyph unicode="â" horiz-adv-x="1026" d="M78 281q0 109 66 184.5t177.5 110t262.5 34.5q63 0 121 -10v105q0 219 -228 219q-166 0 -295 -95l-49 140q155 100 371 100q180 0 275 -77t95 -255v-340q0 -101 3 -200t5 -148l3 -49q-52 -10 -78 -10q-100 0 -100 121v22q-115 -158 -330 -158q-129 0 -214 77t-85 229z M178 1333l324 189l329 -185l-83 -116l-250 135l-236 -135zM256 289q0 -81 46 -126.5t126 -45.5q163 0 277 159v201q-62 6 -158 6q-131 0 -211 -46.5t-80 -147.5z" />
-<glyph unicode="ã" horiz-adv-x="1026" d="M78 281q0 109 66 184.5t177.5 110t262.5 34.5q63 0 121 -10v105q0 219 -228 219q-166 0 -295 -95l-49 140q155 100 371 100q180 0 275 -77t95 -255v-340q0 -101 3 -200t5 -148l3 -49q-52 -10 -78 -10q-100 0 -100 121v22q-115 -158 -330 -158q-129 0 -214 77t-85 229z M176 1374q29 41 74.5 67.5t101.5 26.5q63 0 153 -28.5t144 -28.5q83 0 142 62l40 -113q-29 -41 -74.5 -67.5t-101.5 -26.5q-63 0 -153 28.5t-144 28.5q-83 0 -141 -61zM256 289q0 -81 46 -126.5t126 -45.5q163 0 277 159v201q-62 6 -158 6q-131 0 -211 -46.5t-80 -147.5z " />
-<glyph unicode="ä" horiz-adv-x="1026" d="M78 281q0 109 66 184.5t177.5 110t262.5 34.5q63 0 121 -10v105q0 219 -228 219q-166 0 -295 -95l-49 140q155 100 371 100q180 0 275 -77t95 -255v-340q0 -101 3 -200t5 -148l3 -49q-52 -10 -78 -10q-100 0 -100 121v22q-115 -158 -330 -158q-129 0 -214 77t-85 229z M215 1354q0 46 31 76t76 30q44 0 75 -31t31 -75t-31 -75.5t-75 -31.5t-75.5 31.5t-31.5 75.5zM256 289q0 -81 46 -126.5t126 -45.5q163 0 277 159v201q-62 6 -158 6q-131 0 -211 -46.5t-80 -147.5zM580 1354q0 47 30.5 76.5t75.5 29.5t76 -30t31 -76q0 -44 -31.5 -75.5 t-75.5 -31.5t-75 31.5t-31 75.5z" />
-<glyph unicode="å" horiz-adv-x="1026" d="M78 281q0 109 66 184.5t177.5 110t262.5 34.5q63 0 121 -10v105q0 219 -228 219q-166 0 -295 -95l-49 140q155 100 371 100q180 0 275 -77t95 -255v-340q0 -101 3 -200t5 -148l3 -49q-52 -10 -78 -10q-100 0 -100 121v22q-115 -158 -330 -158q-129 0 -214 77t-85 229z M256 289q0 -81 46 -126.5t126 -45.5q163 0 277 159v201q-62 6 -158 6q-131 0 -211 -46.5t-80 -147.5zM309 1382q0 86 57 140.5t138 54.5t137.5 -54.5t56.5 -140.5q0 -80 -57 -137t-137 -57t-137.5 57.5t-57.5 136.5zM414 1382q0 -37 26.5 -63.5t63.5 -26.5t63.5 26.5 t26.5 63.5q0 40 -26 65.5t-64 25.5t-64 -25.5t-26 -65.5z" />
-<glyph unicode="æ" horiz-adv-x="1662" d="M80 281q0 165 140 259.5t366 94.5q63 0 121 -10v80q0 219 -228 219q-166 0 -295 -95l-49 140q155 100 371 100q133 0 211 -42.5t108 -139.5q119 182 353 182q182 0 287.5 -116.5t105.5 -348.5q0 -52 -6 -104h-691q2 -88 24 -155t57 -109t84 -69t100.5 -37.5t111.5 -10.5 q139 0 258 53l31 -137q-128 -60 -319 -60q-328 0 -443 203q-138 -203 -399 -203q-129 0 -214 77t-85 229zM258 289q0 -81 46 -126.5t126 -45.5q170 0 291 196q-14 79 -14 172v17q-61 6 -158 6q-126 0 -208.5 -58t-82.5 -161zM883 635h514q0 135 -68 214t-170 79 q-110 0 -183.5 -70.5t-92.5 -222.5z" />
-<glyph unicode="ç" horiz-adv-x="940" d="M92 522q0 238 146 392.5t368 154.5q152 0 264 -53l-34 -150q-110 52 -226 52q-155 0 -247.5 -96t-92.5 -300q0 -93 20.5 -164t54.5 -115t82.5 -72t98.5 -39t109 -11q111 0 199 49l36 -141q-123 -54 -266 -54h-22l-11 -75l27 -4q68 -11 107.5 -50.5t39.5 -107.5 q0 -87 -61 -140t-166 -53q-84 0 -166 37l29 113q66 -41 133 -41q47 0 70.5 21t23.5 55q0 58 -61 80q-35 12 -109 16l23 162q-85 14 -150.5 49.5t-115.5 98t-76.5 159.5t-26.5 227z" />
-<glyph unicode="è" horiz-adv-x="1056" d="M94 522q0 242 131 394.5t348 152.5q181 0 287.5 -113t106.5 -331q0 -53 -6 -105h-691q0 -92 21 -163t55.5 -115.5t84 -72.5t102 -39t114.5 -11q139 0 258 53l31 -137q-128 -60 -320 -60q-95 0 -171 15.5t-143 54.5t-112 100.5t-70.5 156.5t-25.5 220zM279 655h514 q0 122 -68.5 197.5t-169.5 75.5q-108 0 -181.5 -67t-94.5 -206zM350 1399l111 139l305 -242l-84 -106z" />
-<glyph unicode="é" horiz-adv-x="1056" d="M94 522q0 242 131 394.5t348 152.5q181 0 287.5 -113t106.5 -331q0 -53 -6 -105h-691q0 -92 21 -163t55.5 -115.5t84 -72.5t102 -39t114.5 -11q139 0 258 53l31 -137q-128 -60 -320 -60q-95 0 -171 15.5t-143 54.5t-112 100.5t-70.5 156.5t-25.5 220zM279 655h514 q0 122 -68.5 197.5t-169.5 75.5q-108 0 -181.5 -67t-94.5 -206zM414 1296l305 242l110 -139l-331 -209z" />
-<glyph unicode="ê" horiz-adv-x="1056" d="M94 522q0 242 131 394.5t348 152.5q181 0 287.5 -113t106.5 -331q0 -53 -6 -105h-691q0 -92 21 -163t55.5 -115.5t84 -72.5t102 -39t114.5 -11q139 0 258 53l31 -137q-128 -60 -320 -60q-95 0 -171 15.5t-143 54.5t-112 100.5t-70.5 156.5t-25.5 220zM246 1333l323 189 l330 -185l-84 -116l-250 135l-235 -135zM279 655h514q0 122 -68.5 197.5t-169.5 75.5q-108 0 -181.5 -67t-94.5 -206z" />
-<glyph unicode="ë" horiz-adv-x="1056" d="M94 522q0 242 131 394.5t348 152.5q181 0 287.5 -113t106.5 -331q0 -53 -6 -105h-691q0 -92 21 -163t55.5 -115.5t84 -72.5t102 -39t114.5 -11q139 0 258 53l31 -137q-128 -60 -320 -60q-95 0 -171 15.5t-143 54.5t-112 100.5t-70.5 156.5t-25.5 220zM274 1354 q0 46 31 76t76 30q44 0 75 -31t31 -75t-31 -75.5t-75 -31.5t-75.5 31.5t-31.5 75.5zM279 655h514q0 122 -68.5 197.5t-169.5 75.5q-108 0 -181.5 -67t-94.5 -206zM639 1354q0 47 30.5 76.5t75.5 29.5t76 -30t31 -76q0 -44 -31.5 -75.5t-75.5 -31.5t-75 31.5t-31 75.5z" />
-<glyph unicode="ì" horiz-adv-x="497" d="M20 1399l111 139l305 -242l-84 -106zM162 0v1044h174v-1044h-174z" />
-<glyph unicode="í" horiz-adv-x="497" d="M82 1296l305 242l111 -139l-332 -209zM162 0v1044h174v-1044h-174z" />
-<glyph unicode="î" horiz-adv-x="497" d="M-78 1333l324 189l329 -185l-83 -116l-250 135l-236 -135zM162 0v1044h174v-1044h-174z" />
-<glyph unicode="ï" horiz-adv-x="497" d="M-39 1354q0 46 31 76t76 30q44 0 75 -31t31 -75t-31 -75.5t-75 -31.5t-75.5 31.5t-31.5 75.5zM162 0v1044h174v-1044h-174zM326 1354q0 47 30.5 76.5t75.5 29.5t76 -30t31 -76q0 -44 -31.5 -75.5t-75.5 -31.5t-75 31.5t-31 75.5z" />
-<glyph unicode="ð" horiz-adv-x="1138" d="M94 498q0 223 125.5 367.5t345.5 144.5q157 0 244 -115q-68 177 -207 309l-246 -164l-71 111l213 141q-107 75 -230 125l101 117q159 -61 278 -152l230 152l73 -113l-200 -133q274 -281 274 -749q0 -159 -52 -285t-159 -202.5t-254 -76.5q-115 0 -205 41.5t-146 114 t-85 166t-29 201.5zM272 498q0 -172 81 -274.5t206 -102.5q135 0 211 101t76 276q0 366 -287 366t-287 -366z" />
-<glyph unicode="ñ" horiz-adv-x="1148" d="M154 1044q57 11 77 11q101 0 101 -121v-23q118 158 330 158q69 0 127 -19t106.5 -59t76 -111.5t27.5 -168.5v-711h-174v664q0 254 -215 254q-161 0 -272 -156v-762h-174v647q0 101 -2.5 200t-5.5 148zM254 1374q29 41 74.5 67.5t101.5 26.5q63 0 153 -28.5t144 -28.5 q82 0 141 62l41 -113q-29 -41 -74.5 -67.5t-101.5 -26.5q-63 0 -153 28.5t-144 28.5q-83 0 -141 -61z" />
-<glyph unicode="ò" horiz-adv-x="1142" d="M94 522q0 156 54.5 278.5t164 195.5t258.5 73q128 0 222.5 -41.5t149 -117t80.5 -172t26 -216.5q0 -111 -32 -209.5t-91.5 -174t-151 -119.5t-203.5 -44q-120 0 -213 44t-149.5 120t-85.5 173t-29 210zM272 522q0 -185 83 -293t216 -108q145 0 222 105.5t77 295.5 q0 199 -76 300.5t-223 101.5t-223 -101.5t-76 -300.5zM342 1399l111 139l305 -242l-84 -106z" />
-<glyph unicode="ó" horiz-adv-x="1142" d="M94 522q0 156 54.5 278.5t164 195.5t258.5 73q128 0 222.5 -41.5t149 -117t80.5 -172t26 -216.5q0 -111 -32 -209.5t-91.5 -174t-151 -119.5t-203.5 -44q-120 0 -213 44t-149.5 120t-85.5 173t-29 210zM272 522q0 -185 83 -293t216 -108q145 0 222 105.5t77 295.5 q0 199 -76 300.5t-223 101.5t-223 -101.5t-76 -300.5zM426 1296l305 242l111 -139l-332 -209z" />
-<glyph unicode="ô" horiz-adv-x="1142" d="M94 522q0 156 54.5 278.5t164 195.5t258.5 73q128 0 222.5 -41.5t149 -117t80.5 -172t26 -216.5q0 -111 -32 -209.5t-91.5 -174t-151 -119.5t-203.5 -44q-120 0 -213 44t-149.5 120t-85.5 173t-29 210zM246 1333l323 189l330 -185l-84 -116l-250 135l-235 -135zM272 522 q0 -185 83 -293t216 -108q145 0 222 105.5t77 295.5q0 199 -76 300.5t-223 101.5t-223 -101.5t-76 -300.5z" />
-<glyph unicode="õ" horiz-adv-x="1142" d="M94 522q0 156 54.5 278.5t164 195.5t258.5 73q128 0 222.5 -41.5t149 -117t80.5 -172t26 -216.5q0 -111 -32 -209.5t-91.5 -174t-151 -119.5t-203.5 -44q-120 0 -213 44t-149.5 120t-85.5 173t-29 210zM244 1374q29 41 74.5 67.5t101.5 26.5q63 0 153 -28.5t144 -28.5 q82 0 141 62l41 -113q-29 -41 -74.5 -67.5t-101.5 -26.5q-63 0 -153 28.5t-144 28.5q-83 0 -141 -61zM272 522q0 -185 83 -293t216 -108q145 0 222 105.5t77 295.5q0 199 -76 300.5t-223 101.5t-223 -101.5t-76 -300.5z" />
-<glyph unicode="ö" horiz-adv-x="1142" d="M94 522q0 156 54.5 278.5t164 195.5t258.5 73q128 0 222.5 -41.5t149 -117t80.5 -172t26 -216.5q0 -111 -32 -209.5t-91.5 -174t-151 -119.5t-203.5 -44q-120 0 -213 44t-149.5 120t-85.5 173t-29 210zM272 522q0 -185 83 -293t216 -108q145 0 222 105.5t77 295.5 q0 199 -76 300.5t-223 101.5t-223 -101.5t-76 -300.5zM283 1354q0 47 30.5 76.5t75.5 29.5q44 0 75.5 -31t31.5 -75t-31.5 -75.5t-75.5 -31.5t-75 31.5t-31 75.5zM647 1354q0 46 31 76t76 30t75.5 -29.5t30.5 -76.5q0 -44 -31 -75.5t-75 -31.5t-75.5 31.5t-31.5 75.5z" />
-<glyph unicode="÷" horiz-adv-x="1130" d="M88 446v154h954v-154h-954zM442 94q0 54 35.5 88.5t87.5 34.5t87.5 -34.5t35.5 -88.5q0 -51 -36 -87t-87 -36t-87 36t-36 87zM442 950q0 54 35.5 88.5t87.5 34.5t87.5 -34.5t35.5 -88.5q0 -51 -36 -87t-87 -36t-87 36t-36 87z" />
-<glyph unicode="ø" horiz-adv-x="1142" d="M94 522q0 156 54.5 278.5t164 195.5t258.5 73q143 0 250 -55l97 147l100 -65l-100 -156q131 -140 131 -418q0 -111 -32 -209.5t-91.5 -174t-151 -119.5t-203.5 -44q-136 0 -243 60l-99 -152l-100 66l104 160q-139 148 -139 413zM272 522q0 -158 60 -260l401 617 q-62 45 -162 45q-147 0 -223 -101.5t-76 -300.5zM416 170q64 -49 155 -49q145 0 222 105.5t77 295.5q0 164 -53 264z" />
-<glyph unicode="ù" horiz-adv-x="1146" d="M150 334v710h174v-663q0 -254 215 -254q160 0 272 154v763h174v-647q0 -101 2.5 -200t4.5 -148l3 -49q-52 -10 -77 -10q-101 0 -101 121v22q-115 -158 -330 -158q-69 0 -127 19t-106.5 59.5t-76 112t-27.5 168.5zM295 1399l111 139l305 -242l-84 -106z" />
-<glyph unicode="ú" horiz-adv-x="1146" d="M150 334v710h174v-663q0 -254 215 -254q160 0 272 154v763h174v-647q0 -101 2.5 -200t4.5 -148l3 -49q-52 -10 -77 -10q-101 0 -101 121v22q-115 -158 -330 -158q-69 0 -127 19t-106.5 59.5t-76 112t-27.5 168.5zM444 1296l306 242l110 -139l-332 -209z" />
-<glyph unicode="û" horiz-adv-x="1146" d="M150 334v710h174v-663q0 -254 215 -254q160 0 272 154v763h174v-647q0 -101 2.5 -200t4.5 -148l3 -49q-52 -10 -77 -10q-101 0 -101 121v22q-115 -158 -330 -158q-69 0 -127 19t-106.5 59.5t-76 112t-27.5 168.5zM242 1333l323 189l330 -185l-84 -116l-250 135l-235 -135 z" />
-<glyph unicode="ü" horiz-adv-x="1146" d="M150 334v710h174v-663q0 -254 215 -254q160 0 272 154v763h174v-647q0 -101 2.5 -200t4.5 -148l3 -49q-52 -10 -77 -10q-101 0 -101 121v22q-115 -158 -330 -158q-69 0 -127 19t-106.5 59.5t-76 112t-27.5 168.5zM279 1354q0 47 30.5 76.5t75.5 29.5q44 0 75.5 -31 t31.5 -75t-31.5 -75.5t-75.5 -31.5t-75 31.5t-31 75.5zM643 1354q0 46 31 76t76 30t75.5 -29.5t30.5 -76.5q0 -44 -31 -75.5t-75 -31.5t-75.5 31.5t-31.5 75.5z" />
-<glyph unicode="ý" d="M27 1044h188l236 -665q39 -111 65 -240q25 110 70 240l227 665h184l-385 -1044q-95 -257 -197.5 -365t-267.5 -108q-28 0 -49 6l-24 145q24 -6 55 -6q57 0 99 14t87 61t80 130l39 92q-24 47 -51 123zM395 1296l305 242l111 -139l-332 -209z" />
-<glyph unicode="þ" horiz-adv-x="1153" d="M162 -455v1942l174 12v-381q0 -128 -10 -213q113 164 333 164q84 0 155 -30.5t126.5 -91t87 -161t31.5 -231.5q0 -135 -42 -245.5t-116 -183t-173 -112t-214 -39.5q-92 0 -186 23q8 -98 8 -199v-241zM336 160q83 -39 203 -39q146 0 244 107t98 302q0 192 -72 290t-201 98 q-161 0 -272 -156v-602z" />
-<glyph unicode="ÿ" d="M27 1044h188l236 -665q39 -111 65 -240q25 110 70 240l227 665h184l-385 -1044q-95 -257 -197.5 -365t-267.5 -108q-28 0 -49 6l-24 145q24 -6 55 -6q57 0 99 14t87 61t80 130l39 92q-24 47 -51 123zM225 1354q0 46 31 76t76 30q44 0 75 -31t31 -75t-31 -75.5t-75 -31.5 t-75.5 31.5t-31.5 75.5zM590 1354q0 47 30.5 76.5t75.5 29.5t76 -30t31 -76q0 -44 -31.5 -75.5t-75.5 -31.5t-75 31.5t-31 75.5z" />
-<glyph unicode="Œ" horiz-adv-x="1875" d="M104 717q0 216 78.5 383.5t225.5 261.5t340 94q109 0 219 -22h788v-154h-643v-463h578v-147h-578v-516h649v-154h-805q-115 -23 -208 -23q-124 0 -228.5 37t-180.5 104t-129.5 159.5t-79.5 203.5t-26 236zM291 717q0 -141 38 -254.5t102.5 -184t145.5 -108t171 -37.5 q102 0 190 25v1118q-84 24 -190 24q-98 0 -179.5 -34t-144.5 -103t-98 -182.5t-35 -263.5z" />
-<glyph unicode="œ" horiz-adv-x="1832" d="M94 522q0 156 54.5 278.5t164 195.5t258.5 73q290 0 390 -227q58 108 157.5 167.5t231.5 59.5q181 0 287 -113t106 -331q0 -53 -6 -105h-690q0 -92 20.5 -163t55 -115.5t84 -72.5t102 -39t114.5 -11q139 0 258 53l31 -137q-128 -60 -319 -60q-165 0 -277.5 52.5 t-169.5 175.5q-56 -107 -151 -167.5t-224 -60.5q-120 0 -213 44t-149.5 120t-85.5 173t-29 210zM272 522q0 -185 83 -293t216 -108q145 0 222 105.5t77 295.5q0 199 -76 300.5t-223 101.5t-223 -101.5t-76 -300.5zM1055 655h514q0 122 -68.5 197.5t-169.5 75.5 q-108 0 -181.5 -67t-94.5 -206z" />
-<glyph unicode="Ÿ" horiz-adv-x="1124" d="M-2 1434h211l274 -543q48 -96 80 -178q26 66 86 178l285 543h203l-488 -869v-565h-178v565zM283 1702q0 47 30.5 76.5t75.5 29.5q44 0 75.5 -31t31.5 -75t-31.5 -75.5t-75.5 -31.5t-75 31.5t-31 75.5zM647 1702q0 46 31 76t76 30t75.5 -29.5t30.5 -76.5q0 -44 -31 -75.5 t-75 -31.5t-75.5 31.5t-31.5 75.5z" />
-<glyph unicode="ˆ" d="M186 1333l324 189l330 -185l-84 -116l-250 135l-236 -135z" />
-<glyph unicode="˜" d="M184 1374q29 41 74.5 67.5t101.5 26.5q63 0 153 -28.5t144 -28.5q83 0 142 62l41 -113q-29 -41 -74.5 -67.5t-101.5 -26.5q-63 0 -153 28.5t-144 28.5q-84 0 -142 -61z" />
-<glyph unicode=" " horiz-adv-x="962" />
-<glyph unicode=" " horiz-adv-x="1925" />
-<glyph unicode=" " horiz-adv-x="962" />
-<glyph unicode=" " horiz-adv-x="1925" />
-<glyph unicode=" " horiz-adv-x="641" />
-<glyph unicode=" " horiz-adv-x="481" />
-<glyph unicode=" " horiz-adv-x="320" />
-<glyph unicode=" " horiz-adv-x="320" />
-<glyph unicode=" " horiz-adv-x="240" />
-<glyph unicode=" " horiz-adv-x="385" />
-<glyph unicode=" " horiz-adv-x="106" />
-<glyph unicode="‐" horiz-adv-x="794" d="M137 481v156h520v-156h-520z" />
-<glyph unicode="‑" horiz-adv-x="794" d="M137 481v156h520v-156h-520z" />
-<glyph unicode="‒" horiz-adv-x="794" d="M137 481v156h520v-156h-520z" />
-<glyph unicode="–" horiz-adv-x="1298" d="M137 481v154h1024v-154h-1024z" />
-<glyph unicode="—" horiz-adv-x="2322" d="M137 481v154h2048v-154h-2048z" />
-<glyph unicode="‘" horiz-adv-x="440" d="M100 1190q0 148 75 253.5t194 133.5l32 -102q-65 -13 -101 -67.5t-36 -135.5q31 -5 56.5 -35t25.5 -78q0 -54 -35.5 -88.5t-87.5 -34.5q-55 0 -89 36.5t-34 117.5z" />
-<glyph unicode="’" horiz-adv-x="462" d="M88 1110q65 13 101 67.5t36 135.5q-31 5 -56.5 34.5t-25.5 77.5q0 54 35.5 88.5t87.5 34.5q55 0 89 -36t34 -117q0 -149 -74.5 -254t-193.5 -133z" />
-<glyph unicode="‚" horiz-adv-x="491" d="M68 -221q65 13 101 67.5t36 135.5q-31 5 -56.5 34.5t-25.5 77.5q0 54 35.5 88.5t87.5 34.5q55 0 89 -36.5t34 -117.5q0 -148 -75 -253.5t-194 -133.5z" />
-<glyph unicode="“" horiz-adv-x="849" d="M100 1190q0 148 75 253.5t194 133.5l32 -102q-65 -13 -101 -67.5t-36 -135.5q31 -5 56.5 -35t25.5 -78q0 -54 -35.5 -88.5t-87.5 -34.5q-55 0 -89 36.5t-34 117.5zM510 1190q0 149 74.5 254t193.5 133l33 -102q-65 -13 -101 -67.5t-36 -135.5q31 -5 56.5 -35t25.5 -78 q0 -54 -35.5 -88.5t-87.5 -34.5q-55 0 -89 36.5t-34 117.5z" />
-<glyph unicode="”" horiz-adv-x="872" d="M88 1110q65 13 101 67.5t36 135.5q-31 5 -56.5 34.5t-25.5 77.5q0 54 35.5 88.5t87.5 34.5q55 0 89 -36t34 -117q0 -149 -74.5 -254t-193.5 -133zM498 1110q65 13 101 67.5t36 135.5q-31 5 -56.5 34.5t-25.5 77.5q0 54 35.5 88.5t87.5 34.5q55 0 89 -36t34 -117 q0 -148 -75 -253.5t-194 -133.5z" />
-<glyph unicode="„" horiz-adv-x="901" d="M68 -221q65 13 101 67.5t36 135.5q-31 5 -56.5 34.5t-25.5 77.5q0 54 35.5 88.5t87.5 34.5q55 0 89 -36.5t34 -117.5q0 -148 -75 -253.5t-194 -133.5zM477 -221q65 13 101 67.5t36 135.5q-31 5 -56.5 34.5t-25.5 77.5q0 54 35.5 88.5t87.5 34.5q55 0 89 -36.5t34 -117.5 q0 -149 -74.5 -254t-193.5 -133z" />
-<glyph unicode="•" horiz-adv-x="733" d="M109 657q0 112 74.5 185t183.5 73t183.5 -73t74.5 -185q0 -107 -75.5 -182.5t-182.5 -75.5t-182.5 75.5t-75.5 182.5z" />
-<glyph unicode="…" horiz-adv-x="1466" d="M123 94q0 54 35.5 88.5t87.5 34.5t87.5 -34.5t35.5 -88.5q0 -51 -36 -87t-87 -36t-87 36t-36 87zM610 94q0 54 35.5 88.5t87.5 34.5t87.5 -34.5t35.5 -88.5q0 -51 -36 -87t-87 -36t-87 36t-36 87zM1098 94q0 54 35.5 88.5t87.5 34.5t87 -34t35 -89q0 -51 -35.5 -87 t-86.5 -36t-87 36t-36 87z" />
-<glyph unicode=" " horiz-adv-x="385" />
-<glyph unicode="‹" horiz-adv-x="571" d="M82 522l242 428l143 -61l-203 -365l203 -368l-148 -62z" />
-<glyph unicode="›" horiz-adv-x="571" d="M104 156l203 364l-203 369l148 61l237 -428l-241 -428z" />
-<glyph unicode=" " horiz-adv-x="481" />
-<glyph unicode="€" horiz-adv-x="1208" d="M63 518v135h136q-2 23 -2 64q0 42 2 65h-136v136h152q48 255 215 401.5t424 146.5q132 0 274 -43l-20 -168q-47 22 -118.5 38t-131.5 16q-393 0 -463 -391h590v-136h-604q-2 -20 -2 -65q0 -44 2 -64h604v-135h-588q41 -193 160.5 -294t304.5 -101q62 0 133 15t113 36 l20 -156q-119 -51 -274 -51q-564 0 -645 551h-146z" />
-<glyph unicode="™" horiz-adv-x="1693" d="M43 1321v113h596v-113h-225v-604h-146v604h-225zM700 717l76 717h158l162 -426q17 -46 39 -127q14 45 45 127l170 426h157l70 -717h-143l-21 305q-10 137 -10 233q-29 -96 -51 -151l-158 -387h-123l-149 387q-29 75 -54 162q0 -39 -14 -244l-25 -305h-129z" />
-<glyph unicode="◼" horiz-adv-x="1044" d="M0 0v1044h1044v-1044h-1044z" />
-<hkern u1=""" u2="î" k="-16" />
-<hkern u1="$" u2="7" k="20" />
-<hkern u1="&" u2="’" k="145" />
-<hkern u1="&" u2="v" k="76" />
-<hkern u1="&" u2="f" k="16" />
-<hkern u1="&" u2="V" k="111" />
-<hkern u1="'" u2="î" k="-16" />
-<hkern u1="(" u2="ð" k="35" />
-<hkern u1="(" u2="ß" k="25" />
-<hkern u1="(" u2="v" k="29" />
-<hkern u1="(" u2="p" k="33" />
-<hkern u1="(" u2="j" k="-47" />
-<hkern u1="(" u2="f" k="23" />
-<hkern u1="(" u2="8" k="27" />
-<hkern u1="(" u2="6" k="35" />
-<hkern u1="(" u2="4" k="20" />
-<hkern u1="(" u2="2" k="25" />
-<hkern u1="(" u2="1" k="41" />
-<hkern u1="(" u2="0" k="41" />
-<hkern u1="*" u2="ð" k="31" />
-<hkern u1="*" u2="ï" k="-57" />
-<hkern u1="*" u2="î" k="-86" />
-<hkern u1="+" u2="7" k="39" />
-<hkern u1="+" u2="3" k="20" />
-<hkern u1="+" u2="2" k="33" />
-<hkern u1="," u2="9" k="20" />
-<hkern u1="," u2="8" k="25" />
-<hkern u1="," u2="7" k="47" />
-<hkern u1="," u2="6" k="41" />
-<hkern u1="," u2="1" k="51" />
-<hkern u1="-" u2="8" k="41" />
-<hkern u1="-" u2="7" k="49" />
-<hkern u1="-" u2="6" k="31" />
-<hkern u1="-" u2="3" k="39" />
-<hkern u1="-" u2="2" k="33" />
-<hkern u1="." u2="v" k="53" />
-<hkern u1="." u2="f" k="27" />
-<hkern u1="." u2="V" k="102" />
-<hkern u1="." u2="9" k="25" />
-<hkern u1="." u2="8" k="25" />
-<hkern u1="." u2="7" k="49" />
-<hkern u1="." u2="6" k="41" />
-<hkern u1="." u2="3" k="25" />
-<hkern u1="." u2="1" k="51" />
-<hkern u1="/" u2="ï" k="-10" />
-<hkern u1="/" u2="î" k="-45" />
-<hkern u1="/" u2="4" k="39" />
-<hkern u1="/" u2="0" k="20" />
-<hkern u1="/" u2="/" k="436" />
-<hkern u1="0" u2="°" k="51" />
-<hkern u1="0" u2="}" k="37" />
-<hkern u1="0" u2="]" k="35" />
-<hkern u1="0" u2=")" k="41" />
-<hkern u1="1" u2="°" k="20" />
-<hkern u1="1" u2="}" k="33" />
-<hkern u1="1" u2="]" k="33" />
-<hkern u1="1" u2="\" k="20" />
-<hkern u1="1" u2=")" k="35" />
-<hkern u1="2" u2="°" k="41" />
-<hkern u1="2" u2=")" k="20" />
-<hkern u1="3" u2="°" k="53" />
-<hkern u1="3" u2="-" k="20" />
-<hkern u1="4" u2="°" k="70" />
-<hkern u1="4" u2="\" k="41" />
-<hkern u1="4" u2="7" k="35" />
-<hkern u1="4" u2="1" k="33" />
-<hkern u1="5" u2="÷" k="35" />
-<hkern u1="5" u2="·" k="39" />
-<hkern u1="5" u2="°" k="27" />
-<hkern u1="5" u2="-" k="43" />
-<hkern u1="6" u2="." k="33" />
-<hkern u1="6" u2="-" k="29" />
-<hkern u1="6" u2="," k="33" />
-<hkern u1="7" u2="÷" k="33" />
-<hkern u1="7" u2="·" k="31" />
-<hkern u1="7" u2="]" k="20" />
-<hkern u1="7" u2="4" k="41" />
-<hkern u1="7" u2="/" k="45" />
-<hkern u1="7" u2="." k="72" />
-<hkern u1="7" u2="-" k="37" />
-<hkern u1="7" u2="," k="72" />
-<hkern u1="7" u2=")" k="25" />
-<hkern u1="8" u2="·" k="23" />
-<hkern u1="8" u2="." k="35" />
-<hkern u1="8" u2="-" k="39" />
-<hkern u1="8" u2="," k="33" />
-<hkern u1="8" u2=")" k="23" />
-<hkern u1="9" u2="°" k="61" />
-<hkern u1="9" u2=")" k="25" />
-<hkern u1=">" u2="7" k="35" />
-<hkern u1=">" u2="2" k="31" />
-<hkern u1="@" u2="’" k="41" />
-<hkern u1="@" u2="Y" k="55" />
-<hkern u1="@" u2="W" k="27" />
-<hkern u1="@" u2="V" k="37" />
-<hkern u1="@" u2="T" k="70" />
-<hkern u1="B" u2="x" k="10" />
-<hkern u1="B" u2=";" k="18" />
-<hkern u1="B" u2=":" k="18" />
-<hkern u1="B" u2="," k="37" />
-<hkern u1="B" u2=")" k="27" />
-<hkern u1="C" u2="ð" k="45" />
-<hkern u1="C" u2="ï" k="-25" />
-<hkern u1="C" u2="î" k="-49" />
-<hkern u1="E" u2="ð" k="23" />
-<hkern u1="E" u2="ß" k="12" />
-<hkern u1="F" u2="ð" k="27" />
-<hkern u1="F" u2="ï" k="-14" />
-<hkern u1="F" u2="î" k="-49" />
-<hkern u1="F" u2="ß" k="20" />
-<hkern u1="F" u2="x" k="57" />
-<hkern u1="F" u2="v" k="12" />
-<hkern u1="F" u2="p" k="45" />
-<hkern u1="F" u2="b" k="10" />
-<hkern u1="F" u2=";" k="35" />
-<hkern u1="F" u2=":" k="35" />
-<hkern u1="F" u2="/" k="55" />
-<hkern u1="F" u2="," k="96" />
-<hkern u1="J" u2="ð" k="16" />
-<hkern u1="J" u2="ß" k="14" />
-<hkern u1="K" u2="ð" k="49" />
-<hkern u1="K" u2="ï" k="-47" />
-<hkern u1="K" u2="î" k="-33" />
-<hkern u1="L" u2="ð" k="12" />
-<hkern u1="L" u2="·" k="254" />
-<hkern u1="M" u2="v" k="20" />
-<hkern u1="P" u2="ð" k="29" />
-<hkern u1="P" u2="p" k="10" />
-<hkern u1="P" u2="X" k="12" />
-<hkern u1="P" u2=";" k="18" />
-<hkern u1="P" u2=":" k="18" />
-<hkern u1="P" u2="/" k="53" />
-<hkern u1="P" u2="," k="145" />
-<hkern u1="P" u2="&" k="12" />
-<hkern u1="R" u2="ß" k="23" />
-<hkern u1="T" u2="™" k="-55" />
-<hkern u1="T" u2="ð" k="82" />
-<hkern u1="T" u2="ï" k="-72" />
-<hkern u1="T" u2="î" k="-109" />
-<hkern u1="T" u2="ß" k="18" />
-<hkern u1="T" u2="@" k="68" />
-<hkern u1="U" u2="ð" k="14" />
-<hkern u1="U" u2="ß" k="20" />
-<hkern u1="V" u2="ð" k="57" />
-<hkern u1="V" u2="ï" k="-80" />
-<hkern u1="V" u2="î" k="-98" />
-<hkern u1="V" u2="ì" k="-29" />
-<hkern u1="V" u2="ß" k="18" />
-<hkern u1="V" u2="x" k="12" />
-<hkern u1="V" u2="p" k="66" />
-<hkern u1="V" u2="@" k="43" />
-<hkern u1="V" u2=";" k="49" />
-<hkern u1="V" u2=":" k="49" />
-<hkern u1="V" u2="/" k="59" />
-<hkern u1="V" u2="," k="106" />
-<hkern u1="V" u2="&" k="18" />
-<hkern u1="W" u2="ð" k="51" />
-<hkern u1="W" u2="ï" k="-72" />
-<hkern u1="W" u2="î" k="-96" />
-<hkern u1="W" u2="ì" k="-20" />
-<hkern u1="W" u2="ß" k="14" />
-<hkern u1="W" u2="@" k="33" />
-<hkern u1="X" u2="ð" k="33" />
-<hkern u1="X" u2="v" k="59" />
-<hkern u1="X" u2="p" k="10" />
-<hkern u1="Y" u2="ð" k="74" />
-<hkern u1="Y" u2="ï" k="-92" />
-<hkern u1="Y" u2="î" k="-100" />
-<hkern u1="Y" u2="ì" k="-41" />
-<hkern u1="Y" u2="ß" k="18" />
-<hkern u1="Y" u2="@" k="59" />
-<hkern u1="Z" u2="ð" k="41" />
-<hkern u1="Z" u2="î" k="-39" />
-<hkern u1="Z" u2="ß" k="12" />
-<hkern u1="[" u2="ð" k="29" />
-<hkern u1="[" u2="ï" k="-39" />
-<hkern u1="[" u2="v" k="31" />
-<hkern u1="[" u2="p" k="33" />
-<hkern u1="[" u2="j" k="-63" />
-<hkern u1="[" u2="6" k="27" />
-<hkern u1="[" u2="2" k="25" />
-<hkern u1="[" u2="1" k="35" />
-<hkern u1="[" u2="0" k="35" />
-<hkern u1="\" u2="’" k="61" />
-<hkern u1="\" u2="v" k="43" />
-<hkern u1="\" u2="j" k="-41" />
-<hkern u1="\" u2="V" k="59" />
-<hkern u1="\" u2="6" k="23" />
-<hkern u1="\" u2="1" k="37" />
-<hkern u1="a" u2="Z" k="20" />
-<hkern u1="a" u2="Y" k="135" />
-<hkern u1="a" u2="W" k="70" />
-<hkern u1="a" u2="V" k="92" />
-<hkern u1="a" u2="T" k="174" />
-<hkern u1="a" u2="M" k="10" />
-<hkern u1="a" u2="J" k="16" />
-<hkern u1="c" u2="ð" k="16" />
-<hkern u1="c" u2="Y" k="33" />
-<hkern u1="c" u2="W" k="10" />
-<hkern u1="c" u2="V" k="20" />
-<hkern u1="c" u2="T" k="82" />
-<hkern u1="d" u2="J" k="14" />
-<hkern u1="e" u2="Z" k="14" />
-<hkern u1="e" u2="Y" k="158" />
-<hkern u1="e" u2="W" k="55" />
-<hkern u1="e" u2="V" k="76" />
-<hkern u1="e" u2="T" k="184" />
-<hkern u1="e" u2="J" k="10" />
-<hkern u1="f" u2="™" k="-98" />
-<hkern u1="f" u2="ï" k="-76" />
-<hkern u1="f" u2="î" k="-123" />
-<hkern u1="f" u2="ì" k="-23" />
-<hkern u1="f" u2="}" k="-29" />
-<hkern u1="f" u2="]" k="-33" />
-<hkern u1="f" u2="\" k="-20" />
-<hkern u1="f" u2="Y" k="-82" />
-<hkern u1="f" u2="X" k="-10" />
-<hkern u1="f" u2="W" k="-47" />
-<hkern u1="f" u2="V" k="-55" />
-<hkern u1="f" u2="T" k="-55" />
-<hkern u1="f" u2="?" k="-16" />
-<hkern u1="f" u2="/" k="39" />
-<hkern u1="f" u2="," k="61" />
-<hkern u1="f" u2="&" k="31" />
-<hkern u1="g" u2="Y" k="10" />
-<hkern u1="g" u2="T" k="43" />
-<hkern u1="g" u2="J" k="-20" />
-<hkern u1="k" u2="Y" k="18" />
-<hkern u1="k" u2="T" k="123" />
-<hkern u1="l" u2="·" k="133" />
-<hkern u1="l" u2="M" k="10" />
-<hkern u1="l" u2="J" k="14" />
-<hkern u1="o" u2="Z" k="41" />
-<hkern u1="o" u2="Y" k="145" />
-<hkern u1="o" u2="X" k="41" />
-<hkern u1="o" u2="W" k="70" />
-<hkern u1="o" u2="V" k="82" />
-<hkern u1="o" u2="T" k="174" />
-<hkern u1="o" u2="S" k="16" />
-<hkern u1="o" u2="J" k="14" />
-<hkern u1="q" u2="}" k="33" />
-<hkern u1="q" u2="]" k="33" />
-<hkern u1="q" u2="Z" k="23" />
-<hkern u1="q" u2="Y" k="133" />
-<hkern u1="q" u2="X" k="10" />
-<hkern u1="q" u2="W" k="63" />
-<hkern u1="q" u2="V" k="72" />
-<hkern u1="q" u2="T" k="158" />
-<hkern u1="q" u2="J" k="14" />
-<hkern u1="q" u2="?" k="27" />
-<hkern u1="q" u2="*" k="20" />
-<hkern u1="q" u2=")" k="33" />
-<hkern u1="r" u2="ð" k="31" />
-<hkern u1="r" u2="Z" k="55" />
-<hkern u1="r" u2="Y" k="18" />
-<hkern u1="r" u2="X" k="61" />
-<hkern u1="r" u2="T" k="86" />
-<hkern u1="r" u2="M" k="23" />
-<hkern u1="r" u2="J" k="10" />
-<hkern u1="r" u2="@" k="25" />
-<hkern u1="s" u2="Z" k="10" />
-<hkern u1="s" u2="Y" k="68" />
-<hkern u1="s" u2="W" k="33" />
-<hkern u1="s" u2="V" k="49" />
-<hkern u1="s" u2="T" k="96" />
-<hkern u1="s" u2="J" k="10" />
-<hkern u1="t" u2="Y" k="33" />
-<hkern u1="t" u2="W" k="10" />
-<hkern u1="t" u2="V" k="14" />
-<hkern u1="t" u2="T" k="123" />
-<hkern u1="u" u2="Z" k="25" />
-<hkern u1="u" u2="Y" k="106" />
-<hkern u1="u" u2="X" k="10" />
-<hkern u1="u" u2="W" k="59" />
-<hkern u1="u" u2="V" k="68" />
-<hkern u1="u" u2="T" k="156" />
-<hkern u1="u" u2="J" k="14" />
-<hkern u1="v" u2="ð" k="10" />
-<hkern u1="v" u2="}" k="29" />
-<hkern u1="v" u2="]" k="31" />
-<hkern u1="v" u2="Z" k="43" />
-<hkern u1="v" u2="Y" k="23" />
-<hkern u1="v" u2="X" k="57" />
-<hkern u1="v" u2="T" k="98" />
-<hkern u1="v" u2="M" k="23" />
-<hkern u1="v" u2="J" k="12" />
-<hkern u1="v" u2="/" k="43" />
-<hkern u1="v" u2="," k="55" />
-<hkern u1="v" u2=")" k="29" />
-<hkern u1="v" u2="&" k="23" />
-<hkern u1="w" u2="ð" k="8" />
-<hkern u1="w" u2="Z" k="41" />
-<hkern u1="w" u2="Y" k="25" />
-<hkern u1="w" u2="X" k="49" />
-<hkern u1="w" u2="T" k="100" />
-<hkern u1="w" u2="M" k="18" />
-<hkern u1="w" u2="J" k="10" />
-<hkern u1="x" u2="ð" k="18" />
-<hkern u1="x" u2="Y" k="29" />
-<hkern u1="x" u2="V" k="12" />
-<hkern u1="x" u2="T" k="127" />
-<hkern u1="x" u2="&" k="18" />
-<hkern u1="y" u2="ð" k="8" />
-<hkern u1="y" u2="Z" k="41" />
-<hkern u1="y" u2="Y" k="23" />
-<hkern u1="y" u2="X" k="55" />
-<hkern u1="y" u2="T" k="98" />
-<hkern u1="y" u2="M" k="20" />
-<hkern u1="y" u2="J" k="10" />
-<hkern u1="z" u2="ð" k="8" />
-<hkern u1="z" u2="Y" k="35" />
-<hkern u1="z" u2="W" k="20" />
-<hkern u1="z" u2="V" k="25" />
-<hkern u1="z" u2="T" k="78" />
-<hkern u1="z" u2="J" k="10" />
-<hkern u1="{" u2="ð" k="31" />
-<hkern u1="{" u2="ï" k="-37" />
-<hkern u1="{" u2="v" k="29" />
-<hkern u1="{" u2="p" k="33" />
-<hkern u1="{" u2="j" k="-61" />
-<hkern u1="{" u2="8" k="20" />
-<hkern u1="{" u2="6" k="29" />
-<hkern u1="{" u2="2" k="25" />
-<hkern u1="{" u2="1" k="37" />
-<hkern u1="{" u2="0" k="37" />
-<hkern u1="¡" u2="V" k="20" />
-<hkern u1="°" u2="9" k="53" />
-<hkern u1="°" u2="6" k="35" />
-<hkern u1="°" u2="5" k="31" />
-<hkern u1="°" u2="4" k="74" />
-<hkern u1="°" u2="3" k="29" />
-<hkern u1="°" u2="1" k="39" />
-<hkern u1="°" u2="0" k="57" />
-<hkern u1="·" u2="l" k="131" />
-<hkern u1="·" u2="L" k="33" />
-<hkern u1="·" u2="8" k="23" />
-<hkern u1="·" u2="7" k="47" />
-<hkern u1="·" u2="3" k="37" />
-<hkern u1="·" u2="2" k="33" />
-<hkern u1="¿" u2="j" k="-88" />
-<hkern u1="Þ" u2="}" k="27" />
-<hkern u1="Þ" u2="]" k="23" />
-<hkern u1="Þ" u2="X" k="37" />
-<hkern u1="Þ" u2="/" k="39" />
-<hkern u1="Þ" u2="," k="76" />
-<hkern u1="Þ" u2=")" k="35" />
-<hkern u1="ß" u2="y" k="16" />
-<hkern u1="ß" u2="w" k="10" />
-<hkern u1="ß" u2="v" k="16" />
-<hkern u1="í" u2="?" k="-12" />
-<hkern u1="î" u2="“" k="-27" />
-<hkern u1="î" u2="‘" k="-27" />
-<hkern u1="î" u2="\" k="-47" />
-<hkern u1="î" u2="?" k="-74" />
-<hkern u1="î" u2="*" k="-86" />
-<hkern u1="î" u2="'" k="-20" />
-<hkern u1="î" u2=""" k="-20" />
-<hkern u1="ï" u2="}" k="-39" />
-<hkern u1="ï" u2="]" k="-41" />
-<hkern u1="ï" u2="\" k="-20" />
-<hkern u1="ï" u2="?" k="-41" />
-<hkern u1="ï" u2="*" k="-55" />
-<hkern u1="ð" u2="x" k="12" />
-<hkern u1="ð" u2="," k="27" />
-<hkern u1="ð" u2="*" k="20" />
-<hkern u1="ð" u2=")" k="27" />
-<hkern u1="÷" u2="7" k="41" />
-<hkern u1="÷" u2="3" k="33" />
-<hkern u1="÷" u2="2" k="37" />
-<hkern u1="‘" u2="ï" k="-14" />
-<hkern u1="’" u2="ï" k="-25" />
-<hkern u1="’" u2="î" k="-57" />
-<hkern u1="’" u2="@" k="90" />
-<hkern u1="’" u2="/" k="78" />
-<hkern u1="’" u2="&" k="43" />
-<hkern u1="“" u2="ï" k="-14" />
-<hkern u1="”" u2="ï" k="-25" />
-<hkern u1="”" u2="î" k="-57" />
-<hkern g1="zero" g2="quotedbl,quotesingle" k="39" />
-<hkern g1="two" g2="quotedbl,quotesingle" k="29" />
-<hkern g1="three" g2="quotedbl,quotesingle" k="41" />
-<hkern g1="four" g2="quotedbl,quotesingle" k="51" />
-<hkern g1="seven" g2="equal" k="23" />
-<hkern g1="eight" g2="equal" k="20" />
-<hkern g1="nine" g2="quotedbl,quotesingle" k="47" />
-<hkern g1="equal" g2="three" k="23" />
-<hkern g1="equal" g2="seven" k="35" />
-<hkern g1="germandbls" g2="quoteright,quotedblright" k="18" />
-<hkern g1="eth" g2="quotedbl,quotesingle" k="23" />
-<hkern g1="eth" g2="quoteleft,quotedblleft" k="25" />
-<hkern g1="eth" g2="quoteright,quotedblright" k="20" />
-<hkern g1="eth" g2="period,ellipsis" k="27" />
-<hkern g1="eth" g2="quotesinglbase,quotedblbase" k="27" />
-<hkern g1="quotedbl,quotesingle" g2="C,G,Ccedilla" k="23" />
-<hkern g1="quotedbl,quotesingle" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="20" />
-<hkern g1="quotedbl,quotesingle" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="78" />
-<hkern g1="quotedbl,quotesingle" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="16" />
-<hkern g1="quotedbl,quotesingle" g2="J" k="16" />
-<hkern g1="quotedbl,quotesingle" g2="M" k="25" />
-<hkern g1="quotedbl,quotesingle" g2="AE" k="113" />
-<hkern g1="quotedbl,quotesingle" g2="period,ellipsis" k="248" />
-<hkern g1="quotedbl,quotesingle" g2="quotesinglbase,quotedblbase" k="248" />
-<hkern g1="quotedbl,quotesingle" g2="ampersand" k="43" />
-<hkern g1="quotedbl,quotesingle" g2="comma" k="248" />
-<hkern g1="quotedbl,quotesingle" g2="slash" k="68" />
-<hkern g1="quotedbl,quotesingle" g2="zero" k="43" />
-<hkern g1="quotedbl,quotesingle" g2="one" k="29" />
-<hkern g1="quotedbl,quotesingle" g2="four" k="57" />
-<hkern g1="quotedbl,quotesingle" g2="five" k="20" />
-<hkern g1="quotedbl,quotesingle" g2="six" k="31" />
-<hkern g1="quotedbl,quotesingle" g2="nine" k="33" />
-<hkern g1="quotedbl,quotesingle" g2="at" k="70" />
-<hkern g1="quotedbl,quotesingle" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="20" />
-<hkern g1="quotedbl,quotesingle" g2="d,q" k="61" />
-<hkern g1="quotedbl,quotesingle" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="49" />
-<hkern g1="quotedbl,quotesingle" g2="g" k="45" />
-<hkern g1="quotedbl,quotesingle" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="47" />
-<hkern g1="quotedbl,quotesingle" g2="s" k="29" />
-<hkern g1="quotedbl,quotesingle" g2="eth" k="39" />
-<hkern g1="quotedbl,quotesingle" g2="guillemotleft,guilsinglleft" k="45" />
-<hkern g1="quotedbl,quotesingle" g2="guillemotright,guilsinglright" k="20" />
-<hkern g1="parenleft" g2="C,G,Ccedilla" k="33" />
-<hkern g1="parenleft" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="35" />
-<hkern g1="parenleft" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="20" />
-<hkern g1="parenleft" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="33" />
-<hkern g1="parenleft" g2="d,q" k="37" />
-<hkern g1="parenleft" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="41" />
-<hkern g1="parenleft" g2="g" k="35" />
-<hkern g1="parenleft" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="41" />
-<hkern g1="parenleft" g2="s" k="29" />
-<hkern g1="parenleft" g2="m,n,r,ntilde" k="33" />
-<hkern g1="parenleft" g2="t" k="29" />
-<hkern g1="parenleft" g2="u,ugrave,uacute,ucircumflex,udieresis" k="37" />
-<hkern g1="parenleft" g2="w" k="29" />
-<hkern g1="parenleft" g2="y,yacute,ydieresis" k="29" />
-<hkern g1="parenleft" g2="z" k="23" />
-<hkern g1="asterisk" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="55" />
-<hkern g1="asterisk" g2="T" k="-10" />
-<hkern g1="asterisk" g2="AE" k="72" />
-<hkern g1="asterisk" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="25" />
-<hkern g1="asterisk" g2="d,q" k="33" />
-<hkern g1="asterisk" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="27" />
-<hkern g1="asterisk" g2="g" k="29" />
-<hkern g1="asterisk" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="27" />
-<hkern g1="asterisk" g2="s" k="16" />
-<hkern g1="hyphen,endash,emdash" g2="C,G,Ccedilla" k="31" />
-<hkern g1="hyphen,endash,emdash" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="33" />
-<hkern g1="hyphen,endash,emdash" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="43" />
-<hkern g1="hyphen,endash,emdash" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="51" />
-<hkern g1="hyphen,endash,emdash" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="45" />
-<hkern g1="hyphen,endash,emdash" g2="J" k="45" />
-<hkern g1="hyphen,endash,emdash" g2="M" k="39" />
-<hkern g1="hyphen,endash,emdash" g2="S" k="74" />
-<hkern g1="hyphen,endash,emdash" g2="T" k="115" />
-<hkern g1="hyphen,endash,emdash" g2="V" k="80" />
-<hkern g1="hyphen,endash,emdash" g2="W" k="70" />
-<hkern g1="hyphen,endash,emdash" g2="X" k="80" />
-<hkern g1="hyphen,endash,emdash" g2="Y,Yacute,Ydieresis" k="109" />
-<hkern g1="hyphen,endash,emdash" g2="Z" k="72" />
-<hkern g1="hyphen,endash,emdash" g2="AE" k="51" />
-<hkern g1="hyphen,endash,emdash" g2="t" k="27" />
-<hkern g1="hyphen,endash,emdash" g2="z" k="35" />
-<hkern g1="hyphen,endash,emdash" g2="f,uniFB01,uniFB02,uniFB03,uniFB04" k="31" />
-<hkern g1="hyphen,endash,emdash" g2="x" k="33" />
-<hkern g1="period" g2="quotedbl,quotesingle" k="248" />
-<hkern g1="period" g2="quoteleft,quotedblleft" k="258" />
-<hkern g1="period" g2="quoteright,quotedblright" k="236" />
-<hkern g1="period" g2="C,G,Ccedilla" k="55" />
-<hkern g1="period" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="57" />
-<hkern g1="period" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="51" />
-<hkern g1="period" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="31" />
-<hkern g1="period" g2="J" k="31" />
-<hkern g1="period" g2="T" k="102" />
-<hkern g1="period" g2="W" k="88" />
-<hkern g1="period" g2="Y,Yacute,Ydieresis" k="104" />
-<hkern g1="period" g2="t" k="31" />
-<hkern g1="period" g2="w" k="43" />
-<hkern g1="period" g2="y,yacute,ydieresis" k="53" />
-<hkern g1="slash" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="27" />
-<hkern g1="slash" g2="Y,Yacute,Ydieresis" k="-12" />
-<hkern g1="slash" g2="AE" k="20" />
-<hkern g1="slash" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="23" />
-<hkern g1="slash" g2="g" k="29" />
-<hkern g1="slash" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="23" />
-<hkern g1="at" g2="quotedbl,quotesingle" k="49" />
-<hkern g1="bracketleft" g2="C,G,Ccedilla" k="23" />
-<hkern g1="bracketleft" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="25" />
-<hkern g1="bracketleft" g2="J" k="-41" />
-<hkern g1="bracketleft" g2="Y,Yacute,Ydieresis" k="-14" />
-<hkern g1="bracketleft" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="29" />
-<hkern g1="bracketleft" g2="d,q" k="29" />
-<hkern g1="bracketleft" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="35" />
-<hkern g1="bracketleft" g2="g" k="35" />
-<hkern g1="bracketleft" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="35" />
-<hkern g1="bracketleft" g2="s" k="27" />
-<hkern g1="bracketleft" g2="m,n,r,ntilde" k="33" />
-<hkern g1="bracketleft" g2="t" k="25" />
-<hkern g1="bracketleft" g2="u,ugrave,uacute,ucircumflex,udieresis" k="35" />
-<hkern g1="bracketleft" g2="w" k="29" />
-<hkern g1="bracketleft" g2="y,yacute,ydieresis" k="31" />
-<hkern g1="bracketleft" g2="z" k="20" />
-<hkern g1="backslash" g2="quotedbl,quotesingle" k="68" />
-<hkern g1="backslash" g2="C,G,Ccedilla" k="29" />
-<hkern g1="backslash" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="31" />
-<hkern g1="backslash" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="35" />
-<hkern g1="backslash" g2="J" k="-16" />
-<hkern g1="backslash" g2="T" k="63" />
-<hkern g1="backslash" g2="W" k="53" />
-<hkern g1="backslash" g2="Y,Yacute,Ydieresis" k="63" />
-<hkern g1="backslash" g2="t" k="29" />
-<hkern g1="backslash" g2="u,ugrave,uacute,ucircumflex,udieresis" k="23" />
-<hkern g1="backslash" g2="w" k="39" />
-<hkern g1="backslash" g2="y,yacute,ydieresis" k="43" />
-<hkern g1="braceleft" g2="C,G,Ccedilla" k="27" />
-<hkern g1="braceleft" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="27" />
-<hkern g1="braceleft" g2="J" k="-39" />
-<hkern g1="braceleft" g2="Y,Yacute,Ydieresis" k="-12" />
-<hkern g1="braceleft" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="29" />
-<hkern g1="braceleft" g2="d,q" k="33" />
-<hkern g1="braceleft" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="37" />
-<hkern g1="braceleft" g2="g" k="35" />
-<hkern g1="braceleft" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="37" />
-<hkern g1="braceleft" g2="s" k="27" />
-<hkern g1="braceleft" g2="m,n,r,ntilde" k="33" />
-<hkern g1="braceleft" g2="t" k="25" />
-<hkern g1="braceleft" g2="u,ugrave,uacute,ucircumflex,udieresis" k="35" />
-<hkern g1="braceleft" g2="w" k="29" />
-<hkern g1="braceleft" g2="y,yacute,ydieresis" k="29" />
-<hkern g1="exclamdown" g2="T" k="70" />
-<hkern g1="exclamdown" g2="Y,Yacute,Ydieresis" k="33" />
-<hkern g1="questiondown" g2="J" k="-47" />
-<hkern g1="questiondown" g2="T" k="74" />
-<hkern g1="questiondown" g2="Y,Yacute,Ydieresis" k="33" />
-<hkern g1="quoteleft,quotedblleft" g2="C,G,Ccedilla" k="20" />
-<hkern g1="quoteleft,quotedblleft" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="20" />
-<hkern g1="quoteleft,quotedblleft" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="78" />
-<hkern g1="quoteleft,quotedblleft" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="16" />
-<hkern g1="quoteleft,quotedblleft" g2="J" k="16" />
-<hkern g1="quoteleft,quotedblleft" g2="M" k="25" />
-<hkern g1="quoteleft,quotedblleft" g2="AE" k="111" />
-<hkern g1="quoteleft,quotedblleft" g2="period,ellipsis" k="256" />
-<hkern g1="quoteleft,quotedblleft" g2="comma" k="256" />
-<hkern g1="quoteleft,quotedblleft" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="23" />
-<hkern g1="quoteleft,quotedblleft" g2="d,q" k="63" />
-<hkern g1="quoteleft,quotedblleft" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="49" />
-<hkern g1="quoteleft,quotedblleft" g2="g" k="47" />
-<hkern g1="quoteleft,quotedblleft" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="49" />
-<hkern g1="quoteleft,quotedblleft" g2="s" k="33" />
-<hkern g1="quoteleft,quotedblleft" g2="eth" k="41" />
-<hkern g1="quoteright,quotedblright" g2="C,G,Ccedilla" k="33" />
-<hkern g1="quoteright,quotedblright" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="31" />
-<hkern g1="quoteright,quotedblright" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="84" />
-<hkern g1="quoteright,quotedblright" g2="M" k="25" />
-<hkern g1="quoteright,quotedblright" g2="AE" k="121" />
-<hkern g1="quoteright,quotedblright" g2="period,ellipsis" k="276" />
-<hkern g1="quoteright,quotedblright" g2="quotesinglbase,quotedblbase" k="276" />
-<hkern g1="quoteright,quotedblright" g2="comma" k="276" />
-<hkern g1="quoteright,quotedblright" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="37" />
-<hkern g1="quoteright,quotedblright" g2="d,q" k="82" />
-<hkern g1="quoteright,quotedblright" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="68" />
-<hkern g1="quoteright,quotedblright" g2="g" k="63" />
-<hkern g1="quoteright,quotedblright" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="66" />
-<hkern g1="quoteright,quotedblright" g2="s" k="45" />
-<hkern g1="quoteright,quotedblright" g2="eth" k="39" />
-<hkern g1="quoteright,quotedblright" g2="guillemotleft,guilsinglleft" k="68" />
-<hkern g1="quoteright,quotedblright" g2="guillemotright,guilsinglright" k="41" />
-<hkern g1="quoteright,quotedblright" g2="m,n,r,ntilde" k="23" />
-<hkern g1="quoteright,quotedblright" g2="u,ugrave,uacute,ucircumflex,udieresis" k="25" />
-<hkern g1="quoteright,quotedblright" g2="hyphen,endash,emdash" k="35" />
-<hkern g1="quoteright,quotedblright" g2="p" k="23" />
-<hkern g1="quotesinglbase,quotedblbase" g2="quotedbl,quotesingle" k="248" />
-<hkern g1="quotesinglbase,quotedblbase" g2="quoteright,quotedblright" k="236" />
-<hkern g1="quotesinglbase,quotedblbase" g2="C,G,Ccedilla" k="55" />
-<hkern g1="quotesinglbase,quotedblbase" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="57" />
-<hkern g1="quotesinglbase,quotedblbase" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="51" />
-<hkern g1="quotesinglbase,quotedblbase" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="31" />
-<hkern g1="quotesinglbase,quotedblbase" g2="J" k="31" />
-<hkern g1="quotesinglbase,quotedblbase" g2="T" k="100" />
-<hkern g1="quotesinglbase,quotedblbase" g2="V" k="102" />
-<hkern g1="quotesinglbase,quotedblbase" g2="W" k="88" />
-<hkern g1="quotesinglbase,quotedblbase" g2="Y,Yacute,Ydieresis" k="104" />
-<hkern g1="quotesinglbase,quotedblbase" g2="eth" k="16" />
-<hkern g1="quotesinglbase,quotedblbase" g2="t" k="31" />
-<hkern g1="quotesinglbase,quotedblbase" g2="w" k="43" />
-<hkern g1="quotesinglbase,quotedblbase" g2="y,yacute,ydieresis" k="53" />
-<hkern g1="quotesinglbase,quotedblbase" g2="f,uniFB01,uniFB02,uniFB03,uniFB04" k="27" />
-<hkern g1="quotesinglbase,quotedblbase" g2="v" k="53" />
-<hkern g1="guillemotleft,guilsinglleft" g2="quotedbl,quotesingle" k="20" />
-<hkern g1="guillemotleft,guilsinglleft" g2="T" k="78" />
-<hkern g1="guillemotleft,guilsinglleft" g2="V" k="35" />
-<hkern g1="guillemotleft,guilsinglleft" g2="W" k="25" />
-<hkern g1="guillemotleft,guilsinglleft" g2="Y,Yacute,Ydieresis" k="53" />
-<hkern g1="guillemotright,guilsinglright" g2="quotedbl,quotesingle" k="45" />
-<hkern g1="guillemotright,guilsinglright" g2="quoteright,quotedblright" k="39" />
-<hkern g1="guillemotright,guilsinglright" g2="S" k="23" />
-<hkern g1="guillemotright,guilsinglright" g2="T" k="84" />
-<hkern g1="guillemotright,guilsinglright" g2="V" k="49" />
-<hkern g1="guillemotright,guilsinglright" g2="W" k="41" />
-<hkern g1="guillemotright,guilsinglright" g2="X" k="33" />
-<hkern g1="guillemotright,guilsinglright" g2="Y,Yacute,Ydieresis" k="72" />
-<hkern g1="guillemotright,guilsinglright" g2="Z" k="37" />
-<hkern g1="guillemotright,guilsinglright" g2="z" k="31" />
-<hkern g1="guillemotright,guilsinglright" g2="x" k="29" />
-<hkern g1="ampersand" g2="quotedbl,quotesingle" k="145" />
-<hkern g1="ampersand" g2="C,G,Ccedilla" k="12" />
-<hkern g1="ampersand" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="12" />
-<hkern g1="ampersand" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="18" />
-<hkern g1="ampersand" g2="T" k="150" />
-<hkern g1="ampersand" g2="W" k="92" />
-<hkern g1="ampersand" g2="Y,Yacute,Ydieresis" k="147" />
-<hkern g1="ampersand" g2="t" k="20" />
-<hkern g1="ampersand" g2="w" k="51" />
-<hkern g1="ampersand" g2="y,yacute,ydieresis" k="76" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="quotedbl,quotesingle" k="76" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="quoteleft,quotedblleft" k="76" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="quoteright,quotedblright" k="68" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="10" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="T" k="106" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="V" k="72" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="W" k="53" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="Y,Yacute,Ydieresis" k="102" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="t" k="25" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="w" k="41" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="y,yacute,ydieresis" k="55" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="f,uniFB01,uniFB02,uniFB03,uniFB04" k="18" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="hyphen,endash,emdash" k="51" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="v" k="55" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="asterisk" k="53" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="backslash" k="31" />
-<hkern g1="B" g2="quotedbl,quotesingle" k="20" />
-<hkern g1="B" g2="quoteleft,quotedblleft" k="16" />
-<hkern g1="B" g2="quoteright,quotedblright" k="16" />
-<hkern g1="B" g2="T" k="10" />
-<hkern g1="B" g2="period,ellipsis" k="37" />
-<hkern g1="B" g2="quotesinglbase,quotedblbase" k="37" />
-<hkern g1="B" g2="z" k="10" />
-<hkern g1="B" g2="hyphen,endash,emdash" k="35" />
-<hkern g1="C,Ccedilla" g2="C,G,Ccedilla" k="31" />
-<hkern g1="C,Ccedilla" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="33" />
-<hkern g1="C,Ccedilla" g2="ampersand" k="10" />
-<hkern g1="C,Ccedilla" g2="d,q" k="35" />
-<hkern g1="C,Ccedilla" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="43" />
-<hkern g1="C,Ccedilla" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="51" />
-<hkern g1="C,Ccedilla" g2="guillemotleft,guilsinglleft" k="23" />
-<hkern g1="C,Ccedilla" g2="t" k="14" />
-<hkern g1="C,Ccedilla" g2="u,ugrave,uacute,ucircumflex,udieresis" k="27" />
-<hkern g1="C,Ccedilla" g2="w" k="23" />
-<hkern g1="C,Ccedilla" g2="y,yacute,ydieresis" k="25" />
-<hkern g1="C,Ccedilla" g2="hyphen,endash,emdash" k="63" />
-<hkern g1="C,Ccedilla" g2="v" k="25" />
-<hkern g1="D,Eth" g2="T" k="33" />
-<hkern g1="D,Eth" g2="X" k="23" />
-<hkern g1="D,Eth" g2="Y,Yacute,Ydieresis" k="20" />
-<hkern g1="D,Eth" g2="Z" k="14" />
-<hkern g1="D,Eth" g2="AE" k="18" />
-<hkern g1="D,Eth" g2="period,ellipsis" k="66" />
-<hkern g1="D,Eth" g2="quotesinglbase,quotedblbase" k="66" />
-<hkern g1="D,Eth" g2="comma" k="66" />
-<hkern g1="D,Eth" g2="slash" k="37" />
-<hkern g1="D,Eth" g2="hyphen,endash,emdash" k="35" />
-<hkern g1="D,Eth" g2="parenright" k="35" />
-<hkern g1="D,Eth" g2="bracketright" k="25" />
-<hkern g1="D,Eth" g2="braceright" k="27" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="d,q" k="18" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="18" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="g" k="14" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="20" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="m,n,r,ntilde" k="18" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="t" k="20" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="u,ugrave,uacute,ucircumflex,udieresis" k="25" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="w" k="27" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="y,yacute,ydieresis" k="29" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="f,uniFB01,uniFB02,uniFB03,uniFB04" k="18" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="hyphen,endash,emdash" k="57" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="p" k="18" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="v" k="29" />
-<hkern g1="F" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="59" />
-<hkern g1="F" g2="AE" k="137" />
-<hkern g1="F" g2="period,ellipsis" k="96" />
-<hkern g1="F" g2="quotesinglbase,quotedblbase" k="96" />
-<hkern g1="F" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="70" />
-<hkern g1="F" g2="d,q" k="25" />
-<hkern g1="F" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="23" />
-<hkern g1="F" g2="g" k="47" />
-<hkern g1="F" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="20" />
-<hkern g1="F" g2="s" k="23" />
-<hkern g1="F" g2="m,n,r,ntilde" k="45" />
-<hkern g1="F" g2="t" k="20" />
-<hkern g1="F" g2="u,ugrave,uacute,ucircumflex,udieresis" k="35" />
-<hkern g1="F" g2="w" k="12" />
-<hkern g1="F" g2="y,yacute,ydieresis" k="12" />
-<hkern g1="F" g2="z" k="47" />
-<hkern g1="F" g2="f,uniFB01,uniFB02,uniFB03,uniFB04" k="18" />
-<hkern g1="F" g2="hyphen,endash,emdash" k="49" />
-<hkern g1="F" g2="h,k,thorn" k="10" />
-<hkern g1="F" g2="i,j,igrave,iacute,icircumflex,idieresis" k="10" />
-<hkern g1="F" g2="l" k="10" />
-<hkern g1="G" g2="quotedbl,quotesingle" k="23" />
-<hkern g1="G" g2="quoteleft,quotedblleft" k="25" />
-<hkern g1="G" g2="quoteright,quotedblright" k="29" />
-<hkern g1="G" g2="t" k="12" />
-<hkern g1="G" g2="w" k="10" />
-<hkern g1="G" g2="y,yacute,ydieresis" k="14" />
-<hkern g1="G" g2="f,uniFB01,uniFB02,uniFB03,uniFB04" k="12" />
-<hkern g1="G" g2="hyphen,endash,emdash" k="35" />
-<hkern g1="G" g2="v" k="14" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="quotedbl,quotesingle" k="16" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="quoteleft,quotedblleft" k="16" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="quoteright,quotedblright" k="16" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="period,ellipsis" k="31" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="quotesinglbase,quotedblbase" k="31" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="comma" k="31" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="10" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="d,q" k="14" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="14" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="g" k="23" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="14" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="s" k="10" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="eth" k="16" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="m,n,r,ntilde" k="14" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="t" k="10" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="u,ugrave,uacute,ucircumflex,udieresis" k="16" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="w" k="10" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="y,yacute,ydieresis" k="12" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="z" k="12" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="f,uniFB01,uniFB02,uniFB03,uniFB04" k="10" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="hyphen,endash,emdash" k="45" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="p" k="14" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="v" k="12" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="h,k,thorn" k="14" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="i,j,igrave,iacute,icircumflex,idieresis" k="14" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="l" k="14" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="colon" k="16" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="semicolon" k="16" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="b" k="14" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="germandbls" k="14" />
-<hkern g1="J" g2="period,ellipsis" k="33" />
-<hkern g1="J" g2="quotesinglbase,quotedblbase" k="31" />
-<hkern g1="J" g2="comma" k="31" />
-<hkern g1="J" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="10" />
-<hkern g1="J" g2="d,q" k="14" />
-<hkern g1="J" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="14" />
-<hkern g1="J" g2="g" k="23" />
-<hkern g1="J" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="14" />
-<hkern g1="J" g2="s" k="10" />
-<hkern g1="J" g2="m,n,r,ntilde" k="14" />
-<hkern g1="J" g2="t" k="10" />
-<hkern g1="J" g2="u,ugrave,uacute,ucircumflex,udieresis" k="16" />
-<hkern g1="J" g2="w" k="10" />
-<hkern g1="J" g2="y,yacute,ydieresis" k="10" />
-<hkern g1="J" g2="z" k="10" />
-<hkern g1="J" g2="f,uniFB01,uniFB02,uniFB03,uniFB04" k="10" />
-<hkern g1="J" g2="hyphen,endash,emdash" k="45" />
-<hkern g1="J" g2="p" k="14" />
-<hkern g1="J" g2="v" k="10" />
-<hkern g1="J" g2="h,k,thorn" k="14" />
-<hkern g1="J" g2="i,j,igrave,iacute,icircumflex,idieresis" k="14" />
-<hkern g1="J" g2="l" k="14" />
-<hkern g1="J" g2="colon" k="16" />
-<hkern g1="J" g2="semicolon" k="16" />
-<hkern g1="J" g2="b" k="14" />
-<hkern g1="K" g2="C,G,Ccedilla" k="55" />
-<hkern g1="K" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="53" />
-<hkern g1="K" g2="d,q" k="41" />
-<hkern g1="K" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="53" />
-<hkern g1="K" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="66" />
-<hkern g1="K" g2="t" k="20" />
-<hkern g1="K" g2="u,ugrave,uacute,ucircumflex,udieresis" k="20" />
-<hkern g1="K" g2="w" k="55" />
-<hkern g1="K" g2="y,yacute,ydieresis" k="74" />
-<hkern g1="K" g2="hyphen,endash,emdash" k="78" />
-<hkern g1="K" g2="v" k="74" />
-<hkern g1="L" g2="quotedbl,quotesingle" k="145" />
-<hkern g1="L" g2="quoteleft,quotedblleft" k="143" />
-<hkern g1="L" g2="quoteright,quotedblright" k="143" />
-<hkern g1="L" g2="C,G,Ccedilla" k="37" />
-<hkern g1="L" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="45" />
-<hkern g1="L" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="37" />
-<hkern g1="L" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="-10" />
-<hkern g1="L" g2="T" k="166" />
-<hkern g1="L" g2="V" k="145" />
-<hkern g1="L" g2="W" k="104" />
-<hkern g1="L" g2="Y,Yacute,Ydieresis" k="186" />
-<hkern g1="L" g2="AE" k="-51" />
-<hkern g1="L" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="12" />
-<hkern g1="L" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="14" />
-<hkern g1="L" g2="t" k="31" />
-<hkern g1="L" g2="u,ugrave,uacute,ucircumflex,udieresis" k="12" />
-<hkern g1="L" g2="w" k="80" />
-<hkern g1="L" g2="y,yacute,ydieresis" k="117" />
-<hkern g1="L" g2="f,uniFB01,uniFB02,uniFB03,uniFB04" k="20" />
-<hkern g1="L" g2="hyphen,endash,emdash" k="160" />
-<hkern g1="L" g2="v" k="117" />
-<hkern g1="L" g2="asterisk" k="135" />
-<hkern g1="L" g2="backslash" k="43" />
-<hkern g1="L" g2="question" k="20" />
-<hkern g1="M" g2="quotedbl,quotesingle" k="25" />
-<hkern g1="M" g2="quoteleft,quotedblleft" k="25" />
-<hkern g1="M" g2="quoteright,quotedblright" k="23" />
-<hkern g1="M" g2="Y,Yacute,Ydieresis" k="10" />
-<hkern g1="M" g2="g" k="12" />
-<hkern g1="M" g2="t" k="14" />
-<hkern g1="M" g2="u,ugrave,uacute,ucircumflex,udieresis" k="10" />
-<hkern g1="M" g2="w" k="16" />
-<hkern g1="M" g2="y,yacute,ydieresis" k="20" />
-<hkern g1="M" g2="f,uniFB01,uniFB02,uniFB03,uniFB04" k="14" />
-<hkern g1="M" g2="hyphen,endash,emdash" k="39" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="quotedbl,quotesingle" k="18" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="quoteleft,quotedblleft" k="16" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="T" k="31" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="X" k="16" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="Y,Yacute,Ydieresis" k="14" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="Z" k="12" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="period,ellipsis" k="61" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="quotesinglbase,quotedblbase" k="59" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="comma" k="59" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="slash" k="33" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="hyphen,endash,emdash" k="33" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="parenright" k="33" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="bracketright" k="23" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="braceright" k="25" />
-<hkern g1="P" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="68" />
-<hkern g1="P" g2="AE" k="180" />
-<hkern g1="P" g2="period,ellipsis" k="145" />
-<hkern g1="P" g2="quotesinglbase,quotedblbase" k="145" />
-<hkern g1="P" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="12" />
-<hkern g1="P" g2="d,q" k="25" />
-<hkern g1="P" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="20" />
-<hkern g1="P" g2="g" k="29" />
-<hkern g1="P" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="18" />
-<hkern g1="P" g2="guillemotleft,guilsinglleft" k="23" />
-<hkern g1="P" g2="m,n,r,ntilde" k="10" />
-<hkern g1="P" g2="hyphen,endash,emdash" k="61" />
-<hkern g1="R" g2="T" k="23" />
-<hkern g1="R" g2="ampersand" k="12" />
-<hkern g1="R" g2="g" k="20" />
-<hkern g1="R" g2="m,n,r,ntilde" k="25" />
-<hkern g1="R" g2="u,ugrave,uacute,ucircumflex,udieresis" k="20" />
-<hkern g1="R" g2="hyphen,endash,emdash" k="37" />
-<hkern g1="R" g2="p" k="25" />
-<hkern g1="R" g2="h,k,thorn" k="23" />
-<hkern g1="R" g2="i,j,igrave,iacute,icircumflex,idieresis" k="25" />
-<hkern g1="R" g2="l" k="31" />
-<hkern g1="R" g2="b" k="20" />
-<hkern g1="S" g2="quoteright,quotedblright" k="25" />
-<hkern g1="S" g2="period,ellipsis" k="27" />
-<hkern g1="S" g2="quotesinglbase,quotedblbase" k="27" />
-<hkern g1="S" g2="comma" k="27" />
-<hkern g1="S" g2="t" k="18" />
-<hkern g1="S" g2="w" k="23" />
-<hkern g1="S" g2="y,yacute,ydieresis" k="33" />
-<hkern g1="S" g2="z" k="16" />
-<hkern g1="S" g2="f,uniFB01,uniFB02,uniFB03,uniFB04" k="20" />
-<hkern g1="S" g2="x" k="25" />
-<hkern g1="S" g2="hyphen,endash,emdash" k="35" />
-<hkern g1="S" g2="v" k="33" />
-<hkern g1="S" g2="colon" k="20" />
-<hkern g1="S" g2="semicolon" k="20" />
-<hkern g1="T" g2="C,G,Ccedilla" k="41" />
-<hkern g1="T" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="39" />
-<hkern g1="T" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="106" />
-<hkern g1="T" g2="M" k="10" />
-<hkern g1="T" g2="AE" k="158" />
-<hkern g1="T" g2="period,ellipsis" k="102" />
-<hkern g1="T" g2="quotesinglbase,quotedblbase" k="102" />
-<hkern g1="T" g2="ampersand" k="37" />
-<hkern g1="T" g2="comma" k="102" />
-<hkern g1="T" g2="slash" k="63" />
-<hkern g1="T" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="125" />
-<hkern g1="T" g2="d,q" k="188" />
-<hkern g1="T" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="180" />
-<hkern g1="T" g2="g" k="190" />
-<hkern g1="T" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="180" />
-<hkern g1="T" g2="s" k="176" />
-<hkern g1="T" g2="guillemotleft,guilsinglleft" k="84" />
-<hkern g1="T" g2="guillemotright,guilsinglright" k="80" />
-<hkern g1="T" g2="m,n,r,ntilde" k="156" />
-<hkern g1="T" g2="t" k="57" />
-<hkern g1="T" g2="u,ugrave,uacute,ucircumflex,udieresis" k="158" />
-<hkern g1="T" g2="w" k="100" />
-<hkern g1="T" g2="y,yacute,ydieresis" k="98" />
-<hkern g1="T" g2="z" k="78" />
-<hkern g1="T" g2="f,uniFB01,uniFB02,uniFB03,uniFB04" k="41" />
-<hkern g1="T" g2="x" k="115" />
-<hkern g1="T" g2="hyphen,endash,emdash" k="115" />
-<hkern g1="T" g2="p" k="156" />
-<hkern g1="T" g2="v" k="98" />
-<hkern g1="T" g2="asterisk" k="-10" />
-<hkern g1="T" g2="colon" k="92" />
-<hkern g1="T" g2="semicolon" k="92" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="period,ellipsis" k="53" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="quotesinglbase,quotedblbase" k="53" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="comma" k="53" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="slash" k="35" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="14" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="d,q" k="14" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="12" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="g" k="29" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="12" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="s" k="16" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="m,n,r,ntilde" k="20" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="u,ugrave,uacute,ucircumflex,udieresis" k="20" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="z" k="16" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="x" k="10" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="hyphen,endash,emdash" k="43" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="p" k="20" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="parenright" k="20" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="i,j,igrave,iacute,icircumflex,idieresis" k="16" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="colon" k="25" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="semicolon" k="25" />
-<hkern g1="V" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="72" />
-<hkern g1="V" g2="AE" k="123" />
-<hkern g1="V" g2="period,ellipsis" k="106" />
-<hkern g1="V" g2="quotesinglbase,quotedblbase" k="106" />
-<hkern g1="V" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="74" />
-<hkern g1="V" g2="d,q" k="100" />
-<hkern g1="V" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="88" />
-<hkern g1="V" g2="g" k="106" />
-<hkern g1="V" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="86" />
-<hkern g1="V" g2="s" k="76" />
-<hkern g1="V" g2="guillemotleft,guilsinglleft" k="49" />
-<hkern g1="V" g2="guillemotright,guilsinglright" k="35" />
-<hkern g1="V" g2="m,n,r,ntilde" k="66" />
-<hkern g1="V" g2="t" k="10" />
-<hkern g1="V" g2="u,ugrave,uacute,ucircumflex,udieresis" k="59" />
-<hkern g1="V" g2="z" k="18" />
-<hkern g1="V" g2="hyphen,endash,emdash" k="80" />
-<hkern g1="W" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="53" />
-<hkern g1="W" g2="AE" k="94" />
-<hkern g1="W" g2="period,ellipsis" k="90" />
-<hkern g1="W" g2="quotesinglbase,quotedblbase" k="90" />
-<hkern g1="W" g2="ampersand" k="12" />
-<hkern g1="W" g2="comma" k="90" />
-<hkern g1="W" g2="slash" k="53" />
-<hkern g1="W" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="51" />
-<hkern g1="W" g2="d,q" k="78" />
-<hkern g1="W" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="74" />
-<hkern g1="W" g2="g" k="84" />
-<hkern g1="W" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="74" />
-<hkern g1="W" g2="s" k="55" />
-<hkern g1="W" g2="guillemotleft,guilsinglleft" k="41" />
-<hkern g1="W" g2="guillemotright,guilsinglright" k="25" />
-<hkern g1="W" g2="m,n,r,ntilde" k="53" />
-<hkern g1="W" g2="u,ugrave,uacute,ucircumflex,udieresis" k="47" />
-<hkern g1="W" g2="z" k="16" />
-<hkern g1="W" g2="hyphen,endash,emdash" k="72" />
-<hkern g1="W" g2="p" k="53" />
-<hkern g1="W" g2="colon" k="41" />
-<hkern g1="W" g2="semicolon" k="41" />
-<hkern g1="X" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="16" />
-<hkern g1="X" g2="d,q" k="25" />
-<hkern g1="X" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="29" />
-<hkern g1="X" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="35" />
-<hkern g1="X" g2="guillemotleft,guilsinglleft" k="31" />
-<hkern g1="X" g2="m,n,r,ntilde" k="10" />
-<hkern g1="X" g2="t" k="33" />
-<hkern g1="X" g2="u,ugrave,uacute,ucircumflex,udieresis" k="31" />
-<hkern g1="X" g2="w" k="51" />
-<hkern g1="X" g2="y,yacute,ydieresis" k="59" />
-<hkern g1="X" g2="f,uniFB01,uniFB02,uniFB03,uniFB04" k="20" />
-<hkern g1="X" g2="hyphen,endash,emdash" k="80" />
-<hkern g1="Y,Yacute,Ydieresis" g2="C,G,Ccedilla" k="18" />
-<hkern g1="Y,Yacute,Ydieresis" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="16" />
-<hkern g1="Y,Yacute,Ydieresis" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="100" />
-<hkern g1="Y,Yacute,Ydieresis" g2="T" k="-14" />
-<hkern g1="Y,Yacute,Ydieresis" g2="AE" k="154" />
-<hkern g1="Y,Yacute,Ydieresis" g2="period,ellipsis" k="106" />
-<hkern g1="Y,Yacute,Ydieresis" g2="quotesinglbase,quotedblbase" k="106" />
-<hkern g1="Y,Yacute,Ydieresis" g2="ampersand" k="29" />
-<hkern g1="Y,Yacute,Ydieresis" g2="comma" k="106" />
-<hkern g1="Y,Yacute,Ydieresis" g2="slash" k="63" />
-<hkern g1="Y,Yacute,Ydieresis" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="104" />
-<hkern g1="Y,Yacute,Ydieresis" g2="d,q" k="147" />
-<hkern g1="Y,Yacute,Ydieresis" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="147" />
-<hkern g1="Y,Yacute,Ydieresis" g2="g" k="152" />
-<hkern g1="Y,Yacute,Ydieresis" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="147" />
-<hkern g1="Y,Yacute,Ydieresis" g2="s" k="152" />
-<hkern g1="Y,Yacute,Ydieresis" g2="guillemotleft,guilsinglleft" k="72" />
-<hkern g1="Y,Yacute,Ydieresis" g2="guillemotright,guilsinglright" k="53" />
-<hkern g1="Y,Yacute,Ydieresis" g2="m,n,r,ntilde" k="98" />
-<hkern g1="Y,Yacute,Ydieresis" g2="t" k="31" />
-<hkern g1="Y,Yacute,Ydieresis" g2="u,ugrave,uacute,ucircumflex,udieresis" k="84" />
-<hkern g1="Y,Yacute,Ydieresis" g2="w" k="23" />
-<hkern g1="Y,Yacute,Ydieresis" g2="y,yacute,ydieresis" k="20" />
-<hkern g1="Y,Yacute,Ydieresis" g2="z" k="31" />
-<hkern g1="Y,Yacute,Ydieresis" g2="f,uniFB01,uniFB02,uniFB03,uniFB04" k="23" />
-<hkern g1="Y,Yacute,Ydieresis" g2="x" k="20" />
-<hkern g1="Y,Yacute,Ydieresis" g2="hyphen,endash,emdash" k="109" />
-<hkern g1="Y,Yacute,Ydieresis" g2="p" k="98" />
-<hkern g1="Y,Yacute,Ydieresis" g2="v" k="20" />
-<hkern g1="Y,Yacute,Ydieresis" g2="backslash" k="-10" />
-<hkern g1="Y,Yacute,Ydieresis" g2="bracketright" k="-25" />
-<hkern g1="Y,Yacute,Ydieresis" g2="braceright" k="-23" />
-<hkern g1="Y,Yacute,Ydieresis" g2="colon" k="66" />
-<hkern g1="Y,Yacute,Ydieresis" g2="semicolon" k="66" />
-<hkern g1="Y,Yacute,Ydieresis" g2="question" k="-14" />
-<hkern g1="Z" g2="C,G,Ccedilla" k="12" />
-<hkern g1="Z" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="12" />
-<hkern g1="Z" g2="d,q" k="31" />
-<hkern g1="Z" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="37" />
-<hkern g1="Z" g2="g" k="18" />
-<hkern g1="Z" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="43" />
-<hkern g1="Z" g2="guillemotleft,guilsinglleft" k="39" />
-<hkern g1="Z" g2="m,n,r,ntilde" k="25" />
-<hkern g1="Z" g2="t" k="25" />
-<hkern g1="Z" g2="u,ugrave,uacute,ucircumflex,udieresis" k="37" />
-<hkern g1="Z" g2="w" k="31" />
-<hkern g1="Z" g2="y,yacute,ydieresis" k="29" />
-<hkern g1="Z" g2="f,uniFB01,uniFB02,uniFB03,uniFB04" k="20" />
-<hkern g1="Z" g2="hyphen,endash,emdash" k="80" />
-<hkern g1="Z" g2="p" k="25" />
-<hkern g1="Z" g2="v" k="29" />
-<hkern g1="Z" g2="colon" k="16" />
-<hkern g1="Z" g2="semicolon" k="16" />
-<hkern g1="Thorn" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="16" />
-<hkern g1="Thorn" g2="T" k="25" />
-<hkern g1="Thorn" g2="Y,Yacute,Ydieresis" k="20" />
-<hkern g1="Thorn" g2="Z" k="27" />
-<hkern g1="Thorn" g2="AE" k="43" />
-<hkern g1="Thorn" g2="period,ellipsis" k="76" />
-<hkern g1="Thorn" g2="quotesinglbase,quotedblbase" k="76" />
-<hkern g1="Thorn" g2="hyphen,endash,emdash" k="31" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="quotedbl,quotesingle" k="35" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="quoteleft,quotedblleft" k="37" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="quoteright,quotedblright" k="27" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="23" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="16" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="asterisk" k="25" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="backslash" k="27" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="parenright" k="33" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="bracketright" k="33" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="braceright" k="33" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="question" k="29" />
-<hkern g1="c,ccedilla" g2="C,G,Ccedilla" k="10" />
-<hkern g1="c,ccedilla" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="10" />
-<hkern g1="c,ccedilla" g2="ampersand" k="16" />
-<hkern g1="c,ccedilla" g2="d,q" k="12" />
-<hkern g1="c,ccedilla" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="12" />
-<hkern g1="c,ccedilla" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="14" />
-<hkern g1="c,ccedilla" g2="guillemotleft,guilsinglleft" k="20" />
-<hkern g1="c,ccedilla" g2="hyphen,endash,emdash" k="27" />
-<hkern g1="d" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="20" />
-<hkern g1="d" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="14" />
-<hkern g1="e,ae,egrave,eacute,ecircumflex,edieresis,oe" g2="quotedbl,quotesingle" k="29" />
-<hkern g1="e,ae,egrave,eacute,ecircumflex,edieresis,oe" g2="quoteleft,quotedblleft" k="35" />
-<hkern g1="e,ae,egrave,eacute,ecircumflex,edieresis,oe" g2="quoteright,quotedblright" k="25" />
-<hkern g1="e,ae,egrave,eacute,ecircumflex,edieresis,oe" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="10" />
-<hkern g1="e,ae,egrave,eacute,ecircumflex,edieresis,oe" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="10" />
-<hkern g1="e,ae,egrave,eacute,ecircumflex,edieresis,oe" g2="parenright" k="31" />
-<hkern g1="e,ae,egrave,eacute,ecircumflex,edieresis,oe" g2="bracketright" k="27" />
-<hkern g1="e,ae,egrave,eacute,ecircumflex,edieresis,oe" g2="braceright" k="31" />
-<hkern g1="e,ae,egrave,eacute,ecircumflex,edieresis,oe" g2="question" k="20" />
-<hkern g1="f" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="74" />
-<hkern g1="f" g2="period,ellipsis" k="61" />
-<hkern g1="f" g2="quotesinglbase,quotedblbase" k="61" />
-<hkern g1="f" g2="d,q" k="25" />
-<hkern g1="f" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="18" />
-<hkern g1="f" g2="g" k="16" />
-<hkern g1="f" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="16" />
-<hkern g1="f" g2="eth" k="33" />
-<hkern g1="f" g2="guillemotleft,guilsinglleft" k="37" />
-<hkern g1="f" g2="hyphen,endash,emdash" k="63" />
-<hkern g1="g" g2="ampersand" k="14" />
-<hkern g1="g" g2="guillemotleft,guilsinglleft" k="20" />
-<hkern g1="g" g2="hyphen,endash,emdash" k="18" />
-<hkern g1="i,j,igrave,iacute,icircumflex,idieresis,uniFB01,uniFB03" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="16" />
-<hkern g1="i,j,igrave,iacute,icircumflex,idieresis,uniFB01,uniFB03" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="14" />
-<hkern g1="i,j,igrave,iacute,icircumflex,idieresis,uniFB01,uniFB03" g2="J" k="14" />
-<hkern g1="k" g2="C,G,Ccedilla" k="18" />
-<hkern g1="k" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="20" />
-<hkern g1="k" g2="ampersand" k="10" />
-<hkern g1="k" g2="d,q" k="39" />
-<hkern g1="k" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="43" />
-<hkern g1="k" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="43" />
-<hkern g1="k" g2="eth" k="51" />
-<hkern g1="k" g2="guillemotleft,guilsinglleft" k="20" />
-<hkern g1="k" g2="hyphen,endash,emdash" k="47" />
-<hkern g1="l,uniFB02,uniFB04" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="23" />
-<hkern g1="l,uniFB02,uniFB04" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="14" />
-<hkern g1="h,m,n,ntilde" g2="quotedbl,quotesingle" k="37" />
-<hkern g1="h,m,n,ntilde" g2="quoteleft,quotedblleft" k="39" />
-<hkern g1="h,m,n,ntilde" g2="quoteright,quotedblright" k="29" />
-<hkern g1="h,m,n,ntilde" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="23" />
-<hkern g1="h,m,n,ntilde" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="16" />
-<hkern g1="h,m,n,ntilde" g2="J" k="16" />
-<hkern g1="h,m,n,ntilde" g2="M" k="10" />
-<hkern g1="h,m,n,ntilde" g2="T" k="176" />
-<hkern g1="h,m,n,ntilde" g2="V" k="92" />
-<hkern g1="h,m,n,ntilde" g2="W" k="72" />
-<hkern g1="h,m,n,ntilde" g2="Y,Yacute,Ydieresis" k="135" />
-<hkern g1="h,m,n,ntilde" g2="Z" k="20" />
-<hkern g1="h,m,n,ntilde" g2="asterisk" k="25" />
-<hkern g1="h,m,n,ntilde" g2="backslash" k="27" />
-<hkern g1="h,m,n,ntilde" g2="parenright" k="35" />
-<hkern g1="h,m,n,ntilde" g2="bracketright" k="33" />
-<hkern g1="h,m,n,ntilde" g2="braceright" k="33" />
-<hkern g1="h,m,n,ntilde" g2="question" k="29" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="quotedbl,quotesingle" k="43" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="quoteleft,quotedblleft" k="47" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="quoteright,quotedblright" k="35" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="12" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="14" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="x" k="14" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="asterisk" k="23" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="backslash" k="20" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="parenright" k="41" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="bracketright" k="35" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="braceright" k="37" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="question" k="27" />
-<hkern g1="b,p,thorn" g2="quotedbl,quotesingle" k="39" />
-<hkern g1="b,p,thorn" g2="quoteleft,quotedblleft" k="41" />
-<hkern g1="b,p,thorn" g2="quoteright,quotedblright" k="29" />
-<hkern g1="b,p,thorn" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="10" />
-<hkern g1="b,p,thorn" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="14" />
-<hkern g1="b,p,thorn" g2="J" k="14" />
-<hkern g1="b,p,thorn" g2="S" k="18" />
-<hkern g1="b,p,thorn" g2="T" k="170" />
-<hkern g1="b,p,thorn" g2="V" k="80" />
-<hkern g1="b,p,thorn" g2="W" k="63" />
-<hkern g1="b,p,thorn" g2="X" k="49" />
-<hkern g1="b,p,thorn" g2="Y,Yacute,Ydieresis" k="145" />
-<hkern g1="b,p,thorn" g2="Z" k="49" />
-<hkern g1="b,p,thorn" g2="slash" k="20" />
-<hkern g1="b,p,thorn" g2="x" k="14" />
-<hkern g1="b,p,thorn" g2="asterisk" k="20" />
-<hkern g1="b,p,thorn" g2="parenright" k="41" />
-<hkern g1="b,p,thorn" g2="bracketright" k="35" />
-<hkern g1="b,p,thorn" g2="braceright" k="37" />
-<hkern g1="b,p,thorn" g2="question" k="27" />
-<hkern g1="q" g2="quotedbl,quotesingle" k="20" />
-<hkern g1="q" g2="quoteleft,quotedblleft" k="23" />
-<hkern g1="q" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="20" />
-<hkern g1="q" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="14" />
-<hkern g1="r" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="80" />
-<hkern g1="r" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="10" />
-<hkern g1="r" g2="period,ellipsis" k="70" />
-<hkern g1="r" g2="quotesinglbase,quotedblbase" k="70" />
-<hkern g1="r" g2="ampersand" k="47" />
-<hkern g1="r" g2="comma" k="70" />
-<hkern g1="r" g2="slash" k="47" />
-<hkern g1="r" g2="d,q" k="23" />
-<hkern g1="r" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="14" />
-<hkern g1="r" g2="g" k="14" />
-<hkern g1="r" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="14" />
-<hkern g1="r" g2="guillemotleft,guilsinglleft" k="39" />
-<hkern g1="r" g2="hyphen,endash,emdash" k="63" />
-<hkern g1="r" g2="parenright" k="31" />
-<hkern g1="r" g2="bracketright" k="33" />
-<hkern g1="r" g2="braceright" k="31" />
-<hkern g1="s" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="12" />
-<hkern g1="s" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="10" />
-<hkern g1="s" g2="parenright" k="33" />
-<hkern g1="s" g2="bracketright" k="31" />
-<hkern g1="s" g2="braceright" k="31" />
-<hkern g1="u,ugrave,uacute,ucircumflex,udieresis" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="20" />
-<hkern g1="u,ugrave,uacute,ucircumflex,udieresis" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="14" />
-<hkern g1="u,ugrave,uacute,ucircumflex,udieresis" g2="parenright" k="33" />
-<hkern g1="u,ugrave,uacute,ucircumflex,udieresis" g2="bracketright" k="33" />
-<hkern g1="u,ugrave,uacute,ucircumflex,udieresis" g2="braceright" k="33" />
-<hkern g1="u,ugrave,uacute,ucircumflex,udieresis" g2="question" k="25" />
-<hkern g1="v" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="55" />
-<hkern g1="v" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="12" />
-<hkern g1="v" g2="period,ellipsis" k="55" />
-<hkern g1="v" g2="quotesinglbase,quotedblbase" k="55" />
-<hkern g1="v" g2="d,q" k="8" />
-<hkern g1="v" g2="g" k="10" />
-<hkern g1="v" g2="guillemotleft,guilsinglleft" k="20" />
-<hkern g1="w" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="41" />
-<hkern g1="w" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="10" />
-<hkern g1="w" g2="period,ellipsis" k="45" />
-<hkern g1="w" g2="quotesinglbase,quotedblbase" k="45" />
-<hkern g1="w" g2="ampersand" k="16" />
-<hkern g1="w" g2="comma" k="45" />
-<hkern g1="w" g2="slash" k="39" />
-<hkern g1="w" g2="g" k="8" />
-<hkern g1="w" g2="parenright" k="29" />
-<hkern g1="w" g2="bracketright" k="29" />
-<hkern g1="w" g2="braceright" k="29" />
-<hkern g1="x" g2="C,G,Ccedilla" k="12" />
-<hkern g1="x" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="12" />
-<hkern g1="x" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="12" />
-<hkern g1="x" g2="d,q" k="12" />
-<hkern g1="x" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="14" />
-<hkern g1="x" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="14" />
-<hkern g1="x" g2="guillemotleft,guilsinglleft" k="29" />
-<hkern g1="x" g2="hyphen,endash,emdash" k="33" />
-<hkern g1="y,yacute,ydieresis" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="49" />
-<hkern g1="y,yacute,ydieresis" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="10" />
-<hkern g1="y,yacute,ydieresis" g2="period,ellipsis" k="51" />
-<hkern g1="y,yacute,ydieresis" g2="quotesinglbase,quotedblbase" k="51" />
-<hkern g1="y,yacute,ydieresis" g2="ampersand" k="20" />
-<hkern g1="y,yacute,ydieresis" g2="comma" k="51" />
-<hkern g1="y,yacute,ydieresis" g2="slash" k="41" />
-<hkern g1="y,yacute,ydieresis" g2="g" k="8" />
-<hkern g1="y,yacute,ydieresis" g2="parenright" k="29" />
-<hkern g1="y,yacute,ydieresis" g2="bracketright" k="29" />
-<hkern g1="y,yacute,ydieresis" g2="braceright" k="29" />
-<hkern g1="z" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="16" />
-<hkern g1="z" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="12" />
-<hkern g1="z" g2="ampersand" k="14" />
-<hkern g1="z" g2="guillemotleft,guilsinglleft" k="31" />
-<hkern g1="z" g2="hyphen,endash,emdash" k="35" />
-<hkern g1="z" g2="parenright" k="23" />
-<hkern g1="z" g2="bracketright" k="20" />
-</font>
-</defs></svg>
\ No newline at end of file
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-regular.ttf b/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-regular.ttf
deleted file mode 100755
index 4f51cab..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-regular.ttf and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-regular.woff b/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-regular.woff
deleted file mode 100755
index e65076f..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-regular.woff and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-semibold.eot b/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-semibold.eot
deleted file mode 100755
index e86df09..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-semibold.eot and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-semibold.otf b/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-semibold.otf
deleted file mode 100755
index 34f2ede..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-semibold.otf and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-semibold.svg b/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-semibold.svg
deleted file mode 100755
index 22b6762..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-semibold.svg
+++ /dev/null
@@ -1,1522 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="acordesemibold" horiz-adv-x="1171" >
-<font-face units-per-em="2048" ascent="1597" descent="-451" />
-<missing-glyph horiz-adv-x="450" />
-<glyph unicode="fi" horiz-adv-x="1273" d="M45 864v185h164v135q0 156 100 247t273 91q102 0 172 -15l-29 -190q-65 14 -115 14q-82 0 -116.5 -40t-34.5 -124v-118h674v-1049h-248v864h-426v-864h-250v864h-164zM866 1364q0 62 41.5 100.5t102.5 38.5t102 -38.5t41 -100.5q0 -61 -41 -101t-102 -40t-102.5 40 t-41.5 101z" />
-<glyph unicode="fl" horiz-adv-x="1277" d="M45 864v185h164v135q0 156 117.5 247t320.5 91q124 0 291 -29l195 10v-1065q0 -117 2.5 -226t4.5 -160l3 -50q-72 -14 -111 -14q-147 0 -147 155v1160q-123 28 -209 28q-114 0 -165.5 -40.5t-51.5 -123.5v-118h276v-185h-276v-864h-250v864h-164z" />
-<glyph unicode="ffi" horiz-adv-x="1949" d="M45 864v185h164v135q0 156 100 247t273 91q110 0 221 -27l-27 -190q-83 26 -166 26q-82 0 -116.5 -40t-34.5 -124v-118h426v135q0 156 99.5 247t272.5 91q103 0 173 -15l-29 -190q-65 14 -115 14q-82 0 -116.5 -40t-34.5 -124v-118h673v-1049h-247v864h-426v-864h-250 v864h-426v-864h-250v864h-164zM1542 1364q0 62 41.5 100.5t102.5 38.5t102 -38.5t41 -100.5q0 -61 -41 -101t-102 -40t-102.5 40t-41.5 101z" />
-<glyph unicode="ffl" horiz-adv-x="1951" d="M45 864v185h164v135q0 156 100 247t273 91q110 0 221 -27l-27 -190q-83 26 -166 26q-82 0 -116.5 -40t-34.5 -124v-118h426v135q0 156 117.5 247t320.5 91q124 0 291 -29l194 10v-1065q0 -117 3 -226t5 -160l3 -50q-72 -14 -111 -14q-147 0 -147 155v1160 q-123 28 -209 28q-114 0 -165.5 -40.5t-51.5 -123.5v-118h276v-185h-276v-864h-250v864h-426v-864h-250v864h-164z" />
-<glyph horiz-adv-x="2048" />
-<glyph horiz-adv-x="2048" />
-<glyph unicode="
" horiz-adv-x="2048" />
-<glyph unicode=" " horiz-adv-x="450" />
-<glyph unicode="	" horiz-adv-x="450" />
-<glyph unicode=" " horiz-adv-x="450" />
-<glyph unicode="!" horiz-adv-x="587" d="M139 127q0 68 45 111t109 43q66 0 111 -43t45 -111q0 -65 -45.5 -110.5t-110.5 -45.5q-63 0 -108.5 46t-45.5 110zM156 1475h276l-22 -1067h-232z" />
-<glyph unicode=""" horiz-adv-x="817" d="M96 1516h242l-27 -500h-190zM479 1516h242l-27 -500h-190z" />
-<glyph unicode="#" horiz-adv-x="1417" d="M66 395v180h258l36 304h-217v180h238l47 375h225l-47 -375h283l47 375h225l-47 -375h238v-180h-258l-37 -304h217v-180h-240l-47 -395h-225l47 395h-283l-47 -395h-225l47 395h-235zM549 575h282l37 304h-282z" />
-<glyph unicode="$" horiz-adv-x="1058" d="M66 57l40 217q180 -102 359 -102v459q-37 17 -59.5 27t-58 28t-57.5 32.5t-51.5 37t-48 43.5t-39 49.5t-31.5 59t-18.5 68t-7.5 79.5q0 150 99.5 257.5t265.5 141.5v164h170v-152q176 -6 317 -61l-35 -221q-141 70 -288 76v-422q47 -21 76 -34.5t72.5 -37.5t70.5 -45.5 t58.5 -55t49 -68.5t29.5 -82t12 -101q0 -158 -96.5 -273.5t-265.5 -154.5v-170h-170v151q-222 3 -393 90zM354 1077q0 -95 111 -164v328q-111 -42 -111 -164zM623 201q110 50 110 182q0 100 -110 168v-350z" />
-<glyph unicode="%" horiz-adv-x="1855" d="M66 1073q0 169 98.5 272t265.5 103q185 0 275 -100t90 -275q0 -162 -99.5 -268.5t-265.5 -106.5q-174 0 -269 105t-95 270zM258 1073q0 -97 49 -154t123 -57q80 0 126 56t46 155q0 104 -45.5 158.5t-126.5 54.5t-126.5 -54.5t-45.5 -158.5zM381 -61l946 1642l148 -86 l-949 -1642zM1061 360q0 169 97.5 272t264.5 103q184 0 274.5 -100t90.5 -275q0 -162 -100 -268t-265 -106q-174 0 -268 104.5t-94 269.5zM1251 360q0 -97 49 -155t123 -58q80 0 126 57t46 156q0 104 -45.5 157.5t-126.5 53.5t-126.5 -53.5t-45.5 -157.5z" />
-<glyph unicode="&" horiz-adv-x="1566" d="M74 410q0 78 19.5 144t57 117.5t80 89.5t99.5 75q-101 157 -101 290q0 89 32.5 157t87 106.5t118 57.5t133.5 19q149 0 233.5 -67t84.5 -199q0 -114 -72 -210.5t-213 -186.5q161 -173 401 -336q77 148 96 311l234 -43q-26 -203 -139 -389q203 -117 340 -164l-103 -211 q-171 65 -383 197q-207 -193 -497 -193q-242 0 -375 123t-133 312zM319 440q0 -119 84.5 -193.5t217.5 -74.5q155 0 280 115q-281 196 -457 397q-61 -48 -93 -105t-32 -139zM453 1145q0 -90 67 -199q98 63 135 119t37 117q0 58 -32.5 88t-81.5 30q-125 0 -125 -155z" />
-<glyph unicode="'" horiz-adv-x="432" d="M96 1516h242l-27 -500h-190z" />
-<glyph unicode="(" horiz-adv-x="657" d="M106 532q0 168 23 321.5t66 281t84 220t96 189.5h221q-248 -465 -248 -985q0 -268 72 -521t176 -448h-227q-263 469 -263 942z" />
-<glyph unicode=")" horiz-adv-x="655" d="M59 -410q106 196 177 447t71 538q0 269 -72 523t-176 446h228q264 -464 264 -942q0 -168 -23 -322t-65.5 -280.5t-84.5 -220t-97 -189.5h-222z" />
-<glyph unicode="*" horiz-adv-x="1013" d="M66 1118l63 197l289 -119l-23 320h215l-22 -322l295 119l65 -193l-313 -78l209 -247l-170 -123l-172 270l-168 -270l-166 123l205 245z" />
-<glyph unicode="+" horiz-adv-x="1097" d="M66 422v207h368v383h228v-383h368v-207h-368v-383h-228v383h-368z" />
-<glyph unicode="," horiz-adv-x="518" d="M57 -213q66 11 105 64t39 135q-34 10 -65.5 46t-31.5 95q0 68 45 111t109 43q70 0 113 -46.5t43 -144.5q0 -176 -89 -293t-235 -145z" />
-<glyph unicode="-" horiz-adv-x="806" d="M123 457v209h561v-209h-561z" />
-<glyph unicode="." horiz-adv-x="516" d="M104 127q0 68 45 111t109 43q66 0 111 -43t45 -111q0 -65 -46 -110.5t-110 -45.5q-63 0 -108.5 46t-45.5 110z" />
-<glyph unicode="/" horiz-adv-x="874" d="M68 -414l503 1876h238l-502 -1876h-239z" />
-<glyph unicode="0" horiz-adv-x="1189" d="M84 524q0 246 137.5 397.5t372.5 151.5q132 0 231.5 -40t160 -113.5t90.5 -172.5t30 -223q0 -152 -61 -276t-179 -198.5t-272 -74.5q-124 0 -222.5 43t-160.5 118t-94.5 174t-32.5 214zM324 524q0 -156 77 -248t193 -92q125 0 197.5 90.5t72.5 249.5q0 168 -71.5 255 t-198.5 87t-198.5 -87t-71.5 -255z" />
-<glyph unicode="1" horiz-adv-x="759" d="M25 825l346 224h215v-1049h-250v592q0 103 12 217q-50 -43 -98 -66l-166 -86z" />
-<glyph unicode="2" horiz-adv-x="1021" d="M88 979q168 94 391 94q199 0 304.5 -80t105.5 -241q0 -56 -12.5 -106.5t-38.5 -94.5t-51.5 -77.5t-66 -70t-65.5 -56t-67 -50.5q-90 -67 -164 -111q209 11 268 11h258v-197h-856v178q72 41 174 112t183 140q37 33 63 58t57 62.5t47.5 76.5t16.5 78q0 85 -54.5 129.5 t-158.5 44.5q-163 0 -285 -86z" />
-<glyph unicode="3" horiz-adv-x="1007" d="M45 -322l27 205q142 -65 323 -65q139 0 215 63t76 172q0 106 -91 163.5t-251 57.5q-57 0 -143 -8l-15 183q226 0 338.5 64t112.5 196q0 170 -225 170q-167 0 -285 -86l-51 186q168 94 393 94q422 0 422 -317q0 -126 -65.5 -214t-180.5 -136q154 -32 223.5 -113.5 t69.5 -222.5q0 -197 -152.5 -323t-382.5 -126q-210 0 -358 57z" />
-<glyph unicode="4" horiz-adv-x="1105" d="M59 18v172l336 859h240l-256 -672q-40 -103 -74 -170q71 6 152 6h219v459h235v-459h158v-195h-158v-372h-239v372h-613z" />
-<glyph unicode="5" horiz-adv-x="1044" d="M63 -322l27 205q145 -65 324 -65q148 0 226.5 69t78.5 185t-66.5 179.5t-187.5 63.5q-129 0 -229 -73l-140 61l51 746h779v-201h-248q-161 0 -305 12q0 -24 -2 -49l-23 -285q-2 -25 -10 -71q103 63 233 63q176 0 288 -106t112 -308q0 -219 -153.5 -351t-393.5 -132 q-213 0 -361 57z" />
-<glyph unicode="6" horiz-adv-x="1132" d="M90 610q0 165 34.5 300.5t96.5 230.5t149.5 160t191.5 95.5t224 30.5q104 0 191 -20l14 -203q-98 27 -188 27q-96 0 -169.5 -22.5t-136.5 -77.5t-102 -158t-51 -254q110 164 332 164q174 0 277.5 -106t103.5 -322q0 -217 -132 -348.5t-345 -131.5q-117 0 -204.5 33 t-153 106t-99 197t-33.5 299zM342 518q11 -181 78.5 -263.5t171.5 -82.5q105 0 164 67.5t59 186.5q0 129 -58.5 189.5t-156.5 60.5q-161 0 -258 -158z" />
-<glyph unicode="7" horiz-adv-x="1013" d="M45 846v203h940v-160l-215 -389q-104 -186 -205 -428t-143 -426h-254q34 174 113 368.5t211 458.5q111 224 235 383q-95 -10 -223 -10h-459z" />
-<glyph unicode="8" horiz-adv-x="1132" d="M86 348q0 71 22 132t61 105t84 75.5t99 52.5q-104 62 -162.5 143.5t-58.5 200.5q0 165 130 267.5t319 102.5q210 0 322 -89t112 -253q0 -213 -250 -327q66 -33 113 -65t87 -76t60 -101t20 -129q0 -81 -32 -154.5t-91 -131.5t-152.5 -92t-207.5 -34q-228 0 -351.5 97.5 t-123.5 275.5zM332 377q0 -101 68.5 -156t168.5 -55q111 0 170.5 53.5t59.5 145.5t-66.5 149.5t-216.5 120.5q-87 -32 -135.5 -97.5t-48.5 -160.5zM375 1067q0 -83 52 -131.5t171 -101.5q174 62 174 227q0 75 -55 126.5t-148 51.5q-89 0 -141.5 -45.5t-52.5 -126.5z" />
-<glyph unicode="9" horiz-adv-x="1093" d="M51 596q0 217 132.5 347t346.5 130q117 0 204 -32.5t152 -105.5t98.5 -197t33.5 -300q0 -206 -52.5 -364.5t-147 -256t-219.5 -147t-277 -49.5q-82 0 -189 21l-14 204q89 -28 186 -28q76 0 137.5 13.5t118.5 48.5t97.5 91.5t68.5 147t37 211.5q-106 -164 -332 -164 q-172 0 -276.5 107t-104.5 323zM295 625q0 -130 58 -191t157 -61q163 0 258 157q-11 181 -79 265t-171 84q-105 0 -164 -68t-59 -186z" />
-<glyph unicode=":" horiz-adv-x="591" d="M141 127q0 68 45 111t109 43q66 0 111 -43t45 -111q0 -65 -45.5 -110.5t-110.5 -45.5q-63 0 -108.5 46t-45.5 110zM141 813q0 68 45 111t109 43q66 0 111 -43t45 -111q0 -65 -45.5 -110.5t-110.5 -45.5q-63 0 -108.5 46t-45.5 110z" />
-<glyph unicode=";" horiz-adv-x="593" d="M94 -213q66 11 105 64t39 135q-34 10 -65.5 46t-31.5 95q0 68 45 111t109 43q70 0 113 -46.5t43 -144.5q0 -176 -89 -293t-235 -145zM141 813q0 68 45 111t109 43q66 0 111 -43t45 -111q0 -65 -45.5 -110.5t-110.5 -45.5q-63 0 -108.5 46t-45.5 110z" />
-<glyph unicode="<" horiz-adv-x="1095" d="M43 463v147l944 477v-241l-661 -307l661 -301v-252z" />
-<glyph unicode="=" horiz-adv-x="1200" d="M119 240v200h962v-200h-962zM119 610v201h962v-201h-962z" />
-<glyph unicode=">" horiz-adv-x="1093" d="M109 -14v243l659 308l-659 301v249l942 -477v-147z" />
-<glyph unicode="?" horiz-adv-x="952" d="M59 1391q66 47 175 81.5t219 34.5q197 0 312.5 -87.5t115.5 -254.5q0 -64 -17 -118t-55 -104t-78 -88.5t-106 -92.5q-117 -94 -117 -246q0 -64 8 -100l-246 -17q-10 45 -10 133q0 98 43.5 188.5t132.5 153.5q109 78 147 129t38 130q0 80 -62.5 123.5t-159.5 43.5 q-82 0 -158 -30.5t-130 -71.5zM244 127q0 68 44.5 111t108.5 43q66 0 111 -43t45 -111q0 -65 -45.5 -110.5t-110.5 -45.5q-63 0 -108 46t-45 110z" />
-<glyph unicode="@" horiz-adv-x="1853" d="M59 326q0 169 46.5 316t132.5 257.5t203 190t261.5 120.5t305.5 41q126 0 238 -24.5t209.5 -78.5t167.5 -133t110.5 -193.5t40.5 -254.5q0 -256 -152 -424t-373 -168q-102 0 -159.5 39.5t-57.5 118.5q0 37 17 90l28 88q-140 -336 -346 -336q-221 0 -221 265 q0 126 36.5 238.5t101.5 196t161.5 132.5t210.5 49q160 0 297 -59l-94 -525q-6 -54 -6 -65q0 -40 20.5 -59t67.5 -19q90 0 168.5 115t78.5 297q0 128 -46.5 227.5t-129 161.5t-189.5 93.5t-233 31.5q-141 0 -263 -50t-210 -140t-138 -223t-50 -292q0 -158 47.5 -277.5 t133 -191.5t196 -107.5t245.5 -35.5q201 0 392 67l34 -167q-204 -82 -467 -82q-133 0 -251.5 27t-222.5 87t-179 148t-118.5 218t-43.5 290zM723 276q0 -126 78 -126q80 0 161 129t121 366l7 31q-56 16 -111 16q-59 0 -109 -39t-81 -100.5t-48.5 -133.5t-17.5 -143z" />
-<glyph unicode="A" horiz-adv-x="1267" d="M-2 0l520 1434h248l489 -1434h-268l-104 334h-514l-109 -334h-262zM432 532h389l-116 381q-37 113 -70 277q-48 -185 -78 -277z" />
-<glyph unicode="B" horiz-adv-x="1212" d="M170 4v1426q188 16 381 16q125 0 216 -17.5t160.5 -58t104.5 -111.5t35 -172q0 -96 -50.5 -179t-144.5 -136q250 -72 250 -338q0 -205 -148.5 -325.5t-422.5 -120.5q-193 0 -381 16zM420 190q70 -8 137 -8q311 0 311 234q0 68 -24 115.5t-68.5 73t-97.5 36t-121 10.5 q-85 0 -137 -6v-455zM420 825q35 -4 137 -4q258 0 258 228q0 48 -14 84.5t-37.5 58.5t-58 35.5t-69.5 18.5t-79 5q-67 0 -137 -8v-418z" />
-<glyph unicode="C" horiz-adv-x="1179" d="M86 713q0 339 194 546t511 207q188 0 337 -55l-47 -221q-117 57 -270 57q-227 0 -344 -136.5t-117 -393.5q0 -261 127 -398t336 -137q146 0 268 56l47 -203q-142 -68 -348 -68q-344 0 -519 187t-175 559z" />
-<glyph unicode="D" horiz-adv-x="1382" d="M170 4v1426q188 16 381 16q139 0 251.5 -22.5t205.5 -73t155.5 -128.5t96.5 -192.5t34 -261.5q0 -189 -58 -339.5t-160 -245.5t-235.5 -145t-289.5 -50q-193 0 -381 16zM424 203q74 -8 139 -8q224 0 345.5 145t121.5 416q0 126 -36 221t-100.5 151t-147.5 83.5t-183 27.5 q-65 0 -139 -8v-1028z" />
-<glyph unicode="E" horiz-adv-x="1126" d="M170 0v1434h850v-207h-594v-391h526v-195h-526v-434h602v-207h-858z" />
-<glyph unicode="F" horiz-adv-x="1087" d="M170 0v1434h850v-207h-594v-416h541v-199h-541v-612h-256z" />
-<glyph unicode="G" horiz-adv-x="1363" d="M86 713q0 225 88.5 395.5t255.5 264t391 93.5q208 0 389 -61l-45 -223q-57 27 -145.5 46t-179.5 19q-247 0 -368.5 -135.5t-121.5 -394.5q0 -264 126 -402.5t343 -138.5q109 0 195 21v403h-246v186h487v-714q-86 -47 -210.5 -76t-245.5 -29q-713 0 -713 746z" />
-<glyph unicode="H" horiz-adv-x="1435" d="M170 0v1434h256v-574h584v574h254v-1434h-254v653h-584v-653h-256z" />
-<glyph unicode="I" horiz-adv-x="593" d="M170 0v1434h254v-1434h-254z" />
-<glyph unicode="J" horiz-adv-x="593" d="M-43 -186q126 0 176 84q23 39 30 100t7 190v1246h254v-1262q0 -155 -17.5 -234.5t-64.5 -146.5q-106 -156 -362 -156z" />
-<glyph unicode="K" horiz-adv-x="1228" d="M170 0v1434h256v-656l492 656h288l-528 -682l563 -752h-309l-506 700v-700h-256z" />
-<glyph unicode="L" horiz-adv-x="1038" d="M170 0v1434h256v-1227h594v-207h-850z" />
-<glyph unicode="M" horiz-adv-x="1826" d="M119 0l139 1434h281l305 -895q34 -95 65 -240q45 165 72 240l319 895h281l125 -1434h-254l-43 641q-15 227 -18 440q-51 -189 -80 -268l-295 -813h-230l-284 813q-35 100 -76 262q-10 -226 -27 -434l-51 -641h-229z" />
-<glyph unicode="N" horiz-adv-x="1443" d="M170 0v1434h262l473 -775q71 -118 154 -307q-12 190 -12 477v605h227v-1434h-262l-475 774q-76 125 -152 301q12 -254 12 -471v-604h-227z" />
-<glyph unicode="O" horiz-adv-x="1476" d="M86 717q0 340 176.5 544.5t474.5 204.5q170 0 296.5 -53t204 -153t115.5 -235.5t38 -307.5q0 -213 -79 -383t-229 -268.5t-346 -98.5q-158 0 -282.5 57t-204.5 158.5t-122 237.5t-42 297zM350 717q0 -129 31.5 -233t86 -169t123.5 -99t146 -34q174 0 281.5 138.5 t107.5 396.5q0 269 -106 401.5t-283 132.5q-176 0 -281.5 -132.5t-105.5 -401.5z" />
-<glyph unicode="P" horiz-adv-x="1167" d="M170 0v1430q188 16 381 16q296 0 431.5 -100.5t135.5 -339.5q0 -226 -151.5 -366t-407.5 -140q-79 0 -135 6v-506h-254zM424 705q65 -7 139 -7q297 0 297 291q0 260 -297 260q-83 0 -139 -6v-538z" />
-<glyph unicode="Q" horiz-adv-x="1476" d="M86 717q0 340 176.5 544.5t474.5 204.5q170 0 296.5 -53t204 -153t115.5 -235.5t38 -307.5q0 -258 -115.5 -449.5t-317.5 -263.5q149 -70 340 -70q62 0 123 11l-20 -213q-30 -6 -82 -6q-191 0 -347.5 63t-236.5 178q-157 1 -281.5 58t-204 158t-121.5 237t-42 297z M350 717q0 -129 31.5 -233t86 -169t123.5 -99t146 -34q174 0 281.5 138.5t107.5 396.5q0 269 -106 401.5t-283 132.5q-176 0 -281.5 -132.5t-105.5 -401.5z" />
-<glyph unicode="R" horiz-adv-x="1224" d="M170 0v1430q188 16 381 16q268 0 402 -87.5t134 -297.5q0 -122 -62 -211t-165 -139q64 -32 107 -97t77 -180l127 -434h-266l-110 395q-32 115 -84 155t-150 40q-84 0 -139 -6v-584h-252zM422 780q37 -4 139 -4q117 0 191.5 62t74.5 184q0 227 -266 227q-84 0 -139 -6 v-463z" />
-<glyph unicode="S" horiz-adv-x="1075" d="M74 57l41 217q183 -102 362 -102q126 0 195 55t69 156q0 46 -22 83.5t-59 65t-85 51.5t-101 47.5t-105.5 49.5t-100.5 60.5t-85 76.5t-59 103t-22 135q0 180 139 295.5t357 115.5q199 0 356 -61l-34 -221q-156 78 -322 78q-113 0 -174.5 -47.5t-61.5 -137.5 q0 -44 22 -80.5t58.5 -62.5t84.5 -49t100.5 -46t105.5 -48t101 -60t84.5 -77t58.5 -103.5t22 -136.5q0 -195 -143 -321t-381 -126q-221 0 -401 90z" />
-<glyph unicode="T" horiz-adv-x="1124" d="M23 1227v207h1079v-207h-412v-1227h-254v1227h-413z" />
-<glyph unicode="U" horiz-adv-x="1390" d="M154 504v930h256v-906q0 -346 292 -346q136 0 211.5 81t75.5 239v932h248v-920q0 -119 -32.5 -216.5t-98.5 -172.5t-174.5 -116.5t-251.5 -41.5q-256 0 -391 137.5t-135 399.5z" />
-<glyph unicode="V" horiz-adv-x="1263" d="M10 1434h277l272 -852q38 -118 72 -291q31 143 82 291l286 852h269l-520 -1434h-248z" />
-<glyph unicode="W" horiz-adv-x="1953" d="M29 1434h262l225 -856q29 -108 51 -263q22 133 60 263l239 856h242l225 -856q33 -128 53 -265q25 147 58 265l237 856h256l-434 -1434h-258l-221 856q-24 95 -45 215q-22 -126 -47 -215l-240 -856h-256z" />
-<glyph unicode="X" horiz-adv-x="1198" d="M14 0l432 741l-403 693h293l270 -498l266 498h277l-395 -682l438 -752h-295l-305 563l-301 -563h-277z" />
-<glyph unicode="Y" horiz-adv-x="1177" d="M-10 1434h299l231 -482q45 -94 72 -182q19 61 78 182l241 482h287l-483 -885v-549h-256v549z" />
-<glyph unicode="Z" horiz-adv-x="1183" d="M86 0v193l539 794q97 142 186 248q-98 -8 -199 -8h-526v207h1010v-193l-539 -795q-73 -108 -186 -249q82 10 198 10h527v-207h-1010z" />
-<glyph unicode="[" horiz-adv-x="659" d="M160 -410v1954h440v-186h-209v-1581h209v-187h-440z" />
-<glyph unicode="\" horiz-adv-x="874" d="M63 1462h240l504 -1876h-240z" />
-<glyph unicode="]" horiz-adv-x="659" d="M59 -223h209v1581h-209v186h441v-1954h-441v187z" />
-<glyph unicode="^" horiz-adv-x="1232" d="M82 590l424 885h233l404 -885h-269l-253 680l-281 -680h-258z" />
-<glyph unicode="_" horiz-adv-x="1032" d="M4 -186h1024v-197h-1024v197z" />
-<glyph unicode="`" horiz-adv-x="1024" d="M283 1362l116 188l344 -237l-88 -139z" />
-<glyph unicode="a" horiz-adv-x="1042" d="M63 285q0 117 67 194t180.5 110.5t271.5 33.5q38 0 92 -7v76q0 193 -209 193q-164 0 -295 -88l-49 182q164 94 391 94q194 0 296.5 -79t102.5 -267v-289q0 -117 2.5 -226t5.5 -160l3 -50q-72 -14 -111 -14q-129 0 -135 137q-107 -150 -311 -150q-132 0 -217 78.5 t-85 231.5zM301 303q0 -67 36.5 -104t102.5 -37q133 0 234 147v158q-55 6 -119 6q-116 0 -185 -40.5t-69 -129.5z" />
-<glyph unicode="b" horiz-adv-x="1165" d="M137 49v1442l248 12v-366q0 -117 -12 -219q108 155 315 155q84 0 154 -29t125.5 -88.5t86.5 -159t31 -231.5q0 -282 -154.5 -436t-410.5 -154q-199 0 -383 74zM385 203q81 -31 160 -31q127 0 208 91.5t81 266.5q0 169 -59.5 252.5t-168.5 83.5q-127 0 -221 -131v-532z " />
-<glyph unicode="c" horiz-adv-x="925" d="M76 522q0 244 149 397.5t377 153.5q160 0 264 -51l-35 -201q-96 45 -202 45q-137 0 -218 -83t-81 -261q0 -81 18 -143.5t48 -100.5t72.5 -62.5t86.5 -34t96 -9.5q102 0 178 43l37 -188q-117 -52 -274 -52q-119 0 -208.5 26.5t-161 87t-109 169.5t-37.5 264z" />
-<glyph unicode="d" horiz-adv-x="1169" d="M78 485q0 280 155.5 434t411.5 154q66 0 141 -10q-8 98 -8 194v234l250 12v-1065q0 -117 2.5 -226t5.5 -160l2 -50q-72 -14 -110 -14q-127 0 -133 139q-108 -152 -320 -152q-84 0 -154 29t-125.5 88.5t-86.5 159.5t-31 233zM332 518q0 -168 58.5 -252t166.5 -84 q129 0 221 129v535q-78 33 -160 33q-125 0 -205.5 -92.5t-80.5 -268.5z" />
-<glyph unicode="e" horiz-adv-x="1067" d="M78 522q0 247 135 399t360 152q193 0 305.5 -114.5t112.5 -337.5q0 -71 -8 -123h-661q13 -332 352 -332q137 0 254 47l33 -176q-144 -62 -345 -62q-127 0 -221.5 26.5t-168 87.5t-111 169.5t-37.5 263.5zM332 657h424q0 107 -55.5 170.5t-141.5 63.5q-92 0 -151 -57 t-76 -177z" />
-<glyph unicode="f" horiz-adv-x="782" d="M45 864v185h164v135q0 156 100.5 247t276.5 91q121 0 227 -29l-27 -190q-82 28 -172 28q-85 0 -120 -39.5t-35 -124.5v-118h293v-185h-293v-864h-250v864h-164z" />
-<glyph unicode="g" horiz-adv-x="1136" d="M59 -152q0 83 50.5 148.5t121.5 93.5q-127 52 -127 176q0 65 38 117t96 80q-109 91 -109 252q0 111 56 193.5t149.5 123.5t210.5 41q110 0 190 -26q191 0 367 8v-156q-66 -4 -111 -4q-51 0 -82 2q49 -79 49 -182q0 -161 -118.5 -260t-294.5 -99q-106 0 -197 33 q-43 -24 -43 -72q0 -37 42.5 -58t111 -29.5t151 -15.5t165 -22.5t151 -43.5t111 -86t42.5 -142q0 -179 -143.5 -286t-398.5 -107q-239 0 -358.5 89.5t-119.5 231.5zM291 -121q0 -87 80 -131.5t200 -44.5q117 0 196 42t79 128q0 20 -5 36.5t-16 30t-23 24.5t-33.5 19.5 t-38.5 15t-47.5 11.5t-50.5 8.5t-57 7t-59 5.5t-63 5q-9 1 -13.5 1t-12 1t-13.5 1q-123 -44 -123 -160zM354 715q0 -87 54 -141t137 -54q85 0 136.5 53.5t51.5 141.5q0 93 -50.5 143.5t-137.5 50.5q-88 0 -139.5 -50.5t-51.5 -143.5z" />
-<glyph unicode="h" horiz-adv-x="1169" d="M141 0v1491l248 12v-366q0 -117 -12 -219q112 155 315 155q73 0 133 -19.5t109 -60t76.5 -111.5t27.5 -167v-715h-247v655q0 112 -46.5 161.5t-132.5 49.5q-133 0 -223 -131v-735h-248z" />
-<glyph unicode="i" horiz-adv-x="534" d="M125 1364q0 62 41 100.5t102 38.5t102.5 -38.5t41.5 -100.5q0 -61 -41.5 -101t-102.5 -40t-102 40t-41 101zM143 0v1049h248v-1049h-248z" />
-<glyph unicode="j" horiz-adv-x="534" d="M-66 -299q124 0 172 84q23 39 30 100.5t7 190.5v973h248v-986q0 -155 -17.5 -233.5t-64.5 -146.5q-108 -156 -352 -156zM125 1364q0 62 41 100.5t102 38.5t102.5 -38.5t41.5 -100.5q0 -61 -41.5 -101t-102.5 -40t-102 40t-41 101z" />
-<glyph unicode="k" horiz-adv-x="1075" d="M141 0v1491l248 12v-895l359 441h280l-387 -459l432 -590h-299l-385 545v-545h-248z" />
-<glyph unicode="l" horiz-adv-x="532" d="M139 143v1348l250 12v-1065q0 -117 2.5 -226t4.5 -160l3 -50q-72 -14 -110 -14q-150 0 -150 155z" />
-<glyph unicode="m" horiz-adv-x="1804" d="M133 1049q72 14 111 14q127 0 133 -139q105 149 313 149q224 0 303 -168q119 168 340 168q72 0 131.5 -19.5t108 -60t75.5 -111.5t27 -167v-715h-250v655q0 113 -44 162t-130 49q-119 0 -219 -127v-739h-248v655q0 113 -44 162t-130 49q-129 0 -219 -127v-739h-248v610 q0 117 -2.5 227t-4.5 161z" />
-<glyph unicode="n" d="M133 1049q72 14 111 14q126 0 133 -141q108 151 317 151q72 0 132 -19.5t109.5 -60t77 -111.5t27.5 -167v-715h-247v655q0 112 -46.5 161.5t-134.5 49.5q-131 0 -221 -131v-735h-248v610q0 117 -2.5 227t-4.5 161z" />
-<glyph unicode="o" horiz-adv-x="1150" d="M78 524q0 247 131.5 398t365.5 151q134 0 231.5 -40t155 -114.5t84.5 -172t27 -222.5q0 -114 -33 -213.5t-94.5 -174.5t-157 -118t-213.5 -43q-125 0 -221.5 43t-156 118.5t-89.5 173.5t-30 214zM332 524q0 -164 67 -258t176 -94q120 0 183 91.5t63 260.5q0 355 -246 355 q-243 0 -243 -355z" />
-<glyph unicode="p" d="M133 1049q72 14 111 14q126 0 133 -141q108 151 317 151q84 0 154 -29t125.5 -88.5t87 -159t31.5 -231.5q0 -282 -155 -436t-411 -154q-59 0 -145 11q10 -82 10 -195v-233l-248 -13v1065q0 117 -2.5 227t-4.5 161zM391 205q78 -33 162 -33q126 0 206.5 91.5t80.5 266.5 q0 169 -59.5 252.5t-168.5 83.5q-131 0 -221 -131v-530z" />
-<glyph unicode="q" horiz-adv-x="1163" d="M78 485q0 280 155.5 434t411.5 154q205 0 383 -74v-1441l-250 -13v369q0 130 10 215q-111 -154 -313 -154q-84 0 -154 29t-125.5 88.5t-86.5 159.5t-31 233zM332 518q0 -168 58.5 -252t166.5 -84q129 0 221 129v535q-78 33 -160 33q-125 0 -205.5 -92.5t-80.5 -268.5z " />
-<glyph unicode="r" horiz-adv-x="776" d="M133 1049q72 14 111 14q133 0 133 -158v-24q79 192 272 192q58 0 109 -14l-23 -234q-59 23 -121 23q-152 0 -223 -195v-653h-248v610q0 117 -2.5 227t-4.5 161z" />
-<glyph unicode="s" horiz-adv-x="854" d="M70 39l32 188q132 -71 258 -71q168 0 168 118q0 40 -24 70.5t-62.5 51.5t-85 41t-93 45t-85 56.5t-62.5 83t-24 117.5q0 147 106.5 240.5t282.5 93.5q151 0 275 -47l-31 -192q-108 59 -236 59q-149 0 -149 -119q0 -37 24.5 -65.5t63.5 -48t86 -39t94 -44.5t86 -57.5 t63.5 -85.5t24.5 -121q0 -150 -113 -244t-294 -94q-177 0 -305 64z" />
-<glyph unicode="t" horiz-adv-x="794" d="M45 864v185h168l20 260l209 45v-305h293v-185h-293v-530q0 -93 36.5 -127.5t103.5 -34.5q80 0 153 43l23 -174q-109 -66 -248 -66q-315 0 -315 297v592h-150z" />
-<glyph unicode="u" d="M131 334v715h248v-656q0 -112 46 -161.5t132 -49.5q129 0 221 129v738h250v-611q0 -117 2.5 -226t5.5 -160l2 -50q-72 -14 -110 -14q-127 0 -133 139q-108 -152 -318 -152q-73 0 -133 19.5t-109 60.5t-76.5 112t-27.5 167z" />
-<glyph unicode="v" horiz-adv-x="1060" d="M14 1049h269l190 -557q30 -85 57 -226q33 139 64 226l192 557h265l-404 -1049h-246z" />
-<glyph unicode="w" horiz-adv-x="1617" d="M20 1049h254l158 -562q24 -91 47 -237q20 136 51 237l160 562h246l158 -562q24 -91 47 -237q20 136 51 237l162 562h248l-342 -1049h-254l-154 563q-31 117 -45 221q-20 -126 -47 -221l-160 -563h-254z" />
-<glyph unicode="x" horiz-adv-x="1054" d="M25 0l344 541l-324 508h293l201 -349l192 349h268l-313 -496l350 -553h-291l-227 395l-227 -395h-266z" />
-<glyph unicode="y" horiz-adv-x="1062" d="M14 1049h269l190 -557q35 -104 64 -256q34 157 67 256l182 557h265l-381 -1049q-92 -254 -207.5 -363.5t-290.5 -109.5q-44 0 -84 8l-27 197q33 -8 78 -8q82 0 142 35.5t108 138.5l31 65q-28 57 -64 156z" />
-<glyph unicode="z" horiz-adv-x="991" d="M84 0v164l420 584q37 52 96 118q-76 -12 -197 -12h-319v195h825v-142l-440 -606q-45 -62 -96 -119q92 15 196 15h340v-197h-825z" />
-<glyph unicode="{" horiz-adv-x="720" d="M27 496v184q45 0 79.5 10.5t64 35t45 72t15.5 115.5v256q0 174 82 274.5t232 100.5h117v-186q-120 0 -159.5 -42t-39.5 -167v-199q0 -116 -22.5 -191t-58.5 -111.5t-95 -59.5q87 -26 131.5 -109t44.5 -254v-239q0 -125 39.5 -167t159.5 -42v-187h-117q-158 0 -236 86.5 t-78 288.5v299q0 115 -56.5 173.5t-147.5 58.5z" />
-<glyph unicode="|" horiz-adv-x="530" d="M160 -455v1979h211v-1979h-211z" />
-<glyph unicode="}" horiz-adv-x="720" d="M59 -223q119 0 159 42.5t40 166.5v239q0 170 43.5 250t132.5 113q-88 28 -132 109.5t-44 252.5v199q0 124 -40 166.5t-159 42.5v186h115q160 0 237.5 -86t77.5 -289v-256q0 -116 56 -174.5t149 -58.5v-184q-95 0 -150 -51.5t-55 -180.5v-299q0 -175 -82 -275t-233 -100 h-115v187z" />
-<glyph unicode="~" horiz-adv-x="1216" d="M111 565q40 56 109 94.5t147 38.5q94 0 251 -44t222 -44q63 0 121 29t96 70l49 -181q-40 -56 -109 -94.5t-147 -38.5q-94 0 -251 44t-222 44q-63 0 -121.5 -28.5t-95.5 -69.5z" />
-<glyph unicode="¡" horiz-adv-x="507" d="M100 924q0 68 44.5 110.5t109.5 42.5q66 0 111 -42.5t45 -110.5q0 -64 -46 -110t-110 -46q-63 0 -108.5 46t-45.5 110zM117 -426l22 1067h230l24 -1067h-276z" />
-<glyph unicode="¢" horiz-adv-x="927" d="M59 522q0 212 116.5 358.5t303.5 182.5v178h164v-170q121 -9 207 -49l-35 -201q-91 38 -172 43v-692q97 0 170 43l37 -188q-82 -38 -207 -50v-161h-164v166q-98 10 -172 42.5t-131 94.5t-87 163.5t-30 239.5zM313 522q0 -250 166 -321v641q-166 -71 -166 -320z" />
-<glyph unicode="£" horiz-adv-x="1116" d="M57 0v158q58 11 95.5 44t62.5 108.5t31 197.5l6 133h-166v195h176l10 178q7 118 43 206t97.5 141t140 79t176.5 26q159 0 299 -45l-22 -219q-130 60 -261 60q-44 0 -77 -8t-66.5 -31.5t-53.5 -74t-24 -126.5l-10 -186h436v-195h-446l-8 -168q-8 -171 -86 -280 q82 14 188 14h428v-207h-969z" />
-<glyph unicode="¤" horiz-adv-x="1155" d="M74 84l157 178q-75 106 -75 262q0 153 75 260l-157 181l155 131l152 -189q89 39 197 39q114 0 198 -35l150 185l153 -131l-151 -172q71 -104 71 -269q0 -152 -77 -258l157 -182l-153 -131l-154 190q-84 -41 -194 -41q-111 0 -197 39l-152 -188zM371 524q0 -111 59.5 -177 t147.5 -66q96 0 151 64.5t55 178.5q0 121 -54.5 183.5t-151.5 62.5t-152 -62.5t-55 -183.5z" />
-<glyph unicode="¥" horiz-adv-x="1341" d="M70 1434h297l231 -482q43 -91 72 -184q32 90 80 184l241 482h287l-297 -539q-40 -76 -113 -184h273v-160h-348v-117h348v-160h-348v-274h-254v274h-349v160h349v117h-349v160h275q-54 80 -109 184z" />
-<glyph unicode="¦" horiz-adv-x="542" d="M166 262h211v-717h-211v717zM166 807v717h211v-717h-211z" />
-<glyph unicode="§" horiz-adv-x="948" d="M68 -319l22 221q65 -37 146.5 -61.5t154.5 -24.5q80 0 125 32t45 91q0 40 -26.5 79.5t-69 73.5t-93.5 69.5t-102.5 76t-94 85t-69 104t-26.5 126.5q0 102 45 181t131 124q-121 121 -121 264q0 152 110.5 248t297.5 96q159 0 299 -45l-23 -219q-130 60 -260 60 q-74 0 -118 -30.5t-44 -92.5q0 -40 26.5 -79.5t69 -73.5t94 -69.5t103 -76.5t94 -85.5t69 -104t26.5 -126.5q0 -102 -46 -181t-133 -124q123 -120 123 -264q0 -156 -113 -250t-311 -94q-188 0 -331 70zM301 596q0 -24 7 -45.5t24 -43t32.5 -38t45.5 -39t49 -35.5t57 -38 t57 -38q41 26 63.5 68.5t22.5 89.5q0 27 -12.5 54.5t-27 47t-48 47t-53.5 42t-67 46t-66 44.5q-84 -55 -84 -162z" />
-<glyph unicode="¨" horiz-adv-x="1024" d="M188 1352q0 57 37 93t92 36q53 0 90 -37t37 -92q0 -52 -37 -89.5t-90 -37.5q-54 0 -91.5 37t-37.5 90zM580 1352q0 56 37 92.5t90 36.5q55 0 92 -36.5t37 -92.5q0 -53 -37.5 -90t-91.5 -37q-53 0 -90 37.5t-37 89.5z" />
-<glyph unicode="©" horiz-adv-x="1673" d="M66 717q0 218 103.5 395.5t279.5 276t387 98.5q220 0 396 -99t275 -275t99 -396q0 -218 -103.5 -395.5t-279.5 -276t-387 -98.5t-387 98.5t-279.5 276t-103.5 395.5zM238 717q0 -130 46.5 -244.5t127 -194.5t190.5 -126t234 -46t234 46t190.5 126t127 194.5t46.5 244.5 t-46.5 244t-127 194t-190.5 126t-234 46t-234 -46t-190.5 -126t-127 -194t-46.5 -244zM508 711q0 169 108 270.5t283 101.5q101 0 182 -24l-28 -141q-57 26 -133 26q-230 0 -230 -231q0 -113 63.5 -169.5t166.5 -56.5q75 0 133 25l28 -131q-81 -31 -192 -31q-381 0 -381 361 z" />
-<glyph unicode="ª" horiz-adv-x="870" d="M127 932q0 117 94.5 173t261.5 56q18 0 54 -4v35q0 117 -136 117q-108 0 -200 -56l-35 138q116 61 274 61q137 0 210 -52.5t73 -180.5v-175q0 -83 1.5 -158t3.5 -109l1 -34q-55 -10 -88 -10q-92 0 -102 90q-71 -98 -209 -98q-90 0 -146.5 52.5t-56.5 154.5zM133 496v137 h590v-137h-590zM311 946q0 -80 82 -80q80 0 144 90v91q-46 4 -68 4q-158 0 -158 -105z" />
-<glyph unicode="«" horiz-adv-x="1054" d="M80 526l227 443l207 -68l-184 -373l184 -374l-213 -68zM528 526l228 443l207 -68l-185 -373l185 -374l-213 -68z" />
-<glyph unicode="¬" horiz-adv-x="1052" d="M88 451v194h852v-495h-231v301h-621z" />
-<glyph unicode="­" horiz-adv-x="806" d="M123 457v209h561v-209h-561z" />
-<glyph unicode="®" horiz-adv-x="1673" d="M66 717q0 218 103.5 395.5t279.5 276t387 98.5q220 0 396 -99t275 -275t99 -396q0 -218 -103.5 -395.5t-279.5 -276t-387 -98.5t-387 98.5t-279.5 276t-103.5 395.5zM238 717q0 -130 46.5 -244.5t127 -194.5t190.5 -126t234 -46t234 46t190.5 126t127 194.5t46.5 244.5 t-46.5 244t-127 194t-190.5 126t-234 46t-234 -46t-190.5 -126t-127 -194t-46.5 -244zM573 367v698q73 10 218 10q163 0 240 -41.5t77 -148.5q0 -114 -119 -168q36 -17 60 -51t43 -95l61 -204h-182l-56 186q-15 51 -38 69.5t-66 18.5q-31 0 -63 -4v-270h-175zM748 760 q16 -2 63 -2q53 0 86 24.5t33 75.5q0 94 -119 94q-31 0 -63 -4v-188z" />
-<glyph unicode="¯" horiz-adv-x="1024" d="M217 1264v174h590v-174h-590z" />
-<glyph unicode="°" horiz-adv-x="786" d="M72 1264q0 140 94 222.5t227 82.5q154 0 238 -79.5t84 -225.5q0 -128 -96 -215.5t-226 -87.5q-139 0 -230 86t-91 217zM262 1264q0 -54 39 -94t92 -40q55 0 94 40t39 94q0 61 -38 98t-95 37q-56 0 -93.5 -37t-37.5 -98z" />
-<glyph unicode="±" horiz-adv-x="1077" d="M82 94h911v-203h-911v203zM82 510v207h342v332h227v-332h342v-207h-342v-334h-227v334h-342z" />
-<glyph unicode="²" horiz-adv-x="722" d="M57 741v133q54 35 121 91.5t113 107.5q135 151 135 270q0 123 -145 123q-108 0 -181 -47l-34 142q108 55 266 55q299 0 299 -240q0 -59 -13.5 -111t-42.5 -100t-60 -87t-79 -89q-43 -45 -133 -106q92 10 186 10h183v-152h-615z" />
-<glyph unicode="³" horiz-adv-x="714" d="M53 760l17 151q103 -41 209 -41q81 0 125.5 34t44.5 91t-53.5 88t-149.5 31q-52 0 -96 -6l-9 135q279 0 279 139q0 91 -135 91q-100 0 -181 -48l-34 136q112 55 266 55q287 0 287 -195q0 -142 -156 -207q94 -22 139 -70.5t45 -131.5q0 -125 -102 -205t-256 -80 q-131 0 -240 33z" />
-<glyph unicode="´" horiz-adv-x="1024" d="M283 1313l344 237l116 -188l-372 -188z" />
-<glyph unicode="µ" horiz-adv-x="1153" d="M106 -455v1504h248v-656q0 -113 51 -162t154 -49q123 0 217 131v736h248v-611q0 -117 2.5 -226t5.5 -160l2 -50q-72 -14 -108 -14q-129 0 -135 139q-108 -152 -318 -152q-55 0 -135 25q16 -94 16 -184v-258z" />
-<glyph unicode="¶" horiz-adv-x="1333" d="M63 991q0 194 129 318.5t316 124.5h197v-1803h-197v916q-124 0 -223.5 50.5t-160.5 153t-61 240.5zM862 -369v1803h404v-164h-205v-1639h-199z" />
-<glyph unicode="·" horiz-adv-x="544" d="M117 569q0 68 44.5 111t108.5 43q66 0 111 -43t45 -111q0 -64 -45.5 -109.5t-110.5 -45.5q-63 0 -108 45.5t-45 109.5z" />
-<glyph unicode="¸" horiz-adv-x="1024" d="M297 -442l29 135q66 -41 133 -41q45 0 67.5 20t22.5 54q0 51 -53 73q-46 16 -111 19l31 202h151l-14 -116l31 -6q143 -27 143 -164q0 -96 -67 -154.5t-183 -58.5q-92 0 -180 37z" />
-<glyph unicode="¹" horiz-adv-x="555" d="M14 1454l256 148h172v-861h-200v539q0 89 10 154q-53 -46 -100 -66l-95 -41z" />
-<glyph unicode="º" horiz-adv-x="952" d="M127 1090q0 164 92.5 263t255.5 99q348 0 348 -362q0 -159 -93 -262t-255 -103q-171 0 -259.5 101.5t-88.5 263.5zM141 496v137h670v-137h-670zM328 1090q0 -102 40.5 -160t106.5 -58q73 0 111.5 56.5t38.5 161.5q0 215 -150 215q-147 0 -147 -215z" />
-<glyph unicode="»" horiz-adv-x="1052" d="M90 154l186 370l-186 377l213 68l221 -443l-227 -440zM539 154l186 370l-186 377l213 68l221 -443l-228 -440z" />
-<glyph unicode="¼" horiz-adv-x="1792" d="M12 1286l256 148h172v-861h-200v539q0 89 10 154q-53 -46 -100 -66l-95 -41zM252 -61l948 1642l146 -86l-947 -1642zM1079 238v129l191 493h186l-143 -377q-9 -25 -26 -63t-19 -43q62 4 94 4h113v258h186v-258h90v-143h-90v-238h-191v238h-391z" />
-<glyph unicode="½" horiz-adv-x="1759" d="M12 1286l256 148h172v-861h-200v539q0 89 10 154q-53 -46 -100 -66l-95 -41zM252 -61l948 1642l146 -86l-947 -1642zM1092 0v133q54 35 120.5 91.5t112.5 107.5q135 151 135 270q0 123 -145 123q-107 0 -180 -47l-35 141q108 55 266 55q299 0 299 -239q0 -59 -13.5 -111 t-42.5 -100t-60 -87t-79 -89q-45 -48 -133 -107q101 11 187 11h182v-152h-614z" />
-<glyph unicode="¾" horiz-adv-x="1949" d="M51 592l17 151q103 -41 208 -41q81 0 125.5 34t44.5 91t-53 88t-149 31q-54 0 -97 -6l-8 135q279 0 279 139q0 91 -135 91q-100 0 -181 -48l-34 136q112 55 266 55q287 0 287 -195q0 -141 -156 -206q94 -22 139 -71t45 -132q0 -125 -102 -205t-256 -80q-131 0 -240 33z M410 -61l948 1642l145 -86l-946 -1642zM1237 238v129l190 493h187l-144 -377q-9 -25 -26 -63t-19 -43q62 4 95 4h112v258h187v-258h90v-143h-90v-238h-191v238h-391z" />
-<glyph unicode="¿" horiz-adv-x="950" d="M82 -115q0 64 17 118.5t54.5 103.5t78.5 88.5t106 91.5q117 97 117 245q0 60 -9 103l246 14q10 -45 10 -131q0 -99 -44 -189t-134 -155q-107 -77 -145.5 -128t-38.5 -128q0 -81 62.5 -125.5t158.5 -44.5q82 0 159 31t132 71l51 -190q-67 -48 -175.5 -83.5t-217.5 -35.5 q-198 0 -313 87.5t-115 256.5zM410 924q0 68 44.5 110.5t108.5 42.5q66 0 111 -42.5t45 -110.5q0 -64 -45.5 -110t-110.5 -46q-63 0 -108 46t-45 110z" />
-<glyph unicode="À" horiz-adv-x="1267" d="M-2 0l520 1434h248l489 -1434h-268l-104 334h-514l-109 -334h-262zM391 1714l117 189l344 -238l-88 -139zM432 532h389l-116 381q-37 113 -70 277q-48 -185 -78 -277z" />
-<glyph unicode="Á" horiz-adv-x="1267" d="M-2 0l520 1434h248l489 -1434h-268l-104 334h-514l-109 -334h-262zM432 532h389l-116 381q-37 113 -70 277q-48 -185 -78 -277zM473 1665l344 238l117 -189l-373 -188z" />
-<glyph unicode="Â" horiz-adv-x="1267" d="M-2 0l520 1434h248l489 -1434h-268l-104 334h-514l-109 -334h-262zM303 1702l338 182l340 -178l-84 -152l-262 123l-248 -123zM432 532h389l-116 381q-37 113 -70 277q-48 -185 -78 -277z" />
-<glyph unicode="Ã" horiz-adv-x="1267" d="M-2 0l520 1434h248l489 -1434h-268l-104 334h-514l-109 -334h-262zM301 1731q29 45 77 74.5t109 29.5q64 0 154 -27.5t145 -27.5q91 0 154 63l45 -143q-29 -46 -77.5 -76.5t-108.5 -30.5q-64 0 -154 29t-145 29q-91 0 -152 -64zM432 532h389l-116 381q-37 113 -70 277 q-48 -185 -78 -277z" />
-<glyph unicode="Ä" horiz-adv-x="1267" d="M-2 0l520 1434h248l489 -1434h-268l-104 334h-514l-109 -334h-262zM319 1704q0 57 37.5 93t92.5 36q53 0 89.5 -37t36.5 -92q0 -53 -37 -90t-89 -37q-54 0 -92 37t-38 90zM432 532h389l-116 381q-37 113 -70 277q-48 -185 -78 -277zM711 1704q0 56 37 92.5t90 36.5 q55 0 92 -36.5t37 -92.5q0 -53 -37.5 -90t-91.5 -37q-52 0 -89.5 37.5t-37.5 89.5z" />
-<glyph unicode="Å" horiz-adv-x="1267" d="M-2 0l520 1434h248l489 -1434h-268l-104 334h-514l-109 -334h-262zM432 532h389l-116 381q-37 113 -70 277q-48 -185 -78 -277zM434 1737q0 92 60.5 151.5t148.5 59.5t148.5 -59.5t60.5 -151.5q0 -86 -61.5 -147.5t-147.5 -61.5t-147.5 61.5t-61.5 147.5zM557 1737 q0 -35 25.5 -59.5t60.5 -24.5t60.5 24.5t25.5 59.5q0 39 -25 62.5t-61 23.5t-61 -23.5t-25 -62.5z" />
-<glyph unicode="Æ" horiz-adv-x="1798" d="M-43 0l801 1434h934v-207h-594v-391h526v-195h-526v-434h602v-207h-848v334h-442l-177 -334h-276zM516 532h336v195q0 306 10 494q-95 -213 -196 -406z" />
-<glyph unicode="Ç" horiz-adv-x="1179" d="M86 713q0 339 194 546t511 207q188 0 337 -55l-47 -221q-117 57 -270 57q-227 0 -344 -136.5t-117 -393.5q0 -261 127 -398t336 -137q146 0 268 56l47 -203q-142 -68 -348 -68h-37l-8 -67l31 -6q143 -27 143 -164q0 -96 -67 -154.5t-183 -58.5q-92 0 -180 37l29 135 q66 -41 133 -41q90 0 90 73q0 52 -53 74q-46 16 -111 19l25 170q-506 92 -506 729z" />
-<glyph unicode="È" horiz-adv-x="1126" d="M170 0v1434h850v-207h-594v-391h526v-195h-526v-434h602v-207h-858zM330 1714l116 189l345 -238l-89 -139z" />
-<glyph unicode="É" horiz-adv-x="1126" d="M170 0v1434h850v-207h-594v-391h526v-195h-526v-434h602v-207h-858zM420 1665l344 238l117 -189l-373 -188z" />
-<glyph unicode="Ê" horiz-adv-x="1126" d="M170 0v1434h850v-207h-594v-391h526v-195h-526v-434h602v-207h-858zM256 1702l338 182l340 -178l-84 -152l-262 123l-248 -123z" />
-<glyph unicode="Ë" horiz-adv-x="1126" d="M170 0v1434h850v-207h-594v-391h526v-195h-526v-434h602v-207h-858zM272 1704q0 57 37 93t92 36q53 0 90 -37t37 -92q0 -52 -37 -89.5t-90 -37.5q-54 0 -91.5 37t-37.5 90zM664 1704q0 56 37 92.5t90 36.5q55 0 92 -36.5t37 -92.5q0 -53 -37.5 -90t-91.5 -37 q-53 0 -90 37.5t-37 89.5z" />
-<glyph unicode="Ì" horiz-adv-x="593" d="M45 1714l117 189l344 -238l-88 -139zM170 0v1434h254v-1434h-254z" />
-<glyph unicode="Í" horiz-adv-x="593" d="M109 1665l344 238l116 -189l-372 -188zM170 0v1434h254v-1434h-254z" />
-<glyph unicode="Î" horiz-adv-x="593" d="M-43 1702l338 182l340 -178l-84 -152l-262 123l-248 -123zM170 0v1434h254v-1434h-254z" />
-<glyph unicode="Ï" horiz-adv-x="593" d="M-27 1704q0 57 37 93t92 36q53 0 90 -37t37 -92q0 -52 -37.5 -89.5t-89.5 -37.5q-54 0 -91.5 37t-37.5 90zM170 0v1434h254v-1434h-254zM365 1704q0 56 37 92.5t90 36.5q55 0 92 -36.5t37 -92.5q0 -53 -37.5 -90t-91.5 -37q-52 0 -89.5 37.5t-37.5 89.5z" />
-<glyph unicode="Ð" horiz-adv-x="1390" d="M37 659v191h141v580q188 16 381 16q139 0 251.5 -22.5t205.5 -73t156 -128.5t97 -192.5t34 -261.5q0 -189 -58.5 -339.5t-160.5 -245.5t-235.5 -145t-289.5 -50q-193 0 -381 16v655h-141zM432 203q74 -8 139 -8q224 0 345.5 145t121.5 416q0 126 -36 221t-100.5 151 t-147.5 83.5t-183 27.5q-65 0 -139 -8v-381h273v-191h-273v-456z" />
-<glyph unicode="Ñ" horiz-adv-x="1443" d="M170 0v1434h262l473 -775q71 -118 154 -307q-12 190 -12 477v605h227v-1434h-262l-475 774q-76 125 -152 301q12 -254 12 -471v-604h-227zM381 1731q29 45 77 74.5t109 29.5q64 0 154 -27.5t145 -27.5q91 0 154 63l45 -143q-29 -46 -77.5 -76.5t-108.5 -30.5 q-64 0 -154 29t-145 29q-91 0 -152 -64z" />
-<glyph unicode="Ò" horiz-adv-x="1476" d="M86 717q0 340 176.5 544.5t474.5 204.5q170 0 296.5 -53t204 -153t115.5 -235.5t38 -307.5q0 -213 -79 -383t-229 -268.5t-346 -98.5q-158 0 -282.5 57t-204.5 158.5t-122 237.5t-42 297zM350 717q0 -129 31.5 -233t86 -169t123.5 -99t146 -34q174 0 281.5 138.5 t107.5 396.5q0 269 -106 401.5t-283 132.5q-176 0 -281.5 -132.5t-105.5 -401.5zM489 1714l117 189l344 -238l-88 -139z" />
-<glyph unicode="Ó" horiz-adv-x="1476" d="M86 717q0 340 176.5 544.5t474.5 204.5q170 0 296.5 -53t204 -153t115.5 -235.5t38 -307.5q0 -213 -79 -383t-229 -268.5t-346 -98.5q-158 0 -282.5 57t-204.5 158.5t-122 237.5t-42 297zM350 717q0 -129 31.5 -233t86 -169t123.5 -99t146 -34q174 0 281.5 138.5 t107.5 396.5q0 269 -106 401.5t-283 132.5q-176 0 -281.5 -132.5t-105.5 -401.5zM578 1665l344 238l116 -189l-372 -188z" />
-<glyph unicode="Ô" horiz-adv-x="1476" d="M86 717q0 340 176.5 544.5t474.5 204.5q170 0 296.5 -53t204 -153t115.5 -235.5t38 -307.5q0 -213 -79 -383t-229 -268.5t-346 -98.5q-158 0 -282.5 57t-204.5 158.5t-122 237.5t-42 297zM350 717q0 -129 31.5 -233t86 -169t123.5 -99t146 -34q174 0 281.5 138.5 t107.5 396.5q0 269 -106 401.5t-283 132.5q-176 0 -281.5 -132.5t-105.5 -401.5zM399 1702l338 182l340 -178l-84 -152l-262 123l-248 -123z" />
-<glyph unicode="Õ" horiz-adv-x="1476" d="M86 717q0 340 176.5 544.5t474.5 204.5q170 0 296.5 -53t204 -153t115.5 -235.5t38 -307.5q0 -213 -79 -383t-229 -268.5t-346 -98.5q-158 0 -282.5 57t-204.5 158.5t-122 237.5t-42 297zM350 717q0 -129 31.5 -233t86 -169t123.5 -99t146 -34q174 0 281.5 138.5 t107.5 396.5q0 269 -106 401.5t-283 132.5q-176 0 -281.5 -132.5t-105.5 -401.5zM395 1731q29 45 77.5 74.5t109.5 29.5q64 0 154 -27.5t145 -27.5q90 0 153 63l45 -143q-29 -46 -77.5 -76.5t-108.5 -30.5q-64 0 -154 29t-145 29q-91 0 -152 -64z" />
-<glyph unicode="Ö" horiz-adv-x="1476" d="M86 717q0 340 176.5 544.5t474.5 204.5q170 0 296.5 -53t204 -153t115.5 -235.5t38 -307.5q0 -213 -79 -383t-229 -268.5t-346 -98.5q-158 0 -282.5 57t-204.5 158.5t-122 237.5t-42 297zM350 717q0 -129 31.5 -233t86 -169t123.5 -99t146 -34q174 0 281.5 138.5 t107.5 396.5q0 269 -106 401.5t-283 132.5q-176 0 -281.5 -132.5t-105.5 -401.5zM414 1704q0 57 37 93t92 36q53 0 90 -37t37 -92q0 -52 -37 -89.5t-90 -37.5q-54 0 -91.5 37t-37.5 90zM805 1704q0 56 37 92.5t90 36.5q55 0 92 -36.5t37 -92.5q0 -53 -37.5 -90t-91.5 -37 q-52 0 -89.5 37.5t-37.5 89.5z" />
-<glyph unicode="×" horiz-adv-x="1001" d="M76 248l270 270l-268 270l160 160l270 -270l272 272l146 -145l-273 -273l273 -270l-162 -162l-270 271l-271 -271z" />
-<glyph unicode="Ø" horiz-adv-x="1476" d="M86 717q0 340 176.5 544.5t474.5 204.5q199 0 344 -77l131 200l131 -86l-137 -211q185 -191 185 -575q0 -213 -79 -383t-229 -268.5t-346 -98.5q-190 0 -336 84l-135 -207l-131 86l144 220q-193 202 -193 567zM350 717q0 -201 76 -340l524 809q-85 65 -213 65 q-176 0 -281.5 -132.5t-105.5 -401.5zM530 252q91 -70 207 -70q174 0 281.5 138.5t107.5 396.5q0 209 -69 344z" />
-<glyph unicode="Ù" horiz-adv-x="1390" d="M154 504v930h256v-906q0 -346 292 -346q136 0 211.5 81t75.5 239v932h248v-920q0 -119 -32.5 -216.5t-98.5 -172.5t-174.5 -116.5t-251.5 -41.5q-256 0 -391 137.5t-135 399.5zM436 1714l117 189l344 -238l-88 -139z" />
-<glyph unicode="Ú" horiz-adv-x="1390" d="M154 504v930h256v-906q0 -346 292 -346q136 0 211.5 81t75.5 239v932h248v-920q0 -119 -32.5 -216.5t-98.5 -172.5t-174.5 -116.5t-251.5 -41.5q-256 0 -391 137.5t-135 399.5zM526 1665l344 238l117 -189l-373 -188z" />
-<glyph unicode="Û" horiz-adv-x="1390" d="M154 504v930h256v-906q0 -346 292 -346q136 0 211.5 81t75.5 239v932h248v-920q0 -119 -32.5 -216.5t-98.5 -172.5t-174.5 -116.5t-251.5 -41.5q-256 0 -391 137.5t-135 399.5zM360 1702l338 182l340 -178l-84 -152l-262 123l-248 -123z" />
-<glyph unicode="Ü" horiz-adv-x="1390" d="M154 504v930h256v-906q0 -346 292 -346q136 0 211.5 81t75.5 239v932h248v-920q0 -119 -32.5 -216.5t-98.5 -172.5t-174.5 -116.5t-251.5 -41.5q-256 0 -391 137.5t-135 399.5zM375 1704q0 57 37 93t92 36q53 0 90 -37t37 -92q0 -52 -37.5 -89.5t-89.5 -37.5 q-54 0 -91.5 37t-37.5 90zM766 1704q0 56 37 92.5t90 36.5q55 0 92 -36.5t37 -92.5q0 -53 -37.5 -90t-91.5 -37q-53 0 -90 37.5t-37 89.5z" />
-<glyph unicode="Ý" horiz-adv-x="1177" d="M-10 1434h299l231 -482q45 -94 72 -182q19 61 78 182l241 482h287l-483 -885v-549h-256v549zM467 1665l344 238l117 -189l-373 -188z" />
-<glyph unicode="Þ" d="M170 0v1434h256v-215q19 0 61 1t64 1q297 0 433 -100.5t136 -340.5q0 -226 -151.5 -366t-407.5 -140q-74 0 -135 7v-281h-256zM426 477q53 -6 139 -6q297 0 297 291q0 136 -79 199t-218 63q-69 0 -139 -8v-539z" />
-<glyph unicode="ß" horiz-adv-x="1179" d="M141 0v1065q0 121 38.5 211t108 142.5t158.5 78t199 25.5q184 0 287.5 -80t103.5 -217q0 -88 -34.5 -151.5t-104.5 -125.5q-50 -45 -72 -83t-22 -87q0 -37 24.5 -69t61 -55t79.5 -54.5t79.5 -65t61 -89.5t24.5 -126q0 -150 -107.5 -247t-286.5 -97q-130 0 -233 41l31 187 q96 -47 200 -47q66 0 104 36.5t38 92.5q0 41 -18 75.5t-46.5 60.5t-63 50.5t-69 51t-63 56t-46.5 71.5t-18 91q0 74 30 134.5t103 123.5q50 44 72 84t22 97q0 67 -45 108t-121 41q-109 0 -168 -71t-59 -234v-1024h-248z" />
-<glyph unicode="à" horiz-adv-x="1042" d="M63 285q0 117 67 194t180.5 110.5t271.5 33.5q38 0 92 -7v76q0 193 -209 193q-164 0 -295 -88l-49 182q164 94 391 94q194 0 296.5 -79t102.5 -267v-289q0 -117 2.5 -226t5.5 -160l3 -50q-72 -14 -111 -14q-129 0 -135 137q-107 -150 -311 -150q-132 0 -217 78.5 t-85 231.5zM262 1362l117 188l344 -237l-88 -139zM301 303q0 -67 36.5 -104t102.5 -37q133 0 234 147v158q-55 6 -119 6q-116 0 -185 -40.5t-69 -129.5z" />
-<glyph unicode="á" horiz-adv-x="1042" d="M63 285q0 117 67 194t180.5 110.5t271.5 33.5q38 0 92 -7v76q0 193 -209 193q-164 0 -295 -88l-49 182q164 94 391 94q194 0 296.5 -79t102.5 -267v-289q0 -117 2.5 -226t5.5 -160l3 -50q-72 -14 -111 -14q-129 0 -135 137q-107 -150 -311 -150q-132 0 -217 78.5 t-85 231.5zM301 303q0 -67 36.5 -104t102.5 -37q133 0 234 147v158q-55 6 -119 6q-116 0 -185 -40.5t-69 -129.5zM344 1313l344 237l117 -188l-373 -188z" />
-<glyph unicode="â" horiz-adv-x="1042" d="M63 285q0 117 67 194t180.5 110.5t271.5 33.5q38 0 92 -7v76q0 193 -209 193q-164 0 -295 -88l-49 182q164 94 391 94q194 0 296.5 -79t102.5 -267v-289q0 -117 2.5 -226t5.5 -160l3 -50q-72 -14 -111 -14q-129 0 -135 137q-107 -150 -311 -150q-132 0 -217 78.5 t-85 231.5zM176 1350l338 182l340 -178l-84 -152l-262 123l-248 -123zM301 303q0 -67 36.5 -104t102.5 -37q133 0 234 147v158q-55 6 -119 6q-116 0 -185 -40.5t-69 -129.5z" />
-<glyph unicode="ã" horiz-adv-x="1042" d="M63 285q0 117 67 194t180.5 110.5t271.5 33.5q38 0 92 -7v76q0 193 -209 193q-164 0 -295 -88l-49 182q164 94 391 94q194 0 296.5 -79t102.5 -267v-289q0 -117 2.5 -226t5.5 -160l3 -50q-72 -14 -111 -14q-129 0 -135 137q-107 -150 -311 -150q-132 0 -217 78.5 t-85 231.5zM172 1378q29 45 77 75t109 30q64 0 154 -28t145 -28q90 0 154 64l45 -143q-29 -46 -77.5 -76.5t-108.5 -30.5q-64 0 -154 28.5t-145 28.5q-92 0 -152 -63zM301 303q0 -67 36.5 -104t102.5 -37q133 0 234 147v158q-55 6 -119 6q-116 0 -185 -40.5t-69 -129.5z" />
-<glyph unicode="ä" horiz-adv-x="1042" d="M63 285q0 117 67 194t180.5 110.5t271.5 33.5q38 0 92 -7v76q0 193 -209 193q-164 0 -295 -88l-49 182q164 94 391 94q194 0 296.5 -79t102.5 -267v-289q0 -117 2.5 -226t5.5 -160l3 -50q-72 -14 -111 -14q-129 0 -135 137q-107 -150 -311 -150q-132 0 -217 78.5 t-85 231.5zM193 1352q0 57 37 93t92 36q53 0 90 -37t37 -92q0 -52 -37.5 -89.5t-89.5 -37.5q-54 0 -91.5 37t-37.5 90zM301 303q0 -67 36.5 -104t102.5 -37q133 0 234 147v158q-55 6 -119 6q-116 0 -185 -40.5t-69 -129.5zM584 1352q0 56 37 92.5t90 36.5q55 0 92 -36.5 t37 -92.5q0 -53 -37.5 -90t-91.5 -37q-53 0 -90 37.5t-37 89.5z" />
-<glyph unicode="å" horiz-adv-x="1042" d="M63 285q0 117 67 194t180.5 110.5t271.5 33.5q38 0 92 -7v76q0 193 -209 193q-164 0 -295 -88l-49 182q164 94 391 94q194 0 296.5 -79t102.5 -267v-289q0 -117 2.5 -226t5.5 -160l3 -50q-72 -14 -111 -14q-129 0 -135 137q-107 -150 -311 -150q-132 0 -217 78.5 t-85 231.5zM301 303q0 -67 36.5 -104t102.5 -37q133 0 234 147v158q-55 6 -119 6q-116 0 -185 -40.5t-69 -129.5zM307 1384q0 92 60.5 151.5t148.5 59.5t148.5 -59.5t60.5 -151.5q0 -86 -61.5 -147t-147.5 -61t-147.5 61t-61.5 147zM430 1384q0 -35 25.5 -59.5t60.5 -24.5 t60.5 24.5t25.5 59.5q0 39 -25 62.5t-61 23.5t-61 -23.5t-25 -62.5z" />
-<glyph unicode="æ" horiz-adv-x="1650" d="M63 285q0 175 141 266.5t380 91.5q46 0 92 -6v55q0 193 -209 193q-164 0 -295 -88l-49 182q164 94 391 94q125 0 201 -35.5t110 -119.5q117 155 330 155q194 0 306 -117t112 -352q0 -64 -6 -123h-664q20 -315 352 -315q136 0 256 47l33 -176q-144 -62 -346 -62 q-317 0 -436 191q-128 -191 -387 -191q-137 0 -224.5 78t-87.5 232zM301 303q0 -67 37.5 -104t103.5 -37q144 0 244 178q-10 62 -10 145q-65 7 -119 7q-113 0 -184.5 -49t-71.5 -140zM913 643h426q0 117 -55 182.5t-141 65.5q-92 0 -153 -59t-77 -189z" />
-<glyph unicode="ç" horiz-adv-x="925" d="M76 522q0 244 149 397.5t377 153.5q160 0 264 -51l-35 -201q-96 45 -202 45q-137 0 -218 -83t-81 -261q0 -81 18 -143.5t48 -100.5t72.5 -62.5t86.5 -34t96 -9.5q102 0 178 43l37 -188q-117 -52 -274 -52h-10l-9 -71l31 -6q67 -13 105.5 -54t38.5 -110q0 -96 -67 -154.5 t-183 -58.5q-93 0 -181 37l29 135q66 -41 133 -41q45 0 67.5 20t22.5 54q0 51 -53 73q-47 16 -110 19l24 172q-170 34 -262 160t-92 372z" />
-<glyph unicode="è" horiz-adv-x="1067" d="M78 522q0 247 135 399t360 152q193 0 305.5 -114.5t112.5 -337.5q0 -71 -8 -123h-661q13 -332 352 -332q137 0 254 47l33 -176q-144 -62 -345 -62q-127 0 -221.5 26.5t-168 87.5t-111 169.5t-37.5 263.5zM332 657h424q0 107 -55.5 170.5t-141.5 63.5q-92 0 -151 -57 t-76 -177zM332 1362l117 188l344 -237l-88 -139z" />
-<glyph unicode="é" horiz-adv-x="1067" d="M78 522q0 247 135 399t360 152q193 0 305.5 -114.5t112.5 -337.5q0 -71 -8 -123h-661q13 -332 352 -332q137 0 254 47l33 -176q-144 -62 -345 -62q-127 0 -221.5 26.5t-168 87.5t-111 169.5t-37.5 263.5zM332 657h424q0 107 -55.5 170.5t-141.5 63.5q-92 0 -151 -57 t-76 -177zM391 1313l344 237l117 -188l-373 -188z" />
-<glyph unicode="ê" horiz-adv-x="1067" d="M78 522q0 247 135 399t360 152q193 0 305.5 -114.5t112.5 -337.5q0 -71 -8 -123h-661q13 -332 352 -332q137 0 254 47l33 -176q-144 -62 -345 -62q-127 0 -221.5 26.5t-168 87.5t-111 169.5t-37.5 263.5zM231 1350l338 182l340 -178l-84 -152l-262 123l-248 -123z M332 657h424q0 107 -55.5 170.5t-141.5 63.5q-92 0 -151 -57t-76 -177z" />
-<glyph unicode="ë" horiz-adv-x="1067" d="M78 522q0 247 135 399t360 152q193 0 305.5 -114.5t112.5 -337.5q0 -71 -8 -123h-661q13 -332 352 -332q137 0 254 47l33 -176q-144 -62 -345 -62q-127 0 -221.5 26.5t-168 87.5t-111 169.5t-37.5 263.5zM242 1352q0 57 37 93t92 36q53 0 90 -37t37 -92q0 -52 -37 -89.5 t-90 -37.5q-54 0 -91.5 37t-37.5 90zM332 657h424q0 107 -55.5 170.5t-141.5 63.5q-92 0 -151 -57t-76 -177zM633 1352q0 56 37 92.5t90 36.5q55 0 92 -36.5t37 -92.5q0 -53 -37.5 -90t-91.5 -37q-52 0 -89.5 37.5t-37.5 89.5z" />
-<glyph unicode="ì" horiz-adv-x="534" d="M14 1362l117 188l344 -237l-88 -139zM143 0v1049h248v-1049h-248z" />
-<glyph unicode="í" horiz-adv-x="534" d="M82 1313l344 237l117 -188l-373 -188zM143 0v1049h248v-1049h-248z" />
-<glyph unicode="î" horiz-adv-x="534" d="M-72 1350l338 182l340 -178l-84 -152l-262 123l-248 -123zM143 0v1049h248v-1049h-248z" />
-<glyph unicode="ï" horiz-adv-x="534" d="M-55 1352q0 57 37 93t92 36q53 0 90 -37t37 -92q0 -52 -37.5 -89.5t-89.5 -37.5q-54 0 -91.5 37t-37.5 90zM143 0v1049h248v-1049h-248zM336 1352q0 56 37 92.5t90 36.5q55 0 92 -36.5t37 -92.5q0 -53 -37.5 -90t-91.5 -37q-53 0 -90 37.5t-37 89.5z" />
-<glyph unicode="ð" horiz-adv-x="1155" d="M78 500q0 229 125.5 371.5t345.5 142.5q130 0 215 -82q-66 152 -178 258l-238 -146l-78 132l191 118q-97 64 -223 115l147 137q159 -52 277 -137l219 137l82 -135l-175 -108q269 -276 269 -742q0 -124 -31.5 -230t-91.5 -186t-154.5 -125t-212.5 -45q-120 0 -214.5 40.5 t-153.5 112.5t-90 166.5t-31 205.5zM332 500q0 -153 66 -240.5t169 -87.5q113 0 175.5 86t62.5 242q0 319 -238 319q-235 0 -235 -319z" />
-<glyph unicode="ñ" d="M133 1049q72 14 111 14q126 0 133 -141q108 151 317 151q72 0 132 -19.5t109.5 -60t77 -111.5t27.5 -167v-715h-247v655q0 112 -46.5 161.5t-134.5 49.5q-131 0 -221 -131v-735h-248v610q0 117 -2.5 227t-4.5 161zM250 1378q29 45 77 75t109 30q64 0 154 -28t145 -28 q90 0 154 64l45 -143q-29 -46 -77.5 -76.5t-108.5 -30.5q-64 0 -154 28.5t-145 28.5q-92 0 -152 -63z" />
-<glyph unicode="ò" horiz-adv-x="1150" d="M78 524q0 247 131.5 398t365.5 151q134 0 231.5 -40t155 -114.5t84.5 -172t27 -222.5q0 -114 -33 -213.5t-94.5 -174.5t-157 -118t-213.5 -43q-125 0 -221.5 43t-156 118.5t-89.5 173.5t-30 214zM330 1362l116 188l345 -237l-89 -139zM332 524q0 -164 67 -258t176 -94 q120 0 183 91.5t63 260.5q0 355 -246 355q-243 0 -243 -355z" />
-<glyph unicode="ó" horiz-adv-x="1150" d="M78 524q0 247 131.5 398t365.5 151q134 0 231.5 -40t155 -114.5t84.5 -172t27 -222.5q0 -114 -33 -213.5t-94.5 -174.5t-157 -118t-213.5 -43q-125 0 -221.5 43t-156 118.5t-89.5 173.5t-30 214zM332 524q0 -164 67 -258t176 -94q120 0 183 91.5t63 260.5q0 355 -246 355 q-243 0 -243 -355zM408 1313l344 237l116 -188l-372 -188z" />
-<glyph unicode="ô" horiz-adv-x="1150" d="M78 524q0 247 131.5 398t365.5 151q134 0 231.5 -40t155 -114.5t84.5 -172t27 -222.5q0 -114 -33 -213.5t-94.5 -174.5t-157 -118t-213.5 -43q-125 0 -221.5 43t-156 118.5t-89.5 173.5t-30 214zM238 1350l337 182l340 -178l-84 -152l-262 123l-247 -123zM332 524 q0 -164 67 -258t176 -94q120 0 183 91.5t63 260.5q0 355 -246 355q-243 0 -243 -355z" />
-<glyph unicode="õ" horiz-adv-x="1150" d="M78 524q0 247 131.5 398t365.5 151q134 0 231.5 -40t155 -114.5t84.5 -172t27 -222.5q0 -114 -33 -213.5t-94.5 -174.5t-157 -118t-213.5 -43q-125 0 -221.5 43t-156 118.5t-89.5 173.5t-30 214zM233 1378q29 45 77.5 75t109.5 30q64 0 154 -28t145 -28q89 0 153 64 l46 -143q-29 -46 -78 -76.5t-109 -30.5q-64 0 -154 28.5t-145 28.5q-91 0 -151 -63zM332 524q0 -164 67 -258t176 -94q120 0 183 91.5t63 260.5q0 355 -246 355q-243 0 -243 -355z" />
-<glyph unicode="ö" horiz-adv-x="1150" d="M78 524q0 247 131.5 398t365.5 151q134 0 231.5 -40t155 -114.5t84.5 -172t27 -222.5q0 -114 -33 -213.5t-94.5 -174.5t-157 -118t-213.5 -43q-125 0 -221.5 43t-156 118.5t-89.5 173.5t-30 214zM252 1352q0 57 37 93t92 36q53 0 90 -37t37 -92q0 -52 -37 -89.5 t-90 -37.5q-54 0 -91.5 37t-37.5 90zM332 524q0 -164 67 -258t176 -94q120 0 183 91.5t63 260.5q0 355 -246 355q-243 0 -243 -355zM643 1352q0 56 37 92.5t90 36.5q55 0 92 -36.5t37 -92.5q0 -53 -37.5 -90t-91.5 -37q-52 0 -89.5 37.5t-37.5 89.5z" />
-<glyph unicode="÷" horiz-adv-x="1114" d="M76 424v203h962v-203h-962zM401 84q0 69 45 112.5t111 43.5q65 0 109.5 -43.5t44.5 -112.5q0 -63 -45.5 -108.5t-108.5 -45.5q-64 0 -110 45.5t-46 108.5zM401 965q0 68 45 111.5t111 43.5q64 0 109 -43.5t45 -111.5q0 -64 -45.5 -110t-108.5 -46q-65 0 -110.5 45.5 t-45.5 110.5z" />
-<glyph unicode="ø" horiz-adv-x="1150" d="M78 524q0 247 131.5 398t365.5 151q146 0 246 -47l94 143l113 -71l-96 -148q141 -138 141 -426q0 -114 -33 -213.5t-94.5 -174.5t-157 -118t-213.5 -43q-128 0 -239 52l-96 -148l-113 74l98 151q-147 147 -147 420zM324 524q0 -127 38 -211l347 533q-55 37 -134 37 q-251 0 -251 -359zM449 205q53 -39 126 -39q122 0 187 93t65 265q0 132 -34 213z" />
-<glyph unicode="ù" d="M131 334v715h248v-656q0 -112 46 -161.5t132 -49.5q129 0 221 129v738h250v-611q0 -117 2.5 -226t5.5 -160l2 -50q-72 -14 -110 -14q-127 0 -133 139q-108 -152 -318 -152q-73 0 -133 19.5t-109 60.5t-76.5 112t-27.5 167zM297 1362l117 188l344 -237l-88 -139z" />
-<glyph unicode="ú" d="M131 334v715h248v-656q0 -112 46 -161.5t132 -49.5q129 0 221 129v738h250v-611q0 -117 2.5 -226t5.5 -160l2 -50q-72 -14 -110 -14q-127 0 -133 139q-108 -152 -318 -152q-73 0 -133 19.5t-109 60.5t-76.5 112t-27.5 167zM426 1313l344 237l117 -188l-373 -188z" />
-<glyph unicode="û" d="M131 334v715h248v-656q0 -112 46 -161.5t132 -49.5q129 0 221 129v738h250v-611q0 -117 2.5 -226t5.5 -160l2 -50q-72 -14 -110 -14q-127 0 -133 139q-108 -152 -318 -152q-73 0 -133 19.5t-109 60.5t-76.5 112t-27.5 167zM242 1350l338 182l340 -178l-84 -152l-263 123 l-247 -123z" />
-<glyph unicode="ü" d="M131 334v715h248v-656q0 -112 46 -161.5t132 -49.5q129 0 221 129v738h250v-611q0 -117 2.5 -226t5.5 -160l2 -50q-72 -14 -110 -14q-127 0 -133 139q-108 -152 -318 -152q-73 0 -133 19.5t-109 60.5t-76.5 112t-27.5 167zM256 1352q0 57 37 93t92 36q53 0 90 -37t37 -92 q0 -52 -37 -89.5t-90 -37.5q-54 0 -91.5 37t-37.5 90zM647 1352q0 56 37 92.5t90 36.5q55 0 92 -36.5t37 -92.5q0 -53 -37.5 -90t-91.5 -37q-52 0 -89.5 37.5t-37.5 89.5z" />
-<glyph unicode="ý" horiz-adv-x="1062" d="M14 1049h269l190 -557q35 -104 64 -256q34 157 67 256l182 557h265l-381 -1049q-92 -254 -207.5 -363.5t-290.5 -109.5q-44 0 -84 8l-27 197q33 -8 78 -8q82 0 142 35.5t108 138.5l31 65q-28 57 -64 156zM395 1313l344 237l117 -188l-373 -188z" />
-<glyph unicode="þ" horiz-adv-x="1169" d="M141 -455v1946l248 12v-366q0 -117 -12 -219q112 155 315 155q85 0 155.5 -29t126 -88.5t87 -159t31.5 -231.5q0 -188 -73.5 -323t-200 -201t-294.5 -66q-70 0 -143 13q8 -98 8 -197v-233zM389 205q78 -33 162 -33q126 0 206.5 91.5t80.5 266.5q0 169 -59.5 252.5 t-166.5 83.5q-133 0 -223 -131v-530z" />
-<glyph unicode="ÿ" horiz-adv-x="1062" d="M14 1049h269l190 -557q35 -104 64 -256q34 157 67 256l182 557h265l-381 -1049q-92 -254 -207.5 -363.5t-290.5 -109.5q-44 0 -84 8l-27 197q33 -8 78 -8q82 0 142 35.5t108 138.5l31 65q-28 57 -64 156zM211 1352q0 57 37 93t92 36q53 0 90 -37t37 -92 q0 -52 -37.5 -89.5t-89.5 -37.5q-54 0 -91.5 37t-37.5 90zM602 1352q0 56 37 92.5t90 36.5q55 0 92 -36.5t37 -92.5q0 -53 -37.5 -90t-91.5 -37q-53 0 -90 37.5t-37 89.5z" />
-<glyph unicode="Œ" horiz-adv-x="1849" d="M88 717q0 339 175.5 539t475.5 200q117 0 230 -22h774v-207h-594v-391h526v-195h-526v-434h602v-207h-799q-115 -23 -213 -23q-158 0 -282.5 55.5t-204.5 155t-122 234t-42 295.5zM352 717q0 -129 31.5 -231t86 -165t123 -95.5t146.5 -32.5q89 0 162 22v1004 q-73 22 -162 22q-85 0 -154 -29.5t-122 -91t-82 -164t-29 -239.5z" />
-<glyph unicode="œ" horiz-adv-x="1814" d="M78 524q0 247 131.5 398t365.5 151q270 0 379 -194q123 194 367 194q194 0 306 -114t112 -338q0 -65 -6 -123h-664q13 -332 352 -332q137 0 254 47l35 -176q-148 -62 -346 -62q-157 0 -262.5 45t-163.5 148q-59 -92 -151 -142.5t-212 -50.5q-125 0 -221.5 43t-156 118.5 t-89.5 173.5t-30 214zM332 524q0 -164 67 -258t176 -94q120 0 183 91.5t63 260.5q0 355 -246 355q-243 0 -243 -355zM1079 657h426q0 107 -55 170.5t-141 63.5q-93 0 -153 -57t-77 -177z" />
-<glyph unicode="Ÿ" horiz-adv-x="1177" d="M-10 1434h299l231 -482q45 -94 72 -182q19 61 78 182l241 482h287l-483 -885v-549h-256v549zM276 1704q0 57 37.5 93t92.5 36q53 0 89.5 -37t36.5 -92q0 -53 -37 -90t-89 -37q-54 0 -92 37t-38 90zM668 1704q0 56 37 92.5t90 36.5q55 0 92 -36.5t37 -92.5 q0 -53 -37.5 -90t-91.5 -37q-53 0 -90 37.5t-37 89.5z" />
-<glyph unicode="ˆ" horiz-adv-x="1024" d="M174 1350l338 182l340 -178l-84 -152l-262 123l-248 -123z" />
-<glyph unicode="˜" horiz-adv-x="1024" d="M170 1378q29 45 77 75t109 30q64 0 154 -28t145 -28q90 0 154 64l45 -143q-29 -46 -77.5 -76.5t-108.5 -30.5q-64 0 -154 28.5t-145 28.5q-92 0 -152 -63z" />
-<glyph unicode=" " horiz-adv-x="974" />
-<glyph unicode=" " horiz-adv-x="1948" />
-<glyph unicode=" " horiz-adv-x="974" />
-<glyph unicode=" " horiz-adv-x="1948" />
-<glyph unicode=" " horiz-adv-x="649" />
-<glyph unicode=" " horiz-adv-x="487" />
-<glyph unicode=" " horiz-adv-x="324" />
-<glyph unicode=" " horiz-adv-x="324" />
-<glyph unicode=" " horiz-adv-x="243" />
-<glyph unicode=" " horiz-adv-x="389" />
-<glyph unicode=" " horiz-adv-x="108" />
-<glyph unicode="‐" horiz-adv-x="806" d="M123 457v209h561v-209h-561z" />
-<glyph unicode="‑" horiz-adv-x="806" d="M123 457v209h561v-209h-561z" />
-<glyph unicode="‒" horiz-adv-x="806" d="M123 457v209h561v-209h-561z" />
-<glyph unicode="–" horiz-adv-x="1269" d="M123 457v207h1024v-207h-1024z" />
-<glyph unicode="—" horiz-adv-x="2293" d="M123 457v207h2048v-207h-2048z" />
-<glyph unicode="‘" horiz-adv-x="475" d="M88 1163q0 176 89 293.5t233 145.5l34 -136q-68 -11 -106.5 -63.5t-38.5 -134.5q35 -10 66.5 -46.5t31.5 -95.5q0 -68 -44.5 -110.5t-110.5 -42.5q-70 0 -112 45.5t-42 144.5z" />
-<glyph unicode="’" horiz-adv-x="497" d="M80 1079q66 11 104.5 64t38.5 135q-34 10 -65 46t-31 95q0 68 45 111t109 43q70 0 112.5 -46t42.5 -145q0 -177 -88.5 -293.5t-234.5 -144.5z" />
-<glyph unicode="‚" horiz-adv-x="518" d="M57 -213q66 11 105 64t39 135q-34 10 -65.5 46t-31.5 95q0 68 45 111t109 43q70 0 113 -46.5t43 -144.5q0 -176 -89 -293t-235 -145z" />
-<glyph unicode="“" horiz-adv-x="931" d="M88 1163q0 176 89 293.5t233 145.5l34 -136q-68 -11 -106.5 -63.5t-38.5 -134.5q35 -10 66.5 -46.5t31.5 -95.5q0 -68 -44.5 -110.5t-110.5 -42.5q-70 0 -112 45.5t-42 144.5zM545 1163q0 176 88.5 293.5t232.5 145.5l35 -136q-68 -11 -106.5 -63.5t-38.5 -134.5 q35 -10 66.5 -46.5t31.5 -95.5q0 -68 -45 -110.5t-111 -42.5q-70 0 -111.5 45.5t-41.5 144.5z" />
-<glyph unicode="”" horiz-adv-x="954" d="M80 1079q66 11 104.5 64t38.5 135q-34 10 -65 46t-31 95q0 68 45 111t109 43q70 0 112.5 -46t42.5 -145q0 -177 -88.5 -293.5t-234.5 -144.5zM539 1079q66 11 104.5 64t38.5 135q-34 10 -65 46t-31 95q0 68 44.5 111t108.5 43q70 0 113 -46.5t43 -144.5q0 -176 -89 -293 t-235 -145z" />
-<glyph unicode="„" horiz-adv-x="974" d="M57 -213q66 11 105 64t39 135q-34 10 -65.5 46t-31.5 95q0 68 45 111t109 43q70 0 113 -46.5t43 -144.5q0 -176 -89 -293t-235 -145zM514 -213q66 11 104.5 64t38.5 135q-34 10 -65 46t-31 95q0 68 45 111t109 43q70 0 112.5 -46t42.5 -145q0 -177 -88.5 -293.5 t-234.5 -144.5z" />
-<glyph unicode="•" horiz-adv-x="759" d="M90 662q0 127 83.5 208.5t205.5 81.5q123 0 207 -81.5t84 -208.5q0 -120 -84.5 -203.5t-206.5 -83.5q-120 0 -204.5 83.5t-84.5 203.5z" />
-<glyph unicode="…" horiz-adv-x="1540" d="M104 127q0 68 45 111t109 43q66 0 111 -43t45 -111q0 -65 -46 -110.5t-110 -45.5q-63 0 -108.5 46t-45.5 110zM616 127q0 68 45 111t109 43q66 0 111 -43t45 -111q0 -65 -46 -110.5t-110 -45.5q-63 0 -108.5 46t-45.5 110zM1128 127q0 68 45 111t109 43q66 0 111 -43 t45 -111q0 -65 -46 -110.5t-110 -45.5q-63 0 -108.5 46t-45.5 110z" />
-<glyph unicode=" " horiz-adv-x="389" />
-<glyph unicode="‹" horiz-adv-x="606" d="M80 526l227 443l207 -68l-184 -373l184 -374l-213 -68z" />
-<glyph unicode="›" horiz-adv-x="604" d="M90 154l186 370l-186 377l213 68l221 -443l-227 -440z" />
-<glyph unicode=" " horiz-adv-x="487" />
-<glyph unicode="€" horiz-adv-x="1226" d="M61 500v159h144q-2 20 -2 58q0 39 2 59h-144v160h164q53 248 223.5 389t428.5 141q124 0 276 -41l-29 -219q-42 21 -106.5 35t-120.5 14q-176 0 -277.5 -79t-138.5 -240h516v-160h-536q-2 -20 -2 -59q0 -38 2 -58h536v-159h-514q80 -326 416 -326q57 0 122.5 14t104.5 33 l27 -203q-128 -51 -287 -51q-289 0 -448.5 132t-200.5 401h-156z" />
-<glyph unicode="™" horiz-adv-x="1730" d="M41 1298v136h623v-136h-220v-585h-184v585h-219zM713 713l78 721h202l133 -381q16 -46 39 -138q14 57 43 138l144 381h200l70 -721h-178l-17 278q-8 152 -8 219q-24 -93 -47 -149l-135 -348h-156l-127 348q-28 75 -47 164q-2 -62 -14 -234l-21 -278h-159z" />
-<glyph unicode="◼" horiz-adv-x="1044" d="M0 0v1044h1044v-1044h-1044z" />
-<hkern u1=""" u2="ï" k="-16" />
-<hkern u1=""" u2="î" k="-23" />
-<hkern u1="&" u2="’" k="127" />
-<hkern u1="&" u2="v" k="76" />
-<hkern u1="&" u2="V" k="109" />
-<hkern u1="'" u2="ï" k="-16" />
-<hkern u1="'" u2="î" k="-23" />
-<hkern u1="(" u2="ð" k="35" />
-<hkern u1="(" u2="v" k="29" />
-<hkern u1="(" u2="p" k="31" />
-<hkern u1="(" u2="j" k="-51" />
-<hkern u1="(" u2="M" k="20" />
-<hkern u1="(" u2="8" k="29" />
-<hkern u1="(" u2="6" k="35" />
-<hkern u1="(" u2="4" k="27" />
-<hkern u1="(" u2="2" k="27" />
-<hkern u1="(" u2="1" k="39" />
-<hkern u1="(" u2="0" k="41" />
-<hkern u1="*" u2="’" k="-14" />
-<hkern u1="*" u2="ð" k="29" />
-<hkern u1="*" u2="ï" k="-57" />
-<hkern u1="*" u2="î" k="-59" />
-<hkern u1="*" u2="ì" k="-20" />
-<hkern u1="+" u2="7" k="25" />
-<hkern u1="+" u2="2" k="20" />
-<hkern u1="," u2="7" k="45" />
-<hkern u1="," u2="6" k="33" />
-<hkern u1="," u2="1" k="49" />
-<hkern u1="-" u2="8" k="31" />
-<hkern u1="-" u2="7" k="37" />
-<hkern u1="-" u2="3" k="33" />
-<hkern u1="-" u2="2" k="20" />
-<hkern u1="." u2="v" k="51" />
-<hkern u1="." u2="V" k="94" />
-<hkern u1="." u2="7" k="47" />
-<hkern u1="." u2="6" k="31" />
-<hkern u1="." u2="1" k="49" />
-<hkern u1="/" u2="ï" k="-35" />
-<hkern u1="/" u2="î" k="-43" />
-<hkern u1="/" u2="4" k="41" />
-<hkern u1="/" u2="0" k="23" />
-<hkern u1="/" u2="/" k="477" />
-<hkern u1="0" u2="°" k="47" />
-<hkern u1="0" u2="}" k="39" />
-<hkern u1="0" u2="]" k="37" />
-<hkern u1="0" u2="\" k="20" />
-<hkern u1="0" u2=")" k="39" />
-<hkern u1="1" u2="}" k="35" />
-<hkern u1="1" u2="]" k="37" />
-<hkern u1="1" u2="\" k="23" />
-<hkern u1="1" u2=")" k="35" />
-<hkern u1="2" u2="°" k="39" />
-<hkern u1="2" u2="}" k="20" />
-<hkern u1="2" u2="]" k="23" />
-<hkern u1="2" u2="\" k="20" />
-<hkern u1="2" u2=")" k="23" />
-<hkern u1="3" u2="°" k="47" />
-<hkern u1="4" u2="°" k="82" />
-<hkern u1="4" u2="\" k="39" />
-<hkern u1="4" u2="7" k="25" />
-<hkern u1="4" u2="1" k="23" />
-<hkern u1="4" u2="-" k="20" />
-<hkern u1="5" u2="÷" k="20" />
-<hkern u1="5" u2="·" k="29" />
-<hkern u1="5" u2="°" k="20" />
-<hkern u1="5" u2="-" k="31" />
-<hkern u1="6" u2="." k="23" />
-<hkern u1="6" u2="," k="23" />
-<hkern u1="7" u2="÷" k="23" />
-<hkern u1="7" u2="·" k="20" />
-<hkern u1="7" u2="}" k="23" />
-<hkern u1="7" u2="]" k="25" />
-<hkern u1="7" u2="4" k="37" />
-<hkern u1="7" u2="/" k="43" />
-<hkern u1="7" u2="." k="66" />
-<hkern u1="7" u2="-" k="27" />
-<hkern u1="7" u2="," k="66" />
-<hkern u1="7" u2=")" k="27" />
-<hkern u1="8" u2="/" k="20" />
-<hkern u1="8" u2="." k="23" />
-<hkern u1="8" u2="-" k="29" />
-<hkern u1="8" u2="," k="23" />
-<hkern u1="8" u2=")" k="25" />
-<hkern u1="9" u2="°" k="57" />
-<hkern u1="9" u2=")" k="27" />
-<hkern u1=">" u2="7" k="23" />
-<hkern u1=">" u2="2" k="20" />
-<hkern u1="@" u2="’" k="25" />
-<hkern u1="@" u2="Y" k="53" />
-<hkern u1="@" u2="W" k="27" />
-<hkern u1="@" u2="V" k="33" />
-<hkern u1="@" u2="T" k="59" />
-<hkern u1="B" u2="x" k="12" />
-<hkern u1="B" u2="p" k="10" />
-<hkern u1="B" u2="/" k="23" />
-<hkern u1="B" u2="," k="25" />
-<hkern u1="B" u2=")" k="29" />
-<hkern u1="C" u2="ð" k="39" />
-<hkern u1="C" u2="ï" k="-51" />
-<hkern u1="C" u2="î" k="-57" />
-<hkern u1="E" u2="ð" k="18" />
-<hkern u1="E" u2="ï" k="-12" />
-<hkern u1="E" u2="î" k="-16" />
-<hkern u1="F" u2="ð" k="27" />
-<hkern u1="F" u2="ï" k="-43" />
-<hkern u1="F" u2="î" k="-55" />
-<hkern u1="F" u2="x" k="39" />
-<hkern u1="F" u2="v" k="12" />
-<hkern u1="F" u2="p" k="39" />
-<hkern u1="F" u2="M" k="10" />
-<hkern u1="F" u2=";" k="27" />
-<hkern u1="F" u2=":" k="27" />
-<hkern u1="F" u2="/" k="53" />
-<hkern u1="F" u2="," k="84" />
-<hkern u1="J" u2="ð" k="18" />
-<hkern u1="K" u2="ð" k="53" />
-<hkern u1="K" u2="ï" k="-78" />
-<hkern u1="K" u2="î" k="-53" />
-<hkern u1="L" u2="ð" k="10" />
-<hkern u1="L" u2="·" k="268" />
-<hkern u1="L" u2="@" k="-20" />
-<hkern u1="M" u2="ð" k="12" />
-<hkern u1="M" u2="v" k="27" />
-<hkern u1="M" u2="p" k="10" />
-<hkern u1="M" u2="b" k="10" />
-<hkern u1="M" u2="V" k="12" />
-<hkern u1="M" u2=")" k="20" />
-<hkern u1="P" u2="ð" k="31" />
-<hkern u1="P" u2="p" k="10" />
-<hkern u1="P" u2="X" k="23" />
-<hkern u1="P" u2="/" k="55" />
-<hkern u1="P" u2="," k="137" />
-<hkern u1="P" u2=")" k="20" />
-<hkern u1="P" u2="&" k="12" />
-<hkern u1="Q" u2="j" k="-25" />
-<hkern u1="R" u2="ð" k="12" />
-<hkern u1="R" u2="ß" k="16" />
-<hkern u1="T" u2="™" k="-53" />
-<hkern u1="T" u2="ð" k="84" />
-<hkern u1="T" u2="ï" k="-88" />
-<hkern u1="T" u2="î" k="-102" />
-<hkern u1="T" u2="ì" k="-14" />
-<hkern u1="T" u2="@" k="66" />
-<hkern u1="U" u2="ð" k="18" />
-<hkern u1="V" u2="ð" k="63" />
-<hkern u1="V" u2="ï" k="-104" />
-<hkern u1="V" u2="î" k="-109" />
-<hkern u1="V" u2="ì" k="-29" />
-<hkern u1="V" u2="}" k="-14" />
-<hkern u1="V" u2="p" k="70" />
-<hkern u1="V" u2="]" k="-14" />
-<hkern u1="V" u2="\" k="-12" />
-<hkern u1="V" u2="M" k="10" />
-<hkern u1="V" u2="@" k="43" />
-<hkern u1="V" u2="?" k="-10" />
-<hkern u1="V" u2=";" k="41" />
-<hkern u1="V" u2=":" k="41" />
-<hkern u1="V" u2="/" k="61" />
-<hkern u1="V" u2="," k="96" />
-<hkern u1="V" u2="&" k="20" />
-<hkern u1="W" u2="ð" k="66" />
-<hkern u1="W" u2="ï" k="-88" />
-<hkern u1="W" u2="î" k="-92" />
-<hkern u1="W" u2="ì" k="-12" />
-<hkern u1="W" u2="@" k="37" />
-<hkern u1="X" u2="ð" k="39" />
-<hkern u1="X" u2="ï" k="-49" />
-<hkern u1="X" u2="î" k="-39" />
-<hkern u1="X" u2="v" k="53" />
-<hkern u1="X" u2="&" k="10" />
-<hkern u1="Y" u2="ð" k="78" />
-<hkern u1="Y" u2="ï" k="-119" />
-<hkern u1="Y" u2="î" k="-109" />
-<hkern u1="Y" u2="ì" k="-35" />
-<hkern u1="Y" u2="@" k="61" />
-<hkern u1="Z" u2="ð" k="37" />
-<hkern u1="Z" u2="ï" k="-23" />
-<hkern u1="Z" u2="î" k="-37" />
-<hkern u1="[" u2="ð" k="31" />
-<hkern u1="[" u2="ï" k="-55" />
-<hkern u1="[" u2="î" k="-41" />
-<hkern u1="[" u2="v" k="33" />
-<hkern u1="[" u2="p" k="35" />
-<hkern u1="[" u2="j" k="-66" />
-<hkern u1="[" u2="6" k="31" />
-<hkern u1="[" u2="4" k="27" />
-<hkern u1="[" u2="2" k="27" />
-<hkern u1="[" u2="1" k="37" />
-<hkern u1="[" u2="0" k="37" />
-<hkern u1="\" u2="’" k="59" />
-<hkern u1="\" u2="v" k="45" />
-<hkern u1="\" u2="j" k="-43" />
-<hkern u1="\" u2="V" k="61" />
-<hkern u1="\" u2="6" k="27" />
-<hkern u1="\" u2="1" k="37" />
-<hkern u1="a" u2="Z" k="20" />
-<hkern u1="a" u2="Y" k="131" />
-<hkern u1="a" u2="W" k="76" />
-<hkern u1="a" u2="V" k="86" />
-<hkern u1="a" u2="T" k="160" />
-<hkern u1="a" u2="M" k="14" />
-<hkern u1="a" u2="J" k="18" />
-<hkern u1="c" u2="ð" k="14" />
-<hkern u1="c" u2="Y" k="47" />
-<hkern u1="c" u2="W" k="23" />
-<hkern u1="c" u2="V" k="27" />
-<hkern u1="c" u2="T" k="84" />
-<hkern u1="d" u2="T" k="10" />
-<hkern u1="d" u2="M" k="10" />
-<hkern u1="d" u2="J" k="16" />
-<hkern u1="e" u2="Z" k="16" />
-<hkern u1="e" u2="Y" k="162" />
-<hkern u1="e" u2="W" k="70" />
-<hkern u1="e" u2="V" k="80" />
-<hkern u1="e" u2="T" k="158" />
-<hkern u1="e" u2="J" k="12" />
-<hkern u1="f" u2="™" k="-96" />
-<hkern u1="f" u2="ï" k="-111" />
-<hkern u1="f" u2="î" k="-127" />
-<hkern u1="f" u2="ì" k="-39" />
-<hkern u1="f" u2="}" k="-29" />
-<hkern u1="f" u2="]" k="-31" />
-<hkern u1="f" u2="\" k="-23" />
-<hkern u1="f" u2="Y" k="-86" />
-<hkern u1="f" u2="X" k="-33" />
-<hkern u1="f" u2="W" k="-47" />
-<hkern u1="f" u2="V" k="-66" />
-<hkern u1="f" u2="T" k="-53" />
-<hkern u1="f" u2="M" k="14" />
-<hkern u1="f" u2="?" k="-14" />
-<hkern u1="f" u2="/" k="41" />
-<hkern u1="f" u2="," k="59" />
-<hkern u1="f" u2=")" k="-12" />
-<hkern u1="f" u2="&" k="31" />
-<hkern u1="g" u2="ð" k="8" />
-<hkern u1="g" u2="j" k="-16" />
-<hkern u1="g" u2="Y" k="16" />
-<hkern u1="g" u2="W" k="10" />
-<hkern u1="g" u2="V" k="10" />
-<hkern u1="g" u2="T" k="49" />
-<hkern u1="g" u2="J" k="-31" />
-<hkern u1="k" u2="Y" k="18" />
-<hkern u1="k" u2="T" k="104" />
-<hkern u1="l" u2="·" k="98" />
-<hkern u1="l" u2="T" k="10" />
-<hkern u1="l" u2="M" k="12" />
-<hkern u1="l" u2="J" k="16" />
-<hkern u1="o" u2="Z" k="37" />
-<hkern u1="o" u2="Y" k="143" />
-<hkern u1="o" u2="X" k="51" />
-<hkern u1="o" u2="W" k="76" />
-<hkern u1="o" u2="V" k="84" />
-<hkern u1="o" u2="T" k="166" />
-<hkern u1="o" u2="S" k="14" />
-<hkern u1="o" u2="M" k="12" />
-<hkern u1="o" u2="J" k="16" />
-<hkern u1="q" u2="}" k="35" />
-<hkern u1="q" u2="]" k="35" />
-<hkern u1="q" u2="Z" k="23" />
-<hkern u1="q" u2="Y" k="129" />
-<hkern u1="q" u2="W" k="70" />
-<hkern u1="q" u2="V" k="74" />
-<hkern u1="q" u2="T" k="152" />
-<hkern u1="q" u2="M" k="12" />
-<hkern u1="q" u2="J" k="16" />
-<hkern u1="q" u2="?" k="23" />
-<hkern u1="q" u2=")" k="33" />
-<hkern u1="r" u2="ð" k="20" />
-<hkern u1="r" u2="Z" k="47" />
-<hkern u1="r" u2="Y" k="29" />
-<hkern u1="r" u2="X" k="59" />
-<hkern u1="r" u2="W" k="10" />
-<hkern u1="r" u2="V" k="10" />
-<hkern u1="r" u2="T" k="84" />
-<hkern u1="r" u2="M" k="29" />
-<hkern u1="r" u2="J" k="12" />
-<hkern u1="s" u2="Z" k="10" />
-<hkern u1="s" u2="Y" k="76" />
-<hkern u1="s" u2="X" k="12" />
-<hkern u1="s" u2="W" k="45" />
-<hkern u1="s" u2="V" k="53" />
-<hkern u1="s" u2="T" k="90" />
-<hkern u1="s" u2="J" k="12" />
-<hkern u1="t" u2="Y" k="35" />
-<hkern u1="t" u2="W" k="20" />
-<hkern u1="t" u2="V" k="18" />
-<hkern u1="t" u2="T" k="76" />
-<hkern u1="u" u2="Z" k="23" />
-<hkern u1="u" u2="Y" k="106" />
-<hkern u1="u" u2="W" k="68" />
-<hkern u1="u" u2="V" k="72" />
-<hkern u1="u" u2="T" k="150" />
-<hkern u1="u" u2="M" k="10" />
-<hkern u1="u" u2="J" k="16" />
-<hkern u1="v" u2="ð" k="14" />
-<hkern u1="v" u2="}" k="31" />
-<hkern u1="v" u2="]" k="33" />
-<hkern u1="v" u2="Z" k="37" />
-<hkern u1="v" u2="Y" k="27" />
-<hkern u1="v" u2="X" k="53" />
-<hkern u1="v" u2="W" k="10" />
-<hkern u1="v" u2="V" k="10" />
-<hkern u1="v" u2="T" k="88" />
-<hkern u1="v" u2="M" k="29" />
-<hkern u1="v" u2="J" k="14" />
-<hkern u1="v" u2="/" k="45" />
-<hkern u1="v" u2="," k="53" />
-<hkern u1="v" u2=")" k="27" />
-<hkern u1="v" u2="&" k="25" />
-<hkern u1="w" u2="ð" k="10" />
-<hkern u1="w" u2="Z" k="35" />
-<hkern u1="w" u2="Y" k="31" />
-<hkern u1="w" u2="X" k="45" />
-<hkern u1="w" u2="W" k="10" />
-<hkern u1="w" u2="V" k="10" />
-<hkern u1="w" u2="T" k="90" />
-<hkern u1="w" u2="M" k="25" />
-<hkern u1="w" u2="J" k="12" />
-<hkern u1="x" u2="ð" k="25" />
-<hkern u1="x" u2="Y" k="27" />
-<hkern u1="x" u2="W" k="10" />
-<hkern u1="x" u2="V" k="10" />
-<hkern u1="x" u2="T" k="106" />
-<hkern u1="x" u2="&" k="20" />
-<hkern u1="y" u2="ð" k="12" />
-<hkern u1="y" u2="Z" k="35" />
-<hkern u1="y" u2="Y" k="29" />
-<hkern u1="y" u2="X" k="49" />
-<hkern u1="y" u2="W" k="10" />
-<hkern u1="y" u2="V" k="10" />
-<hkern u1="y" u2="T" k="88" />
-<hkern u1="y" u2="M" k="27" />
-<hkern u1="y" u2="J" k="12" />
-<hkern u1="z" u2="Y" k="47" />
-<hkern u1="z" u2="W" k="35" />
-<hkern u1="z" u2="V" k="31" />
-<hkern u1="z" u2="T" k="80" />
-<hkern u1="z" u2="J" k="12" />
-<hkern u1="{" u2="ð" k="31" />
-<hkern u1="{" u2="ï" k="-55" />
-<hkern u1="{" u2="î" k="-41" />
-<hkern u1="{" u2="ß" k="20" />
-<hkern u1="{" u2="v" k="31" />
-<hkern u1="{" u2="p" k="35" />
-<hkern u1="{" u2="j" k="-66" />
-<hkern u1="{" u2="6" k="33" />
-<hkern u1="{" u2="4" k="27" />
-<hkern u1="{" u2="2" k="27" />
-<hkern u1="{" u2="1" k="39" />
-<hkern u1="{" u2="0" k="39" />
-<hkern u1="¡" u2="V" k="27" />
-<hkern u1="°" u2="9" k="49" />
-<hkern u1="°" u2="6" k="31" />
-<hkern u1="°" u2="5" k="29" />
-<hkern u1="°" u2="4" k="68" />
-<hkern u1="°" u2="3" k="23" />
-<hkern u1="°" u2="1" k="35" />
-<hkern u1="°" u2="0" k="53" />
-<hkern u1="·" u2="l" k="98" />
-<hkern u1="·" u2="L" k="27" />
-<hkern u1="·" u2="7" k="31" />
-<hkern u1="·" u2="3" k="29" />
-<hkern u1="·" u2="2" k="20" />
-<hkern u1="¿" u2="j" k="-70" />
-<hkern u1="¿" u2="V" k="33" />
-<hkern u1="Þ" u2="}" k="31" />
-<hkern u1="Þ" u2="]" k="27" />
-<hkern u1="Þ" u2="X" k="51" />
-<hkern u1="Þ" u2="/" k="41" />
-<hkern u1="Þ" u2="," k="66" />
-<hkern u1="Þ" u2=")" k="35" />
-<hkern u1="ß" u2="y" k="18" />
-<hkern u1="ß" u2="w" k="12" />
-<hkern u1="ß" u2="v" k="18" />
-<hkern u1="ß" u2=")" k="20" />
-<hkern u1="í" u2="í" k="-10" />
-<hkern u1="í" u2="*" k="-37" />
-<hkern u1="î" u2="“" k="-23" />
-<hkern u1="î" u2="‘" k="-23" />
-<hkern u1="î" u2="}" k="-43" />
-<hkern u1="î" u2="]" k="-43" />
-<hkern u1="î" u2="\" k="-45" />
-<hkern u1="î" u2="?" k="-63" />
-<hkern u1="î" u2="*" k="-63" />
-<hkern u1="î" u2="'" k="-25" />
-<hkern u1="î" u2=""" k="-25" />
-<hkern u1="ï" u2="“" k="-18" />
-<hkern u1="ï" u2="‘" k="-18" />
-<hkern u1="ï" u2="}" k="-57" />
-<hkern u1="ï" u2="]" k="-57" />
-<hkern u1="ï" u2="\" k="-39" />
-<hkern u1="ï" u2="?" k="-53" />
-<hkern u1="ï" u2="*" k="-59" />
-<hkern u1="ï" u2="'" k="-18" />
-<hkern u1="ï" u2=""" k="-18" />
-<hkern u1="ð" u2="}" k="23" />
-<hkern u1="ð" u2="x" k="16" />
-<hkern u1="ð" u2="]" k="23" />
-<hkern u1="ð" u2="/" k="23" />
-<hkern u1="ð" u2="," k="23" />
-<hkern u1="ð" u2="*" k="16" />
-<hkern u1="ð" u2=")" k="29" />
-<hkern u1="÷" u2="7" k="31" />
-<hkern u1="÷" u2="3" k="23" />
-<hkern u1="÷" u2="2" k="27" />
-<hkern u1="‘" u2="ï" k="-49" />
-<hkern u1="’" u2="ï" k="-51" />
-<hkern u1="’" u2="î" k="-63" />
-<hkern u1="’" u2="@" k="82" />
-<hkern u1="’" u2="/" k="80" />
-<hkern u1="’" u2="&" k="37" />
-<hkern u1="“" u2="ï" k="-47" />
-<hkern u1="”" u2="ï" k="-51" />
-<hkern u1="”" u2="î" k="-63" />
-<hkern g1="zero" g2="quotedbl,quotesingle" k="35" />
-<hkern g1="two" g2="quotedbl,quotesingle" k="27" />
-<hkern g1="three" g2="quotedbl,quotesingle" k="37" />
-<hkern g1="four" g2="quotedbl,quotesingle" k="61" />
-<hkern g1="nine" g2="quotedbl,quotesingle" k="43" />
-<hkern g1="germandbls" g2="quoteright,quotedblright" k="16" />
-<hkern g1="germandbls" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="10" />
-<hkern g1="germandbls" g2="t" k="8" />
-<hkern g1="eth" g2="quotedbl,quotesingle" k="20" />
-<hkern g1="eth" g2="quoteleft,quotedblleft" k="20" />
-<hkern g1="eth" g2="period,ellipsis" k="23" />
-<hkern g1="eth" g2="quotesinglbase,quotedblbase" k="23" />
-<hkern g1="quotedbl,quotesingle" g2="C,G,Ccedilla" k="20" />
-<hkern g1="quotedbl,quotesingle" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="16" />
-<hkern g1="quotedbl,quotesingle" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="76" />
-<hkern g1="quotedbl,quotesingle" g2="M" k="25" />
-<hkern g1="quotedbl,quotesingle" g2="AE" k="109" />
-<hkern g1="quotedbl,quotesingle" g2="period,ellipsis" k="233" />
-<hkern g1="quotedbl,quotesingle" g2="quotesinglbase,quotedblbase" k="233" />
-<hkern g1="quotedbl,quotesingle" g2="ampersand" k="39" />
-<hkern g1="quotedbl,quotesingle" g2="comma" k="233" />
-<hkern g1="quotedbl,quotesingle" g2="slash" k="66" />
-<hkern g1="quotedbl,quotesingle" g2="zero" k="39" />
-<hkern g1="quotedbl,quotesingle" g2="one" k="23" />
-<hkern g1="quotedbl,quotesingle" g2="four" k="51" />
-<hkern g1="quotedbl,quotesingle" g2="six" k="29" />
-<hkern g1="quotedbl,quotesingle" g2="nine" k="31" />
-<hkern g1="quotedbl,quotesingle" g2="at" k="63" />
-<hkern g1="quotedbl,quotesingle" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="16" />
-<hkern g1="quotedbl,quotesingle" g2="d,q" k="55" />
-<hkern g1="quotedbl,quotesingle" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="45" />
-<hkern g1="quotedbl,quotesingle" g2="g" k="39" />
-<hkern g1="quotedbl,quotesingle" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="43" />
-<hkern g1="quotedbl,quotesingle" g2="s" k="27" />
-<hkern g1="quotedbl,quotesingle" g2="eth" k="37" />
-<hkern g1="quotedbl,quotesingle" g2="guillemotleft,guilsinglleft" k="41" />
-<hkern g1="parenleft" g2="C,G,Ccedilla" k="35" />
-<hkern g1="parenleft" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="35" />
-<hkern g1="parenleft" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="23" />
-<hkern g1="parenleft" g2="J" k="-23" />
-<hkern g1="parenleft" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="25" />
-<hkern g1="parenleft" g2="t" k="31" />
-<hkern g1="parenleft" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="33" />
-<hkern g1="parenleft" g2="d,q" k="35" />
-<hkern g1="parenleft" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="41" />
-<hkern g1="parenleft" g2="g" k="33" />
-<hkern g1="parenleft" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="41" />
-<hkern g1="parenleft" g2="s" k="29" />
-<hkern g1="parenleft" g2="m,n,r,ntilde" k="31" />
-<hkern g1="parenleft" g2="u,ugrave,uacute,ucircumflex,udieresis" k="37" />
-<hkern g1="parenleft" g2="w" k="29" />
-<hkern g1="parenleft" g2="y,yacute,ydieresis" k="29" />
-<hkern g1="parenleft" g2="z" k="25" />
-<hkern g1="asterisk" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="51" />
-<hkern g1="asterisk" g2="T" k="-14" />
-<hkern g1="asterisk" g2="AE" k="68" />
-<hkern g1="asterisk" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="18" />
-<hkern g1="asterisk" g2="d,q" k="31" />
-<hkern g1="asterisk" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="25" />
-<hkern g1="asterisk" g2="g" k="25" />
-<hkern g1="asterisk" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="23" />
-<hkern g1="hyphen,endash,emdash" g2="C,G,Ccedilla" k="18" />
-<hkern g1="hyphen,endash,emdash" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="37" />
-<hkern g1="hyphen,endash,emdash" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="20" />
-<hkern g1="hyphen,endash,emdash" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="37" />
-<hkern g1="hyphen,endash,emdash" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="43" />
-<hkern g1="hyphen,endash,emdash" g2="J" k="37" />
-<hkern g1="hyphen,endash,emdash" g2="M" k="33" />
-<hkern g1="hyphen,endash,emdash" g2="S" k="59" />
-<hkern g1="hyphen,endash,emdash" g2="T" k="104" />
-<hkern g1="hyphen,endash,emdash" g2="V" k="70" />
-<hkern g1="hyphen,endash,emdash" g2="W" k="63" />
-<hkern g1="hyphen,endash,emdash" g2="X" k="63" />
-<hkern g1="hyphen,endash,emdash" g2="Y,Yacute,Ydieresis" k="98" />
-<hkern g1="hyphen,endash,emdash" g2="Z" k="61" />
-<hkern g1="hyphen,endash,emdash" g2="AE" k="43" />
-<hkern g1="hyphen,endash,emdash" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="29" />
-<hkern g1="hyphen,endash,emdash" g2="t" k="23" />
-<hkern g1="hyphen,endash,emdash" g2="z" k="23" />
-<hkern g1="hyphen,endash,emdash" g2="x" k="29" />
-<hkern g1="period" g2="quotedbl,quotesingle" k="233" />
-<hkern g1="period" g2="quoteleft,quotedblleft" k="238" />
-<hkern g1="period" g2="quoteright,quotedblright" k="211" />
-<hkern g1="period" g2="C,G,Ccedilla" k="45" />
-<hkern g1="period" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="25" />
-<hkern g1="period" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="47" />
-<hkern g1="period" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="43" />
-<hkern g1="period" g2="J" k="25" />
-<hkern g1="period" g2="T" k="96" />
-<hkern g1="period" g2="W" k="82" />
-<hkern g1="period" g2="Y,Yacute,Ydieresis" k="100" />
-<hkern g1="period" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="29" />
-<hkern g1="period" g2="t" k="31" />
-<hkern g1="period" g2="w" k="41" />
-<hkern g1="period" g2="y,yacute,ydieresis" k="51" />
-<hkern g1="slash" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="31" />
-<hkern g1="slash" g2="Y,Yacute,Ydieresis" k="-18" />
-<hkern g1="slash" g2="AE" k="25" />
-<hkern g1="slash" g2="d,q" k="20" />
-<hkern g1="slash" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="25" />
-<hkern g1="slash" g2="g" k="29" />
-<hkern g1="slash" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="25" />
-<hkern g1="at" g2="quotedbl,quotesingle" k="41" />
-<hkern g1="bracketleft" g2="C,G,Ccedilla" k="27" />
-<hkern g1="bracketleft" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="27" />
-<hkern g1="bracketleft" g2="J" k="-47" />
-<hkern g1="bracketleft" g2="Y,Yacute,Ydieresis" k="-18" />
-<hkern g1="bracketleft" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="20" />
-<hkern g1="bracketleft" g2="t" k="29" />
-<hkern g1="bracketleft" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="31" />
-<hkern g1="bracketleft" g2="d,q" k="33" />
-<hkern g1="bracketleft" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="37" />
-<hkern g1="bracketleft" g2="g" k="37" />
-<hkern g1="bracketleft" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="37" />
-<hkern g1="bracketleft" g2="s" k="29" />
-<hkern g1="bracketleft" g2="m,n,r,ntilde" k="35" />
-<hkern g1="bracketleft" g2="u,ugrave,uacute,ucircumflex,udieresis" k="37" />
-<hkern g1="bracketleft" g2="w" k="33" />
-<hkern g1="bracketleft" g2="y,yacute,ydieresis" k="33" />
-<hkern g1="bracketleft" g2="z" k="25" />
-<hkern g1="backslash" g2="quotedbl,quotesingle" k="66" />
-<hkern g1="backslash" g2="C,G,Ccedilla" k="33" />
-<hkern g1="backslash" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="33" />
-<hkern g1="backslash" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="37" />
-<hkern g1="backslash" g2="J" k="-14" />
-<hkern g1="backslash" g2="T" k="63" />
-<hkern g1="backslash" g2="W" k="57" />
-<hkern g1="backslash" g2="Y,Yacute,Ydieresis" k="68" />
-<hkern g1="backslash" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="20" />
-<hkern g1="backslash" g2="t" k="31" />
-<hkern g1="backslash" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="20" />
-<hkern g1="backslash" g2="u,ugrave,uacute,ucircumflex,udieresis" k="25" />
-<hkern g1="backslash" g2="w" k="41" />
-<hkern g1="backslash" g2="y,yacute,ydieresis" k="45" />
-<hkern g1="braceleft" g2="C,G,Ccedilla" k="31" />
-<hkern g1="braceleft" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="29" />
-<hkern g1="braceleft" g2="J" k="-49" />
-<hkern g1="braceleft" g2="Y,Yacute,Ydieresis" k="-18" />
-<hkern g1="braceleft" g2="t" k="27" />
-<hkern g1="braceleft" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="31" />
-<hkern g1="braceleft" g2="d,q" k="35" />
-<hkern g1="braceleft" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="39" />
-<hkern g1="braceleft" g2="g" k="37" />
-<hkern g1="braceleft" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="39" />
-<hkern g1="braceleft" g2="s" k="29" />
-<hkern g1="braceleft" g2="m,n,r,ntilde" k="35" />
-<hkern g1="braceleft" g2="u,ugrave,uacute,ucircumflex,udieresis" k="37" />
-<hkern g1="braceleft" g2="w" k="31" />
-<hkern g1="braceleft" g2="y,yacute,ydieresis" k="31" />
-<hkern g1="braceleft" g2="z" k="23" />
-<hkern g1="exclamdown" g2="T" k="66" />
-<hkern g1="exclamdown" g2="W" k="25" />
-<hkern g1="exclamdown" g2="Y,Yacute,Ydieresis" k="41" />
-<hkern g1="questiondown" g2="J" k="-35" />
-<hkern g1="questiondown" g2="T" k="70" />
-<hkern g1="questiondown" g2="W" k="29" />
-<hkern g1="questiondown" g2="Y,Yacute,Ydieresis" k="47" />
-<hkern g1="quoteleft,quotedblleft" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="72" />
-<hkern g1="quoteleft,quotedblleft" g2="M" k="23" />
-<hkern g1="quoteleft,quotedblleft" g2="AE" k="100" />
-<hkern g1="quoteleft,quotedblleft" g2="period,ellipsis" k="236" />
-<hkern g1="quoteleft,quotedblleft" g2="comma" k="236" />
-<hkern g1="quoteleft,quotedblleft" g2="d,q" k="51" />
-<hkern g1="quoteleft,quotedblleft" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="41" />
-<hkern g1="quoteleft,quotedblleft" g2="g" k="37" />
-<hkern g1="quoteleft,quotedblleft" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="39" />
-<hkern g1="quoteleft,quotedblleft" g2="s" k="27" />
-<hkern g1="quoteleft,quotedblleft" g2="eth" k="39" />
-<hkern g1="quoteright,quotedblright" g2="C,G,Ccedilla" k="29" />
-<hkern g1="quoteright,quotedblright" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="25" />
-<hkern g1="quoteright,quotedblright" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="80" />
-<hkern g1="quoteright,quotedblright" g2="M" k="23" />
-<hkern g1="quoteright,quotedblright" g2="AE" k="115" />
-<hkern g1="quoteright,quotedblright" g2="period,ellipsis" k="256" />
-<hkern g1="quoteright,quotedblright" g2="quotesinglbase,quotedblbase" k="256" />
-<hkern g1="quoteright,quotedblright" g2="comma" k="256" />
-<hkern g1="quoteright,quotedblright" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="33" />
-<hkern g1="quoteright,quotedblright" g2="d,q" k="72" />
-<hkern g1="quoteright,quotedblright" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="61" />
-<hkern g1="quoteright,quotedblright" g2="g" k="55" />
-<hkern g1="quoteright,quotedblright" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="59" />
-<hkern g1="quoteright,quotedblright" g2="s" k="43" />
-<hkern g1="quoteright,quotedblright" g2="eth" k="37" />
-<hkern g1="quoteright,quotedblright" g2="guillemotleft,guilsinglleft" k="61" />
-<hkern g1="quoteright,quotedblright" g2="m,n,r,ntilde" k="18" />
-<hkern g1="quoteright,quotedblright" g2="u,ugrave,uacute,ucircumflex,udieresis" k="20" />
-<hkern g1="quoteright,quotedblright" g2="hyphen,endash,emdash" k="35" />
-<hkern g1="quoteright,quotedblright" g2="p" k="18" />
-<hkern g1="quoteright,quotedblright" g2="guillemotright,guilsinglright" k="35" />
-<hkern g1="quotesinglbase,quotedblbase" g2="quotedbl,quotesingle" k="233" />
-<hkern g1="quotesinglbase,quotedblbase" g2="quoteright,quotedblright" k="211" />
-<hkern g1="quotesinglbase,quotedblbase" g2="C,G,Ccedilla" k="45" />
-<hkern g1="quotesinglbase,quotedblbase" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="25" />
-<hkern g1="quotesinglbase,quotedblbase" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="47" />
-<hkern g1="quotesinglbase,quotedblbase" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="45" />
-<hkern g1="quotesinglbase,quotedblbase" g2="J" k="25" />
-<hkern g1="quotesinglbase,quotedblbase" g2="T" k="96" />
-<hkern g1="quotesinglbase,quotedblbase" g2="V" k="96" />
-<hkern g1="quotesinglbase,quotedblbase" g2="W" k="84" />
-<hkern g1="quotesinglbase,quotedblbase" g2="Y,Yacute,Ydieresis" k="100" />
-<hkern g1="quotesinglbase,quotedblbase" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="29" />
-<hkern g1="quotesinglbase,quotedblbase" g2="t" k="31" />
-<hkern g1="quotesinglbase,quotedblbase" g2="w" k="41" />
-<hkern g1="quotesinglbase,quotedblbase" g2="y,yacute,ydieresis" k="51" />
-<hkern g1="quotesinglbase,quotedblbase" g2="v" k="51" />
-<hkern g1="guillemotleft,guilsinglleft" g2="T" k="76" />
-<hkern g1="guillemotleft,guilsinglleft" g2="V" k="33" />
-<hkern g1="guillemotleft,guilsinglleft" g2="W" k="29" />
-<hkern g1="guillemotleft,guilsinglleft" g2="Y,Yacute,Ydieresis" k="53" />
-<hkern g1="guillemotright,guilsinglright" g2="quotedbl,quotesingle" k="41" />
-<hkern g1="guillemotright,guilsinglright" g2="quoteright,quotedblright" k="31" />
-<hkern g1="guillemotright,guilsinglright" g2="T" k="82" />
-<hkern g1="guillemotright,guilsinglright" g2="V" k="47" />
-<hkern g1="guillemotright,guilsinglright" g2="W" k="43" />
-<hkern g1="guillemotright,guilsinglright" g2="X" k="27" />
-<hkern g1="guillemotright,guilsinglright" g2="Y,Yacute,Ydieresis" k="70" />
-<hkern g1="guillemotright,guilsinglright" g2="Z" k="33" />
-<hkern g1="guillemotright,guilsinglright" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="20" />
-<hkern g1="guillemotright,guilsinglright" g2="y,yacute,ydieresis" k="20" />
-<hkern g1="guillemotright,guilsinglright" g2="z" k="27" />
-<hkern g1="guillemotright,guilsinglright" g2="x" k="27" />
-<hkern g1="guillemotright,guilsinglright" g2="v" k="20" />
-<hkern g1="ampersand" g2="quotedbl,quotesingle" k="147" />
-<hkern g1="ampersand" g2="C,G,Ccedilla" k="10" />
-<hkern g1="ampersand" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="10" />
-<hkern g1="ampersand" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="16" />
-<hkern g1="ampersand" g2="T" k="133" />
-<hkern g1="ampersand" g2="W" k="98" />
-<hkern g1="ampersand" g2="Y,Yacute,Ydieresis" k="133" />
-<hkern g1="ampersand" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="23" />
-<hkern g1="ampersand" g2="t" k="23" />
-<hkern g1="ampersand" g2="w" k="51" />
-<hkern g1="ampersand" g2="y,yacute,ydieresis" k="76" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="quotedbl,quotesingle" k="74" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="quoteleft,quotedblleft" k="70" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="quoteright,quotedblright" k="61" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="10" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="14" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="T" k="109" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="V" k="78" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="W" k="63" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="Y,Yacute,Ydieresis" k="109" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="29" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="t" k="33" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="u,ugrave,uacute,ucircumflex,udieresis" k="10" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="w" k="47" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="y,yacute,ydieresis" k="61" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="hyphen,endash,emdash" k="45" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="v" k="61" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="asterisk" k="49" />
-<hkern g1="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" g2="backslash" k="33" />
-<hkern g1="B" g2="quotedbl,quotesingle" k="16" />
-<hkern g1="B" g2="Y,Yacute,Ydieresis" k="10" />
-<hkern g1="B" g2="period,ellipsis" k="25" />
-<hkern g1="B" g2="quotesinglbase,quotedblbase" k="25" />
-<hkern g1="B" g2="g" k="10" />
-<hkern g1="B" g2="m,n,r,ntilde" k="10" />
-<hkern g1="B" g2="z" k="10" />
-<hkern g1="B" g2="hyphen,endash,emdash" k="23" />
-<hkern g1="B" g2="h,k,thorn" k="10" />
-<hkern g1="B" g2="i,j,igrave,iacute,icircumflex,idieresis" k="10" />
-<hkern g1="C,Ccedilla" g2="C,G,Ccedilla" k="27" />
-<hkern g1="C,Ccedilla" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="29" />
-<hkern g1="C,Ccedilla" g2="AE" k="-16" />
-<hkern g1="C,Ccedilla" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="12" />
-<hkern g1="C,Ccedilla" g2="t" k="18" />
-<hkern g1="C,Ccedilla" g2="d,q" k="27" />
-<hkern g1="C,Ccedilla" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="35" />
-<hkern g1="C,Ccedilla" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="41" />
-<hkern g1="C,Ccedilla" g2="u,ugrave,uacute,ucircumflex,udieresis" k="20" />
-<hkern g1="C,Ccedilla" g2="w" k="18" />
-<hkern g1="C,Ccedilla" g2="y,yacute,ydieresis" k="18" />
-<hkern g1="C,Ccedilla" g2="hyphen,endash,emdash" k="51" />
-<hkern g1="C,Ccedilla" g2="v" k="18" />
-<hkern g1="D,Eth" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="14" />
-<hkern g1="D,Eth" g2="T" k="27" />
-<hkern g1="D,Eth" g2="X" k="33" />
-<hkern g1="D,Eth" g2="Y,Yacute,Ydieresis" k="29" />
-<hkern g1="D,Eth" g2="Z" k="12" />
-<hkern g1="D,Eth" g2="AE" k="31" />
-<hkern g1="D,Eth" g2="period,ellipsis" k="55" />
-<hkern g1="D,Eth" g2="quotesinglbase,quotedblbase" k="55" />
-<hkern g1="D,Eth" g2="comma" k="55" />
-<hkern g1="D,Eth" g2="slash" k="39" />
-<hkern g1="D,Eth" g2="g" k="10" />
-<hkern g1="D,Eth" g2="x" k="10" />
-<hkern g1="D,Eth" g2="hyphen,endash,emdash" k="23" />
-<hkern g1="D,Eth" g2="parenright" k="35" />
-<hkern g1="D,Eth" g2="bracketright" k="29" />
-<hkern g1="D,Eth" g2="braceright" k="29" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="16" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="t" k="18" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="d,q" k="14" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="16" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="g" k="12" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="18" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="m,n,r,ntilde" k="14" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="u,ugrave,uacute,ucircumflex,udieresis" k="20" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="w" k="23" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="y,yacute,ydieresis" k="27" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="hyphen,endash,emdash" k="45" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="p" k="14" />
-<hkern g1="E,AE,Egrave,Eacute,Ecircumflex,Edieresis,OE" g2="v" k="27" />
-<hkern g1="F" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="59" />
-<hkern g1="F" g2="AE" k="131" />
-<hkern g1="F" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="16" />
-<hkern g1="F" g2="t" k="16" />
-<hkern g1="F" g2="period,ellipsis" k="84" />
-<hkern g1="F" g2="quotesinglbase,quotedblbase" k="84" />
-<hkern g1="F" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="57" />
-<hkern g1="F" g2="d,q" k="25" />
-<hkern g1="F" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="23" />
-<hkern g1="F" g2="g" k="45" />
-<hkern g1="F" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="20" />
-<hkern g1="F" g2="s" k="25" />
-<hkern g1="F" g2="m,n,r,ntilde" k="39" />
-<hkern g1="F" g2="u,ugrave,uacute,ucircumflex,udieresis" k="33" />
-<hkern g1="F" g2="w" k="12" />
-<hkern g1="F" g2="y,yacute,ydieresis" k="12" />
-<hkern g1="F" g2="z" k="37" />
-<hkern g1="F" g2="hyphen,endash,emdash" k="39" />
-<hkern g1="F" g2="i,j,igrave,iacute,icircumflex,idieresis" k="10" />
-<hkern g1="G" g2="quotedbl,quotesingle" k="23" />
-<hkern g1="G" g2="quoteleft,quotedblleft" k="20" />
-<hkern g1="G" g2="quoteright,quotedblright" k="23" />
-<hkern g1="G" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="10" />
-<hkern g1="G" g2="t" k="10" />
-<hkern g1="G" g2="w" k="10" />
-<hkern g1="G" g2="y,yacute,ydieresis" k="14" />
-<hkern g1="G" g2="hyphen,endash,emdash" k="23" />
-<hkern g1="G" g2="v" k="14" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="12" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="t" k="12" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="period,ellipsis" k="25" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="quotesinglbase,quotedblbase" k="25" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="comma" k="25" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="12" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="d,q" k="16" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="16" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="g" k="25" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="16" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="s" k="12" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="eth" k="18" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="m,n,r,ntilde" k="16" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="u,ugrave,uacute,ucircumflex,udieresis" k="18" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="w" k="12" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="y,yacute,ydieresis" k="14" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="z" k="14" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="hyphen,endash,emdash" k="37" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="p" k="16" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="v" k="14" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="h,k,thorn" k="16" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="i,j,igrave,iacute,icircumflex,idieresis" k="16" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="b" k="16" />
-<hkern g1="H,I,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde" g2="l" k="16" />
-<hkern g1="J" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="12" />
-<hkern g1="J" g2="t" k="12" />
-<hkern g1="J" g2="period,ellipsis" k="27" />
-<hkern g1="J" g2="quotesinglbase,quotedblbase" k="25" />
-<hkern g1="J" g2="comma" k="25" />
-<hkern g1="J" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="12" />
-<hkern g1="J" g2="d,q" k="16" />
-<hkern g1="J" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="16" />
-<hkern g1="J" g2="g" k="25" />
-<hkern g1="J" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="16" />
-<hkern g1="J" g2="s" k="12" />
-<hkern g1="J" g2="m,n,r,ntilde" k="16" />
-<hkern g1="J" g2="u,ugrave,uacute,ucircumflex,udieresis" k="18" />
-<hkern g1="J" g2="w" k="12" />
-<hkern g1="J" g2="y,yacute,ydieresis" k="12" />
-<hkern g1="J" g2="z" k="12" />
-<hkern g1="J" g2="hyphen,endash,emdash" k="37" />
-<hkern g1="J" g2="p" k="16" />
-<hkern g1="J" g2="v" k="12" />
-<hkern g1="J" g2="h,k,thorn" k="16" />
-<hkern g1="J" g2="i,j,igrave,iacute,icircumflex,idieresis" k="16" />
-<hkern g1="J" g2="b" k="16" />
-<hkern g1="J" g2="l" k="16" />
-<hkern g1="K" g2="C,G,Ccedilla" k="49" />
-<hkern g1="K" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="47" />
-<hkern g1="K" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="18" />
-<hkern g1="K" g2="t" k="37" />
-<hkern g1="K" g2="ampersand" k="12" />
-<hkern g1="K" g2="d,q" k="41" />
-<hkern g1="K" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="53" />
-<hkern g1="K" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="63" />
-<hkern g1="K" g2="u,ugrave,uacute,ucircumflex,udieresis" k="29" />
-<hkern g1="K" g2="w" k="55" />
-<hkern g1="K" g2="y,yacute,ydieresis" k="68" />
-<hkern g1="K" g2="hyphen,endash,emdash" k="66" />
-<hkern g1="K" g2="v" k="68" />
-<hkern g1="L" g2="quotedbl,quotesingle" k="125" />
-<hkern g1="L" g2="quoteleft,quotedblleft" k="125" />
-<hkern g1="L" g2="quoteright,quotedblright" k="121" />
-<hkern g1="L" g2="C,G,Ccedilla" k="27" />
-<hkern g1="L" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="35" />
-<hkern g1="L" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="31" />
-<hkern g1="L" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="-18" />
-<hkern g1="L" g2="T" k="139" />
-<hkern g1="L" g2="V" k="129" />
-<hkern g1="L" g2="W" k="109" />
-<hkern g1="L" g2="X" k="-10" />
-<hkern g1="L" g2="Y,Yacute,Ydieresis" k="162" />
-<hkern g1="L" g2="AE" k="-57" />
-<hkern g1="L" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="33" />
-<hkern g1="L" g2="t" k="37" />
-<hkern g1="L" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="10" />
-<hkern g1="L" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="12" />
-<hkern g1="L" g2="u,ugrave,uacute,ucircumflex,udieresis" k="10" />
-<hkern g1="L" g2="w" k="82" />
-<hkern g1="L" g2="y,yacute,ydieresis" k="100" />
-<hkern g1="L" g2="hyphen,endash,emdash" k="119" />
-<hkern g1="L" g2="v" k="100" />
-<hkern g1="L" g2="asterisk" k="117" />
-<hkern g1="L" g2="backslash" k="45" />
-<hkern g1="L" g2="bracketright" k="20" />
-<hkern g1="L" g2="question" k="23" />
-<hkern g1="M" g2="quotedbl,quotesingle" k="23" />
-<hkern g1="M" g2="quoteleft,quotedblleft" k="23" />
-<hkern g1="M" g2="quoteright,quotedblright" k="20" />
-<hkern g1="M" g2="T" k="10" />
-<hkern g1="M" g2="W" k="14" />
-<hkern g1="M" g2="Y,Yacute,Ydieresis" k="14" />
-<hkern g1="M" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="20" />
-<hkern g1="M" g2="t" k="18" />
-<hkern g1="M" g2="d,q" k="10" />
-<hkern g1="M" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="12" />
-<hkern g1="M" g2="g" k="14" />
-<hkern g1="M" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="12" />
-<hkern g1="M" g2="m,n,r,ntilde" k="10" />
-<hkern g1="M" g2="u,ugrave,uacute,ucircumflex,udieresis" k="12" />
-<hkern g1="M" g2="w" k="23" />
-<hkern g1="M" g2="y,yacute,ydieresis" k="27" />
-<hkern g1="M" g2="hyphen,endash,emdash" k="33" />
-<hkern g1="M" g2="h,k,thorn" k="10" />
-<hkern g1="M" g2="i,j,igrave,iacute,icircumflex,idieresis" k="10" />
-<hkern g1="M" g2="l" k="10" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="10" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="T" k="25" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="X" k="23" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="Y,Yacute,Ydieresis" k="25" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="Z" k="10" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="period,ellipsis" k="49" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="quotesinglbase,quotedblbase" k="49" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="comma" k="49" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="slash" k="35" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="g" k="10" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="x" k="10" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="hyphen,endash,emdash" k="20" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="parenright" k="33" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="bracketright" k="25" />
-<hkern g1="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" g2="braceright" k="27" />
-<hkern g1="P" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="74" />
-<hkern g1="P" g2="AE" k="156" />
-<hkern g1="P" g2="period,ellipsis" k="137" />
-<hkern g1="P" g2="quotesinglbase,quotedblbase" k="137" />
-<hkern g1="P" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="16" />
-<hkern g1="P" g2="d,q" k="29" />
-<hkern g1="P" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="23" />
-<hkern g1="P" g2="g" k="31" />
-<hkern g1="P" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="20" />
-<hkern g1="P" g2="s" k="12" />
-<hkern g1="P" g2="guillemotleft,guilsinglleft" k="23" />
-<hkern g1="P" g2="m,n,r,ntilde" k="10" />
-<hkern g1="P" g2="u,ugrave,uacute,ucircumflex,udieresis" k="10" />
-<hkern g1="P" g2="hyphen,endash,emdash" k="51" />
-<hkern g1="P" g2="i,j,igrave,iacute,icircumflex,idieresis" k="10" />
-<hkern g1="R" g2="T" k="20" />
-<hkern g1="R" g2="Y,Yacute,Ydieresis" k="10" />
-<hkern g1="R" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="10" />
-<hkern g1="R" g2="g" k="12" />
-<hkern g1="R" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="12" />
-<hkern g1="R" g2="m,n,r,ntilde" k="14" />
-<hkern g1="R" g2="u,ugrave,uacute,ucircumflex,udieresis" k="16" />
-<hkern g1="R" g2="w" k="10" />
-<hkern g1="R" g2="y,yacute,ydieresis" k="12" />
-<hkern g1="R" g2="hyphen,endash,emdash" k="31" />
-<hkern g1="R" g2="p" k="14" />
-<hkern g1="R" g2="v" k="12" />
-<hkern g1="R" g2="h,k,thorn" k="12" />
-<hkern g1="R" g2="i,j,igrave,iacute,icircumflex,idieresis" k="14" />
-<hkern g1="R" g2="b" k="12" />
-<hkern g1="R" g2="l" k="16" />
-<hkern g1="S" g2="quoteright,quotedblright" k="18" />
-<hkern g1="S" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="23" />
-<hkern g1="S" g2="t" k="20" />
-<hkern g1="S" g2="period,ellipsis" k="18" />
-<hkern g1="S" g2="quotesinglbase,quotedblbase" k="18" />
-<hkern g1="S" g2="comma" k="18" />
-<hkern g1="S" g2="m,n,r,ntilde" k="10" />
-<hkern g1="S" g2="w" k="20" />
-<hkern g1="S" g2="y,yacute,ydieresis" k="29" />
-<hkern g1="S" g2="z" k="14" />
-<hkern g1="S" g2="x" k="27" />
-<hkern g1="S" g2="hyphen,endash,emdash" k="23" />
-<hkern g1="S" g2="p" k="10" />
-<hkern g1="S" g2="v" k="29" />
-<hkern g1="T" g2="C,G,Ccedilla" k="39" />
-<hkern g1="T" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="33" />
-<hkern g1="T" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="106" />
-<hkern g1="T" g2="M" k="14" />
-<hkern g1="T" g2="Y,Yacute,Ydieresis" k="-16" />
-<hkern g1="T" g2="AE" k="141" />
-<hkern g1="T" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="41" />
-<hkern g1="T" g2="t" k="51" />
-<hkern g1="T" g2="period,ellipsis" k="96" />
-<hkern g1="T" g2="quotesinglbase,quotedblbase" k="96" />
-<hkern g1="T" g2="ampersand" k="35" />
-<hkern g1="T" g2="comma" k="96" />
-<hkern g1="T" g2="slash" k="63" />
-<hkern g1="T" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="119" />
-<hkern g1="T" g2="d,q" k="170" />
-<hkern g1="T" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="168" />
-<hkern g1="T" g2="g" k="174" />
-<hkern g1="T" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="168" />
-<hkern g1="T" g2="s" k="150" />
-<hkern g1="T" g2="guillemotleft,guilsinglleft" k="82" />
-<hkern g1="T" g2="m,n,r,ntilde" k="150" />
-<hkern g1="T" g2="u,ugrave,uacute,ucircumflex,udieresis" k="152" />
-<hkern g1="T" g2="w" k="90" />
-<hkern g1="T" g2="y,yacute,ydieresis" k="88" />
-<hkern g1="T" g2="z" k="80" />
-<hkern g1="T" g2="x" k="98" />
-<hkern g1="T" g2="hyphen,endash,emdash" k="104" />
-<hkern g1="T" g2="p" k="150" />
-<hkern g1="T" g2="guillemotright,guilsinglright" k="76" />
-<hkern g1="T" g2="v" k="88" />
-<hkern g1="T" g2="asterisk" k="-16" />
-<hkern g1="T" g2="h,k,thorn" k="10" />
-<hkern g1="T" g2="i,j,igrave,iacute,icircumflex,idieresis" k="12" />
-<hkern g1="T" g2="colon" k="86" />
-<hkern g1="T" g2="semicolon" k="86" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="14" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="AE" k="20" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="10" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="t" k="10" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="period,ellipsis" k="47" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="quotesinglbase,quotedblbase" k="47" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="comma" k="47" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="slash" k="37" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="16" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="d,q" k="16" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="14" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="g" k="31" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="14" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="s" k="18" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="m,n,r,ntilde" k="23" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="u,ugrave,uacute,ucircumflex,udieresis" k="23" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="z" k="18" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="x" k="10" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="hyphen,endash,emdash" k="37" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="p" k="23" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="parenright" k="23" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="b" k="12" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="colon" k="18" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" g2="semicolon" k="18" />
-<hkern g1="V" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="76" />
-<hkern g1="V" g2="T" k="-16" />
-<hkern g1="V" g2="AE" k="127" />
-<hkern g1="V" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="12" />
-<hkern g1="V" g2="t" k="12" />
-<hkern g1="V" g2="period,ellipsis" k="96" />
-<hkern g1="V" g2="quotesinglbase,quotedblbase" k="96" />
-<hkern g1="V" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="78" />
-<hkern g1="V" g2="d,q" k="94" />
-<hkern g1="V" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="88" />
-<hkern g1="V" g2="g" k="96" />
-<hkern g1="V" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="86" />
-<hkern g1="V" g2="s" k="80" />
-<hkern g1="V" g2="guillemotleft,guilsinglleft" k="47" />
-<hkern g1="V" g2="m,n,r,ntilde" k="70" />
-<hkern g1="V" g2="u,ugrave,uacute,ucircumflex,udieresis" k="63" />
-<hkern g1="V" g2="z" k="25" />
-<hkern g1="V" g2="hyphen,endash,emdash" k="70" />
-<hkern g1="V" g2="guillemotright,guilsinglright" k="33" />
-<hkern g1="W" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="63" />
-<hkern g1="W" g2="M" k="14" />
-<hkern g1="W" g2="AE" k="109" />
-<hkern g1="W" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="14" />
-<hkern g1="W" g2="t" k="16" />
-<hkern g1="W" g2="period,ellipsis" k="84" />
-<hkern g1="W" g2="quotesinglbase,quotedblbase" k="84" />
-<hkern g1="W" g2="ampersand" k="18" />
-<hkern g1="W" g2="comma" k="84" />
-<hkern g1="W" g2="slash" k="57" />
-<hkern g1="W" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="68" />
-<hkern g1="W" g2="d,q" k="82" />
-<hkern g1="W" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="80" />
-<hkern g1="W" g2="g" k="86" />
-<hkern g1="W" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="80" />
-<hkern g1="W" g2="s" k="72" />
-<hkern g1="W" g2="guillemotleft,guilsinglleft" k="43" />
-<hkern g1="W" g2="m,n,r,ntilde" k="63" />
-<hkern g1="W" g2="u,ugrave,uacute,ucircumflex,udieresis" k="59" />
-<hkern g1="W" g2="z" k="29" />
-<hkern g1="W" g2="hyphen,endash,emdash" k="63" />
-<hkern g1="W" g2="p" k="63" />
-<hkern g1="W" g2="guillemotright,guilsinglright" k="27" />
-<hkern g1="W" g2="colon" k="37" />
-<hkern g1="W" g2="semicolon" k="37" />
-<hkern g1="X" g2="C,G,Ccedilla" k="18" />
-<hkern g1="X" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="23" />
-<hkern g1="X" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="25" />
-<hkern g1="X" g2="t" k="37" />
-<hkern g1="X" g2="d,q" k="29" />
-<hkern g1="X" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="37" />
-<hkern g1="X" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="43" />
-<hkern g1="X" g2="guillemotleft,guilsinglleft" k="25" />
-<hkern g1="X" g2="u,ugrave,uacute,ucircumflex,udieresis" k="29" />
-<hkern g1="X" g2="w" k="47" />
-<hkern g1="X" g2="y,yacute,ydieresis" k="53" />
-<hkern g1="X" g2="hyphen,endash,emdash" k="61" />
-<hkern g1="Y,Yacute,Ydieresis" g2="C,G,Ccedilla" k="33" />
-<hkern g1="Y,Yacute,Ydieresis" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="20" />
-<hkern g1="Y,Yacute,Ydieresis" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="106" />
-<hkern g1="Y,Yacute,Ydieresis" g2="M" k="14" />
-<hkern g1="Y,Yacute,Ydieresis" g2="T" k="-27" />
-<hkern g1="Y,Yacute,Ydieresis" g2="AE" k="141" />
-<hkern g1="Y,Yacute,Ydieresis" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="37" />
-<hkern g1="Y,Yacute,Ydieresis" g2="t" k="47" />
-<hkern g1="Y,Yacute,Ydieresis" g2="period,ellipsis" k="102" />
-<hkern g1="Y,Yacute,Ydieresis" g2="quotesinglbase,quotedblbase" k="102" />
-<hkern g1="Y,Yacute,Ydieresis" g2="ampersand" k="33" />
-<hkern g1="Y,Yacute,Ydieresis" g2="comma" k="102" />
-<hkern g1="Y,Yacute,Ydieresis" g2="slash" k="66" />
-<hkern g1="Y,Yacute,Ydieresis" g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,ae" k="109" />
-<hkern g1="Y,Yacute,Ydieresis" g2="d,q" k="143" />
-<hkern g1="Y,Yacute,Ydieresis" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="143" />
-<hkern g1="Y,Yacute,Ydieresis" g2="g" k="147" />
-<hkern g1="Y,Yacute,Ydieresis" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="145" />
-<hkern g1="Y,Yacute,Ydieresis" g2="s" k="156" />
-<hkern g1="Y,Yacute,Ydieresis" g2="guillemotleft,guilsinglleft" k="70" />
-<hkern g1="Y,Yacute,Ydieresis" g2="m,n,r,ntilde" k="102" />
-<hkern g1="Y,Yacute,Ydieresis" g2="u,ugrave,uacute,ucircumflex,udieresis" k="86" />
-<hkern g1="Y,Yacute,Ydieresis" g2="w" k="27" />
-<hkern g1="Y,Yacute,Ydieresis" g2="y,yacute,ydieresis" k="25" />
-<hkern g1="Y,Yacute,Ydieresis" g2="z" k="41" />
-<hkern g1="Y,Yacute,Ydieresis" g2="x" k="18" />
-<hkern g1="Y,Yacute,Ydieresis" g2="hyphen,endash,emdash" k="98" />
-<hkern g1="Y,Yacute,Ydieresis" g2="p" k="102" />
-<hkern g1="Y,Yacute,Ydieresis" g2="guillemotright,guilsinglright" k="51" />
-<hkern g1="Y,Yacute,Ydieresis" g2="v" k="25" />
-<hkern g1="Y,Yacute,Ydieresis" g2="backslash" k="-16" />
-<hkern g1="Y,Yacute,Ydieresis" g2="bracketright" k="-29" />
-<hkern g1="Y,Yacute,Ydieresis" g2="braceright" k="-29" />
-<hkern g1="Y,Yacute,Ydieresis" g2="question" k="-20" />
-<hkern g1="Y,Yacute,Ydieresis" g2="colon" k="59" />
-<hkern g1="Y,Yacute,Ydieresis" g2="semicolon" k="59" />
-<hkern g1="Z" g2="C,G,Ccedilla" k="10" />
-<hkern g1="Z" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="10" />
-<hkern g1="Z" g2="f,germandbls,uniFB01,uniFB02,uniFB03,uniFB04" k="25" />
-<hkern g1="Z" g2="t" k="27" />
-<hkern g1="Z" g2="d,q" k="27" />
-<hkern g1="Z" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="33" />
-<hkern g1="Z" g2="g" k="18" />
-<hkern g1="Z" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="37" />
-<hkern g1="Z" g2="guillemotleft,guilsinglleft" k="35" />
-<hkern g1="Z" g2="m,n,r,ntilde" k="23" />
-<hkern g1="Z" g2="u,ugrave,uacute,ucircumflex,udieresis" k="33" />
-<hkern g1="Z" g2="w" k="29" />
-<hkern g1="Z" g2="y,yacute,ydieresis" k="27" />
-<hkern g1="Z" g2="hyphen,endash,emdash" k="68" />
-<hkern g1="Z" g2="p" k="23" />
-<hkern g1="Z" g2="v" k="27" />
-<hkern g1="Thorn" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="20" />
-<hkern g1="Thorn" g2="T" k="23" />
-<hkern g1="Thorn" g2="Y,Yacute,Ydieresis" k="31" />
-<hkern g1="Thorn" g2="Z" k="23" />
-<hkern g1="Thorn" g2="AE" k="53" />
-<hkern g1="Thorn" g2="period,ellipsis" k="66" />
-<hkern g1="Thorn" g2="quotesinglbase,quotedblbase" k="66" />
-<hkern g1="Thorn" g2="hyphen,endash,emdash" k="18" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="quotedbl,quotesingle" k="33" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="quoteleft,quotedblleft" k="31" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="quoteright,quotedblright" k="20" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="18" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="27" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="y,yacute,ydieresis" k="8" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="v" k="8" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="asterisk" k="23" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="backslash" k="27" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="parenright" k="33" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="bracketright" k="35" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="braceright" k="35" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" g2="question" k="27" />
-<hkern g1="c,ccedilla" g2="C,G,Ccedilla" k="12" />
-<hkern g1="c,ccedilla" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="12" />
-<hkern g1="c,ccedilla" g2="ampersand" k="14" />
-<hkern g1="c,ccedilla" g2="d,q" k="10" />
-<hkern g1="c,ccedilla" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="10" />
-<hkern g1="c,ccedilla" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="12" />
-<hkern g1="d" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="16" />
-<hkern g1="d" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="20" />
-<hkern g1="e,ae,egrave,eacute,ecircumflex,edieresis,oe" g2="quotedbl,quotesingle" k="29" />
-<hkern g1="e,ae,egrave,eacute,ecircumflex,edieresis,oe" g2="quoteleft,quotedblleft" k="31" />
-<hkern g1="e,ae,egrave,eacute,ecircumflex,edieresis,oe" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="12" />
-<hkern g1="e,ae,egrave,eacute,ecircumflex,edieresis,oe" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="12" />
-<hkern g1="e,ae,egrave,eacute,ecircumflex,edieresis,oe" g2="parenright" k="31" />
-<hkern g1="e,ae,egrave,eacute,ecircumflex,edieresis,oe" g2="bracketright" k="31" />
-<hkern g1="e,ae,egrave,eacute,ecircumflex,edieresis,oe" g2="braceright" k="33" />
-<hkern g1="f" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="78" />
-<hkern g1="f" g2="period,ellipsis" k="59" />
-<hkern g1="f" g2="quotesinglbase,quotedblbase" k="59" />
-<hkern g1="f" g2="d,q" k="20" />
-<hkern g1="f" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="14" />
-<hkern g1="f" g2="g" k="12" />
-<hkern g1="f" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="12" />
-<hkern g1="f" g2="eth" k="27" />
-<hkern g1="f" g2="guillemotleft,guilsinglleft" k="33" />
-<hkern g1="f" g2="hyphen,endash,emdash" k="57" />
-<hkern g1="g" g2="ampersand" k="16" />
-<hkern g1="g" g2="guillemotleft,guilsinglleft" k="20" />
-<hkern g1="g" g2="hyphen,endash,emdash" k="16" />
-<hkern g1="i,j,igrave,iacute,icircumflex,idieresis,uniFB01,uniFB03" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="16" />
-<hkern g1="i,j,igrave,iacute,icircumflex,idieresis,uniFB01,uniFB03" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="18" />
-<hkern g1="i,j,igrave,iacute,icircumflex,idieresis,uniFB01,uniFB03" g2="J" k="16" />
-<hkern g1="i,j,igrave,iacute,icircumflex,idieresis,uniFB01,uniFB03" g2="M" k="10" />
-<hkern g1="i,j,igrave,iacute,icircumflex,idieresis,uniFB01,uniFB03" g2="T" k="10" />
-<hkern g1="k" g2="C,G,Ccedilla" k="23" />
-<hkern g1="k" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="25" />
-<hkern g1="k" g2="ampersand" k="14" />
-<hkern g1="k" g2="d,q" k="35" />
-<hkern g1="k" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="39" />
-<hkern g1="k" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="39" />
-<hkern g1="k" g2="eth" k="45" />
-<hkern g1="k" g2="guillemotleft,guilsinglleft" k="23" />
-<hkern g1="k" g2="hyphen,endash,emdash" k="41" />
-<hkern g1="l,uniFB02,uniFB04" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="16" />
-<hkern g1="l,uniFB02,uniFB04" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="20" />
-<hkern g1="h,m,n,ntilde" g2="quotedbl,quotesingle" k="33" />
-<hkern g1="h,m,n,ntilde" g2="quoteleft,quotedblleft" k="33" />
-<hkern g1="h,m,n,ntilde" g2="quoteright,quotedblright" k="20" />
-<hkern g1="h,m,n,ntilde" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="18" />
-<hkern g1="h,m,n,ntilde" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="25" />
-<hkern g1="h,m,n,ntilde" g2="J" k="18" />
-<hkern g1="h,m,n,ntilde" g2="M" k="12" />
-<hkern g1="h,m,n,ntilde" g2="T" k="160" />
-<hkern g1="h,m,n,ntilde" g2="V" k="86" />
-<hkern g1="h,m,n,ntilde" g2="W" k="76" />
-<hkern g1="h,m,n,ntilde" g2="Y,Yacute,Ydieresis" k="131" />
-<hkern g1="h,m,n,ntilde" g2="Z" k="20" />
-<hkern g1="h,m,n,ntilde" g2="y,yacute,ydieresis" k="8" />
-<hkern g1="h,m,n,ntilde" g2="v" k="8" />
-<hkern g1="h,m,n,ntilde" g2="asterisk" k="23" />
-<hkern g1="h,m,n,ntilde" g2="backslash" k="27" />
-<hkern g1="h,m,n,ntilde" g2="parenright" k="33" />
-<hkern g1="h,m,n,ntilde" g2="bracketright" k="35" />
-<hkern g1="h,m,n,ntilde" g2="braceright" k="35" />
-<hkern g1="h,m,n,ntilde" g2="question" k="27" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="quotedbl,quotesingle" k="39" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="quoteleft,quotedblleft" k="39" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="quoteright,quotedblright" k="25" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="16" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="14" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="slash" k="23" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="x" k="20" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="asterisk" k="18" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="backslash" k="23" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="parenright" k="41" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="bracketright" k="37" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="braceright" k="39" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" g2="question" k="25" />
-<hkern g1="b,p,thorn" g2="quotedbl,quotesingle" k="35" />
-<hkern g1="b,p,thorn" g2="quoteleft,quotedblleft" k="33" />
-<hkern g1="b,p,thorn" g2="quoteright,quotedblright" k="18" />
-<hkern g1="b,p,thorn" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="16" />
-<hkern g1="b,p,thorn" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="14" />
-<hkern g1="b,p,thorn" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="10" />
-<hkern g1="b,p,thorn" g2="J" k="16" />
-<hkern g1="b,p,thorn" g2="M" k="12" />
-<hkern g1="b,p,thorn" g2="S" k="16" />
-<hkern g1="b,p,thorn" g2="T" k="164" />
-<hkern g1="b,p,thorn" g2="V" k="82" />
-<hkern g1="b,p,thorn" g2="W" k="74" />
-<hkern g1="b,p,thorn" g2="X" k="59" />
-<hkern g1="b,p,thorn" g2="Y,Yacute,Ydieresis" k="141" />
-<hkern g1="b,p,thorn" g2="Z" k="43" />
-<hkern g1="b,p,thorn" g2="slash" k="25" />
-<hkern g1="b,p,thorn" g2="x" k="18" />
-<hkern g1="b,p,thorn" g2="asterisk" k="16" />
-<hkern g1="b,p,thorn" g2="backslash" k="20" />
-<hkern g1="b,p,thorn" g2="parenright" k="41" />
-<hkern g1="b,p,thorn" g2="bracketright" k="37" />
-<hkern g1="b,p,thorn" g2="braceright" k="39" />
-<hkern g1="b,p,thorn" g2="question" k="25" />
-<hkern g1="q" g2="quotedbl,quotesingle" k="16" />
-<hkern g1="q" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="16" />
-<hkern g1="q" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="23" />
-<hkern g1="r" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="12" />
-<hkern g1="r" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="82" />
-<hkern g1="r" g2="period,ellipsis" k="66" />
-<hkern g1="r" g2="quotesinglbase,quotedblbase" k="66" />
-<hkern g1="r" g2="ampersand" k="43" />
-<hkern g1="r" g2="comma" k="66" />
-<hkern g1="r" g2="slash" k="47" />
-<hkern g1="r" g2="d,q" k="16" />
-<hkern g1="r" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="10" />
-<hkern g1="r" g2="g" k="10" />
-<hkern g1="r" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="10" />
-<hkern g1="r" g2="guillemotleft,guilsinglleft" k="33" />
-<hkern g1="r" g2="hyphen,endash,emdash" k="37" />
-<hkern g1="r" g2="parenright" k="29" />
-<hkern g1="r" g2="bracketright" k="31" />
-<hkern g1="r" g2="braceright" k="31" />
-<hkern g1="s" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="12" />
-<hkern g1="s" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="12" />
-<hkern g1="s" g2="parenright" k="33" />
-<hkern g1="s" g2="bracketright" k="33" />
-<hkern g1="s" g2="braceright" k="33" />
-<hkern g1="u,ugrave,uacute,ucircumflex,udieresis" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="16" />
-<hkern g1="u,ugrave,uacute,ucircumflex,udieresis" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="23" />
-<hkern g1="u,ugrave,uacute,ucircumflex,udieresis" g2="parenright" k="31" />
-<hkern g1="u,ugrave,uacute,ucircumflex,udieresis" g2="bracketright" k="35" />
-<hkern g1="u,ugrave,uacute,ucircumflex,udieresis" g2="braceright" k="35" />
-<hkern g1="u,ugrave,uacute,ucircumflex,udieresis" g2="question" k="20" />
-<hkern g1="v" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="14" />
-<hkern g1="v" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="61" />
-<hkern g1="v" g2="period,ellipsis" k="53" />
-<hkern g1="v" g2="quotesinglbase,quotedblbase" k="53" />
-<hkern g1="v" g2="d,q" k="12" />
-<hkern g1="v" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="8" />
-<hkern g1="v" g2="g" k="12" />
-<hkern g1="v" g2="guillemotleft,guilsinglleft" k="23" />
-<hkern g1="w" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="12" />
-<hkern g1="w" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="47" />
-<hkern g1="w" g2="period,ellipsis" k="43" />
-<hkern g1="w" g2="quotesinglbase,quotedblbase" k="43" />
-<hkern g1="w" g2="ampersand" k="18" />
-<hkern g1="w" g2="comma" k="43" />
-<hkern g1="w" g2="slash" k="41" />
-<hkern g1="w" g2="g" k="10" />
-<hkern g1="w" g2="parenright" k="29" />
-<hkern g1="w" g2="bracketright" k="33" />
-<hkern g1="w" g2="braceright" k="31" />
-<hkern g1="x" g2="C,G,Ccedilla" k="16" />
-<hkern g1="x" g2="O,Q,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,OE" k="14" />
-<hkern g1="x" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="12" />
-<hkern g1="x" g2="d,q" k="16" />
-<hkern g1="x" g2="c,e,ccedilla,egrave,eacute,ecircumflex,edieresis" k="18" />
-<hkern g1="x" g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash,oe" k="20" />
-<hkern g1="x" g2="guillemotleft,guilsinglleft" k="27" />
-<hkern g1="x" g2="hyphen,endash,emdash" k="29" />
-<hkern g1="y,yacute,ydieresis" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="12" />
-<hkern g1="y,yacute,ydieresis" g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" k="57" />
-<hkern g1="y,yacute,ydieresis" g2="period,ellipsis" k="49" />
-<hkern g1="y,yacute,ydieresis" g2="quotesinglbase,quotedblbase" k="49" />
-<hkern g1="y,yacute,ydieresis" g2="ampersand" k="23" />
-<hkern g1="y,yacute,ydieresis" g2="comma" k="49" />
-<hkern g1="y,yacute,ydieresis" g2="slash" k="43" />
-<hkern g1="y,yacute,ydieresis" g2="d,q" k="8" />
-<hkern g1="y,yacute,ydieresis" g2="g" k="10" />
-<hkern g1="y,yacute,ydieresis" g2="guillemotleft,guilsinglleft" k="20" />
-<hkern g1="y,yacute,ydieresis" g2="parenright" k="27" />
-<hkern g1="y,yacute,ydieresis" g2="bracketright" k="33" />
-<hkern g1="y,yacute,ydieresis" g2="braceright" k="31" />
-<hkern g1="z" g2="B,D,E,F,H,I,K,L,N,P,R,Egrave,Eacute,Ecircumflex,Edieresis,Igrave,Iacute,Icircumflex,Idieresis,Eth,Ntilde,Thorn" k="14" />
-<hkern g1="z" g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" k="18" />
-<hkern g1="z" g2="ampersand" k="12" />
-<hkern g1="z" g2="guillemotleft,guilsinglleft" k="27" />
-<hkern g1="z" g2="hyphen,endash,emdash" k="25" />
-<hkern g1="z" g2="parenright" k="25" />
-<hkern g1="z" g2="bracketright" k="25" />
-<hkern g1="z" g2="braceright" k="23" />
-</font>
-</defs></svg>
\ No newline at end of file
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-semibold.ttf b/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-semibold.ttf
deleted file mode 100755
index cdc0d82..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-semibold.ttf and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-semibold.woff b/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-semibold.woff
deleted file mode 100755
index 32825d1..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/acorde-semibold.woff and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/ol-round-gothic-light.eot b/plugins/wordpress-mobile-pack/admin/sass/fonts/ol-round-gothic-light.eot
deleted file mode 100755
index 0c61bed..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/ol-round-gothic-light.eot and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/ol-round-gothic-light.otf b/plugins/wordpress-mobile-pack/admin/sass/fonts/ol-round-gothic-light.otf
deleted file mode 100755
index f1ec52d..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/ol-round-gothic-light.otf and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/ol-round-gothic-light.svg b/plugins/wordpress-mobile-pack/admin/sass/fonts/ol-round-gothic-light.svg
deleted file mode 100755
index 3647edf..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/fonts/ol-round-gothic-light.svg
+++ /dev/null
@@ -1,1021 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="olroundgothicregular" horiz-adv-x="1228" >
-<font-face units-per-em="2048" ascent="1638" descent="-410" />
-<missing-glyph horiz-adv-x="409" />
-<glyph horiz-adv-x="2048" />
-<glyph horiz-adv-x="2048" />
-<glyph horiz-adv-x="682" />
-<glyph unicode="
" horiz-adv-x="409" />
-<glyph horiz-adv-x="665" d="M-256 -27h61l1117 1641h-62z" />
-<glyph horiz-adv-x="563" d="M0 1126h154v-1126h51v1126h358v52h-358v129q0 53 20.5 99t55 81t81 55.5t99.5 20.5t102 -23l25 45q-61 29 -127 29q-63 0 -119.5 -24.5t-97.5 -66.5t-65.5 -98.5t-24.5 -119.5v-127h-154v-52zM639 1561q0 -20 15.5 -36t37.5 -16q20 0 35.5 15.5t15.5 38.5q0 20 -15 35.5 t-38 15.5q-20 0 -35.5 -15.5t-15.5 -37.5zM666 0h51v1178h-51v-1178z" />
-<glyph horiz-adv-x="794" d="M0 1126h154v-1126h51v1126h358v52h-358v129q0 53 20.5 99t55 81t81 55.5t99.5 20.5t102 -23l25 45q-61 29 -127 29q-63 0 -119.5 -24.5t-97.5 -66.5t-65.5 -98.5t-24.5 -119.5v-127h-154v-52zM666 0h51v1792h-51v-1792z" />
-<glyph unicode=" " horiz-adv-x="409" />
-<glyph unicode="	" horiz-adv-x="409" />
-<glyph unicode=" " horiz-adv-x="409" />
-<glyph unicode="!" horiz-adv-x="409" d="M154 25q0 -20 14 -36t37 -16t37 15.5t14 38.5v-2q0 23 -14.5 38t-36.5 15q-23 0 -37 -15.5t-14 -37.5zM178 410h53v1177h-53v-1177z" />
-<glyph unicode=""" horiz-adv-x="409" d="M102 973h52v614h-52v-614zM256 973h51v614h-51v-614z" />
-<glyph unicode="#" horiz-adv-x="921" d="M51 537l819 2v51h-819v-53zM51 1253l819 2v52h-819v-54zM256 -27h51v1641h-51v-1641zM614 -27h52v1641h-52v-1641z" />
-<glyph unicode="$" horiz-adv-x="870" d="M0 410q0 -141 79 -251t204 -157v-80h51v64q25 -4 49.5 -8.5t52.5 -4.5q27 0 51.5 4.5t51.5 8.5v-64h51v80q123 47 201.5 157t78.5 251q0 150 -80.5 249t-201.5 148v721q92 -43 148.5 -130t56.5 -196h53q-2 129 -73 231.5t-185 149.5v82h-51v-66q-23 6 -48.5 10.5 t-54.5 4.5q-27 0 -52.5 -4t-49.5 -11v66h-51v-82q-55 -23 -102.5 -61.5t-81.5 -88t-53 -108.5t-19 -123q0 -137 72.5 -229t185.5 -139v-777q-104 45 -168 139.5t-64 213.5h-51zM76 1204q0 106 57 193.5t150 130.5l-2 -637q-88 41 -146.5 120t-58.5 193zM332 39v776 q25 -8 50.5 -12t49.5 -8q53 -8 107 -25l-2 -731q-23 -6 -48.5 -10t-54.5 -4q-27 0 -52.5 4t-49.5 10zM332 868v678q53 16 104 17q49 0 103 -17l-2 -723q-23 8 -48.5 12.5t-50.5 8.5q-53 8 -106 24zM588 57v693q100 -45 165.5 -130t65.5 -210q0 -119 -63.5 -213.5 t-167.5 -139.5z" />
-<glyph unicode="%" horiz-adv-x="1382" d="M0 1202q0 -80 25.5 -153.5t73.5 -130t114 -91t145 -34.5q80 0 145.5 34.5t114 91t74 131t25.5 154.5t-25.5 154t-74 130t-114 91t-145.5 35t-145.5 -35t-113.5 -91t-73.5 -131t-25.5 -155zM51 1204q0 68 22.5 132.5t62.5 114.5t96.5 81t125.5 31q70 0 126.5 -31t96.5 -81 t62.5 -114.5t22.5 -134.5v2q0 -70 -22.5 -134t-62.5 -114.5t-96.5 -81t-126.5 -30.5t-126 30.5t-96 81t-62.5 115t-22.5 133.5zM102 -27h62l1116 1641h-61zM666 383q0 -80 25.5 -153.5t73.5 -130t113.5 -91.5t145.5 -35t145.5 35t113.5 91.5t73.5 131t25.5 154.5 t-25.5 153.5t-73.5 130t-113.5 91.5t-145.5 35t-145.5 -35t-113.5 -91.5t-73.5 -131t-25.5 -154.5zM717 385q0 68 22.5 132.5t62.5 114.5t96 80.5t126 30.5t126 -30.5t96 -80.5t62.5 -114.5t22.5 -134.5q0 -68 -22.5 -132.5t-62.5 -114.5t-96 -80.5t-126 -30.5t-126 30.5 t-96 80.5t-62.5 114.5t-22.5 134.5z" />
-<glyph unicode="&" horiz-adv-x="1409" d="M0 434q0 -96 36 -179t99.5 -146.5t146.5 -99.5t179 -36q86 0 165 28t134 85l244 246l331 -332h74l-371 369l344 348h-71l-310 -314l-534 535l176 121q59 41 92 105.5t33 142.5q0 63 -24.5 118.5t-65.5 97.5t-97.5 66.5t-119.5 24.5t-119.5 -24.5t-97.5 -66.5t-65.5 -98.5 t-24.5 -119.5t24.5 -120t67.5 -100l141 -141l-182 -125q-92 -63 -148.5 -162.5t-56.5 -222.5zM51 436q0 106 50.5 194.5t131.5 145.5l191 131l543 -538l-244 -248q-47 -49 -116.5 -72.5t-145.5 -23.5q-84 0 -159 32.5t-130 88t-88 130t-33 160.5zM205 1307q0 53 20.5 99 t55 81t81 55.5t99.5 20.5t99 -20.5t81 -55.5t55.5 -82t20.5 -100v2q0 -63 -27.5 -117.5t-75.5 -89.5l-184 -125l-149 147q-35 35 -55.5 82t-20.5 103z" />
-<glyph unicode="'" horiz-adv-x="256" d="M102 973h52v614h-52v-614z" />
-<glyph unicode="(" horiz-adv-x="948" d="M51 690q0 -178 62.5 -343t172 -300t259 -234.5t325.5 -146.5v53q-160 45 -300 139.5t-244.5 223.5t-164 284.5t-59.5 325.5q0 168 59.5 325t164 286t245 223t299.5 139v51q-176 -47 -325.5 -146.5t-259 -234.5t-172 -301t-62.5 -344z" />
-<glyph unicode=")" horiz-adv-x="897" d="M76 1716l2 -53q160 -45 300 -138t243.5 -222t164 -286t60.5 -327t-60.5 -325.5t-164 -283.5t-243.5 -222.5t-300 -139.5v-53q174 47 324.5 146.5t260 235.5t172 301t62.5 343t-62.5 343t-172 300t-260 234.5t-326.5 146.5z" />
-<glyph unicode="*" horiz-adv-x="608" d="M25 1149l26 -45l228 131v-262h51v262l227 -131l27 45l-228 131l228 131l-27 45l-227 -131v262h-51v-262l-228 131l-26 -45l229 -131z" />
-<glyph unicode="+" horiz-adv-x="921" d="M51 768h385v-385h51v385h383v51h-385v385h-51v-385h-383v-51z" />
-<glyph unicode="," horiz-adv-x="409" d="M102 -256l48 -18l102 282q2 4 3 8.5t1 10.5q0 20 -14.5 35.5t-36.5 15.5q-23 0 -37 -15.5t-14 -37.5q0 -16 9 -29.5t23 -18.5z" />
-<glyph unicode="-" horiz-adv-x="512" d="M51 768h410v51h-410v-51z" />
-<glyph unicode="." horiz-adv-x="409" d="M154 25q0 -20 14 -36t37 -16t37 15.5t14 38.5q0 20 -14.5 35.5t-36.5 15.5q-23 0 -37 -15.5t-14 -37.5z" />
-<glyph unicode="/" d="M25 -27h63l1116 1641h-63z" />
-<glyph unicode="0" horiz-adv-x="1433" d="M0 793q0 -160 52 -307.5t147.5 -261t226.5 -182.5t291 -69t292 69t226 182.5t146.5 262t52.5 308.5t-52.5 307t-147.5 261t-226 182.5t-291 68.5t-291 -68.5t-226.5 -182.5t-147.5 -262.5t-52 -307.5zM51 795q0 147 48 286.5t135.5 246t210 171t272.5 64.5t271.5 -64.5 t209.5 -172t136 -246t48 -287.5v2q0 -150 -48 -288t-136 -245.5t-211 -172t-270 -64.5q-150 0 -272.5 64.5t-210 172t-135.5 245.5t-48 288z" />
-<glyph unicode="1" horiz-adv-x="460" d="M0 1100l37 -35l297 395v-1460h51v1614z" />
-<glyph unicode="2" horiz-adv-x="1177" d="M51 0h1075v51h-944l725 670q78 72 123 169t45 212q0 106 -40 199.5t-109.5 163t-162.5 109.5t-200 40q-106 0 -199.5 -40t-163 -109.5t-109.5 -164t-40 -200.5h51q0 96 36 180t99.5 147.5t146.5 99.5t179 36q94 0 178 -36t147.5 -99.5t99.5 -147.5t36 -180 q0 -98 -38 -183.5t-103 -146.5z" />
-<glyph unicode="3" horiz-adv-x="999" d="M51 422q0 -92 35 -174t96.5 -143.5t143.5 -96.5t174 -35t174 35t143.5 96.5t96 143.5t34.5 174q0 74 -22.5 141.5t-63.5 122.5t-96 96t-123 64q113 45 183.5 144.5t70.5 226.5q0 82 -31.5 154.5t-85 125.5t-126 85t-154.5 32t-155 -32t-126 -85t-85 -126t-32 -154h52 q0 72 27.5 134t74.5 109t109.5 75t134.5 28t134 -28t109.5 -75t75 -109.5t27.5 -133.5q0 -72 -27.5 -134.5t-75 -109.5t-110 -75t-133.5 -28v-51q82 0 154.5 -31.5t126 -85t85 -126t31.5 -154.5t-31.5 -154.5t-85 -126t-126 -85t-154.5 -31.5t-155 31.5t-126 85t-85 126 t-32 154.5h-51z" />
-<glyph unicode="4" horiz-adv-x="1101" d="M0 332h795v-332h51v334h229v51h-231v1227zM94 385l701 1057l-2 -1057h-699z" />
-<glyph unicode="5" horiz-adv-x="1177" d="M51 539q0 -117 44 -220.5t121 -180.5t179.5 -121t218.5 -44q117 0 219.5 44t179.5 121t121 180.5t44 220.5t-44 219t-121 179t-179.5 121t-219.5 44q-102 0 -193 -35t-165 -94v563h768v51h-819v-663l37 -35q72 74 167 118t205 44q106 0 199.5 -40t163.5 -110t109.5 -164 t39.5 -200t-39.5 -199.5t-109.5 -163.5t-163 -109.5t-200 -39.5q-106 0 -199 39.5t-163 109.5t-110 164t-40 201h-51z" />
-<glyph unicode="6" horiz-adv-x="1126" d="M0 537q0 -117 44 -219.5t121 -179.5t179 -121t219 -44t219.5 44t179 121t120.5 180.5t44 220.5t-44 219t-120.5 179t-179 121t-219.5 44q-106 0 -203 -39l510 524h-77l-639 -663q-72 -74 -113 -173.5t-41 -213.5zM51 539q0 106 40 199t109.5 163t163 110t199.5 40 t199.5 -40t163 -110t109.5 -164t40 -200v2q0 -106 -40 -200.5t-109.5 -164.5t-162.5 -109.5t-200 -39.5q-106 0 -199.5 39.5t-163 109.5t-109.5 164t-40 201z" />
-<glyph unicode="7" horiz-adv-x="1153" d="M25 0h61l1067 1587h-1077v-51h981z" />
-<glyph unicode="8" horiz-adv-x="897" d="M0 422q0 -92 35 -174t96.5 -143.5t143 -96.5t174.5 -35q92 0 174 35t143 96.5t96 143.5t35 174q0 74 -22.5 141.5t-63.5 122.5t-96.5 96t-122.5 64q113 45 183.5 144.5t70.5 226.5q0 82 -32 154.5t-85 125.5t-126 85t-154 32q-82 0 -155 -32t-126 -85t-85 -126t-32 -154 q0 -127 71 -226.5t181 -144.5q-66 -23 -122 -64t-96 -96t-62.5 -122.5t-22.5 -141.5zM51 422q0 82 32 154.5t85 126t126 85t155 31.5t154.5 -31.5t125.5 -85t85 -126t32 -154.5t-32 -154.5t-85 -126t-126 -85t-154 -31.5q-82 0 -155 31.5t-126 85t-85 126t-32 154.5z M102 1217q0 72 28 134t75 109t109.5 75t134.5 28t134 -28t109 -75t75 -109.5t28 -133.5h-2q0 -72 -27 -134.5t-74 -109.5t-109.5 -75t-133.5 -28q-72 0 -134.5 28t-109.5 75t-75 109.5t-28 134.5z" />
-<glyph unicode="9" horiz-adv-x="1126" d="M0 1049q0 -117 44 -219.5t121 -179.5t179 -121t219 -44q53 0 104.5 10.5t98.5 28.5l-510 -524h78l639 664q72 74 112.5 173t40.5 214q0 117 -44 219t-120.5 179t-179 121t-219.5 44t-219 -45t-179 -122t-121 -179.5t-44 -218.5zM51 1051q0 106 40 199t109.5 163t163 110 t199.5 40t199.5 -40t163 -110t109.5 -164t40 -200v2q0 -106 -40 -200.5t-109.5 -164.5t-162.5 -109.5t-200 -39.5q-106 0 -199.5 39.5t-163 109.5t-109.5 164t-40 201z" />
-<glyph unicode=":" horiz-adv-x="409" d="M154 25q0 -20 14 -36t37 -16t37 15.5t14 38.5v-2q0 23 -14.5 38t-36.5 15q-23 0 -37 -15.5t-14 -37.5zM154 1151q0 -20 14 -35.5t37 -15.5t37 15t14 38q0 20 -14.5 35.5t-36.5 15.5q-23 0 -37 -15t-14 -38z" />
-<glyph unicode=";" horiz-adv-x="409" d="M102 -256l48 -18l102 282q2 4 3 8t1 11v-2q0 23 -14.5 38t-36.5 15q-23 0 -37 -15.5t-14 -37.5q0 -16 9 -29.5t23 -18.5zM154 1151q0 -20 14 -35.5t37 -15.5t37 15t14 38q0 20 -14.5 35.5t-36.5 15.5q-23 0 -37 -15t-14 -38z" />
-<glyph unicode="<" horiz-adv-x="958" d="M25 793l821 -820l35 37l-783 785l783 782l-37 37z" />
-<glyph unicode="=" horiz-adv-x="921" d="M51 690h819v53h-819v-53zM51 844l819 2v51h-819v-53z" />
-<glyph unicode=">" horiz-adv-x="958" d="M76 10l37 -37l819 822l-819 819l-37 -37l784 -784z" />
-<glyph unicode="?" horiz-adv-x="972" d="M78 1202h51q0 74 27.5 139.5t77 114.5t115 78t138.5 29q74 0 139.5 -29t113.5 -78t77 -114.5t29 -139.5q0 -72 -29 -126t-72 -102t-92 -93t-92 -95.5t-71.5 -111t-28.5 -137.5v-127h51v129q0 70 28.5 125t71.5 103t92.5 93t92.5 95.5t71.5 110.5t28.5 138q0 84 -33 159 t-88 130t-130 88t-161 33q-84 0 -158.5 -33t-130 -88t-87 -130t-31.5 -161zM434 25q0 -20 15.5 -36t37.5 -16q20 0 36 15.5t16 38.5l-2 -2q0 23 -14.5 38t-37.5 15q-20 0 -35.5 -15.5t-15.5 -37.5z" />
-<glyph unicode="@" horiz-adv-x="2252" d="M102 588q0 -141 37 -272.5t103.5 -245t160 -206.5t207 -159.5t244.5 -103.5t272 -37q213 0 398.5 80t326.5 221l-36 37q-133 -133 -309.5 -210t-379.5 -77q-201 0 -378 77t-309 209t-208.5 309t-76.5 380q0 201 76.5 378t208.5 309t309.5 209t377.5 77q201 0 378 -77 t309.5 -209t209 -309t76.5 -380q0 -31 -6 -84t-18.5 -115.5t-32 -127t-46 -117t-61 -86t-77.5 -33.5q-47 0 -82 34.5t-35 83.5v1035h-51v-342q-35 80 -92.5 147.5t-130 116.5t-159.5 76.5t-182 27.5q-127 0 -239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5t48 -238.5 t131 -195.5t195.5 -132.5t239.5 -48.5q94 0 181.5 28t160 77t130 116.5t92.5 147.5v-199q0 -72 49 -121t119 -49q55 0 98 35t75.5 90.5t55 125t37 138t20.5 129t6 99.5q0 211 -80.5 398.5t-219 325.5t-326 219t-398.5 81q-141 0 -272 -37t-244.5 -103.5t-207 -159.5 t-160 -208t-103.5 -246t-37 -272zM563 590q0 117 44 219t121 179t179.5 121t218.5 44q117 0 219.5 -45t179.5 -122t121 -179t44 -219v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 2
20.5z" />
-<glyph unicode="A" horiz-adv-x="1433" d="M25 0h57l307 717h655l308 -717h57l-692 1614zM412 768l305 713l305 -713h-610z" />
-<glyph unicode="B" horiz-adv-x="921" d="M76 0h411q90 0 169 34t138.5 93t93.5 139t34 170q0 70 -21.5 136.5t-61.5 121t-97.5 94t-127.5 58.5q117 39 186.5 137t69.5 221q0 80 -30.5 149.5t-82.5 122t-122 82t-150 29.5h-409v-1587zM127 51v768h360q80 0 150 -30.5t122 -83t81.5 -122t29.5 -149.5t-30.5 -149.5 t-82.5 -121.5t-122 -82t-150 -30h-358zM127 870v666h360q68 0 128.5 -26.5t105.5 -71.5t71.5 -105.5t26.5 -130.5v2q0 -70 -26.5 -130t-71.5 -105t-105.5 -72t-130.5 -27h-358z" />
-<glyph unicode="C" horiz-adv-x="1449" d="M0 793q0 -170 64.5 -318.5t175 -260.5t260 -176.5t319.5 -64.5t318.5 64.5t261.5 177.5l-37 35q-104 -104 -243.5 -164.5t-299.5 -60.5t-299 60t-243.5 164.5t-165 245t-60.5 300.5t60.5 299t165 243.5t243.5 165t299 60.5t299 -60.5t244 -165.5l37 35 q-113 113 -261.5 177.5t-318.5 64.5t-319.5 -64.5t-260 -176t-175 -261t-64.5 -319.5z" />
-<glyph unicode="D" horiz-adv-x="1280" d="M76 0h411q164 0 308.5 62.5t252 170t170 252t62.5 310.5q0 164 -62.5 308t-170 251.5t-253 170t-309.5 62.5h-409v-1587zM127 51v1485h360q154 0 289 -58.5t235.5 -158.5t159 -236.5t58.5 -289.5v2q0 -154 -58.5 -290t-159 -236.5t-236.5 -159t-290 -58.5h-358z" />
-<glyph unicode="E" horiz-adv-x="948" d="M76 0h846v51h-795v768h692v51h-692v666h743v51h-794v-1587z" />
-<glyph unicode="F" horiz-adv-x="897" d="M76 0h53v819h690v51h-692v666h743v51h-794v-1587z" />
-<glyph unicode="G" horiz-adv-x="1638" d="M0 793q0 -170 64.5 -318.5t175 -260.5t260 -176.5t319.5 -64.5t319.5 64.5t260 176.5t175 261.5t64.5 319.5v24h-819v-51h768q-6 -154 -67.5 -290t-166 -236.5t-241.5 -158.5t-293 -58q-160 0 -299 60t-243.5 164.5t-165 245t-60.5 300.5t60.5 299t165 243.5t243.5 165 t299 60.5t299 -60.5t244 -165.5l37 35q-113 113 -261.5 177.5t-318.5 64.5t-319.5 -64.5t-260 -176t-175 -261t-64.5 -319.5z" />
-<glyph unicode="H" horiz-adv-x="1331" d="M76 0h53v819h1075v-819h51v1587h-53v-717h-1075v717h-51v-1587z" />
-<glyph unicode="I" horiz-adv-x="204" d="M76 0h53v1587h-53v-1587z" />
-<glyph unicode="J" horiz-adv-x="204" d="M-180 -434v-51q63 0 119.5 24.5t98.5 65.5t66.5 97.5t24.5 119.5v1765h-53v-1765q0 -53 -19.5 -100.5t-54.5 -82t-82 -54t-100 -19.5z" />
-<glyph unicode="K" horiz-adv-x="1050" d="M76 0h53v666l90 92l758 -758h74l-795 795l795 792h-74l-850 -850v850h-51v-1587z" />
-<glyph unicode="L" horiz-adv-x="845" d="M76 0h743v51h-692v1536h-51v-1587z" />
-<glyph unicode="M" horiz-adv-x="1740" d="M76 0h53v1403l741 -1430l744 1430v-1403h51v1614l-795 -1528l-794 1528v-1614z" />
-<glyph unicode="N" horiz-adv-x="1331" d="M76 0h53v1460l1126 -1487v1614h-53v-1460l-1126 1487v-1614z" />
-<glyph unicode="O" horiz-adv-x="1638" d="M0 793q0 -170 64.5 -318.5t175 -260.5t260 -176.5t319.5 -64.5t319.5 64.5t260 176.5t175 261.5t64.5 319.5q0 168 -64.5 317.5t-175 261t-260 176t-319.5 64.5t-319.5 -64.5t-260 -176t-175 -261t-64.5 -319.5zM51 795q0 160 60.5 299t165 243.5t243.5 165t299 60.5 t299 -60.5t243.5 -165t165 -245t60.5 -299.5v2q0 -160 -60.5 -300.5t-165 -245t-243.5 -164.5t-299 -60t-299 60t-243.5 164.5t-165 245t-60.5 300.5z" />
-<glyph unicode="P" horiz-adv-x="921" d="M76 0h53v717h356v51h-358v768h360v51h-411v-1587zM485 717q90 0 170 33.5t139.5 93t93.5 139.5t34 170t-34 169t-93.5 138.5t-139.5 93t-170 33.5v-51q80 0 150 -30.5t122 -83t82.5 -122t30.5 -149.5t-30.5 -149.5t-82.5 -122t-122 -82t-150 -29.5v-51z" />
-<glyph unicode="Q" horiz-adv-x="1638" d="M0 793q0 -170 64.5 -318.5t175 -260.5t260 -176.5t319.5 -64.5q162 0 304.5 58.5t252.5 161.5l191 -193h71l-225 229q104 111 164.5 255.5t60.5 310.5q0 168 -64.5 317.5t-175 261t-260 176t-319.5 64.5t-319.5 -64.5t-260 -176t-175 -261t-64.5 -319.5zM51 795 q0 160 60.5 299t165 243.5t243.5 165t299 60.5t299 -60.5t243.5 -165t165 -245t60.5 -299.5v2q0 -154 -56 -289t-155 -240l-217 221h-72l252 -258q-102 -96 -235 -150t-285 -54q-160 0 -299 60t-243.5 164.5t-165 245t-60.5 300.5z" />
-<glyph unicode="R" horiz-adv-x="972" d="M76 0h53v717h297l485 -717h62l-488 717q90 0 170 33.5t139.5 93t93.5 139.5t34 170t-34 169t-93.5 138.5t-139.5 93t-170 33.5h-409v-1587zM127 768v768h360q80 0 150 -30.5t122 -83t81.5 -122t29.5 -149.5v2q0 -80 -30.5 -150.5t-82.5 -123t-122 -82t-150 -29.5h-358z " />
-<glyph unicode="S" horiz-adv-x="870" d="M0 410q0 -90 34 -169t93 -138.5t139 -94.5t170 -35t169 35t138.5 94.5t93 138.5t33.5 169q0 96 -34.5 171.5t-94 131t-138.5 88.5t-165 43q-72 10 -137 37.5t-115.5 72.5t-80 107.5t-29.5 142.5q0 74 28.5 139.5t77.5 113.5t114.5 77t139.5 29t138.5 -29t113.5 -78 t77 -114.5t28 -139.5h53q0 86 -33 161t-88 130t-130 88t-161 33q-84 0 -158.5 -33t-130 -88t-88 -130t-32.5 -161q0 -90 32.5 -161.5t89 -123t130 -82t155.5 -40.5q76 -10 146.5 -40t124 -78t85 -114.5t31.5 -152.5q0 -80 -30.5 -150t-83 -122t-122 -82.5t-149.5 -30.5 t-149.5 29.5t-121.5 81.5t-82 123t-30 151h-51z" />
-<glyph unicode="T" horiz-adv-x="1382" d="M25 1536h641v-1536h51v1536h641v51h-1333v-51z" />
-<glyph unicode="U" horiz-adv-x="1382" d="M76 588q0 -127 48 -238.5t132 -195.5t196.5 -132.5t239.5 -48.5t238.5 48.5t195.5 132.5t132.5 196.5t48.5 239.5v997h-54v-999q0 -117 -44 -219.5t-120.5 -179t-179 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5v997h-51v-999z" />
-<glyph unicode="V" horiz-adv-x="1433" d="M25 1587l692 -1614l692 1614h-57l-635 -1481l-635 1481h-57z" />
-<glyph unicode="W" horiz-adv-x="1843" d="M25 1587l538 -1614l359 1069l358 -1069l539 1614h-56l-483 -1454l-358 1071l-359 -1071l-483 1454h-55z" />
-<glyph unicode="X" horiz-adv-x="1280" d="M0 0h63l578 786l576 -786h63l-608 829l557 758h-64l-526 -717l-524 717h-64l557 -758z" />
-<glyph unicode="Y" horiz-adv-x="1331" d="M25 1587l616 -846v-741h51v743l615 844h-64l-577 -794l-578 794h-63z" />
-<glyph unicode="Z" d="M51 0h1127v51h-1035l983 1536h-1024v-51h932z" />
-<glyph unicode="[" horiz-adv-x="385" d="M51 -129h256v53h-205v1741h205v51h-256v-1845z" />
-<glyph unicode="\" d="M25 1614l1116 -1641h63l-1116 1641h-63z" />
-<glyph unicode="]" horiz-adv-x="385" d="M76 -78v-51h258v1845h-258v-53h207v-1741h-207z" />
-<glyph unicode="^" horiz-adv-x="768" d="M76 1356l35 -39l274 229l272 -229l35 41l-309 256z" />
-<glyph unicode="_" d="M0 -76v-53h1229v53h-1229z" />
-<glyph unicode="`" horiz-adv-x="638" d="M76 1569l463 -256l24 45l-461 256z" />
-<glyph unicode="a" horiz-adv-x="1306" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q94 0 181.5 28t160 77t130 116.5t92.5 147.5v-342h51v1178h-51v-342q-35 80 -92.5 147.5t-130 116.5t-159.5 76.5t-182 27.5q-127 0 -239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 590q0 117 44 219 t121 179t179.5 121t218.5 44q117 0 219.5 -45t179.5 -122t121 -179t44 -219v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5z" />
-<glyph unicode="b" horiz-adv-x="1306" d="M76 0h53v342q35 -80 92.5 -147.5t130 -116.5t159.5 -77t181 -28q127 0 238.5 48.5t195.5 132.5t132.5 196.5t48.5 239.5t-48.5 238.5t-132.5 195.5t-196.5 132t-239.5 48q-94 0 -180 -27.5t-158.5 -76.5t-130 -117t-94.5 -147v956h-51v-1792zM127 590q0 117 44 219 t121 179t180 121t220 44t219.5 -45t179 -122t120.5 -179t44 -219l-2 2q0 -117 -44 -220.5t-120.5 -180t-179 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5z" />
-<glyph unicode="c" horiz-adv-x="1232" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q96 0 183.5 28t161 79t131 119.5t92.5 152.5l-47 21q-33 -78 -85.5 -141.5t-120 -109.5t-147.5 -71.5t-168 -25.5q-117 0 -219 44t-179 120.5t-121 180t-44 220.5t44 219t121 179t179.5 121t218.5 44 q88 0 168 -25.5t147.5 -71.5t120 -110.5t85.5 -140.5l47 20q-35 82 -92.5 152t-131 121t-160.5 78.5t-184 27.5q-127 0 -239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5z" />
-<glyph unicode="d" horiz-adv-x="1306" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q94 0 181.5 28t160 77t130 116.5t92.5 147.5v-342h51v1792h-51v-956q-35 80 -92.5 147.5t-130 116.5t-159.5 76.5t-182 27.5q-127 0 -239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 590q0 117 44 219 t121 179t179.5 121t218.5 44q117 0 219.5 -45t179.5 -122t121 -179t44 -219v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5z" />
-<glyph unicode="e" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q96 0 183.5 28t161 79t131 119.5t92.5 152.5l-47 21q-33 -78 -85.5 -141.5t-120 -109.5t-147.5 -71.5t-168 -25.5q-115 0 -214 42t-174.5 114.5t-122 171t-52.5 210.5h1178v27q0 127 -48 238.5t-131 195.5 t-196 132t-240 48t-239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 614q6 113 52.5 211.5t122 171t175 114.5t213.5 42q113 0 213.5 -42t176 -114.5t122 -171t52.5 -211.5h-1127z" />
-<glyph unicode="f" horiz-adv-x="563" d="M0 1126h154v-1126h51v1126h358v52h-358v129q0 53 20.5 99t55 81t81 55.5t99.5 20.5t102 -23l27 45q-63 29 -129 29q-63 0 -119.5 -24.5t-97.5 -66.5t-65.5 -98.5t-24.5 -119.5v-127h-154v-52z" />
-<glyph unicode="g" horiz-adv-x="1306" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q94 0 181.5 28t160 77t130 116.5t92.5 147.5v-215q0 -117 -44 -219.5t-121 -179t-179.5 -120.5t-219.5 -44q-88 0 -167.5 25.5t-147.5 71.5t-120 109.5t-85 141.5l-47 -21q35 -84 91.5 -152.5t130 -119.5 t161.5 -78.5t184 -27.5q127 0 240 48t196 132t131 196.5t48 239.5v1049h-51v-342q-35 80 -92.5 147.5t-130 116.5t-159.5 76.5t-182 27.5q-127 0 -239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 590q0 117 44 219t121 179t179.5 121t218.5 44q117 0 219.5 -45 t179.5 -122t121 -179t44 -219v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5z" />
-<glyph unicode="h" horiz-adv-x="1177" d="M76 0h53v692q0 94 36 178t98.5 147.5t146.5 99.5t180 36q94 0 178 -36t147.5 -99.5t99.5 -147.5t36 -180v-690h51v692q0 106 -40 199.5t-109.5 163t-164 109.5t-200.5 40q-76 0 -145.5 -21.5t-129 -59.5t-107.5 -91t-79 -117v877h-51v-1792z" />
-<glyph unicode="i" horiz-adv-x="256" d="M76 1485q0 -23 15 -37t38 -14q20 0 35.5 14t15.5 37t-15 37t-38 14q-20 0 -35.5 -14.5t-15.5 -36.5zM102 0h52v1178h-52v-1178z" />
-<glyph unicode="j" horiz-adv-x="256" d="M-154 -436v-51q63 0 120 24.5t97.5 66.5t65.5 98t25 120v-2v1358h-52v-1358q0 -53 -20.5 -99.5t-55 -81t-80.5 -55t-100 -20.5zM76 1485q0 -23 15 -37t38 -14q20 0 35.5 14t15.5 37t-15 37t-38 14q-20 0 -35.5 -14.5t-15.5 -36.5z" />
-<glyph unicode="k" horiz-adv-x="843" d="M76 0h53v461l90 92l553 -553h72l-588 590l588 588h-72l-645 -646v1260h-51v-1792z" />
-<glyph unicode="l" horiz-adv-x="204" d="M76 0h53v1792h-53v-1792z" />
-<glyph unicode="m" horiz-adv-x="1740" d="M76 0h53v795q0 74 27.5 139t77 113.5t115 77t138.5 28.5q74 0 139.5 -28.5t113.5 -78t77 -115t29 -138.5v-793h51v795q0 74 27.5 139t77 113.5t115 77t138.5 28.5q74 0 139.5 -28.5t113.5 -78t77 -115t29 -138.5v-793h51v795q0 84 -33 158.5t-88 130t-130 88t-161 32.5 q-66 0 -125 -20.5t-109 -55t-89 -85t-60 -107.5q-23 57 -60.5 107.5t-87.5 85t-110.5 55t-126.5 20.5q-117 0 -211 -58.5t-147 -154.5v187h-51v-1178z" />
-<glyph unicode="n" horiz-adv-x="1177" d="M76 0h53v692q0 94 36 178t98.5 147.5t146.5 99.5t180 36q94 0 178 -36t147.5 -99.5t99.5 -147.5t36 -180v-690h51v692q0 106 -40 199.5t-109.5 163t-164 109.5t-200.5 40q-76 0 -145.5 -21.5t-129 -59.5t-107.5 -91t-79 -117v263h-51v-1178z" />
-<glyph unicode="o" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5t240 48.5t196 132.5t131 196.5t48 239.5t-48 238.5t-131 195.5t-196 132t-240 48t-239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 590q0 117 44 219t121 179t179.5 121t218.5 44q117 0 219.5 -45 t179.5 -122t121 -179t44 -219v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5z" />
-<glyph unicode="p" horiz-adv-x="1306" d="M76 -461h53v803q35 -80 92.5 -147.5t130 -116.5t159.5 -77t181 -28q127 0 238.5 48.5t195.5 132.5t132.5 196.5t48.5 239.5t-48.5 238.5t-132.5 195.5t-196.5 132t-239.5 48q-94 0 -180 -27.5t-158.5 -76.5t-130 -117t-94.5 -147v342h-51v-1639zM127 590q0 117 44 219 t121 179t180 121t220 44t219.5 -45t179 -122t120.5 -179t44 -219l-2 2q0 -117 -44 -220.5t-120.5 -180t-179 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5z" />
-<glyph unicode="q" horiz-adv-x="1306" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q94 0 181.5 28t160 77t130 116.5t92.5 147.5v-803h51v1639h-51v-342q-35 80 -92.5 147.5t-130 116.5t-159.5 76.5t-182 27.5q-127 0 -239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 590q0 117 44 219 t121 179t179.5 121t218.5 44q117 0 219.5 -45t179.5 -122t121 -179t44 -219v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5z" />
-<glyph unicode="r" horiz-adv-x="589" d="M76 0h53v692q0 94 36 178t98.5 147.5t146.5 99.5t180 36v51q-154 0 -277 -80t-186 -209v263h-51v-1178z" />
-<glyph unicode="s" horiz-adv-x="768" d="M51 307q0 -70 26.5 -130t72 -105t105.5 -72t130 -27q68 0 128 27t105.5 72t72 105t26.5 130q0 74 -26.5 132.5t-72 99.5t-105.5 66.5t-126 33.5q-53 6 -100 26.5t-82 52.5t-56.5 77t-21.5 102q0 51 20.5 98t55.5 82t82 55.5t100 20.5q51 0 98 -20.5t81 -55.5t54.5 -82 t20.5 -100h53q0 63 -24.5 119.5t-66.5 98.5t-98.5 66.5t-119.5 24.5t-118.5 -24.5t-97.5 -66.5t-66.5 -98.5t-24.5 -119.5q0 -68 24.5 -121t65.5 -91t97 -61.5t118 -31.5q57 -8 108.5 -29.5t90 -57.5t62.5 -85t24 -111q0 -59 -22.5 -110.5t-60.5 -89t-90.5 -60t-109.5 -22.5 t-108.5 22.5t-89.5 60t-60.5 89t-22.5 110.5h-51z" />
-<glyph unicode="t" horiz-adv-x="665" d="M0 1126h307v-1126h51v1126h308v52h-308v409h-51v-409h-307v-52z" />
-<glyph unicode="u" horiz-adv-x="1177" d="M76 485q0 -106 40 -199t109.5 -163t163.5 -110t201 -40q76 0 145.5 21.5t129 59.5t107.5 91.5t79 116.5v-262h51v1178h-53v-693q0 -96 -36 -179t-98.5 -146.5t-146.5 -99t-180 -35.5t-179 35.5t-146.5 99t-99.5 147.5t-36 180v691h-51v-693z" />
-<glyph unicode="v" horiz-adv-x="1126" d="M25 1178l538 -1205l539 1205h-58l-481 -1080l-481 1080h-57z" />
-<glyph unicode="w" horiz-adv-x="1638" d="M25 1178l462 -1205l332 885l332 -885l463 1205h-55l-406 -1063l-334 884l-334 -884l-405 1063h-55z" />
-<glyph unicode="x" horiz-adv-x="1075" d="M0 0h66l473 580l471 -580h65l-504 621l453 557h-66l-421 -516l-420 516h-66l453 -557z" />
-<glyph unicode="y" horiz-adv-x="1126" d="M25 1178l512 -1178l-203 -461h57l711 1639h-58l-481 -1117l-481 1117h-57z" />
-<glyph unicode="z" horiz-adv-x="1075" d="M51 0h973v51h-870l819 1127h-871v-52h768z" />
-<glyph unicode="{" horiz-adv-x="385" d="M51 793q20 -10 35.5 -24.5t15.5 -51.5v-692q0 -63 45.5 -108.5t108.5 -45.5h51v53h-51q-43 0 -72.5 30t-29.5 73v690q0 29 -8.5 46t-22.5 30q14 14 22.5 31.5t8.5 45.5v693q0 41 29.5 71.5t72.5 30.5h51v51h-51q-63 0 -108.5 -45t-45.5 -110v-691q0 -37 -15 -52t-36 -25z " />
-<glyph unicode="|" horiz-adv-x="358" d="M154 -78h51v1743h-51v-1743z" />
-<glyph unicode="}" horiz-adv-x="385" d="M76 -78v-51h53q63 0 108.5 45t45.5 111v690q0 37 14 52.5t37 25.5q-23 10 -38 24.5t-15 50.5v693q0 63 -44 108t-110 45h-51v-53h53q41 0 71.5 -29.5t30.5 -72.5v-691q0 -29 7.5 -46t21.5 -31q-14 -12 -22.5 -30t-8.5 -46v-692q0 -41 -29.5 -72t-72.5 -31h-51z" />
-<glyph unicode="~" horiz-adv-x="768" d="M76 1460h53v25q0 18 23.5 48t76.5 30q37 0 73 -25t73 -53.5t77 -53t85 -24.5q39 0 67.5 12.5t48 31.5t29.5 42t10 43v27h-53v-27q0 -18 -23.5 -48t-78.5 -30q-37 0 -73 24.5t-73 53.5t-77 53.5t-85 24.5q-37 0 -65.5 -12.5t-48 -32t-29.5 -42t-10 -42.5v-25z" />
-<glyph unicode="¡" horiz-adv-x="409" d="M154 1151q0 -20 14 -35.5t37 -15.5t37 15t14 38q0 20 -14.5 35.5t-36.5 15.5q-23 0 -37 -15t-14 -38zM178 -410h51v1178h-51v-1178z" />
-<glyph unicode="¢" horiz-adv-x="1284" d="M51 895q0 -123 46 -232.5t126 -192.5t187.5 -133t230.5 -54v-207h51v207q92 4 175 32.5t153 78.5t124 117.5t89 147.5l-47 21q-31 -74 -81 -135.5t-114.5 -107.5t-140.5 -72.5t-160 -30.5v1124q84 -4 160 -30.5t140.5 -72.5t114.5 -107.5t81 -135.5l47 21 q-35 80 -89 147.5t-124 117.5t-154 78.5t-176 32.5v156h-51v-156q-123 -4 -229.5 -54t-186.5 -133t-126 -192.5t-46 -234.5zM102 897q0 113 42 213t115 176t171 122t211 50l-2 -1124q-113 4 -210 50t-170 122t-115 176t-42 215z" />
-<glyph unicode="£" horiz-adv-x="716" d="M51 1126h154v-999q0 -35 -15.5 -50.5t-35.5 -25.5h71q31 27 31 78v997h256v52h-256v129q0 53 20.5 99t55.5 81t81 55.5t99 20.5t102 -23l27 45q-63 29 -129 29q-63 0 -119.5 -24.5t-97.5 -66.5t-65.5 -98.5t-24.5 -119.5v-127h-154v-52zM102 0h564v51h-564v-51z" />
-<glyph unicode="¥" horiz-adv-x="1331" d="M25 1587l616 -846h-590v-51h590v-102h-590v-51h590v-537h51v539h588v51h-590v102h590v51h-590l617 844h-64l-577 -794l-578 794h-63z" />
-<glyph unicode="§" horiz-adv-x="921" d="M51 180q0 -86 33 -160.5t88 -130t130 -88t159 -32.5t158.5 32.5t130 88t88 130t32.5 160.5q0 125 -60 210t-159 136l66 242l-307 86q-61 18 -117.5 47t-98.5 72t-67 100t-25 131t28 139.5t77 113.5t114.5 77t139.5 29t139.5 -29t114.5 -78t76.5 -114.5t27.5 -139.5h51 q0 86 -32.5 161t-88 130t-130 88t-158.5 33t-159 -33t-130 -88t-88 -130t-33 -161q0 -125 60.5 -210t158.5 -136l-65 -242l307 -86q61 -18 117.5 -47.5t98.5 -72.5t66.5 -99.5t24.5 -130.5t-27.5 -139.5t-76.5 -113.5t-114.5 -76.5t-139.5 -28.5t-139.5 28.5t-114.5 77.5 t-77 114.5t-28 139.5h-51zM268 651l47 183q20 -10 40 -16.5t40 -12.5l258 -74l-47 -182q-20 10 -39.5 16t-40.5 13z" />
-<glyph unicode="¨" horiz-adv-x="768" d="M76 1561q0 -20 15 -36t38 -16q20 0 35.5 15.5t15.5 38.5h-2q0 20 -14 35.5t-37 15.5q-20 0 -35.5 -15.5t-15.5 -37.5zM588 1561q0 -20 15 -36t38 -16q20 0 35.5 15.5t15.5 38.5q0 20 -15 35.5t-38 15.5q-20 0 -35.5 -15.5t-15.5 -37.5z" />
-<glyph unicode="©" horiz-adv-x="768" d="M25 1253q0 -74 28.5 -139t77.5 -113.5t114.5 -77t139.5 -28.5t139.5 28.5t113.5 78t76.5 114.5t28.5 139t-28.5 139.5t-77.5 113.5t-114.5 77t-139.5 29t-139.5 -29t-113.5 -78t-76.5 -114.5t-28.5 -139.5zM76 1255q0 63 24.5 119t66.5 97.5t98.5 66.5t119.5 25 t118.5 -25t97.5 -66.5t66.5 -98t24.5 -120.5l-2 2q0 -63 -24.5 -119.5t-65.5 -98.5t-97.5 -66.5t-119.5 -24.5t-118.5 24.5t-97.5 66.5t-66.5 98.5t-24.5 119.5zM160 1253q0 -47 17.5 -87t48 -70.5t71.5 -48t88 -17.5q92 0 170 80l-35 35q-63 -63 -137 -64q-35 0 -66.5 13.5 t-55 37t-37 55.5t-13.5 68q0 35 13.5 67t37 55.5t55 36.5t68.5 13q35 0 67.5 -14t67.5 -49l35 35q-78 80 -172 80q-47 0 -87 -17.5t-70.5 -48.5t-48 -72t-17.5 -88z" />
-<glyph unicode="«" horiz-adv-x="1470" d="M25 793l821 -820l35 37l-783 785l783 782l-37 37zM537 793l821 -820l35 37l-783 785l783 782l-37 37z" />
-<glyph unicode="­" horiz-adv-x="512" d="M51 768h410v51h-410v-51z" />
-<glyph unicode="®" horiz-adv-x="768" d="M25 1253q0 -74 28.5 -139t77.5 -113.5t114.5 -77t139.5 -28.5t139.5 28.5t113.5 78t76.5 114.5t28.5 139t-28.5 139.5t-77.5 113.5t-114.5 77t-139.5 29t-139.5 -29t-113.5 -78t-76.5 -114.5t-28.5 -139.5zM76 1255q0 63 24.5 119t66.5 97.5t98.5 66.5t119.5 25 t118.5 -25t97.5 -66.5t66.5 -98t24.5 -120.5l-2 2q0 -63 -24.5 -119.5t-65.5 -98.5t-97.5 -66.5t-119.5 -24.5t-118.5 24.5t-97.5 66.5t-66.5 98.5t-24.5 119.5zM256 1051h51v178h45l121 -178h62l-125 182q41 10 68.5 45t27.5 80q0 53 -38 90t-91 37h-121v-434zM307 1280 v154h70q33 0 55.5 -22.5t22.5 -53.5q0 -33 -22.5 -55.5t-55.5 -22.5h-70z" />
-<glyph unicode="°" horiz-adv-x="460" d="M76 1458q0 -63 45 -108t110 -45q63 0 108.5 44.5t45.5 110.5q0 63 -45 108.5t-111 45.5q-63 0 -108 -45t-45 -111zM127 1460q0 41 30.5 72t73.5 31q41 0 72 -31t31 -74l-2 2q0 -43 -30 -73.5t-73 -30.5q-41 0 -71.5 30.5t-30.5 73.5z" />
-<glyph unicode="´" horiz-adv-x="638" d="M76 1356l26 -43l461 256l-26 45z" />
-<glyph unicode="¶" horiz-adv-x="614" d="M25 1305q0 -63 24.5 -119t66.5 -97.5t98 -66.5t120 -25l51 2v615h-53q-63 0 -118.5 -24.5t-97.5 -66.5t-66.5 -98.5t-24.5 -119.5zM383 -129h51v1743h-51v-1743zM485 -129h54v1743h-54v-1743z" />
-<glyph unicode="·" horiz-adv-x="409" d="M154 793q0 -20 14 -36t37 -16t37 15.5t14 38.5q0 20 -14.5 35.5t-36.5 15.5q-23 0 -37 -15.5t-14 -37.5z" />
-<glyph unicode="»" horiz-adv-x="1470" d="M76 10l37 -37l819 822l-819 819l-37 -37l784 -784zM588 10l37 -37l819 822l-819 819l-37 -37l784 -784z" />
-<glyph unicode="¿" horiz-adv-x="972" d="M76 -27q0 -84 32.5 -158.5t88 -130t130 -88t160.5 -32.5q84 0 159 32.5t130 88t87 130t32 160.5l2 -2h-53q0 -74 -28 -139t-77 -113.5t-114.5 -77t-139.5 -28.5t-139 28.5t-113.5 78t-77 115t-28.5 138.5q0 70 28.5 125.5t71.5 103.5t92.5 93t92.5 95t71.5 110.5 t28.5 138.5v127h-51v-129q0 -72 -29 -126t-72 -102.5t-92 -93.5t-92 -95t-71.5 -110.5t-28.5 -138.5zM434 1151q0 -20 15.5 -35.5t37.5 -15.5q20 0 36 15t16 38q0 20 -15.5 35.5t-38.5 15.5q-20 0 -35.5 -15t-15.5 -38z" />
-<glyph unicode="À" horiz-adv-x="1433" d="M25 0h57l307 717h655l308 -717h57l-692 1614zM412 768l305 713l305 -713h-610zM461 1927l461 -256l24 45l-461 256z" />
-<glyph unicode="Á" horiz-adv-x="1433" d="M25 0h57l307 717h655l308 -717h57l-692 1614zM412 768l305 713l305 -713h-610zM485 1714l27 -43l461 256l-27 45z" />
-<glyph unicode="Â" horiz-adv-x="1433" d="M25 0h57l307 717h655l308 -717h57l-692 1614zM410 1714l32 -39l275 230l274 -230l33 41l-307 256zM412 768l305 713l305 -713h-610z" />
-<glyph unicode="Ã" horiz-adv-x="1433" d="M25 0h57l307 717h655l308 -717h57l-692 1614zM410 1767h51v25q0 18 23.5 48t78.5 30q37 0 72 -24.5t71.5 -53.5t76.5 -53.5t87 -24.5q37 0 66 12.5t48.5 32t29.5 42t10 42.5v27h-51v-27q0 -18 -23.5 -48t-79.5 -30q-37 0 -72.5 25t-72.5 53.5t-77 53t-85 24.5 q-37 0 -65.5 -12.5t-48 -31.5t-29.5 -42t-10 -43v-25zM412 768l305 713l305 -713h-610z" />
-<glyph unicode="Ä" horiz-adv-x="1433" d="M25 0h57l307 717h655l308 -717h57l-692 1614zM410 1765q0 -20 14 -35.5t37 -15.5t37 15t14 38q0 20 -14.5 36t-36.5 16q-23 0 -37 -15.5t-14 -38.5zM412 768l305 713l305 -713h-610zM922 1765q0 -20 14 -35.5t37 -15.5t37 15t14 38q0 20 -14.5 36t-36.5 16 q-23 0 -37 -15.5t-14 -38.5z" />
-<glyph unicode="Å" horiz-adv-x="1433" d="M25 0h57l307 717h655l308 -717h57l-692 1614zM412 768l305 713l305 -713h-610zM563 1868q0 -63 45 -108.5t109 -45.5q63 0 108 45t45 111q0 63 -45 108t-108 45t-108.5 -45t-45.5 -110zM614 1870q0 41 30 71.5t73 30.5t72.5 -30.5t29.5 -73.5v2q0 -43 -29.5 -74 t-72.5 -31t-73 31t-30 74z" />
-<glyph unicode="Æ" horiz-adv-x="2099" d="M25 0h65l606 819h508v-819h844v51h-795v768h693v51h-693v666h744v51h-795zM733 870l471 635v-635h-471z" />
-<glyph unicode="Ç" horiz-adv-x="1449" d="M0 793q0 -166 61.5 -312.5t169 -257t253 -177t311.5 -71.5v-155l28 -29q31 31 74 31q41 0 71.5 -31t30.5 -74q0 -63 -45 -108t-110 -45q-41 0 -72 30.5t-31 73.5h-51q0 -66 45 -110.5t111 -44.5q43 0 80 16t64.5 44t44 65.5t16.5 80.5q0 63 -45 108.5t-111 45.5 q-25 0 -51 -10v112q164 4 305 67.5t250 172.5l-37 35q-104 -104 -243.5 -164.5t-299.5 -60.5t-299 60t-243.5 164.5t-165 245t-60.5 300.5t60.5 299t165 243.5t243.5 165t299 60.5t299 -60.5t244 -165.5l37 35q-113 113 -261.5 177.5t-318.5 64.5t-319.5 -64.5t-260 -176 t-175 -261t-64.5 -319.5z" />
-<glyph unicode="È" horiz-adv-x="972" d="M76 0h846v51h-795v768h692v51h-692v666h743v51h-794v-1587zM256 1927l461 -256l26 45l-462 256z" />
-<glyph unicode="É" horiz-adv-x="972" d="M76 0h846v51h-795v768h692v51h-692v666h743v51h-794v-1587zM281 1714l26 -43l461 256l-27 45z" />
-<glyph unicode="Ê" horiz-adv-x="972" d="M76 0h846v51h-795v768h692v51h-692v666h743v51h-794v-1587zM178 1714l35 -39l274 230l273 -230l35 41l-310 256z" />
-<glyph unicode="Ë" horiz-adv-x="972" d="M76 0h846v51h-795v768h692v51h-692v666h743v51h-794v-1587zM178 1765q0 -20 15.5 -35.5t37.5 -15.5q20 0 36 15.5t16 37.5h-2q0 20 -14.5 36t-37.5 16q-20 0 -35.5 -15.5t-15.5 -38.5zM690 1765q0 -20 15.5 -35.5t37.5 -15.5q20 0 36 15t16 38q0 20 -15.5 36t-38.5 16 q-20 0 -35.5 -15.5t-15.5 -38.5z" />
-<glyph unicode="Ì" horiz-adv-x="204" d="M-154 1927l461 -256l27 45l-463 256zM76 0h51v1587h-51v-1587z" />
-<glyph unicode="Í" horiz-adv-x="204" d="M-129 1714l27 -43l460 256l-26 45zM76 0h53v1587h-53v-1587z" />
-<glyph unicode="Î" horiz-adv-x="204" d="M-205 1714l33 -39l274 230l275 -230l33 41l-308 256zM76 0h51v1587h-51v-1587z" />
-<glyph unicode="Ï" horiz-adv-x="204" d="M-129 1765q0 -20 15.5 -35.5t37.5 -15.5q20 0 35.5 15.5t15.5 37.5h-2q0 20 -14 36t-37 16q-20 0 -35.5 -15.5t-15.5 -38.5zM76 0h53v1587h-53v-1587zM229 1765q0 -20 15.5 -35.5t38.5 -15.5q20 0 35.5 15t15.5 38q0 20 -15.5 36t-37.5 16q-20 0 -36 -15.5t-16 -38.5z " />
-<glyph unicode="Ñ" horiz-adv-x="1331" d="M76 0h53v1460l1126 -1487v1614h-53v-1460l-1126 1487v-1614zM358 1767h52v25q0 18 23.5 48t78.5 30q37 0 71.5 -24.5t71.5 -53.5t77 -53.5t87 -24.5q37 0 65.5 12.5t48 32t30 42t10.5 42.5v27h-51v-27q0 -18 -24 -48t-79 -30q-37 0 -72.5 25t-72.5 53.5t-77 53t-85 24.5 q-37 0 -65.5 -12.5t-48 -31.5t-30 -42t-10.5 -43v-25z" />
-<glyph unicode="Ò" horiz-adv-x="1638" d="M0 793q0 -170 64.5 -318.5t175 -260.5t260 -176.5t319.5 -64.5t319.5 64.5t260 176.5t175 261.5t64.5 319.5v-2q0 170 -64.5 319.5t-175 261t-260 176t-319.5 64.5t-319.5 -64.5t-260 -176t-175 -261t-64.5 -319.5zM51 795q0 160 60.5 299t165 243.5t243.5 165t299 60.5 t299 -60.5t243.5 -165t165 -245t60.5 -299.5v2q0 -160 -60.5 -300.5t-165 -245t-243.5 -164.5t-299 -60t-299 60t-243.5 164.5t-165 245t-60.5 300.5zM563 1927l461 -256l27 45l-463 256z" />
-<glyph unicode="Ó" horiz-adv-x="1638" d="M0 793q0 -170 64.5 -318.5t175 -260.5t260 -176.5t319.5 -64.5t319.5 64.5t260 176.5t175 261.5t64.5 319.5v-2q0 170 -64.5 319.5t-175 261t-260 176t-319.5 64.5t-319.5 -64.5t-260 -176t-175 -261t-64.5 -319.5zM51 795q0 160 60.5 299t165 243.5t243.5 165t299 60.5 t299 -60.5t243.5 -165t165 -245t60.5 -299.5v2q0 -160 -60.5 -300.5t-165 -245t-243.5 -164.5t-299 -60t-299 60t-243.5 164.5t-165 245t-60.5 300.5zM588 1714l26 -43l461 256l-26 45z" />
-<glyph unicode="Ô" horiz-adv-x="1638" d="M0 793q0 -170 64.5 -318.5t175 -260.5t260 -176.5t319.5 -64.5t319.5 64.5t260 176.5t175 261.5t64.5 319.5v-2q0 170 -64.5 319.5t-175 261t-260 176t-319.5 64.5t-319.5 -64.5t-260 -176t-175 -261t-64.5 -319.5zM51 795q0 160 60.5 299t165 243.5t243.5 165t299 60.5 t299 -60.5t243.5 -165t165 -245t60.5 -299.5v2q0 -160 -60.5 -300.5t-165 -245t-243.5 -164.5t-299 -60t-299 60t-243.5 164.5t-165 245t-60.5 300.5zM512 1714l33 -39l274 230l275 -230l32 41l-307 256z" />
-<glyph unicode="Õ" horiz-adv-x="1638" d="M0 793q0 -170 64.5 -318.5t175 -260.5t260 -176.5t319.5 -64.5t319.5 64.5t260 176.5t175 261.5t64.5 319.5v-2q0 170 -64.5 319.5t-175 261t-260 176t-319.5 64.5t-319.5 -64.5t-260 -176t-175 -261t-64.5 -319.5zM51 795q0 160 60.5 299t165 243.5t243.5 165t299 60.5 t299 -60.5t243.5 -165t165 -245t60.5 -299.5v2q0 -160 -60.5 -300.5t-165 -245t-243.5 -164.5t-299 -60t-299 60t-243.5 164.5t-165 245t-60.5 300.5zM512 1767h51v25q0 18 23.5 48t79.5 30q37 0 71.5 -24.5t71.5 -53.5t77 -53.5t87 -24.5q37 0 65.5 12.5t48 32t29.5 42 t10 42.5v27h-51v-27q0 -18 -23.5 -48t-78.5 -30q-37 0 -73 25t-72.5 53.5t-76.5 53t-85 24.5q-37 0 -66 -12.5t-48.5 -31.5t-29.5 -42t-10 -43v-25z" />
-<glyph unicode="Ö" horiz-adv-x="1638" d="M0 793q0 -170 64.5 -318.5t175 -260.5t260 -176.5t319.5 -64.5t319.5 64.5t260 176.5t175 261.5t64.5 319.5v-2q0 170 -64.5 319.5t-175 261t-260 176t-319.5 64.5t-319.5 -64.5t-260 -176t-175 -261t-64.5 -319.5zM51 795q0 160 60.5 299t165 243.5t243.5 165t299 60.5 t299 -60.5t243.5 -165t165 -245t60.5 -299.5v2q0 -160 -60.5 -300.5t-165 -245t-243.5 -164.5t-299 -60t-299 60t-243.5 164.5t-165 245t-60.5 300.5zM512 1765q0 -20 14.5 -35.5t36.5 -15.5q23 0 37 15t14 38q0 20 -14 36t-37 16t-37 -15.5t-14 -38.5zM1024 1765 q0 -20 14.5 -35.5t36.5 -15.5q23 0 37 15t14 38q0 20 -14 36t-37 16t-37 -15.5t-14 -38.5z" />
-<glyph unicode="Ø" horiz-adv-x="1689" d="M25 0h73l191 193q111 -102 252 -161t305 -59q168 0 317.5 64.5t261 176.5t176 261.5t64.5 319.5q0 164 -60.5 308t-166.5 255l227 229h-74l-190 -192q-111 102 -252 160.5t-305 58.5q-170 0 -318.5 -64.5t-260 -176t-176 -261t-64.5 -319.5q0 -164 60 -308.5t167 -255.5z M76 795q0 160 60.5 299t165 243.5t244.5 165t300 60.5q152 0 284 -54.5t236 -150.5l-1079 -1092q-98 104 -154.5 239.5t-56.5 289.5zM324 229l1079 1092q98 -104 154.5 -239.5t56.5 -288.5l-2 2q0 -160 -60.5 -300.5t-164 -245t-243.5 -164.5t-300 -60q-152 0 -284 54 t-236 150z" />
-<glyph unicode="Ù" horiz-adv-x="1382" d="M76 588q0 -127 48 -238.5t132 -195.5t196.5 -132.5t239.5 -48.5t238.5 48.5t195.5 132.5t132.5 196.5t48.5 239.5v-2v999h-54v-999q0 -117 -44 -219.5t-120.5 -179t-179 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5v997h-51v-999zM436 1927l461 -256l25 45 l-461 256z" />
-<glyph unicode="Ú" horiz-adv-x="1382" d="M76 588q0 -127 48 -238.5t132 -195.5t196.5 -132.5t239.5 -48.5t238.5 48.5t195.5 132.5t132.5 196.5t48.5 239.5v-2v999h-54v-999q0 -117 -44 -219.5t-120.5 -179t-179 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5v997h-51v-999zM461 1714l24 -43l461 256 l-24 45z" />
-<glyph unicode="Û" horiz-adv-x="1382" d="M76 588q0 -127 48 -238.5t132 -195.5t196.5 -132.5t239.5 -48.5t238.5 48.5t195.5 132.5t132.5 196.5t48.5 239.5v-2v999h-54v-999q0 -117 -44 -219.5t-120.5 -179t-179 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5v997h-51v-999zM383 1714l35 -39l274 230 l273 -230l34 41l-309 256z" />
-<glyph unicode="Ü" horiz-adv-x="1382" d="M76 588q0 -127 48 -238.5t132 -195.5t196.5 -132.5t239.5 -48.5t238.5 48.5t195.5 132.5t132.5 196.5t48.5 239.5v-2v999h-54v-999q0 -117 -44 -219.5t-120.5 -179t-179 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5v997h-51v-999zM383 1765 q0 -20 15.5 -35.5t37.5 -15.5q20 0 35.5 15.5t15.5 37.5h-2q0 20 -14 36t-37 16q-20 0 -35.5 -15.5t-15.5 -38.5zM895 1765q0 -20 15.5 -35.5t37.5 -15.5q20 0 35.5 15t15.5 38q0 20 -15 36t-38 16q-20 0 -35.5 -15.5t-15.5 -38.5z" />
-<glyph unicode="ß" horiz-adv-x="1050" d="M0 1126h154v-1204h51v1385q0 53 20.5 99t55 81t81 55.5t99.5 20.5t99 -20.5t81 -55.5t55.5 -82t20.5 -100t-20.5 -99.5t-55.5 -81t-81 -55t-99 -20.5v-52q100 0 189 -37.5t154.5 -104.5t104.5 -155t39 -188t-39 -189.5t-104.5 -155t-154.5 -104t-189 -38.5v-52 q111 0 209 42t171.5 116t115.5 172t42 209q0 94 -29.5 178t-84 152.5t-127 118t-158.5 71.5q76 37 122 109.5t46 165.5q0 63 -24.5 118.5t-65.5 97.5t-97.5 66.5t-119.5 24.5t-119.5 -24.5t-97.5 -66.5t-65.5 -98.5t-24.5 -119.5v-127h-154v-52z" />
-<glyph unicode="à" horiz-adv-x="1306" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q94 0 181.5 28t160 77t130 116.5t92.5 147.5v-342h51v1178h-51v-342q-35 80 -92.5 147.5t-130 116.5t-159.5 76.5t-182 27.5q-127 0 -239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 590q0 117 44 219 t121 179t179.5 121t218.5 44q117 0 219.5 -45t179.5 -122t121 -179t44 -219v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5zM358 1569l461 -256l27 45l-463 256z" />
-<glyph unicode="á" horiz-adv-x="1306" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q94 0 181.5 28t160 77t130 116.5t92.5 147.5v-342h51v1178h-51v-342q-35 80 -92.5 147.5t-130 116.5t-159.5 76.5t-182 27.5q-127 0 -239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 590q0 117 44 219 t121 179t179.5 121t218.5 44q117 0 219.5 -45t179.5 -122t121 -179t44 -219v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5zM383 1356l27 -43l460 256l-26 45z" />
-<glyph unicode="â" horiz-adv-x="1306" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q94 0 181.5 28t160 77t130 116.5t92.5 147.5v-342h51v1178h-51v-342q-35 80 -92.5 147.5t-130 116.5t-159.5 76.5t-182 27.5q-127 0 -239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 590q0 117 44 219 t121 179t179.5 121t218.5 44q117 0 219.5 -45t179.5 -122t121 -179t44 -219v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5zM307 1356l33 -39l274 229l275 -229l33 41l-308 256z" />
-<glyph unicode="ã" horiz-adv-x="1306" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q94 0 181.5 28t160 77t130 116.5t92.5 147.5v-342h51v1178h-51v-342q-35 80 -92.5 147.5t-130 116.5t-159.5 76.5t-182 27.5q-127 0 -239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 590q0 117 44 219 t121 179t179.5 121t218.5 44q117 0 219.5 -45t179.5 -122t121 -179t44 -219v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5zM307 1460h51v25q0 18 24 48t79 30q37 0 71.5 -25t71.5 -53.5t77 -53t87 -24.5q37 0 65.5 12.5 t48 31.5t30 42t10.5 43v27h-52v-27q0 -18 -23.5 -48t-78.5 -30q-37 0 -73 24.5t-72.5 53.5t-76.5 53.5t-85 24.5q-37 0 -65.5 -12.5t-48 -32t-30 -42t-10.5 -42.5v-25z" />
-<glyph unicode="ä" horiz-adv-x="1306" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q94 0 181.5 28t160 77t130 116.5t92.5 147.5v-342h51v1178h-51v-342q-35 80 -92.5 147.5t-130 116.5t-159.5 76.5t-182 27.5q-127 0 -239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 590q0 117 44 219 t121 179t179.5 121t218.5 44q117 0 219.5 -45t179.5 -122t121 -179t44 -219v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5zM307 1561q0 -20 14.5 -36t36.5 -16q23 0 37.5 15.5t14.5 38.5q0 20 -14.5 35.5t-37.5 15.5 t-37 -15.5t-14 -37.5zM819 1561q0 -20 14.5 -36t36.5 -16q23 0 37.5 15.5t14.5 38.5q0 20 -14.5 35.5t-37.5 15.5t-37 -15.5t-14 -37.5z" />
-<glyph unicode="å" horiz-adv-x="1306" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q94 0 181.5 28t160 77t130 116.5t92.5 147.5v-342h51v1178h-51v-342q-35 80 -92.5 147.5t-130 116.5t-159.5 76.5t-182 27.5q-127 0 -239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 590q0 117 44 219 t121 179t179.5 121t218.5 44q117 0 219.5 -45t179.5 -122t121 -179t44 -219t-44 -219.5t-121 -179t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5zM461 1458q0 -63 45 -108t108 -45t108.5 44.5t45.5 110.5q0 63 -45 108.5t-109 45.5q-63 0 -108 -45 t-45 -111zM512 1460q0 41 29.5 72t72.5 31t73 -31t30 -74v2q0 -43 -30 -73.5t-73 -30.5t-72.5 30.5t-29.5 73.5z" />
-<glyph unicode="æ" horiz-adv-x="2406" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q94 0 181.5 28t160 77t130 116.5t92.5 147.5v-342h51v342q35 -80 92 -147.5t130 -116.5t160 -77t181 -28q96 0 183 28t161 79t131 119.5t92 152.5l-47 21q-33 -78 -85 -141.5t-119.5 -109.5t-147.5 -71.5 t-168 -25.5q-115 0 -214 42t-175 114.5t-122 171t-52 210.5h1177v27q0 127 -48 238.5t-131 195.5t-195.5 132t-239.5 48q-94 0 -181 -27.5t-160 -76.5t-130 -117t-92 -147v342h-51v-342q-35 80 -92.5 147.5t-130 116.5t-159.5 76.5t-182 27.5q-127 0 -239.5 -48t-195.5 -132 t-131 -196.5t-48 -239.5zM51 590q0 117 44 219t121 179t179.5 121t218.5 44q117 0 219.5 -45t179.5 -122t121 -179t44 -219t-44 -219.5t-121 -179t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5zM1229 614q6 113 52 211.5t122 171t175 114.5t214 42 q113 0 213 -42t176 -114.5t122 -171t52 -211.5h-1126z" />
-<glyph unicode="ç" horiz-adv-x="1099" d="M0 588q0 -123 46 -232.5t126 -192.5t187.5 -133t230.5 -55v-155l28 -29q31 31 74 31q41 0 72 -31t31 -74q0 -63 -45 -108t-111 -45q-41 0 -71.5 30.5t-30.5 73.5h-52q0 -66 45 -110.5t111 -44.5q43 0 80 16t64.5 44t44 65.5t16.5 80.5q0 63 -45 108.5t-111 45.5 q-25 0 -51 -10v112q121 4 226.5 52.5t183.5 126.5l-37 36q-76 -78 -178.5 -121.5t-219.5 -43.5t-219 44t-179 120.5t-121 180t-44 220.5t44 219t121 179t179.5 121t218.5 44q117 0 219.5 -44t178.5 -122l37 37q-84 84 -195 132t-240 48q-127 0 -239.5 -48t-195.5 -132 t-131 -196.5t-48 -239.5z" />
-<glyph unicode="è" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q96 0 183.5 28t161 79t131 119.5t92.5 152.5l-47 21q-33 -78 -85.5 -141.5t-120 -109.5t-147.5 -71.5t-168 -25.5q-115 0 -214 42t-174.5 114.5t-122 171t-52.5 210.5h1178v27q0 127 -48 238.5t-131 195.5 t-196 132t-240 48t-239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 614q6 113 52.5 211.5t122 171t175 114.5t213.5 42q113 0 213.5 -42t176 -114.5t122 -171t52.5 -211.5h-1127zM358 1569l461 -256l27 45l-463 256z" />
-<glyph unicode="é" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q96 0 183.5 28t161 79t131 119.5t92.5 152.5l-47 21q-33 -78 -85.5 -141.5t-120 -109.5t-147.5 -71.5t-168 -25.5q-115 0 -214 42t-174.5 114.5t-122 171t-52.5 210.5h1178v27q0 127 -48 238.5t-131 195.5 t-196 132t-240 48t-239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 614q6 113 52.5 211.5t122 171t175 114.5t213.5 42q113 0 213.5 -42t176 -114.5t122 -171t52.5 -211.5h-1127zM383 1356l27 -43l460 256l-26 45z" />
-<glyph unicode="ê" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q96 0 183.5 28t161 79t131 119.5t92.5 152.5l-47 21q-33 -78 -85.5 -141.5t-120 -109.5t-147.5 -71.5t-168 -25.5q-115 0 -214 42t-174.5 114.5t-122 171t-52.5 210.5h1178v27q0 127 -48 238.5t-131 195.5 t-196 132t-240 48t-239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 614q6 113 52.5 211.5t122 171t175 114.5t213.5 42q113 0 213.5 -42t176 -114.5t122 -171t52.5 -211.5h-1127zM307 1356l33 -39l274 229l275 -229l33 41l-308 256z" />
-<glyph unicode="ë" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5q96 0 183.5 28t161 79t131 119.5t92.5 152.5l-47 21q-33 -78 -85.5 -141.5t-120 -109.5t-147.5 -71.5t-168 -25.5q-115 0 -214 42t-174.5 114.5t-122 171t-52.5 210.5h1178v27q0 127 -48 238.5t-131 195.5 t-196 132t-240 48t-239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 614q6 113 52.5 211.5t122 171t175 114.5t213.5 42q113 0 213.5 -42t176 -114.5t122 -171t52.5 -211.5h-1127zM307 1561q0 -20 14.5 -36t36.5 -16q23 0 37.5 15.5t14.5 38.5q0 20 -14.5 35.5 t-37.5 15.5t-37 -15.5t-14 -37.5zM819 1561q0 -20 14.5 -36t36.5 -16q23 0 37.5 15.5t14.5 38.5q0 20 -14.5 35.5t-37.5 15.5t-37 -15.5t-14 -37.5z" />
-<glyph unicode="ì" horiz-adv-x="256" d="M-129 1569l463 -256l24 45l-460 256zM102 0h52v1178h-52v-1178z" />
-<glyph unicode="í" horiz-adv-x="256" d="M-102 1356l24 -43l461 256l-25 45zM102 0h52v1178h-52v-1178z" />
-<glyph unicode="î" horiz-adv-x="256" d="M-180 1356l35 -39l274 229l272 -229l35 41l-309 256zM102 0h52v1178h-52v-1178z" />
-<glyph unicode="ï" horiz-adv-x="256" d="M-102 1561q0 -20 14 -36t37 -16t37 15.5t14 38.5q0 20 -14.5 35.5t-36.5 15.5q-23 0 -37 -15.5t-14 -37.5zM102 0h52v1178h-52v-1178zM256 1561q0 -20 14.5 -36t36.5 -16q23 0 37 15.5t14 38.5q0 20 -14 35.5t-37 15.5t-37 -15.5t-14 -37.5z" />
-<glyph unicode="ñ" horiz-adv-x="1177" d="M76 0h53v692q0 94 36 178t98.5 147.5t146.5 99.5t180 36q94 0 178 -36t147.5 -99.5t99.5 -147.5t36 -180v-690h51v692q0 106 -40 199.5t-109.5 163t-164 109.5t-200.5 40q-76 0 -145.5 -21.5t-129 -59.5t-107.5 -91t-79 -117v263h-51v-1178zM256 1460h51v25q0 18 23.5 48 t79.5 30q37 0 71.5 -25t71.5 -53.5t77 -53t87 -24.5q37 0 65.5 12.5t48 31.5t29.5 42t10 43v27h-51v-27q0 -18 -23.5 -48t-78.5 -30q-37 0 -73 24.5t-72.5 53.5t-76.5 53.5t-85 24.5q-37 0 -66 -12.5t-48.5 -32t-29.5 -42t-10 -42.5v-25z" />
-<glyph unicode="ò" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5t240 48.5t196 132.5t131 196.5t48 239.5v-2q0 127 -48 239.5t-131 196.5t-196 132t-240 48t-239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 590q0 117 44 219t121 179t179.5 121t218.5 44 q117 0 219.5 -45t179.5 -122t121 -179t44 -219v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5zM358 1569l461 -256l27 45l-463 256z" />
-<glyph unicode="ó" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5t240 48.5t196 132.5t131 196.5t48 239.5v-2q0 127 -48 239.5t-131 196.5t-196 132t-240 48t-239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 590q0 117 44 219t121 179t179.5 121t218.5 44 q117 0 219.5 -45t179.5 -122t121 -179t44 -219v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5zM383 1356l27 -43l460 256l-26 45z" />
-<glyph unicode="ô" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5t240 48.5t196 132.5t131 196.5t48 239.5v-2q0 127 -48 239.5t-131 196.5t-196 132t-240 48t-239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 590q0 117 44 219t121 179t179.5 121t218.5 44 q117 0 219.5 -45t179.5 -122t121 -179t44 -219v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5zM307 1356l33 -39l274 229l275 -229l33 41l-308 256z" />
-<glyph unicode="õ" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5t240 48.5t196 132.5t131 196.5t48 239.5v-2q0 127 -48 239.5t-131 196.5t-196 132t-240 48t-239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 590q0 117 44 219t121 179t179.5 121t218.5 44 q117 0 219.5 -45t179.5 -122t121 -179t44 -219v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5zM307 1460h51v25q0 18 24 48t79 30q37 0 71.5 -25t71.5 -53.5t77 -53t87 -24.5q37 0 65.5 12.5t48 31.5t30 42t10.5 43v27 h-52v-27q0 -18 -23.5 -48t-78.5 -30q-37 0 -73 24.5t-72.5 53.5t-76.5 53.5t-85 24.5q-37 0 -65.5 -12.5t-48 -32t-30 -42t-10.5 -42.5v-25z" />
-<glyph unicode="ö" d="M0 588q0 -127 48 -238.5t131 -195.5t195.5 -132.5t239.5 -48.5t240 48.5t196 132.5t131 196.5t48 239.5v-2q0 127 -48 239.5t-131 196.5t-196 132t-240 48t-239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5zM51 590q0 117 44 219t121 179t179.5 121t218.5 44 q117 0 219.5 -45t179.5 -122t121 -179t44 -219v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44t-219 44t-179 120.5t-121 180t-44 220.5zM307 1561q0 -20 14.5 -36t36.5 -16q23 0 37.5 15.5t14.5 38.5q0 20 -14.5 35.5t-37.5 15.5t-37 -15.5t-14 -37.5zM819 1561 q0 -20 14.5 -36t36.5 -16q23 0 37.5 15.5t14.5 38.5q0 20 -14.5 35.5t-37.5 15.5t-37 -15.5t-14 -37.5z" />
-<glyph unicode="÷" horiz-adv-x="921" d="M51 768h819v51h-819v-51zM410 485q0 -20 14 -35.5t37 -15.5t37 15.5t14 37.5v-2q0 23 -14.5 38.5t-36.5 15.5q-23 0 -37 -15.5t-14 -38.5zM410 1100q0 -20 14 -35.5t37 -15.5t37 15t14 38q0 20 -14.5 35.5t-36.5 15.5q-23 0 -37 -15.5t-14 -37.5z" />
-<glyph unicode="ø" d="M0 0h72l131 133q82 -74 187.5 -117t223.5 -43q127 0 240 48.5t196 132.5t131 196.5t48 239.5q0 123 -44 229.5t-122 190.5l166 168h-72l-131 -134q-82 74 -187.5 117t-224.5 43q-127 0 -239.5 -48t-195.5 -132t-131 -196.5t-48 -239.5q0 -123 44 -229.5t122 -190.5z M51 590q0 117 44 219t121 179t179.5 121t218.5 44q111 0 206 -38.5t171 -106.5l-788 -803q-72 76 -112 174t-40 211zM238 170l788 803q72 -76 112 -174.5t40 -210.5v2q0 -117 -44 -220.5t-121 -180t-179.5 -120.5t-219.5 -44q-111 0 -206 38.5t-170 106.5z" />
-<glyph unicode="ù" horiz-adv-x="1177" d="M76 485q0 -106 40 -199t109.5 -163t163.5 -110t201 -40q76 0 145.5 21.5t129 59.5t107.5 91.5t79 116.5v-262h51v1178h-53v-693q0 -96 -36 -179t-98.5 -146.5t-146.5 -99t-180 -35.5t-179 35.5t-146.5 99t-99.5 147.5t-36 180v691h-51v-693zM358 1569l461 -256l27 45 l-463 256z" />
-<glyph unicode="ú" horiz-adv-x="1177" d="M76 485q0 -106 40 -199t109.5 -163t163.5 -110t201 -40q76 0 145.5 21.5t129 59.5t107.5 91.5t79 116.5v-262h51v1178h-53v-693q0 -96 -36 -179t-98.5 -146.5t-146.5 -99t-180 -35.5t-179 35.5t-146.5 99t-99.5 147.5t-36 180v691h-51v-693zM383 1356l27 -43l460 256 l-26 45z" />
-<glyph unicode="û" horiz-adv-x="1177" d="M76 485q0 -106 40 -199t109.5 -163t163.5 -110t201 -40q76 0 145.5 21.5t129 59.5t107.5 91.5t79 116.5v-262h51v1178h-53v-693q0 -96 -36 -179t-98.5 -146.5t-146.5 -99t-180 -35.5t-179 35.5t-146.5 99t-99.5 147.5t-36 180v691h-51v-693zM281 1356l34 -39l275 229 l272 -229l35 41l-309 256z" />
-<glyph unicode="ü" horiz-adv-x="1177" d="M76 485q0 -106 40 -199t109.5 -163t163.5 -110t201 -40q76 0 145.5 21.5t129 59.5t107.5 91.5t79 116.5v-262h51v1178h-53v-693q0 -96 -36 -179t-98.5 -146.5t-146.5 -99t-180 -35.5t-179 35.5t-146.5 99t-99.5 147.5t-36 180v691h-51v-693zM281 1561q0 -20 15 -36 t38 -16q20 0 35.5 15.5t15.5 38.5h-2q0 20 -14.5 35.5t-36.5 15.5q-20 0 -35.5 -15.5t-15.5 -37.5zM793 1561q0 -20 15 -36t38 -16q20 0 35.5 15.5t15.5 38.5q0 20 -15.5 35.5t-37.5 15.5q-20 0 -35.5 -15.5t-15.5 -37.5z" />
-<glyph unicode="ÿ" horiz-adv-x="1126" d="M25 1178l512 -1178l-246 -563h55l756 1741h-58l-481 -1117l-481 1117h-57zM281 1561q0 -20 15 -36t38 -16q20 0 35.5 15.5t15.5 38.5h-2q0 20 -14.5 35.5t-36.5 15.5q-20 0 -35.5 -15.5t-15.5 -37.5zM793 1561q0 -20 15 -36t38 -16q20 0 35.5 15.5t15.5 38.5 q0 20 -15.5 35.5t-37.5 15.5q-20 0 -35.5 -15.5t-15.5 -37.5z" />
-<glyph unicode="Œ" horiz-adv-x="2535" d="M51 793q0 -170 64.5 -318.5t175 -260.5t260 -176.5t319.5 -64.5q131 0 252 40t220.5 111t176 169t119.5 215v-508h846v51h-794v768h692v51h-692v666h743v51h-795v-508q-43 117 -119.5 215.5t-176 169t-220.5 110.5t-252 40q-170 0 -319.5 -64.5t-260 -176t-175 -261 t-64.5 -319.5zM102 795q0 160 60.5 299t165 243.5t244 165t298.5 60.5q160 0 299.5 -60.5t244 -165t164.5 -245t60 -299.5v2q0 -160 -60 -300.5t-164.5 -245t-244 -164.5t-299.5 -60t-299 60t-243.5 164.5t-165 245t-60.5 300.5z" />
-<glyph unicode="œ" horiz-adv-x="2508" d="M51 588q0 -127 48 -238.5t131 -195.5t196 -132.5t240 -48.5q104 0 198 33t172 92.5t134.5 139t84.5 176.5q27 -96 83.5 -176t134 -139.5t172 -92.5t198.5 -33q96 0 183.5 28t161 79t131 119.5t91.5 152.5l-47 21q-33 -78 -85 -141.5t-119.5 -109.5t-147.5 -71.5 t-168 -25.5q-115 0 -214 42t-175 114.5t-122 171t-52 210.5h1178v27q0 127 -48.5 238.5t-131.5 195.5t-195.5 132t-239.5 48q-104 0 -198.5 -32.5t-172 -92t-134 -140.5t-85.5 -175q-29 94 -84 175t-133 140.5t-172 92t-198 32.5q-127 0 -240 -48t-196 -132t-131 -196.5 t-48 -239.5zM102 590q0 117 44 219t121 179t179.5 121t219.5 44t219 -45t179 -122t121 -179t44 -219t-44 -219.5t-121 -179t-179.5 -120.5t-218.5 -44q-117 0 -219.5 44t-179.5 120.5t-121 180t-44 220.5zM1280 614q6 113 52 211.5t122 171t175.5 114.5t213.5 42 q113 0 213.5 -42t176 -114.5t121.5 -171t52 -211.5h-1126z" />
-<glyph unicode="Ÿ" horiz-adv-x="1331" d="M25 1587l616 -846v-741h51v743l615 844h-64l-577 -794l-578 794h-63zM358 1765q0 -20 14.5 -35.5t37.5 -15.5t37 15t14 38q0 20 -14.5 36t-36.5 16q-23 0 -37.5 -15.5t-14.5 -38.5zM870 1765q0 -20 14.5 -35.5t37.5 -15.5t37 15t14 38q0 20 -14.5 36t-36.5 16 q-23 0 -37.5 -15.5t-14.5 -38.5z" />
-<glyph unicode=" " horiz-adv-x="1011" />
-<glyph unicode=" " horiz-adv-x="2023" />
-<glyph unicode=" " horiz-adv-x="1011" />
-<glyph unicode=" " horiz-adv-x="2023" />
-<glyph unicode=" " horiz-adv-x="674" />
-<glyph unicode=" " horiz-adv-x="505" />
-<glyph unicode=" " horiz-adv-x="337" />
-<glyph unicode=" " horiz-adv-x="337" />
-<glyph unicode=" " horiz-adv-x="252" />
-<glyph unicode=" " horiz-adv-x="404" />
-<glyph unicode=" " horiz-adv-x="112" />
-<glyph unicode="‐" horiz-adv-x="512" d="M51 768h410v51h-410v-51z" />
-<glyph unicode="‑" horiz-adv-x="512" d="M51 768h410v51h-410v-51z" />
-<glyph unicode="‒" horiz-adv-x="512" d="M51 768h410v51h-410v-51z" />
-<glyph unicode="–" horiz-adv-x="921" d="M51 768h819v51h-819v-51z" />
-<glyph unicode="—" horiz-adv-x="1740" d="M51 768h1639v51h-1639v-51z" />
-<glyph unicode="‘" horiz-adv-x="409" d="M154 1331q0 -23 14 -37t37 -14t37 14.5t14 36.5q0 35 -33 49l84 234l-47 16l-102 -280q-4 -12 -4 -19z" />
-<glyph unicode="’" horiz-adv-x="409" d="M102 1280l48 -18l102 282q2 4 3 8.5t1 10.5q0 20 -14.5 35.5t-36.5 15.5q-23 0 -37 -15.5t-14 -37.5q0 -16 9 -29.5t23 -18.5z" />
-<glyph unicode="‚" horiz-adv-x="409" d="M102 -256l48 -18l102 282q2 4 3 8.5t1 10.5q0 20 -14.5 35.5t-36.5 15.5q-23 0 -37 -15.5t-14 -37.5q0 -16 9 -29.5t23 -18.5z" />
-<glyph unicode="“" horiz-adv-x="563" d="M154 1331q0 -23 14 -37t37 -14t37 14.5t14 36.5q0 35 -33 49l84 234l-47 16l-102 -280q-4 -12 -4 -19zM307 1331q0 -23 14.5 -37t36.5 -14q23 0 37.5 14.5t14.5 36.5q0 35 -33 49l84 234l-47 16l-103 -280q-4 -12 -4 -19z" />
-<glyph unicode="”" horiz-adv-x="563" d="M102 1280l48 -18l102 282q2 4 3 8.5t1 10.5q0 20 -14.5 35.5t-36.5 15.5q-23 0 -37 -15.5t-14 -37.5q0 -16 9 -29.5t23 -18.5zM256 1280l47 -18l103 282q2 4 3 8.5t1 10.5q0 20 -14.5 35.5t-37.5 15.5t-37 -15.5t-14 -37.5q0 -16 9.5 -29.5t23.5 -18.5z" />
-<glyph unicode="„" horiz-adv-x="409" d="M102 -256l48 -18l102 282q2 4 3 8.5t1 10.5q0 20 -14.5 35.5t-36.5 15.5q-23 0 -37 -15.5t-14 -37.5q0 -16 9 -29.5t23 -18.5zM256 -256l47 -18l103 282q2 4 3 8.5t1 10.5q0 20 -14.5 35.5t-37.5 15.5t-37 -15.5t-14 -37.5q0 -16 9.5 -29.5t23.5 -18.5z" />
-<glyph unicode="•" horiz-adv-x="512" d="M154 793q0 -41 29.5 -72t72.5 -31t72.5 31t29.5 74q0 41 -29.5 71.5t-72.5 30.5t-72.5 -30.5t-29.5 -73.5z" />
-<glyph unicode="…" d="M154 25q0 -20 14 -36t37 -16t37 15.5t14 38.5q0 20 -14.5 35.5t-36.5 15.5q-23 0 -37 -15.5t-14 -37.5zM563 25q0 -20 14.5 -36t36.5 -16q23 0 37.5 15.5t14.5 38.5q0 20 -14.5 35.5t-37.5 15.5t-37 -15.5t-14 -37.5zM973 25q0 -20 14 -36t37 -16t37 15.5t14 38.5 q0 20 -14 35.5t-37 15.5t-37 -15.5t-14 -37.5z" />
-<glyph unicode=" " horiz-adv-x="404" />
-<glyph unicode=" " horiz-adv-x="505" />
-<glyph unicode="™" horiz-adv-x="819" d="M25 1561h104v-359h51v361h101v49h-256v-51zM383 1614l2 -412h51v258l137 -258h31l139 258v-258l52 2v410h-31l-176 -334l-174 334h-31z" />
-<glyph unicode="◼" horiz-adv-x="1177" d="M0 0v1178h1178v-1178h-1178z" />
-<hkern u1="," u2="9" k="51" />
-<hkern u1="," u2="8" k="51" />
-<hkern u1="," u2="6" k="51" />
-<hkern u1="," u2="5" k="51" />
-<hkern u1="," u2="4" k="51" />
-<hkern u1="," u2="3" k="51" />
-<hkern u1="," u2="1" k="154" />
-<hkern u1="," u2="0" k="51" />
-<hkern u1="-" u2="z" k="154" />
-<hkern u1="-" u2="y" k="78" />
-<hkern u1="-" u2="x" k="102" />
-<hkern u1="-" u2="t" k="51" />
-<hkern u1="-" u2="q" k="-51" />
-<hkern u1="-" u2="o" k="-51" />
-<hkern u1="-" u2="g" k="-51" />
-<hkern u1="-" u2="e" k="-51" />
-<hkern u1="-" u2="d" k="-51" />
-<hkern u1="-" u2="c" k="-51" />
-<hkern u1="-" u2="a" k="-51" />
-<hkern u1="-" u2="Z" k="129" />
-<hkern u1="-" u2="Y" k="154" />
-<hkern u1="-" u2="X" k="102" />
-<hkern u1="-" u2="W" k="102" />
-<hkern u1="-" u2="V" k="129" />
-<hkern u1="-" u2="T" k="256" />
-<hkern u1="-" u2="Q" k="-51" />
-<hkern u1="-" u2="O" k="-51" />
-<hkern u1="-" u2="G" k="-51" />
-<hkern u1="-" u2="C" k="-51" />
-<hkern u1="-" u2="A" k="154" />
-<hkern u1="." u2="y" k="231" />
-<hkern u1="." u2="w" k="231" />
-<hkern u1="." u2="v" k="231" />
-<hkern u1="." u2="u" k="102" />
-<hkern u1="." u2="t" k="154" />
-<hkern u1="." u2="s" k="78" />
-<hkern u1="." u2="q" k="154" />
-<hkern u1="." u2="o" k="154" />
-<hkern u1="." u2="g" k="102" />
-<hkern u1="." u2="f" k="102" />
-<hkern u1="." u2="e" k="154" />
-<hkern u1="." u2="d" k="154" />
-<hkern u1="." u2="c" k="154" />
-<hkern u1="." u2="a" k="154" />
-<hkern u1="." u2="9" k="51" />
-<hkern u1="." u2="8" k="51" />
-<hkern u1="." u2="6" k="51" />
-<hkern u1="." u2="5" k="51" />
-<hkern u1="." u2="4" k="51" />
-<hkern u1="." u2="3" k="51" />
-<hkern u1="." u2="1" k="154" />
-<hkern u1="." u2="0" k="51" />
-<hkern u1="0" u2="." k="51" />
-<hkern u1="0" u2="," k="51" />
-<hkern u1="3" u2="." k="51" />
-<hkern u1="3" u2="," k="51" />
-<hkern u1="4" u2="." k="51" />
-<hkern u1="4" u2="," k="51" />
-<hkern u1="5" u2="." k="51" />
-<hkern u1="5" u2="," k="51" />
-<hkern u1="6" u2="." k="51" />
-<hkern u1="6" u2="," k="51" />
-<hkern u1="7" u2="." k="154" />
-<hkern u1="7" u2="," k="154" />
-<hkern u1="8" u2="." k="51" />
-<hkern u1="8" u2="," k="51" />
-<hkern u1="9" u2="." k="51" />
-<hkern u1="9" u2="," k="51" />
-<hkern u1="A" u2="”" k="283" />
-<hkern u1="A" u2="’" k="283" />
-<hkern u1="A" u2="z" k="51" />
-<hkern u1="A" u2="y" k="256" />
-<hkern u1="A" u2="w" k="256" />
-<hkern u1="A" u2="v" k="256" />
-<hkern u1="A" u2="u" k="102" />
-<hkern u1="A" u2="t" k="205" />
-<hkern u1="A" u2="s" k="51" />
-<hkern u1="A" u2="q" k="102" />
-<hkern u1="A" u2="o" k="102" />
-<hkern u1="A" u2="g" k="102" />
-<hkern u1="A" u2="f" k="102" />
-<hkern u1="A" u2="e" k="102" />
-<hkern u1="A" u2="d" k="102" />
-<hkern u1="A" u2="c" k="102" />
-<hkern u1="A" u2="a" k="102" />
-<hkern u1="A" u2="Z" k="51" />
-<hkern u1="A" u2="Y" k="461" />
-<hkern u1="A" u2="W" k="334" />
-<hkern u1="A" u2="V" k="410" />
-<hkern u1="A" u2="U" k="154" />
-<hkern u1="A" u2="T" k="512" />
-<hkern u1="A" u2="S" k="51" />
-<hkern u1="A" u2="Q" k="154" />
-<hkern u1="A" u2="O" k="154" />
-<hkern u1="A" u2="G" k="154" />
-<hkern u1="A" u2="C" k="102" />
-<hkern u1="A" u2="-" k="154" />
-<hkern u1="B" u2="y" k="27" />
-<hkern u1="B" u2="w" k="27" />
-<hkern u1="B" u2="v" k="27" />
-<hkern u1="B" u2="q" k="-51" />
-<hkern u1="B" u2="o" k="-51" />
-<hkern u1="B" u2="g" k="-51" />
-<hkern u1="B" u2="e" k="-51" />
-<hkern u1="B" u2="d" k="-51" />
-<hkern u1="B" u2="c" k="-51" />
-<hkern u1="B" u2="a" k="-51" />
-<hkern u1="B" u2="Z" k="78" />
-<hkern u1="B" u2="Y" k="154" />
-<hkern u1="B" u2="X" k="51" />
-<hkern u1="B" u2="W" k="82" />
-<hkern u1="B" u2="V" k="102" />
-<hkern u1="B" u2="T" k="102" />
-<hkern u1="B" u2="S" k="-51" />
-<hkern u1="B" u2="Q" k="-25" />
-<hkern u1="B" u2="O" k="-25" />
-<hkern u1="B" u2="G" k="-51" />
-<hkern u1="B" u2="C" k="-25" />
-<hkern u1="B" u2="A" k="51" />
-<hkern u1="C" u2="z" k="102" />
-<hkern u1="C" u2="y" k="164" />
-<hkern u1="C" u2="x" k="78" />
-<hkern u1="C" u2="w" k="164" />
-<hkern u1="C" u2="v" k="164" />
-<hkern u1="C" u2="u" k="78" />
-<hkern u1="C" u2="t" k="78" />
-<hkern u1="C" u2="s" k="51" />
-<hkern u1="C" u2="q" k="51" />
-<hkern u1="C" u2="o" k="51" />
-<hkern u1="C" u2="g" k="51" />
-<hkern u1="C" u2="f" k="51" />
-<hkern u1="C" u2="e" k="51" />
-<hkern u1="C" u2="d" k="51" />
-<hkern u1="C" u2="c" k="51" />
-<hkern u1="C" u2="a" k="51" />
-<hkern u1="C" u2="Z" k="129" />
-<hkern u1="C" u2="Y" k="129" />
-<hkern u1="C" u2="X" k="78" />
-<hkern u1="C" u2="W" k="78" />
-<hkern u1="C" u2="V" k="78" />
-<hkern u1="C" u2="T" k="102" />
-<hkern u1="C" u2="Q" k="51" />
-<hkern u1="C" u2="O" k="51" />
-<hkern u1="C" u2="G" k="51" />
-<hkern u1="C" u2="C" k="51" />
-<hkern u1="C" u2="A" k="51" />
-<hkern u1="D" u2="z" k="102" />
-<hkern u1="D" u2="y" k="27" />
-<hkern u1="D" u2="x" k="51" />
-<hkern u1="D" u2="w" k="27" />
-<hkern u1="D" u2="v" k="27" />
-<hkern u1="D" u2="q" k="-51" />
-<hkern u1="D" u2="o" k="-51" />
-<hkern u1="D" u2="g" k="-51" />
-<hkern u1="D" u2="e" k="-51" />
-<hkern u1="D" u2="d" k="-51" />
-<hkern u1="D" u2="c" k="-51" />
-<hkern u1="D" u2="a" k="-51" />
-<hkern u1="D" u2="Z" k="154" />
-<hkern u1="D" u2="Y" k="205" />
-<hkern u1="D" u2="X" k="180" />
-<hkern u1="D" u2="W" k="129" />
-<hkern u1="D" u2="V" k="154" />
-<hkern u1="D" u2="T" k="154" />
-<hkern u1="D" u2="Q" k="-51" />
-<hkern u1="D" u2="O" k="-51" />
-<hkern u1="D" u2="G" k="-51" />
-<hkern u1="D" u2="C" k="-51" />
-<hkern u1="D" u2="A" k="154" />
-<hkern u1="E" u2="z" k="27" />
-<hkern u1="E" u2="y" k="102" />
-<hkern u1="E" u2="w" k="102" />
-<hkern u1="E" u2="v" k="102" />
-<hkern u1="E" u2="u" k="51" />
-<hkern u1="E" u2="t" k="102" />
-<hkern u1="E" u2="s" k="51" />
-<hkern u1="E" u2="q" k="51" />
-<hkern u1="E" u2="o" k="51" />
-<hkern u1="E" u2="g" k="51" />
-<hkern u1="E" u2="e" k="51" />
-<hkern u1="E" u2="d" k="51" />
-<hkern u1="E" u2="c" k="51" />
-<hkern u1="E" u2="a" k="51" />
-<hkern u1="E" u2="Y" k="51" />
-<hkern u1="E" u2="W" k="51" />
-<hkern u1="E" u2="V" k="51" />
-<hkern u1="E" u2="U" k="27" />
-<hkern u1="E" u2="T" k="51" />
-<hkern u1="E" u2="S" k="51" />
-<hkern u1="E" u2="Q" k="51" />
-<hkern u1="E" u2="O" k="51" />
-<hkern u1="E" u2="G" k="51" />
-<hkern u1="E" u2="C" k="51" />
-<hkern u1="F" u2="z" k="154" />
-<hkern u1="F" u2="y" k="78" />
-<hkern u1="F" u2="x" k="102" />
-<hkern u1="F" u2="w" k="78" />
-<hkern u1="F" u2="v" k="78" />
-<hkern u1="F" u2="u" k="27" />
-<hkern u1="F" u2="t" k="27" />
-<hkern u1="F" u2="s" k="78" />
-<hkern u1="F" u2="q" k="27" />
-<hkern u1="F" u2="o" k="27" />
-<hkern u1="F" u2="g" k="27" />
-<hkern u1="F" u2="f" k="27" />
-<hkern u1="F" u2="e" k="27" />
-<hkern u1="F" u2="d" k="27" />
-<hkern u1="F" u2="c" k="27" />
-<hkern u1="F" u2="a" k="27" />
-<hkern u1="F" u2="Z" k="51" />
-<hkern u1="F" u2="X" k="51" />
-<hkern u1="F" u2="S" k="51" />
-<hkern u1="F" u2="A" k="307" />
-<hkern u1="G" u2="z" k="102" />
-<hkern u1="G" u2="y" k="51" />
-<hkern u1="G" u2="x" k="78" />
-<hkern u1="G" u2="w" k="51" />
-<hkern u1="G" u2="v" k="78" />
-<hkern u1="G" u2="q" k="-51" />
-<hkern u1="G" u2="o" k="-51" />
-<hkern u1="G" u2="g" k="-51" />
-<hkern u1="G" u2="e" k="-51" />
-<hkern u1="G" u2="d" k="-51" />
-<hkern u1="G" u2="c" k="-51" />
-<hkern u1="G" u2="a" k="-51" />
-<hkern u1="G" u2="Z" k="102" />
-<hkern u1="G" u2="Y" k="256" />
-<hkern u1="G" u2="X" k="154" />
-<hkern u1="G" u2="W" k="180" />
-<hkern u1="G" u2="V" k="205" />
-<hkern u1="G" u2="T" k="205" />
-<hkern u1="G" u2="Q" k="-51" />
-<hkern u1="G" u2="O" k="-51" />
-<hkern u1="G" u2="G" k="-51" />
-<hkern u1="G" u2="C" k="-51" />
-<hkern u1="G" u2="A" k="154" />
-<hkern u1="G" u2="-" k="-51" />
-<hkern u1="J" u2="J" k="-51" />
-<hkern u1="K" u2="z" k="51" />
-<hkern u1="K" u2="y" k="231" />
-<hkern u1="K" u2="w" k="256" />
-<hkern u1="K" u2="v" k="256" />
-<hkern u1="K" u2="u" k="102" />
-<hkern u1="K" u2="t" k="102" />
-<hkern u1="K" u2="s" k="102" />
-<hkern u1="K" u2="q" k="154" />
-<hkern u1="K" u2="o" k="154" />
-<hkern u1="K" u2="g" k="154" />
-<hkern u1="K" u2="f" k="102" />
-<hkern u1="K" u2="e" k="154" />
-<hkern u1="K" u2="d" k="154" />
-<hkern u1="K" u2="c" k="154" />
-<hkern u1="K" u2="a" k="154" />
-<hkern u1="K" u2="Z" k="51" />
-<hkern u1="K" u2="U" k="51" />
-<hkern u1="K" u2="S" k="102" />
-<hkern u1="K" u2="Q" k="180" />
-<hkern u1="K" u2="O" k="180" />
-<hkern u1="K" u2="G" k="180" />
-<hkern u1="K" u2="C" k="180" />
-<hkern u1="K" u2="-" k="256" />
-<hkern u1="L" u2="”" k="180" />
-<hkern u1="L" u2="’" k="180" />
-<hkern u1="L" u2="z" k="51" />
-<hkern u1="L" u2="y" k="358" />
-<hkern u1="L" u2="w" k="358" />
-<hkern u1="L" u2="v" k="358" />
-<hkern u1="L" u2="u" k="154" />
-<hkern u1="L" u2="t" k="205" />
-<hkern u1="L" u2="s" k="102" />
-<hkern u1="L" u2="q" k="154" />
-<hkern u1="L" u2="o" k="154" />
-<hkern u1="L" u2="g" k="78" />
-<hkern u1="L" u2="f" k="102" />
-<hkern u1="L" u2="e" k="154" />
-<hkern u1="L" u2="d" k="154" />
-<hkern u1="L" u2="c" k="154" />
-<hkern u1="L" u2="a" k="154" />
-<hkern u1="L" u2="Z" k="51" />
-<hkern u1="L" u2="Y" k="461" />
-<hkern u1="L" u2="W" k="385" />
-<hkern u1="L" u2="V" k="410" />
-<hkern u1="L" u2="U" k="180" />
-<hkern u1="L" u2="T" k="410" />
-<hkern u1="L" u2="S" k="102" />
-<hkern u1="L" u2="Q" k="256" />
-<hkern u1="L" u2="O" k="256" />
-<hkern u1="L" u2="G" k="256" />
-<hkern u1="L" u2="C" k="256" />
-<hkern u1="L" u2="-" k="205" />
-<hkern u1="O" u2="z" k="102" />
-<hkern u1="O" u2="x" k="51" />
-<hkern u1="O" u2="q" k="-51" />
-<hkern u1="O" u2="o" k="-51" />
-<hkern u1="O" u2="g" k="-51" />
-<hkern u1="O" u2="e" k="-51" />
-<hkern u1="O" u2="d" k="-51" />
-<hkern u1="O" u2="c" k="-51" />
-<hkern u1="O" u2="a" k="-51" />
-<hkern u1="O" u2="Z" k="154" />
-<hkern u1="O" u2="Y" k="256" />
-<hkern u1="O" u2="X" k="154" />
-<hkern u1="O" u2="W" k="129" />
-<hkern u1="O" u2="V" k="180" />
-<hkern u1="O" u2="T" k="205" />
-<hkern u1="O" u2="Q" k="-51" />
-<hkern u1="O" u2="O" k="-51" />
-<hkern u1="O" u2="G" k="-51" />
-<hkern u1="O" u2="C" k="-51" />
-<hkern u1="O" u2="A" k="154" />
-<hkern u1="O" u2="-" k="-51" />
-<hkern u1="P" u2="z" k="51" />
-<hkern u1="P" u2="x" k="27" />
-<hkern u1="P" u2="t" k="-51" />
-<hkern u1="P" u2="s" k="51" />
-<hkern u1="P" u2="q" k="51" />
-<hkern u1="P" u2="o" k="51" />
-<hkern u1="P" u2="g" k="51" />
-<hkern u1="P" u2="e" k="51" />
-<hkern u1="P" u2="d" k="51" />
-<hkern u1="P" u2="c" k="51" />
-<hkern u1="P" u2="a" k="51" />
-<hkern u1="P" u2="Z" k="129" />
-<hkern u1="P" u2="Y" k="129" />
-<hkern u1="P" u2="X" k="129" />
-<hkern u1="P" u2="W" k="51" />
-<hkern u1="P" u2="V" k="78" />
-<hkern u1="P" u2="T" k="102" />
-<hkern u1="P" u2="S" k="-51" />
-<hkern u1="P" u2="Q" k="-25" />
-<hkern u1="P" u2="O" k="-25" />
-<hkern u1="P" u2="G" k="-25" />
-<hkern u1="P" u2="C" k="-25" />
-<hkern u1="P" u2="A" k="307" />
-<hkern u1="P" u2="-" k="27" />
-<hkern u1="Q" u2="a" k="-51" />
-<hkern u1="Q" u2="Z" k="51" />
-<hkern u1="Q" u2="Y" k="205" />
-<hkern u1="Q" u2="W" k="154" />
-<hkern u1="Q" u2="V" k="180" />
-<hkern u1="Q" u2="T" k="256" />
-<hkern u1="Q" u2="Q" k="-51" />
-<hkern u1="Q" u2="O" k="-51" />
-<hkern u1="Q" u2="G" k="-51" />
-<hkern u1="Q" u2="C" k="-51" />
-<hkern u1="Q" u2="A" k="27" />
-<hkern u1="Q" u2="-" k="-51" />
-<hkern u1="R" u2="z" k="51" />
-<hkern u1="R" u2="y" k="27" />
-<hkern u1="R" u2="w" k="27" />
-<hkern u1="R" u2="v" k="27" />
-<hkern u1="R" u2="u" k="27" />
-<hkern u1="R" u2="s" k="78" />
-<hkern u1="R" u2="q" k="102" />
-<hkern u1="R" u2="o" k="102" />
-<hkern u1="R" u2="g" k="78" />
-<hkern u1="R" u2="e" k="102" />
-<hkern u1="R" u2="d" k="102" />
-<hkern u1="R" u2="c" k="102" />
-<hkern u1="R" u2="a" k="102" />
-<hkern u1="R" u2="Z" k="51" />
-<hkern u1="R" u2="Y" k="180" />
-<hkern u1="R" u2="W" k="102" />
-<hkern u1="R" u2="V" k="129" />
-<hkern u1="R" u2="T" k="154" />
-<hkern u1="R" u2="Q" k="27" />
-<hkern u1="R" u2="O" k="27" />
-<hkern u1="R" u2="G" k="27" />
-<hkern u1="R" u2="C" k="27" />
-<hkern u1="R" u2="-" k="51" />
-<hkern u1="S" u2="z" k="51" />
-<hkern u1="S" u2="y" k="27" />
-<hkern u1="S" u2="x" k="37" />
-<hkern u1="S" u2="w" k="27" />
-<hkern u1="S" u2="v" k="27" />
-<hkern u1="S" u2="t" k="27" />
-<hkern u1="S" u2="s" k="-25" />
-<hkern u1="S" u2="q" k="-61" />
-<hkern u1="S" u2="o" k="-61" />
-<hkern u1="S" u2="g" k="-61" />
-<hkern u1="S" u2="e" k="-61" />
-<hkern u1="S" u2="d" k="-61" />
-<hkern u1="S" u2="c" k="-61" />
-<hkern u1="S" u2="a" k="-61" />
-<hkern u1="S" u2="Z" k="78" />
-<hkern u1="S" u2="Y" k="129" />
-<hkern u1="S" u2="X" k="78" />
-<hkern u1="S" u2="W" k="51" />
-<hkern u1="S" u2="V" k="78" />
-<hkern u1="S" u2="T" k="102" />
-<hkern u1="S" u2="S" k="-76" />
-<hkern u1="S" u2="Q" k="-25" />
-<hkern u1="S" u2="O" k="-25" />
-<hkern u1="S" u2="G" k="-25" />
-<hkern u1="S" u2="C" k="-25" />
-<hkern u1="S" u2="A" k="51" />
-<hkern u1="T" u2="z" k="614" />
-<hkern u1="T" u2="y" k="563" />
-<hkern u1="T" u2="x" k="563" />
-<hkern u1="T" u2="w" k="614" />
-<hkern u1="T" u2="v" k="512" />
-<hkern u1="T" u2="u" k="512" />
-<hkern u1="T" u2="t" k="283" />
-<hkern u1="T" u2="s" k="512" />
-<hkern u1="T" u2="r" k="512" />
-<hkern u1="T" u2="q" k="512" />
-<hkern u1="T" u2="p" k="512" />
-<hkern u1="T" u2="o" k="512" />
-<hkern u1="T" u2="n" k="512" />
-<hkern u1="T" u2="m" k="512" />
-<hkern u1="T" u2="j" k="78" />
-<hkern u1="T" u2="i" k="78" />
-<hkern u1="T" u2="g" k="512" />
-<hkern u1="T" u2="f" k="205" />
-<hkern u1="T" u2="e" k="512" />
-<hkern u1="T" u2="d" k="512" />
-<hkern u1="T" u2="c" k="512" />
-<hkern u1="T" u2="a" k="512" />
-<hkern u1="T" u2="Z" k="51" />
-<hkern u1="T" u2="X" k="27" />
-<hkern u1="T" u2="S" k="102" />
-<hkern u1="T" u2="Q" k="256" />
-<hkern u1="T" u2="O" k="205" />
-<hkern u1="T" u2="G" k="205" />
-<hkern u1="T" u2="C" k="205" />
-<hkern u1="T" u2="A" k="512" />
-<hkern u1="T" u2="-" k="256" />
-<hkern u1="T" u2="
" k="512" />
-<hkern u1="U" u2="Z" k="78" />
-<hkern u1="U" u2="X" k="51" />
-<hkern u1="U" u2="A" k="154" />
-<hkern u1="V" u2="z" k="231" />
-<hkern u1="V" u2="y" k="180" />
-<hkern u1="V" u2="x" k="205" />
-<hkern u1="V" u2="w" k="180" />
-<hkern u1="V" u2="v" k="180" />
-<hkern u1="V" u2="u" k="205" />
-<hkern u1="V" u2="t" k="154" />
-<hkern u1="V" u2="s" k="256" />
-<hkern u1="V" u2="r" k="205" />
-<hkern u1="V" u2="q" k="283" />
-<hkern u1="V" u2="p" k="205" />
-<hkern u1="V" u2="o" k="283" />
-<hkern u1="V" u2="n" k="205" />
-<hkern u1="V" u2="m" k="205" />
-<hkern u1="V" u2="j" k="78" />
-<hkern u1="V" u2="i" k="78" />
-<hkern u1="V" u2="g" k="283" />
-<hkern u1="V" u2="f" k="129" />
-<hkern u1="V" u2="e" k="283" />
-<hkern u1="V" u2="d" k="283" />
-<hkern u1="V" u2="c" k="283" />
-<hkern u1="V" u2="a" k="283" />
-<hkern u1="V" u2="Z" k="51" />
-<hkern u1="V" u2="X" k="27" />
-<hkern u1="V" u2="S" k="78" />
-<hkern u1="V" u2="Q" k="180" />
-<hkern u1="V" u2="O" k="180" />
-<hkern u1="V" u2="G" k="180" />
-<hkern u1="V" u2="C" k="154" />
-<hkern u1="V" u2="A" k="410" />
-<hkern u1="V" u2="-" k="129" />
-<hkern u1="W" u2="z" k="180" />
-<hkern u1="W" u2="y" k="129" />
-<hkern u1="W" u2="x" k="154" />
-<hkern u1="W" u2="w" k="129" />
-<hkern u1="W" u2="v" k="129" />
-<hkern u1="W" u2="u" k="154" />
-<hkern u1="W" u2="t" k="102" />
-<hkern u1="W" u2="s" k="205" />
-<hkern u1="W" u2="r" k="154" />
-<hkern u1="W" u2="q" k="231" />
-<hkern u1="W" u2="p" k="154" />
-<hkern u1="W" u2="o" k="231" />
-<hkern u1="W" u2="n" k="154" />
-<hkern u1="W" u2="m" k="154" />
-<hkern u1="W" u2="j" k="51" />
-<hkern u1="W" u2="i" k="51" />
-<hkern u1="W" u2="g" k="231" />
-<hkern u1="W" u2="f" k="102" />
-<hkern u1="W" u2="e" k="231" />
-<hkern u1="W" u2="d" k="231" />
-<hkern u1="W" u2="c" k="231" />
-<hkern u1="W" u2="a" k="231" />
-<hkern u1="W" u2="Z" k="51" />
-<hkern u1="W" u2="X" k="27" />
-<hkern u1="W" u2="S" k="51" />
-<hkern u1="W" u2="Q" k="154" />
-<hkern u1="W" u2="O" k="129" />
-<hkern u1="W" u2="G" k="129" />
-<hkern u1="W" u2="C" k="129" />
-<hkern u1="W" u2="A" k="334" />
-<hkern u1="W" u2="-" k="102" />
-<hkern u1="X" u2="z" k="51" />
-<hkern u1="X" u2="y" k="205" />
-<hkern u1="X" u2="w" k="256" />
-<hkern u1="X" u2="v" k="256" />
-<hkern u1="X" u2="u" k="129" />
-<hkern u1="X" u2="t" k="205" />
-<hkern u1="X" u2="s" k="78" />
-<hkern u1="X" u2="r" k="27" />
-<hkern u1="X" u2="q" k="154" />
-<hkern u1="X" u2="p" k="27" />
-<hkern u1="X" u2="o" k="154" />
-<hkern u1="X" u2="j" k="51" />
-<hkern u1="X" u2="i" k="51" />
-<hkern u1="X" u2="g" k="102" />
-<hkern u1="X" u2="f" k="78" />
-<hkern u1="X" u2="e" k="154" />
-<hkern u1="X" u2="d" k="154" />
-<hkern u1="X" u2="c" k="154" />
-<hkern u1="X" u2="a" k="154" />
-<hkern u1="X" u2="Z" k="27" />
-<hkern u1="X" u2="Y" k="27" />
-<hkern u1="X" u2="W" k="27" />
-<hkern u1="X" u2="V" k="27" />
-<hkern u1="X" u2="U" k="51" />
-<hkern u1="X" u2="T" k="27" />
-<hkern u1="X" u2="S" k="78" />
-<hkern u1="X" u2="Q" k="154" />
-<hkern u1="X" u2="O" k="154" />
-<hkern u1="X" u2="G" k="154" />
-<hkern u1="X" u2="C" k="154" />
-<hkern u1="X" u2="-" k="102" />
-<hkern u1="Y" u2="z" k="358" />
-<hkern u1="Y" u2="y" k="283" />
-<hkern u1="Y" u2="x" k="307" />
-<hkern u1="Y" u2="w" k="283" />
-<hkern u1="Y" u2="v" k="283" />
-<hkern u1="Y" u2="u" k="307" />
-<hkern u1="Y" u2="t" k="256" />
-<hkern u1="Y" u2="s" k="358" />
-<hkern u1="Y" u2="r" k="307" />
-<hkern u1="Y" u2="q" k="436" />
-<hkern u1="Y" u2="p" k="307" />
-<hkern u1="Y" u2="o" k="436" />
-<hkern u1="Y" u2="n" k="307" />
-<hkern u1="Y" u2="m" k="307" />
-<hkern u1="Y" u2="j" k="78" />
-<hkern u1="Y" u2="i" k="78" />
-<hkern u1="Y" u2="g" k="436" />
-<hkern u1="Y" u2="f" k="205" />
-<hkern u1="Y" u2="e" k="436" />
-<hkern u1="Y" u2="d" k="436" />
-<hkern u1="Y" u2="c" k="436" />
-<hkern u1="Y" u2="a" k="436" />
-<hkern u1="Y" u2="Z" k="51" />
-<hkern u1="Y" u2="X" k="27" />
-<hkern u1="Y" u2="S" k="129" />
-<hkern u1="Y" u2="Q" k="205" />
-<hkern u1="Y" u2="O" k="256" />
-<hkern u1="Y" u2="G" k="256" />
-<hkern u1="Y" u2="C" k="256" />
-<hkern u1="Y" u2="A" k="461" />
-<hkern u1="Y" u2="-" k="154" />
-<hkern u1="Z" u2="z" k="51" />
-<hkern u1="Z" u2="y" k="283" />
-<hkern u1="Z" u2="x" k="27" />
-<hkern u1="Z" u2="w" k="256" />
-<hkern u1="Z" u2="v" k="256" />
-<hkern u1="Z" u2="u" k="154" />
-<hkern u1="Z" u2="t" k="129" />
-<hkern u1="Z" u2="s" k="102" />
-<hkern u1="Z" u2="r" k="51" />
-<hkern u1="Z" u2="q" k="205" />
-<hkern u1="Z" u2="p" k="51" />
-<hkern u1="Z" u2="o" k="154" />
-<hkern u1="Z" u2="g" k="129" />
-<hkern u1="Z" u2="f" k="102" />
-<hkern u1="Z" u2="e" k="205" />
-<hkern u1="Z" u2="d" k="205" />
-<hkern u1="Z" u2="c" k="205" />
-<hkern u1="Z" u2="a" k="205" />
-<hkern u1="Z" u2="Z" k="51" />
-<hkern u1="Z" u2="Y" k="51" />
-<hkern u1="Z" u2="X" k="27" />
-<hkern u1="Z" u2="W" k="51" />
-<hkern u1="Z" u2="V" k="51" />
-<hkern u1="Z" u2="U" k="78" />
-<hkern u1="Z" u2="T" k="51" />
-<hkern u1="Z" u2="S" k="78" />
-<hkern u1="Z" u2="Q" k="154" />
-<hkern u1="Z" u2="O" k="180" />
-<hkern u1="Z" u2="G" k="154" />
-<hkern u1="Z" u2="C" k="154" />
-<hkern u1="Z" u2="A" k="51" />
-<hkern u1="Z" u2="-" k="129" />
-<hkern u1="b" u2="z" k="102" />
-<hkern u1="b" u2="y" k="102" />
-<hkern u1="b" u2="x" k="102" />
-<hkern u1="b" u2="w" k="102" />
-<hkern u1="b" u2="v" k="129" />
-<hkern u1="b" u2="t" k="51" />
-<hkern u1="b" u2="q" k="-51" />
-<hkern u1="b" u2="o" k="-51" />
-<hkern u1="b" u2="g" k="-51" />
-<hkern u1="b" u2="e" k="-51" />
-<hkern u1="b" u2="d" k="-51" />
-<hkern u1="b" u2="c" k="-51" />
-<hkern u1="b" u2="a" k="-51" />
-<hkern u1="b" u2="-" k="-51" />
-<hkern u1="c" u2="z" k="102" />
-<hkern u1="c" u2="y" k="102" />
-<hkern u1="c" u2="x" k="102" />
-<hkern u1="c" u2="w" k="102" />
-<hkern u1="c" u2="v" k="129" />
-<hkern u1="c" u2="t" k="78" />
-<hkern u1="c" u2="s" k="51" />
-<hkern u1="c" u2="f" k="51" />
-<hkern u1="c" u2="-" k="-25" />
-<hkern u1="e" u2="z" k="102" />
-<hkern u1="e" u2="y" k="102" />
-<hkern u1="e" u2="x" k="102" />
-<hkern u1="e" u2="w" k="102" />
-<hkern u1="e" u2="v" k="129" />
-<hkern u1="e" u2="t" k="102" />
-<hkern u1="e" u2="q" k="-51" />
-<hkern u1="e" u2="o" k="-51" />
-<hkern u1="e" u2="g" k="-51" />
-<hkern u1="e" u2="e" k="-51" />
-<hkern u1="e" u2="d" k="-51" />
-<hkern u1="e" u2="c" k="-51" />
-<hkern u1="e" u2="a" k="-51" />
-<hkern u1="e" u2="-" k="-51" />
-<hkern u1="f" u2="”" k="-76" />
-<hkern u1="f" u2="z" k="51" />
-<hkern u1="f" u2="x" k="27" />
-<hkern u1="f" u2="t" k="-51" />
-<hkern u1="f" u2="s" k="78" />
-<hkern u1="f" u2="q" k="102" />
-<hkern u1="f" u2="o" k="102" />
-<hkern u1="f" u2="l" k="-25" />
-<hkern u1="f" u2="k" k="-25" />
-<hkern u1="f" u2="h" k="-25" />
-<hkern u1="f" u2="g" k="102" />
-<hkern u1="f" u2="f" k="-51" />
-<hkern u1="f" u2="e" k="102" />
-<hkern u1="f" u2="d" k="102" />
-<hkern u1="f" u2="c" k="102" />
-<hkern u1="f" u2="b" k="-25" />
-<hkern u1="f" u2="a" k="102" />
-<hkern u1="f" u2="-" k="51" />
-<hkern u1="h" u2="z" k="51" />
-<hkern u1="h" u2="y" k="139" />
-<hkern u1="h" u2="x" k="51" />
-<hkern u1="h" u2="w" k="51" />
-<hkern u1="h" u2="v" k="78" />
-<hkern u1="h" u2="t" k="51" />
-<hkern u1="h" u2="f" k="27" />
-<hkern u1="k" u2="t" k="-25" />
-<hkern u1="k" u2="s" k="51" />
-<hkern u1="k" u2="q" k="102" />
-<hkern u1="k" u2="o" k="102" />
-<hkern u1="k" u2="g" k="102" />
-<hkern u1="k" u2="f" k="-25" />
-<hkern u1="k" u2="e" k="102" />
-<hkern u1="k" u2="d" k="102" />
-<hkern u1="k" u2="c" k="102" />
-<hkern u1="k" u2="a" k="102" />
-<hkern u1="k" u2="-" k="51" />
-<hkern u1="m" u2="z" k="51" />
-<hkern u1="m" u2="y" k="102" />
-<hkern u1="m" u2="x" k="51" />
-<hkern u1="m" u2="w" k="51" />
-<hkern u1="m" u2="v" k="113" />
-<hkern u1="m" u2="t" k="51" />
-<hkern u1="m" u2="f" k="51" />
-<hkern u1="n" u2="z" k="51" />
-<hkern u1="n" u2="y" k="139" />
-<hkern u1="n" u2="x" k="51" />
-<hkern u1="n" u2="w" k="51" />
-<hkern u1="n" u2="v" k="139" />
-<hkern u1="n" u2="t" k="51" />
-<hkern u1="n" u2="f" k="51" />
-<hkern u1="o" u2="z" k="102" />
-<hkern u1="o" u2="y" k="113" />
-<hkern u1="o" u2="x" k="102" />
-<hkern u1="o" u2="w" k="102" />
-<hkern u1="o" u2="v" k="129" />
-<hkern u1="o" u2="t" k="102" />
-<hkern u1="o" u2="q" k="-51" />
-<hkern u1="o" u2="o" k="-51" />
-<hkern u1="o" u2="g" k="-51" />
-<hkern u1="o" u2="e" k="-51" />
-<hkern u1="o" u2="d" k="-51" />
-<hkern u1="o" u2="c" k="-51" />
-<hkern u1="o" u2="a" k="-51" />
-<hkern u1="o" u2="-" k="-51" />
-<hkern u1="p" u2="z" k="102" />
-<hkern u1="p" u2="y" k="102" />
-<hkern u1="p" u2="x" k="102" />
-<hkern u1="p" u2="w" k="102" />
-<hkern u1="p" u2="v" k="129" />
-<hkern u1="p" u2="t" k="102" />
-<hkern u1="p" u2="q" k="-51" />
-<hkern u1="p" u2="o" k="-51" />
-<hkern u1="p" u2="g" k="-51" />
-<hkern u1="p" u2="e" k="-51" />
-<hkern u1="p" u2="d" k="-51" />
-<hkern u1="p" u2="c" k="-51" />
-<hkern u1="p" u2="a" k="-51" />
-<hkern u1="q" u2="j" k="-129" />
-<hkern u1="q" u2="-" k="-51" />
-<hkern u1="r" u2="z" k="51" />
-<hkern u1="r" u2="x" k="27" />
-<hkern u1="r" u2="t" k="-51" />
-<hkern u1="r" u2="s" k="78" />
-<hkern u1="r" u2="q" k="102" />
-<hkern u1="r" u2="o" k="102" />
-<hkern u1="r" u2="g" k="102" />
-<hkern u1="r" u2="f" k="-51" />
-<hkern u1="r" u2="e" k="102" />
-<hkern u1="r" u2="d" k="102" />
-<hkern u1="r" u2="c" k="102" />
-<hkern u1="r" u2="-" k="51" />
-<hkern u1="s" u2="z" k="78" />
-<hkern u1="s" u2="y" k="102" />
-<hkern u1="s" u2="x" k="78" />
-<hkern u1="s" u2="w" k="78" />
-<hkern u1="s" u2="v" k="102" />
-<hkern u1="s" u2="t" k="78" />
-<hkern u1="s" u2="f" k="27" />
-<hkern u1="s" u2="@" k="51" />
-<hkern u1="t" u2="”" k="-51" />
-<hkern u1="t" u2="z" k="51" />
-<hkern u1="t" u2="x" k="27" />
-<hkern u1="t" u2="t" k="-51" />
-<hkern u1="t" u2="s" k="51" />
-<hkern u1="t" u2="q" k="102" />
-<hkern u1="t" u2="o" k="102" />
-<hkern u1="t" u2="g" k="102" />
-<hkern u1="t" u2="f" k="-51" />
-<hkern u1="t" u2="e" k="102" />
-<hkern u1="t" u2="d" k="102" />
-<hkern u1="t" u2="c" k="102" />
-<hkern u1="t" u2="a" k="102" />
-<hkern u1="t" u2="-" k="51" />
-<hkern u1="v" u2="z" k="51" />
-<hkern u1="v" u2="x" k="27" />
-<hkern u1="v" u2="s" k="102" />
-<hkern u1="v" u2="q" k="129" />
-<hkern u1="v" u2="o" k="129" />
-<hkern u1="v" u2="g" k="129" />
-<hkern u1="v" u2="e" k="129" />
-<hkern u1="v" u2="d" k="129" />
-<hkern u1="v" u2="c" k="129" />
-<hkern u1="v" u2="a" k="129" />
-<hkern u1="v" u2="-" k="51" />
-<hkern u1="w" u2="z" k="51" />
-<hkern u1="w" u2="x" k="27" />
-<hkern u1="w" u2="s" k="78" />
-<hkern u1="w" u2="q" k="102" />
-<hkern u1="w" u2="o" k="102" />
-<hkern u1="w" u2="g" k="51" />
-<hkern u1="w" u2="e" k="102" />
-<hkern u1="w" u2="d" k="102" />
-<hkern u1="w" u2="c" k="102" />
-<hkern u1="w" u2="a" k="102" />
-<hkern u1="w" u2="-" k="51" />
-<hkern u1="x" u2="z" k="27" />
-<hkern u1="x" u2="y" k="51" />
-<hkern u1="x" u2="w" k="27" />
-<hkern u1="x" u2="v" k="27" />
-<hkern u1="x" u2="u" k="27" />
-<hkern u1="x" u2="t" k="27" />
-<hkern u1="x" u2="s" k="78" />
-<hkern u1="x" u2="q" k="102" />
-<hkern u1="x" u2="o" k="102" />
-<hkern u1="x" u2="g" k="102" />
-<hkern u1="x" u2="e" k="102" />
-<hkern u1="x" u2="d" k="102" />
-<hkern u1="x" u2="c" k="102" />
-<hkern u1="x" u2="a" k="102" />
-<hkern u1="x" u2="-" k="102" />
-<hkern u1="y" u2="z" k="51" />
-<hkern u1="y" u2="x" k="51" />
-<hkern u1="y" u2="s" k="102" />
-<hkern u1="y" u2="q" k="102" />
-<hkern u1="y" u2="o" k="113" />
-<hkern u1="y" u2="g" k="102" />
-<hkern u1="y" u2="e" k="102" />
-<hkern u1="y" u2="d" k="102" />
-<hkern u1="y" u2="c" k="102" />
-<hkern u1="y" u2="a" k="113" />
-<hkern u1="y" u2="-" k="51" />
-<hkern u1="z" u2="z" k="51" />
-<hkern u1="z" u2="y" k="51" />
-<hkern u1="z" u2="x" k="27" />
-<hkern u1="z" u2="w" k="51" />
-<hkern u1="z" u2="v" k="51" />
-<hkern u1="z" u2="u" k="51" />
-<hkern u1="z" u2="t" k="51" />
-<hkern u1="z" u2="s" k="78" />
-<hkern u1="z" u2="q" k="102" />
-<hkern u1="z" u2="o" k="102" />
-<hkern u1="z" u2="g" k="102" />
-<hkern u1="z" u2="e" k="102" />
-<hkern u1="z" u2="d" k="102" />
-<hkern u1="z" u2="c" k="102" />
-<hkern u1="z" u2="a" k="102" />
-<hkern u1="z" u2="-" k="154" />
-<hkern u1="‘" u2="A" k="307" />
-<hkern u1="“" u2="A" k="307" />
-</font>
-</defs></svg>
\ No newline at end of file
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/ol-round-gothic-light.ttf b/plugins/wordpress-mobile-pack/admin/sass/fonts/ol-round-gothic-light.ttf
deleted file mode 100755
index acfd177..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/ol-round-gothic-light.ttf and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/ol-round-gothic-light.woff b/plugins/wordpress-mobile-pack/admin/sass/fonts/ol-round-gothic-light.woff
deleted file mode 100755
index 8f60899..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/ol-round-gothic-light.woff and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/open-sans-regular.eot b/plugins/wordpress-mobile-pack/admin/sass/fonts/open-sans-regular.eot
deleted file mode 100755
index da780d7..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/open-sans-regular.eot and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/open-sans-regular.otf b/plugins/wordpress-mobile-pack/admin/sass/fonts/open-sans-regular.otf
deleted file mode 100755
index 784cf4d..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/open-sans-regular.otf and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/open-sans-regular.svg b/plugins/wordpress-mobile-pack/admin/sass/fonts/open-sans-regular.svg
deleted file mode 100755
index 800a03a..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/fonts/open-sans-regular.svg
+++ /dev/null
@@ -1,1825 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="open_sansregular" horiz-adv-x="1171" >
-<font-face units-per-em="2048" ascent="1638" descent="-410" />
-<missing-glyph horiz-adv-x="532" />
-<glyph unicode="fi" horiz-adv-x="1212" d="M29 967v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31q-94 0 -139 -62.5t-45 -200.5v-71h279v-129h-279v-967h-166v967h-196zM856 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5zM870 0v1096h166 v-1096h-166z" />
-<glyph unicode="fl" horiz-adv-x="1212" d="M29 967v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31q-94 0 -139 -62.5t-45 -200.5v-71h279v-129h-279v-967h-166v967h-196zM870 0v1556h166v-1556h-166z" />
-<glyph unicode="ffi" horiz-adv-x="1909" d="M29 967v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31q-94 0 -139 -62.5t-45 -200.5v-71h279v-129h-279v-967h-166v967h-196zM717 967v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31q-94 0 -139 -62.5t-45 -200.5v-71h279v-129 h-279v-967h-166v967h-196zM1551 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5zM1565 0v1096h166v-1096h-166z" />
-<glyph unicode="ffl" horiz-adv-x="1909" d="M29 967v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31q-94 0 -139 -62.5t-45 -200.5v-71h279v-129h-279v-967h-166v967h-196zM717 967v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31q-94 0 -139 -62.5t-45 -200.5v-71h279v-129 h-279v-967h-166v967h-196zM1565 0v1556h166v-1556h-166z" />
-<glyph horiz-adv-x="2048" />
-<glyph horiz-adv-x="2048" />
-<glyph unicode="
" horiz-adv-x="1044" />
-<glyph unicode=" " horiz-adv-x="532" />
-<glyph unicode="	" horiz-adv-x="532" />
-<glyph unicode=" " horiz-adv-x="532" />
-<glyph unicode="!" horiz-adv-x="547" d="M152 106q0 136 120 136q58 0 89.5 -35t31.5 -101q0 -64 -32 -99.5t-89 -35.5q-52 0 -86 31.5t-34 103.5zM170 1462h207l-51 -1059h-105z" />
-<glyph unicode=""" horiz-adv-x="821" d="M133 1462h186l-40 -528h-105zM502 1462h186l-41 -528h-104z" />
-<glyph unicode="#" horiz-adv-x="1323" d="M51 430v129h287l68 340h-277v127h299l82 436h139l-82 -436h305l84 436h134l-84 -436h264v-127h-289l-66 -340h283v-129h-307l-84 -430h-137l84 430h-303l-82 -430h-136l80 430h-262zM475 559h303l66 340h-303z" />
-<glyph unicode="$" d="M131 170v156q83 -37 191.5 -60.5t197.5 -23.5v440q-205 65 -287.5 151t-82.5 222q0 131 101.5 215t268.5 102v182h129v-180q184 -5 355 -74l-52 -131q-149 59 -303 70v-434q157 -50 235 -97.5t115 -109t37 -149.5q0 -136 -102 -224.5t-285 -111.5v-232h-129v223 q-112 0 -217 17.5t-172 48.5zM319 1057q0 -76 45 -122t156 -87v387q-99 -16 -150 -62.5t-51 -115.5zM649 252q217 30 217 184q0 72 -44.5 116.5t-172.5 88.5v-389z" />
-<glyph unicode="%" horiz-adv-x="1686" d="M104 1026q0 227 74.5 342t220.5 115q145 0 223 -119t78 -338q0 -228 -76.5 -344.5t-224.5 -116.5q-140 0 -217.5 119t-77.5 342zM242 1026q0 -170 37 -255t120 -85q164 0 164 340q0 338 -164 338q-83 0 -120 -84t-37 -254zM365 0l811 1462h147l-811 -1462h-147zM985 440 q0 227 74.5 342t220.5 115q142 0 221.5 -117.5t79.5 -339.5q0 -227 -76.5 -343.5t-224.5 -116.5q-142 0 -218.5 119t-76.5 341zM1122 440q0 -171 37 -255.5t121 -84.5t124 83.5t40 256.5q0 171 -40 253.5t-124 82.5t-121 -82.5t-37 -253.5z" />
-<glyph unicode="&" horiz-adv-x="1495" d="M113 379q0 130 69.5 230t249.5 202q-85 95 -115.5 144t-48.5 102t-18 110q0 150 98 234t273 84q162 0 255 -83.5t93 -232.5q0 -107 -68 -197.5t-225 -183.5l407 -391q56 62 89.5 145.5t56.5 182.5h168q-68 -286 -205 -434l299 -291h-229l-185 178q-118 -106 -240 -152 t-272 -46q-215 0 -333.5 106t-118.5 293zM285 383q0 -117 77.5 -185.5t206.5 -68.5q241 0 400 154l-437 424q-111 -68 -157 -112.5t-68 -95.5t-22 -116zM414 1171q0 -69 36 -131.5t123 -150.5q129 75 179.5 138.5t50.5 146.5q0 77 -51.5 125.5t-137.5 48.5q-89 0 -144.5 -48 t-55.5 -129z" />
-<glyph unicode="'" horiz-adv-x="453" d="M133 1462h186l-40 -528h-105z" />
-<glyph unicode="(" horiz-adv-x="606" d="M82 561q0 265 77.5 496t223.5 405h162q-144 -193 -216.5 -424t-72.5 -475q0 -240 74 -469t213 -418h-160q-147 170 -224 397t-77 488z" />
-<glyph unicode=")" horiz-adv-x="606" d="M61 1462h162q147 -175 224 -406.5t77 -494.5t-77.5 -490t-223.5 -395h-160q139 188 213 417.5t74 469.5q0 244 -72.5 475t-216.5 424z" />
-<glyph unicode="*" horiz-adv-x="1130" d="M86 1090l29 182l391 -111l-43 395h194l-43 -395l398 111l26 -182l-381 -31l248 -326l-172 -94l-176 362l-160 -362l-176 94l242 326z" />
-<glyph unicode="+" d="M104 653v138h410v428h139v-428h412v-138h-412v-426h-139v426h-410z" />
-<glyph unicode="," horiz-adv-x="502" d="M63 -264q27 104 59.5 257t45.5 245h182l15 -23q-26 -100 -75 -232.5t-102 -246.5h-125z" />
-<glyph unicode="-" horiz-adv-x="659" d="M84 473v152h491v-152h-491z" />
-<glyph unicode="." horiz-adv-x="545" d="M152 106q0 67 30.5 101.5t87.5 34.5q58 0 90.5 -34.5t32.5 -101.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5z" />
-<glyph unicode="/" horiz-adv-x="752" d="M20 0l545 1462h166l-545 -1462h-166z" />
-<glyph unicode="0" d="M102 733q0 382 119 567t363 185q238 0 361.5 -193t123.5 -559q0 -379 -119.5 -566t-365.5 -187q-236 0 -359 191.5t-123 561.5zM270 733q0 -319 75 -464.5t239 -145.5q166 0 240.5 147.5t74.5 462.5t-74.5 461.5t-240.5 146.5q-164 0 -239 -144.5t-75 -463.5z" />
-<glyph unicode="1" d="M188 1163l387 299h140v-1462h-162v1042q0 130 8 246q-21 -21 -47 -44t-238 -195z" />
-<glyph unicode="2" d="M100 0v143l385 387q176 178 232 254t84 148t28 155q0 117 -71 185.5t-197 68.5q-91 0 -172.5 -30t-181.5 -109l-88 113q202 168 440 168q206 0 323 -105.5t117 -283.5q0 -139 -78 -275t-292 -344l-320 -313v-8h752v-154h-961z" />
-<glyph unicode="3" d="M94 59v158q95 -47 202.5 -71.5t203.5 -24.5q379 0 379 297q0 266 -418 266h-144v143h146q171 0 271 75.5t100 209.5q0 107 -73.5 168t-199.5 61q-96 0 -181 -26t-194 -96l-84 112q90 71 207.5 111.5t247.5 40.5q213 0 331 -97.5t118 -267.5q0 -140 -78.5 -229 t-222.5 -119v-8q176 -22 261 -112t85 -236q0 -209 -145 -321.5t-412 -112.5q-116 0 -212.5 17.5t-187.5 61.5z" />
-<glyph unicode="4" d="M43 336v145l694 989h176v-983h217v-151h-217v-336h-159v336h-711zM209 487h545v486q0 143 10 323h-8q-48 -96 -90 -159z" />
-<glyph unicode="5" d="M133 59v160q70 -45 174 -70.5t205 -25.5q176 0 273.5 83t97.5 240q0 306 -375 306q-95 0 -254 -29l-86 55l55 684h727v-153h-585l-37 -439q115 23 229 23q231 0 363.5 -114.5t132.5 -313.5q0 -227 -144.5 -356t-398.5 -129q-247 0 -377 79z" />
-<glyph unicode="6" d="M117 625q0 431 167.5 644.5t495.5 213.5q113 0 178 -19v-143q-77 25 -176 25q-235 0 -359 -146.5t-136 -460.5h12q110 172 348 172q197 0 310.5 -119t113.5 -323q0 -228 -124.5 -358.5t-336.5 -130.5q-227 0 -360 170.5t-133 474.5zM287 506q0 -103 40 -192t113.5 -141 t167.5 -52q142 0 220.5 89.5t78.5 258.5q0 145 -73 228t-218 83q-90 0 -165 -37t-119.5 -102t-44.5 -135z" />
-<glyph unicode="7" d="M94 1309v153h973v-133l-598 -1329h-184l606 1309h-797z" />
-<glyph unicode="8" d="M104 373q0 251 306 391q-138 78 -198 168.5t-60 202.5q0 159 117.5 253.5t314.5 94.5q200 0 317 -93t117 -257q0 -108 -67 -197t-214 -162q178 -85 253 -178.5t75 -216.5q0 -182 -127 -290.5t-348 -108.5q-234 0 -360 102.5t-126 290.5zM268 369q0 -120 83.5 -187 t234.5 -67q149 0 232 70t83 192q0 97 -78 172.5t-272 146.5q-149 -64 -216 -141.5t-67 -185.5zM315 1128q0 -92 59 -158t218 -132q143 60 202.5 129t59.5 161q0 101 -72.5 160.5t-199.5 59.5q-125 0 -196 -60t-71 -160z" />
-<glyph unicode="9" d="M106 991q0 228 127.5 360t335.5 132q149 0 260.5 -76.5t171.5 -223t60 -345.5q0 -858 -664 -858q-116 0 -184 20v143q80 -26 182 -26q240 0 362.5 148.5t133.5 455.5h-12q-55 -83 -146 -126.5t-205 -43.5q-194 0 -308 116t-114 324zM270 993q0 -144 72 -226.5t219 -82.5 q91 0 167.5 37t120.5 101t44 134q0 105 -41 194t-114.5 140t-168.5 51q-143 0 -221 -92t-78 -256z" />
-<glyph unicode=":" horiz-adv-x="545" d="M152 106q0 67 30.5 101.5t87.5 34.5q58 0 90.5 -34.5t32.5 -101.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5zM152 989q0 135 118 135q123 0 123 -135q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5z" />
-<glyph unicode=";" horiz-adv-x="545" d="M63 -264q27 104 59.5 257t45.5 245h182l15 -23q-26 -100 -75 -232.5t-102 -246.5h-125zM147 989q0 135 119 135q123 0 123 -135q0 -65 -33 -100t-90 -35q-58 0 -88.5 35t-30.5 100z" />
-<glyph unicode="<" d="M104 664v98l961 479v-149l-782 -371l782 -328v-151z" />
-<glyph unicode="=" d="M119 449v137h930v-137h-930zM119 858v137h930v-137h-930z" />
-<glyph unicode=">" d="M104 242v151l783 326l-783 373v149l961 -479v-98z" />
-<glyph unicode="?" horiz-adv-x="879" d="M27 1384q189 99 395 99q191 0 297 -94t106 -265q0 -73 -19.5 -128.5t-57.5 -105t-164 -159.5q-101 -86 -133.5 -143t-32.5 -152v-33h-129v54q0 117 36 192.5t134 159.5q136 115 171.5 173t35.5 140q0 102 -65.5 157.5t-188.5 55.5q-79 0 -154 -18.5t-172 -67.5zM240 106 q0 136 120 136q58 0 89.5 -35t31.5 -101q0 -64 -32 -99.5t-89 -35.5q-52 0 -86 31.5t-34 103.5z" />
-<glyph unicode="@" horiz-adv-x="1841" d="M121 571q0 260 107 463t305 314.5t454 111.5q215 0 382.5 -90.5t259 -257t91.5 -383.5q0 -142 -44 -260t-124 -183t-184 -65q-86 0 -145 52t-70 133h-8q-40 -87 -114.5 -136t-176.5 -49q-150 0 -234.5 102.5t-84.5 278.5q0 204 118 331.5t310 127.5q68 0 154 -12.5 t155 -34.5l-25 -470v-22q0 -178 133 -178q91 0 148 107.5t57 279.5q0 181 -74 317t-210.5 209.5t-313.5 73.5q-223 0 -388 -92.5t-252 -264t-87 -396.5q0 -305 161 -469t464 -164q210 0 436 86v-133q-192 -84 -436 -84q-363 0 -563.5 199.5t-200.5 557.5zM686 598 q0 -254 195 -254q207 0 225 313l14 261q-72 20 -157 20q-130 0 -203.5 -90t-73.5 -250z" />
-<glyph unicode="A" horiz-adv-x="1296" d="M0 0l578 1468h143l575 -1468h-176l-182 465h-586l-180 -465h-172zM412 618h473l-170 453q-33 86 -68 211q-22 -96 -63 -211z" />
-<glyph unicode="B" horiz-adv-x="1327" d="M201 0v1462h413q291 0 421 -87t130 -275q0 -130 -72.5 -214.5t-211.5 -109.5v-10q333 -57 333 -350q0 -196 -132.5 -306t-370.5 -110h-510zM371 145h305q177 0 266.5 68.5t89.5 214.5q0 136 -91.5 200t-278.5 64h-291v-547zM371 836h280q180 0 259 56.5t79 190.5 q0 123 -88 177.5t-280 54.5h-250v-479z" />
-<glyph unicode="C" horiz-adv-x="1292" d="M125 733q0 226 84.5 396t244 262t375.5 92q230 0 402 -84l-72 -146q-166 78 -332 78q-241 0 -380.5 -160.5t-139.5 -439.5q0 -287 134.5 -443.5t383.5 -156.5q153 0 349 55v-149q-152 -57 -375 -57q-323 0 -498.5 196t-175.5 557z" />
-<glyph unicode="D" horiz-adv-x="1493" d="M201 0v1462h448q341 0 530 -189t189 -528q0 -362 -196.5 -553.5t-565.5 -191.5h-405zM371 147h207q304 0 457 149.5t153 442.5q0 286 -143.5 431t-426.5 145h-247v-1168z" />
-<glyph unicode="E" horiz-adv-x="1139" d="M201 0v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152h-815z" />
-<glyph unicode="F" horiz-adv-x="1057" d="M201 0v1462h815v-151h-645v-535h606v-151h-606v-625h-170z" />
-<glyph unicode="G" horiz-adv-x="1491" d="M125 731q0 228 91.5 399.5t263.5 262t403 90.5q234 0 436 -86l-66 -150q-198 84 -381 84q-267 0 -417 -159t-150 -441q0 -296 144.5 -449t424.5 -153q152 0 297 35v450h-327v152h497v-711q-116 -37 -236 -56t-278 -19q-332 0 -517 197.5t-185 553.5z" />
-<glyph unicode="H" horiz-adv-x="1511" d="M201 0v1462h170v-622h770v622h170v-1462h-170v688h-770v-688h-170z" />
-<glyph unicode="I" horiz-adv-x="571" d="M201 0v1462h170v-1462h-170z" />
-<glyph unicode="J" horiz-adv-x="547" d="M-160 -213q71 -20 148 -20q99 0 150.5 60t51.5 173v1462h170v-1448q0 -190 -96 -294.5t-276 -104.5q-94 0 -148 27v145z" />
-<glyph unicode="K" horiz-adv-x="1257" d="M201 0v1462h170v-725l663 725h201l-588 -635l610 -827h-200l-533 709l-153 -136v-573h-170z" />
-<glyph unicode="L" horiz-adv-x="1063" d="M201 0v1462h170v-1308h645v-154h-815z" />
-<glyph unicode="M" horiz-adv-x="1849" d="M201 0v1462h256l463 -1206h8l467 1206h254v-1462h-170v942q0 162 14 352h-8l-500 -1294h-137l-496 1296h-8q14 -154 14 -366v-930h-157z" />
-<glyph unicode="N" horiz-adv-x="1544" d="M201 0v1462h192l797 -1222h8q-2 28 -9 174q-5 114 -5 177v32v839h159v-1462h-194l-799 1227h-8q16 -216 16 -396v-831h-157z" />
-<glyph unicode="O" horiz-adv-x="1595" d="M125 735q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5z" />
-<glyph unicode="P" horiz-adv-x="1233" d="M201 0v1462h379q548 0 548 -426q0 -222 -151.5 -341.5t-433.5 -119.5h-172v-575h-170zM371 721h153q226 0 327 73t101 234q0 145 -95 216t-296 71h-190v-594z" />
-<glyph unicode="Q" horiz-adv-x="1595" d="M125 735q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552q0 -281 -113 -467t-319 -252l348 -362h-247l-285 330l-55 -2q-323 0 -498.5 197.5t-175.5 557.5zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5 q-243 0 -369.5 -153.5t-126.5 -446.5z" />
-<glyph unicode="R" horiz-adv-x="1266" d="M201 0v1462h401q269 0 397.5 -103t128.5 -310q0 -290 -294 -392l397 -657h-201l-354 608h-305v-608h-170zM371 754h233q180 0 264 71.5t84 214.5q0 145 -85.5 209t-274.5 64h-221v-559z" />
-<glyph unicode="S" horiz-adv-x="1124" d="M106 47v164q90 -38 196 -60t210 -22q170 0 256 64.5t86 179.5q0 76 -30.5 124.5t-102 89.5t-217.5 93q-204 73 -291.5 173t-87.5 261q0 169 127 269t336 100q218 0 401 -80l-53 -148q-181 76 -352 76q-135 0 -211 -58t-76 -161q0 -76 28 -124.5t94.5 -89t203.5 -89.5 q230 -82 316.5 -176t86.5 -244q0 -193 -140 -301t-380 -108q-260 0 -400 67z" />
-<glyph unicode="T" horiz-adv-x="1133" d="M18 1311v151h1096v-151h-463v-1311h-170v1311h-463z" />
-<glyph unicode="U" horiz-adv-x="1491" d="M186 520v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396z" />
-<glyph unicode="V" horiz-adv-x="1219" d="M0 1462h180l336 -946q58 -163 92 -317q36 162 94 323l334 940h183l-527 -1462h-168z" />
-<glyph unicode="W" horiz-adv-x="1896" d="M27 1462h180l231 -903q48 -190 70 -344q27 183 80 358l262 889h180l275 -897q48 -155 81 -350q19 142 72 346l230 901h180l-391 -1462h-168l-295 979q-21 65 -47 164t-27 119q-22 -132 -70 -289l-286 -973h-168z" />
-<glyph unicode="X" horiz-adv-x="1182" d="M8 0l486 764l-453 698h188l363 -579l366 579h181l-453 -692l488 -770h-193l-393 643l-400 -643h-180z" />
-<glyph unicode="Y" horiz-adv-x="1147" d="M0 1462h186l387 -731l390 731h184l-488 -895v-567h-172v559z" />
-<glyph unicode="Z" horiz-adv-x="1169" d="M82 0v133l776 1176h-752v153h959v-133l-776 -1175h798v-154h-1005z" />
-<glyph unicode="[" horiz-adv-x="674" d="M166 -324v1786h457v-141h-289v-1503h289v-142h-457z" />
-<glyph unicode="\" horiz-adv-x="752" d="M23 1462h163l547 -1462h-166z" />
-<glyph unicode="]" horiz-adv-x="674" d="M51 -182h289v1503h-289v141h457v-1786h-457v142z" />
-<glyph unicode="^" horiz-adv-x="1110" d="M49 551l434 922h99l477 -922h-152l-372 745l-334 -745h-152z" />
-<glyph unicode="_" horiz-adv-x="918" d="M-4 -184h926v-131h-926v131z" />
-<glyph unicode="`" horiz-adv-x="1182" d="M393 1548v21h203q32 -69 89 -159.5t101 -143.5v-25h-110q-65 52 -154 148t-129 159z" />
-<glyph unicode="a" horiz-adv-x="1139" d="M94 303q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239zM268 301q0 -90 54.5 -137 t152.5 -47q155 0 243.5 85t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5z" />
-<glyph unicode="b" horiz-adv-x="1255" d="M176 0v1556h166v-378q0 -127 -8 -228h8q116 164 344 164q216 0 335.5 -147.5t119.5 -417.5t-120.5 -419.5t-334.5 -149.5q-107 0 -195.5 39.5t-148.5 121.5h-12l-35 -141h-119zM342 549q0 -231 77 -330.5t247 -99.5q153 0 228 111.5t75 320.5q0 214 -75 319t-232 105 q-170 0 -245 -97.5t-75 -328.5z" />
-<glyph unicode="c" horiz-adv-x="975" d="M115 541q0 275 132.5 425t377.5 150q79 0 158 -17t124 -40l-51 -141q-55 22 -120 36.5t-115 14.5q-334 0 -334 -426q0 -202 81.5 -310t241.5 -108q137 0 281 59v-147q-110 -57 -277 -57q-238 0 -368.5 146.5t-130.5 414.5z" />
-<glyph unicode="d" horiz-adv-x="1255" d="M115 545q0 271 120 421t334 150q223 0 342 -162h13l-7 79l-4 77v446h166v-1556h-135l-22 147h-9q-115 -167 -344 -167q-215 0 -334.5 147t-119.5 418zM287 543q0 -210 77 -317t226 -107q170 0 246.5 92.5t76.5 298.5v35q0 233 -77.5 332.5t-247.5 99.5 q-146 0 -223.5 -113.5t-77.5 -320.5z" />
-<glyph unicode="e" horiz-adv-x="1149" d="M115 539q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5q-243 0 -383.5 148t-140.5 411zM291 653h573q0 157 -70 240.5t-200 83.5q-132 0 -210.5 -86t-92.5 -238z " />
-<glyph unicode="f" horiz-adv-x="694" d="M29 967v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31q-94 0 -139 -62.5t-45 -200.5v-71h279v-129h-279v-967h-166v967h-196z" />
-<glyph unicode="g" horiz-adv-x="1122" d="M39 -186q0 100 64 173t180 99q-42 19 -70.5 59t-28.5 93q0 60 32 105t101 87q-85 35 -138.5 119t-53.5 192q0 180 108 277.5t306 97.5q86 0 155 -20h379v-105l-203 -24q28 -35 50 -91.5t22 -127.5q0 -161 -110 -257t-302 -96q-49 0 -92 8q-106 -56 -106 -141 q0 -45 37 -66.5t127 -21.5h194q178 0 273.5 -75t95.5 -218q0 -182 -146 -277.5t-426 -95.5q-215 0 -331.5 80t-116.5 226zM199 -184q0 -89 75 -135t215 -46q209 0 309.5 62.5t100.5 169.5q0 89 -55 123.5t-207 34.5h-199q-113 0 -176 -54t-63 -155zM289 745q0 -115 65 -174 t181 -59q243 0 243 236q0 247 -246 247q-117 0 -180 -63t-63 -187z" />
-<glyph unicode="h" horiz-adv-x="1257" d="M176 0v1556h166v-471q0 -85 -8 -141h10q49 79 139.5 124.5t206.5 45.5q201 0 301.5 -95.5t100.5 -303.5v-715h-166v709q0 134 -61 200t-191 66q-173 0 -252.5 -94t-79.5 -308v-573h-166z" />
-<glyph unicode="i" horiz-adv-x="518" d="M162 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5zM176 0v1096h166v-1096h-166z" />
-<glyph unicode="j" horiz-adv-x="518" d="M-111 -332q69 -20 136 -20q78 0 114.5 42.5t36.5 129.5v1276h166v-1264q0 -324 -299 -324q-95 0 -154 25v135zM162 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="k" horiz-adv-x="1075" d="M176 0v1556h164v-825q0 -55 -8 -170h8q43 61 131 160l354 375h197l-444 -467l475 -629h-201l-387 518l-125 -108v-410h-164z" />
-<glyph unicode="l" horiz-adv-x="518" d="M176 0v1556h166v-1556h-166z" />
-<glyph unicode="m" horiz-adv-x="1905" d="M176 0v1096h135l27 -150h8q47 80 132.5 125t191.5 45q257 0 336 -186h8q49 86 142 136t212 50q186 0 278.5 -95.5t92.5 -305.5v-715h-166v713q0 131 -56 196.5t-174 65.5q-155 0 -229 -89t-74 -274v-612h-166v713q0 131 -56 196.5t-175 65.5q-156 0 -228.5 -93.5 t-72.5 -306.5v-575h-166z" />
-<glyph unicode="n" horiz-adv-x="1257" d="M176 0v1096h135l27 -150h8q51 81 143 125.5t205 44.5q198 0 298 -95.5t100 -305.5v-715h-166v709q0 134 -61 200t-191 66q-172 0 -252 -93t-80 -307v-575h-166z" />
-<glyph unicode="o" horiz-adv-x="1237" d="M115 549q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z" />
-<glyph unicode="p" horiz-adv-x="1255" d="M176 -492v1588h135l23 -150h8q64 90 149 130t195 40q218 0 336.5 -149t118.5 -418q0 -270 -120.5 -419.5t-334.5 -149.5q-107 0 -195.5 39.5t-148.5 121.5h-12q12 -96 12 -182v-451h-166zM342 549q0 -231 77 -330.5t247 -99.5q142 0 222.5 115t80.5 317 q0 205 -80.5 314.5t-226.5 109.5q-168 0 -243 -93t-77 -296v-37z" />
-<glyph unicode="q" horiz-adv-x="1255" d="M115 545q0 269 120 420t334 151q225 0 346 -170h9l24 150h131v-1588h-166v469q0 100 11 170h-13q-115 -167 -346 -167q-212 0 -331 149t-119 416zM287 543q0 -207 76.5 -315.5t226.5 -108.5q166 0 242 89t81 300v37q0 230 -78 331t-247 101q-146 0 -223.5 -113.5 t-77.5 -320.5z" />
-<glyph unicode="r" horiz-adv-x="836" d="M176 0v1096h137l19 -203h8q61 107 147 165t189 58q73 0 131 -12l-23 -154q-68 15 -120 15q-133 0 -227.5 -108t-94.5 -269v-588h-166z" />
-<glyph unicode="s" horiz-adv-x="977" d="M106 827q0 134 109 211.5t299 77.5q177 0 346 -72l-59 -135q-165 68 -299 68q-118 0 -178 -37t-60 -102q0 -44 22.5 -75t72.5 -59t192 -81q195 -71 263.5 -143t68.5 -181q0 -153 -114 -236t-320 -83q-218 0 -340 69v154q79 -40 169.5 -63t174.5 -23q130 0 200 41.5 t70 126.5q0 64 -55.5 109.5t-216.5 107.5q-153 57 -217.5 99.5t-96 96.5t-31.5 129z" />
-<glyph unicode="t" horiz-adv-x="723" d="M31 967v80l157 69l70 234h96v-254h318v-129h-318v-645q0 -99 47 -152t129 -53q44 0 85 6.5t65 13.5v-127q-27 -13 -79.5 -21.5t-94.5 -8.5q-318 0 -318 335v652h-157z" />
-<glyph unicode="u" horiz-adv-x="1257" d="M164 379v717h168v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304z" />
-<glyph unicode="v" horiz-adv-x="1026" d="M0 1096h178l236 -650q80 -228 94 -296h8q11 53 69.5 219.5t262.5 726.5h178l-416 -1096h-194z" />
-<glyph unicode="w" horiz-adv-x="1593" d="M23 1096h174q106 -413 161.5 -629t63.5 -291h8q11 57 35.5 147.5t42.5 143.5l201 629h180l196 -629q56 -172 76 -289h8q4 36 21.5 111t208.5 807h172l-303 -1096h-197l-201 643q-19 59 -71 268h-8q-40 -175 -70 -270l-207 -641h-192z" />
-<glyph unicode="x" horiz-adv-x="1073" d="M39 0l401 561l-381 535h189l289 -420l288 420h187l-381 -535l401 -561h-188l-307 444l-310 -444h-188z" />
-<glyph unicode="y" horiz-adv-x="1032" d="M2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156z" />
-<glyph unicode="z" horiz-adv-x="958" d="M82 0v113l598 854h-561v129h743v-129l-590 -838h605v-129h-795z" />
-<glyph unicode="{" horiz-adv-x="776" d="M61 498v141q130 2 188 48t58 142v306q0 155 108 241t290 86v-139q-230 -6 -230 -199v-295q0 -215 -223 -254v-12q223 -39 223 -254v-297q0 -102 58.5 -148t171.5 -48v-140q-190 2 -294 87t-104 239v303q0 104 -63 148.5t-183 44.5z" />
-<glyph unicode="|" horiz-adv-x="1128" d="M494 -496v2052h141v-2052h-141z" />
-<glyph unicode="}" horiz-adv-x="776" d="M72 -184q111 2 169 48t58 148v297q0 114 55 174t168 80v12q-223 39 -223 254v295q0 193 -227 199v139q184 0 289.5 -87t105.5 -240v-306q0 -97 59 -142.5t189 -47.5v-141q-122 0 -185 -44.5t-63 -148.5v-303q0 -153 -102.5 -238.5t-292.5 -87.5v140z" />
-<glyph unicode="~" d="M104 592v151q100 109 244 109q68 0 124.5 -14t145.5 -52q66 -28 115 -41.5t96 -13.5q54 0 118 32t118 89v-150q-102 -110 -244 -110q-72 0 -135 16.5t-135 48.5q-75 32 -120 44t-93 12q-53 0 -116.5 -33.5t-117.5 -87.5z" />
-<glyph unicode="¡" horiz-adv-x="547" d="M152 983q0 63 31.5 99t88.5 36q51 0 86 -32t35 -103q0 -135 -121 -135q-60 0 -90 35.5t-30 99.5zM168 -373l51 1057h105l51 -1057h-207z" />
-<glyph unicode="¢" d="M190 741q0 508 396 570v172h135v-164q75 -3 146 -19.5t120 -39.5l-49 -140q-133 51 -242 51q-172 0 -253 -105.5t-81 -322.5q0 -212 79.5 -313.5t246.5 -101.5q141 0 283 59v-147q-105 -54 -252 -60v-200h-133v206q-203 32 -299.5 168.5t-96.5 386.5z" />
-<glyph unicode="£" d="M63 0v141q205 47 205 291v223h-198v127h198v316q0 178 112 280.5t302 102.5t360 -84l-61 -133q-154 77 -297 77q-123 0 -185.5 -62t-62.5 -202v-295h422v-127h-422v-221q0 -100 -32.5 -168t-106.5 -112h795v-154h-1029z" />
-<glyph unicode="¤" d="M123 1092l94 92l135 -133q104 73 234 73q127 0 229 -73l137 133l95 -92l-134 -138q74 -113 74 -231q0 -131 -74 -234l131 -135l-92 -92l-137 133q-102 -71 -229 -71q-134 0 -234 73l-135 -133l-92 92l133 136q-74 107 -74 231q0 122 74 229zM313 723q0 -112 78.5 -192 t194.5 -80t195 79.5t79 192.5q0 114 -80 195t-194 81q-116 0 -194.5 -82t-78.5 -194z" />
-<glyph unicode="¥" d="M31 1462h178l375 -727l379 727h174l-416 -770h262v-127h-317v-170h317v-127h-317v-268h-164v268h-316v127h316v170h-316v127h256z" />
-<glyph unicode="¦" horiz-adv-x="1128" d="M494 281h141v-777h-141v777zM494 780v776h141v-776h-141z" />
-<glyph unicode="§" horiz-adv-x="1057" d="M123 57v148q78 -37 175 -59.5t179 -22.5q134 0 204.5 38t70.5 109q0 46 -24 75t-78 58t-169 72q-142 52 -209 97t-100 102t-33 135q0 86 43 154.5t121 105.5q-74 40 -116 95.5t-42 140.5q0 121 103.5 190.5t300.5 69.5q94 0 173.5 -14.5t176.5 -53.5l-53 -131 q-98 39 -165.5 52.5t-143.5 13.5q-116 0 -174 -29.5t-58 -93.5q0 -60 61.5 -102t215.5 -97q186 -68 261 -143.5t75 -182.5q0 -90 -41 -160.5t-115 -111.5q153 -81 153 -227q0 -140 -117 -216.5t-329 -76.5q-218 0 -346 65zM285 829q0 -77 66 -129.5t233 -113.5l49 -19 q137 80 137 191q0 83 -73.5 139t-258.5 113q-68 -19 -110.5 -69t-42.5 -112z" />
-<glyph unicode="¨" horiz-adv-x="1182" d="M309 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM690 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="©" horiz-adv-x="1704" d="M100 731q0 200 100 375t275 276t377 101q200 0 375 -100t276 -275t101 -377q0 -197 -97 -370t-272 -277t-383 -104q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM205 731q0 -173 87 -323.5t237.5 -237t322.5 -86.5q174 0 323 87t236.5 235.5t87.5 324.5q0 174 -87 323 t-235.5 236.5t-324.5 87.5q-174 0 -323 -87t-236.5 -235.5t-87.5 -324.5zM481 731q0 209 110.5 332t301.5 123q128 0 246 -60l-58 -118q-108 51 -188 51q-125 0 -192.5 -87t-67.5 -241q0 -168 63.5 -249t194.5 -81q86 0 211 45v-124q-48 -20 -98.5 -34t-120.5 -14 q-194 0 -298 120.5t-104 336.5z" />
-<glyph unicode="ª" horiz-adv-x="725" d="M70 989q0 102 77 154.5t242 58.5l117 4v39q0 133 -148 133q-100 0 -204 -51l-43 96q114 56 247 56q130 0 198.5 -52.5t68.5 -173.5v-452h-93l-24 84q-92 -97 -232 -97q-95 0 -150.5 49.5t-55.5 151.5zM193 989q0 -100 112 -100q201 0 201 180v49l-98 -4 q-112 -4 -163.5 -32.5t-51.5 -92.5z" />
-<glyph unicode="«" horiz-adv-x="1018" d="M82 524v27l342 407l119 -69l-289 -350l289 -351l-119 -71zM477 524v27l344 407l117 -69l-287 -350l287 -351l-117 -71z" />
-<glyph unicode="¬" d="M104 653v138h961v-527h-137v389h-824z" />
-<glyph unicode="­" horiz-adv-x="659" d="M84 473v152h491v-152h-491z" />
-<glyph unicode="®" horiz-adv-x="1704" d="M100 731q0 200 100 375t275 276t377 101q200 0 375 -100t276 -275t101 -377q0 -197 -97 -370t-272 -277t-383 -104q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM205 731q0 -173 87 -323.5t237.5 -237t322.5 -86.5q174 0 323 87t236.5 235.5t87.5 324.5q0 174 -87 323 t-235.5 236.5t-324.5 87.5q-174 0 -323 -87t-236.5 -235.5t-87.5 -324.5zM575 285v891h261q166 0 243.5 -65t77.5 -198q0 -80 -42.5 -141.5t-119.5 -91.5l238 -395h-168l-207 354h-135v-354h-148zM723 762h108q80 0 128.5 41.5t48.5 105.5q0 75 -43 107.5t-136 32.5h-106 v-287z" />
-<glyph unicode="¯" horiz-adv-x="1024" d="M-6 1556v127h1036v-127h-1036z" />
-<glyph unicode="°" horiz-adv-x="877" d="M127 1171q0 130 90.5 221t220.5 91t221 -90.5t91 -221.5q0 -84 -41 -155.5t-114 -113.5t-157 -42q-130 0 -220.5 90t-90.5 221zM242 1171q0 -82 58.5 -139t139.5 -57q80 0 137.5 56.5t57.5 139.5q0 84 -56.5 140.5t-138.5 56.5q-83 0 -140.5 -57t-57.5 -140z" />
-<glyph unicode="±" d="M104 1v138h961v-138h-961zM104 653v138h410v428h139v-428h412v-138h-412v-426h-139v426h-410z" />
-<glyph unicode="²" horiz-adv-x="711" d="M49 586v104l236 230q89 86 130 134.5t57.5 86.5t16.5 92q0 68 -40 102.5t-103 34.5q-52 0 -101 -19t-118 -69l-66 88q131 111 283 111q132 0 205.5 -65t73.5 -177q0 -80 -44.5 -155.5t-191.5 -213.5l-174 -165h440v-119h-604z" />
-<glyph unicode="³" horiz-adv-x="711" d="M33 625v123q147 -68 270 -68q211 0 211 162q0 145 -231 145h-117v107h119q103 0 152.5 39.5t49.5 107.5q0 61 -40 95t-107 34q-66 0 -122 -21.5t-112 -56.5l-69 90q63 45 133 72t164 27q136 0 214.5 -59.5t78.5 -166.5q0 -80 -41 -131.5t-109 -74.5q176 -47 176 -209 q0 -128 -92 -199.5t-260 -71.5q-152 0 -268 56z" />
-<glyph unicode="´" horiz-adv-x="1182" d="M393 1241v25q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111z" />
-<glyph unicode="µ" horiz-adv-x="1268" d="M176 -492v1588h166v-715q0 -262 254 -262q171 0 250.5 94.5t79.5 306.5v576h166v-1096h-136l-26 147h-10q-111 -167 -340 -167q-150 0 -238 92h-10q10 -84 10 -244v-320h-166z" />
-<glyph unicode="¶" horiz-adv-x="1341" d="M113 1042q0 260 109 387t341 127h557v-1816h-114v1712h-213v-1712h-115v819q-62 -18 -146 -18q-216 0 -317.5 125t-101.5 376z" />
-<glyph unicode="·" horiz-adv-x="545" d="M152 723q0 66 31 100.5t87 34.5q58 0 90.5 -34.5t32.5 -100.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5z" />
-<glyph unicode="¸" horiz-adv-x="465" d="M37 -377q45 -8 104 -8q79 0 119.5 20t40.5 74q0 43 -39.5 69.5t-148.5 43.5l88 178h110l-55 -115q180 -39 180 -174q0 -97 -76.5 -150t-226.5 -53q-51 0 -96 9v106z" />
-<glyph unicode="¹" horiz-adv-x="711" d="M76 1280l262 182h143v-876h-133v579q0 91 6 181q-22 -22 -49 -44.5t-162 -117.5z" />
-<glyph unicode="º" horiz-adv-x="768" d="M66 1135q0 163 84 253.5t235 90.5q152 0 234.5 -91t82.5 -253q0 -164 -85.5 -255.5t-235.5 -91.5q-146 0 -230.5 93t-84.5 254zM188 1135q0 -122 45.5 -183t149.5 -61q105 0 151 61t46 183q0 123 -46 182t-151 59q-103 0 -149 -59t-46 -182z" />
-<glyph unicode="»" horiz-adv-x="1018" d="M80 188l287 351l-287 350l117 69l344 -407v-27l-344 -407zM475 188l287 351l-287 350l117 69l344 -407v-27l-344 -407z" />
-<glyph unicode="¼" horiz-adv-x="1597" d="M75 1280l262 182h143v-876h-133v579q0 91 6 181q-22 -22 -49 -44.5t-162 -117.5zM252 0l903 1462h143l-903 -1462h-143zM817 203v101l408 579h139v-563h125v-117h-125v-202h-145v202h-402zM957 320h262v195q0 134 6 209q-5 -12 -17 -31.5t-27 -42l-30 -45t-26 -39.5z" />
-<glyph unicode="½" horiz-adv-x="1597" d="M46 1280l262 182h143v-876h-133v579q0 91 6 181q-22 -22 -49 -44.5t-162 -117.5zM184 0l903 1462h143l-903 -1462h-143zM895 1v104l236 230q89 86 130 134.5t57.5 86.5t16.5 92q0 68 -40 102.5t-103 34.5q-52 0 -101 -19t-118 -69l-66 88q131 111 283 111 q132 0 205.5 -65t73.5 -177q0 -80 -44.5 -155.5t-191.5 -213.5l-174 -165h440v-119h-604z" />
-<glyph unicode="¾" horiz-adv-x="1597" d="M26 625v123q147 -68 270 -68q211 0 211 162q0 145 -231 145h-117v107h119q103 0 152.5 39.5t49.5 107.5q0 61 -40 95t-107 34q-66 0 -122 -21.5t-112 -56.5l-69 90q63 45 133 72t164 27q136 0 214.5 -59.5t78.5 -166.5q0 -80 -41 -131.5t-109 -74.5q176 -47 176 -209 q0 -128 -92 -199.5t-260 -71.5q-152 0 -268 56zM344 0l903 1462h143l-903 -1462h-143zM897 203v101l408 579h139v-563h125v-117h-125v-202h-145v202h-402zM1037 320h262v195q0 134 6 209q-5 -12 -17 -31.5t-27 -42l-30 -45t-26 -39.5z" />
-<glyph unicode="¿" horiz-adv-x="879" d="M51 -37q0 70 17.5 122.5t49.5 97t76.5 85.5t98.5 88q101 88 133.5 146t32.5 151v31h131v-51q0 -122 -37.5 -196t-134.5 -158q-121 -106 -151.5 -143.5t-43 -76t-12.5 -94.5q0 -100 66 -156.5t188 -56.5q80 0 155 19t173 67l59 -135q-197 -96 -395 -96q-190 0 -298 93 t-108 263zM397 983q0 64 33 99.5t88 35.5q51 0 86 -32t35 -103q0 -135 -121 -135q-59 0 -90 34.5t-31 100.5z" />
-<glyph unicode="À" horiz-adv-x="1296" d="M0 0l578 1468h143l575 -1468h-176l-182 465h-586l-180 -465h-172zM331 1886v21h203q32 -69 89 -159.5t101 -143.5v-25h-110q-65 52 -154 148t-129 159zM412 618h473l-170 453q-33 86 -68 211q-22 -96 -63 -211z" />
-<glyph unicode="Á" horiz-adv-x="1296" d="M0 0l578 1468h143l575 -1468h-176l-182 465h-586l-180 -465h-172zM412 618h473l-170 453q-33 86 -68 211q-22 -96 -63 -211zM526 1579v25q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111z" />
-<glyph unicode="Â" horiz-adv-x="1296" d="M0 0l578 1468h143l575 -1468h-176l-182 465h-586l-180 -465h-172zM303 1579v23q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115zM412 618h473l-170 453q-33 86 -68 211q-22 -96 -63 -211z" />
-<glyph unicode="Ã" horiz-adv-x="1296" d="M0 0l578 1468h143l575 -1468h-176l-182 465h-586l-180 -465h-172zM268 1579q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5 q-50 0 -75.5 -30t-39.5 -91h-98zM412 618h473l-170 453q-33 86 -68 211q-22 -96 -63 -211z" />
-<glyph unicode="Ä" horiz-adv-x="1296" d="M0 0l578 1468h143l575 -1468h-176l-182 465h-586l-180 -465h-172zM364 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM412 618h473l-170 453q-33 86 -68 211q-22 -96 -63 -211zM745 1731q0 52 26.5 75 t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="Å" horiz-adv-x="1296" d="M0 0l578 1468h143l575 -1468h-176l-182 465h-586l-180 -465h-172zM412 618h473l-170 453q-33 86 -68 211q-22 -96 -63 -211zM424 1585q0 98 60.5 155.5t160.5 57.5q101 0 163 -59.5t62 -151.5q0 -98 -61.5 -157.5t-163.5 -59.5q-101 0 -161 58.5t-60 156.5zM528 1585 q0 -56 30 -86.5t87 -30.5q52 0 84.5 30.5t32.5 86.5t-33 86.5t-84 30.5t-84 -30.5t-33 -86.5z" />
-<glyph unicode="Æ" horiz-adv-x="1788" d="M-2 0l698 1462h969v-151h-580v-471h541v-150h-541v-538h580v-152h-750v465h-514l-227 -465h-176zM469 618h446v693h-118z" />
-<glyph unicode="Ç" horiz-adv-x="1292" d="M125 733q0 226 84.5 396t244 262t375.5 92q230 0 402 -84l-72 -146q-166 78 -332 78q-241 0 -380.5 -160.5t-139.5 -439.5q0 -287 134.5 -443.5t383.5 -156.5q153 0 349 55v-149q-152 -57 -375 -57q-323 0 -498.5 196t-175.5 557zM551 -377q45 -8 104 -8q79 0 119.5 20 t40.5 74q0 43 -39.5 69.5t-148.5 43.5l88 178h110l-55 -115q180 -39 180 -174q0 -97 -76.5 -150t-226.5 -53q-51 0 -96 9v106z" />
-<glyph unicode="È" horiz-adv-x="1139" d="M201 0v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152h-815zM320 1886v21h203q32 -69 89 -159.5t101 -143.5v-25h-110q-65 52 -154 148t-129 159z" />
-<glyph unicode="É" horiz-adv-x="1139" d="M201 0v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152h-815zM456 1579v25q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111z" />
-<glyph unicode="Ê" horiz-adv-x="1139" d="M201 0v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152h-815zM263 1579v23q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115z" />
-<glyph unicode="Ë" horiz-adv-x="1139" d="M201 0v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152h-815zM327 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM708 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5 t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="Ì" horiz-adv-x="571" d="M5 1886v21h203q32 -69 89 -159.5t101 -143.5v-25h-110q-65 52 -154 148t-129 159zM201 0v1462h170v-1462h-170z" />
-<glyph unicode="Í" horiz-adv-x="571" d="M179 1579v25q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111zM201 0v1462h170v-1462h-170z" />
-<glyph unicode="Î" horiz-adv-x="571" d="M-57 1579v23q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115zM201 0v1462h170v-1462h-170z" />
-<glyph unicode="Ï" horiz-adv-x="571" d="M5 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM201 0v1462h170v-1462h-170zM386 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="Ð" horiz-adv-x="1479" d="M47 649v150h154v663h434q337 0 527 -187.5t190 -529.5q0 -362 -196.5 -553.5t-565.5 -191.5h-389v649h-154zM371 147h190q610 0 610 592q0 576 -569 576h-231v-516h379v-150h-379v-502z" />
-<glyph unicode="Ñ" horiz-adv-x="1544" d="M201 0v1462h192l797 -1222h8q-2 27 -9 173.5t-5 209.5v839h159v-1462h-194l-799 1227h-8q16 -216 16 -396v-831h-157zM411 1579q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5 q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98z" />
-<glyph unicode="Ò" horiz-adv-x="1595" d="M125 735q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM514 1886v21h203q32 -69 89 -159.5t101 -143.5v-25h-110q-65 52 -154 148t-129 159z" />
-<glyph unicode="Ó" horiz-adv-x="1595" d="M125 735q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM659 1579v25q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111z" />
-<glyph unicode="Ô" horiz-adv-x="1595" d="M125 735q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM448 1579v23q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115z" />
-<glyph unicode="Õ" horiz-adv-x="1595" d="M125 735q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM418 1579q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98z" />
-<glyph unicode="Ö" horiz-adv-x="1595" d="M125 735q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM522 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM903 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="×" d="M133 1075l100 101l353 -355l354 355l96 -99l-352 -354l350 -352l-96 -99l-354 351l-348 -351l-101 99l350 352z" />
-<glyph unicode="Ø" horiz-adv-x="1595" d="M125 735q0 357 176 553.5t500 196.5q209 0 366 -94l97 135l120 -80l-106 -148q192 -202 192 -565q0 -351 -177.5 -552t-493.5 -201q-235 0 -383 100l-101 -141l-120 79l108 154q-178 198 -178 563zM305 733q0 -262 101 -416l669 943q-106 73 -274 73 q-243 0 -369.5 -153.5t-126.5 -446.5zM508 211q115 -82 291 -82q243 0 367 153t124 451q0 272 -110 426z" />
-<glyph unicode="Ù" horiz-adv-x="1491" d="M186 520v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396zM463 1886v21h203q32 -69 89 -159.5t101 -143.5v-25h-110q-65 52 -154 148t-129 159z" />
-<glyph unicode="Ú" horiz-adv-x="1491" d="M186 520v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396zM600 1579v25q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111z" />
-<glyph unicode="Û" horiz-adv-x="1491" d="M186 520v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396zM393 1579v23q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186 h-115z" />
-<glyph unicode="Ü" horiz-adv-x="1491" d="M186 520v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396zM461 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5z M842 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="Ý" horiz-adv-x="1147" d="M0 1462h186l387 -731l390 731h184l-488 -895v-567h-172v559zM442 1579v25q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111z" />
-<glyph unicode="Þ" horiz-adv-x="1251" d="M201 0v1462h170v-256h215q281 0 420 -103.5t139 -318.5q0 -227 -151.5 -346t-438.5 -119h-184v-319h-170zM371 465h168q226 0 327 71.5t101 235.5q0 149 -95 218t-297 69h-204v-594z" />
-<glyph unicode="ß" horiz-adv-x="1274" d="M176 0v1202q0 178 110 271.5t332 93.5q206 0 318.5 -78.5t112.5 -222.5q0 -135 -143 -250q-88 -70 -116 -103.5t-28 -66.5q0 -32 13.5 -53t49 -49.5t113.5 -79.5q140 -95 191 -173.5t51 -179.5q0 -160 -97 -245.5t-276 -85.5q-188 0 -295 69v154q63 -39 141 -62.5 t150 -23.5q215 0 215 182q0 75 -41.5 128.5t-151.5 123.5q-127 82 -175 143.5t-48 145.5q0 63 34.5 116t105.5 106q75 57 107 102t32 98q0 80 -68 122.5t-195 42.5q-276 0 -276 -223v-1204h-166z" />
-<glyph unicode="à" horiz-adv-x="1139" d="M94 303q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239zM268 301q0 -90 54.5 -137 t152.5 -47q155 0 243.5 85t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5zM279 1548v21h203q32 -69 89 -159.5t101 -143.5v-25h-110q-65 52 -154 148t-129 159z" />
-<glyph unicode="á" horiz-adv-x="1139" d="M94 303q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239zM268 301q0 -90 54.5 -137 t152.5 -47q155 0 243.5 85t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5zM436 1241v25q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111z" />
-<glyph unicode="â" horiz-adv-x="1139" d="M94 303q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239zM228 1241v23q127 136 178 200 t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115zM268 301q0 -90 54.5 -137t152.5 -47q155 0 243.5 85t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5z" />
-<glyph unicode="ã" horiz-adv-x="1139" d="M94 303q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239zM197 1241q13 121 70.5 189.5 t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98zM268 301q0 -90 54.5 -137t152.5 -47q155 0 243.5 85t88.5 238v99l-166 -7 q-198 -7 -285.5 -61.5t-87.5 -169.5z" />
-<glyph unicode="ä" horiz-adv-x="1139" d="M94 303q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239zM268 301q0 -90 54.5 -137 t152.5 -47q155 0 243.5 85t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5zM279 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM660 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75 q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="å" horiz-adv-x="1139" d="M94 303q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239zM268 301q0 -90 54.5 -137 t152.5 -47q155 0 243.5 85t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5zM358 1456q0 98 60.5 155.5t160.5 57.5q101 0 163 -59.5t62 -151.5q0 -98 -61.5 -157.5t-163.5 -59.5q-101 0 -161 58.5t-60 156.5zM462 1456q0 -56 30 -86.5t87 -30.5q52 0 84.5 30.5 t32.5 86.5t-33 86.5t-84 30.5t-84 -30.5t-33 -86.5z" />
-<glyph unicode="æ" horiz-adv-x="1757" d="M94 303q0 161 124 250.5t378 97.5l184 6v68q0 129 -58 190.5t-177 61.5q-144 0 -307 -84l-52 127q74 41 173.5 67.5t197.5 26.5q130 0 212.5 -43.5t123.5 -138.5q53 88 138.5 136t195.5 48q192 0 308 -133.5t116 -355.5v-107h-701q8 -395 322 -395q91 0 169.5 17.5 t162.5 56.5v-148q-86 -38 -160.5 -54.5t-175.5 -16.5q-289 0 -414 233q-81 -127 -179.5 -180t-232.5 -53q-163 0 -255.5 85t-92.5 238zM268 301q0 -95 53.5 -139.5t141.5 -44.5q145 0 229 84.5t84 238.5v99l-158 -7q-186 -8 -268 -62.5t-82 -168.5zM954 653h519 q0 156 -64 240t-184 84q-121 0 -190.5 -83t-80.5 -241z" />
-<glyph unicode="ç" horiz-adv-x="975" d="M115 541q0 275 132.5 425t377.5 150q79 0 158 -17t124 -40l-51 -141q-55 22 -120 36.5t-115 14.5q-334 0 -334 -426q0 -202 81.5 -310t241.5 -108q137 0 281 59v-147q-110 -57 -277 -57q-238 0 -368.5 146.5t-130.5 414.5zM363 -377q45 -8 104 -8q79 0 119.5 20t40.5 74 q0 43 -39.5 69.5t-148.5 43.5l88 178h110l-55 -115q180 -39 180 -174q0 -97 -76.5 -150t-226.5 -53q-51 0 -96 9v106z" />
-<glyph unicode="è" horiz-adv-x="1149" d="M115 539q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5q-243 0 -383.5 148t-140.5 411zM291 653h573q0 157 -70 240.5t-200 83.5q-132 0 -210.5 -86t-92.5 -238z M318 1548v21h203q32 -69 89 -159.5t101 -143.5v-25h-110q-65 52 -154 148t-129 159z" />
-<glyph unicode="é" horiz-adv-x="1149" d="M115 539q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5q-243 0 -383.5 148t-140.5 411zM291 653h573q0 157 -70 240.5t-200 83.5q-132 0 -210.5 -86t-92.5 -238z M471 1241v25q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111z" />
-<glyph unicode="ê" horiz-adv-x="1149" d="M115 539q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5q-243 0 -383.5 148t-140.5 411zM259 1241v23q127 136 178 200t74 105h166q22 -42 76.5 -108.5 t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115zM291 653h573q0 157 -70 240.5t-200 83.5q-132 0 -210.5 -86t-92.5 -238z" />
-<glyph unicode="ë" horiz-adv-x="1149" d="M115 539q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5q-243 0 -383.5 148t-140.5 411zM291 653h573q0 157 -70 240.5t-200 83.5q-132 0 -210.5 -86t-92.5 -238z M319 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM700 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="ì" horiz-adv-x="518" d="M-38 1548v21h203q32 -69 89 -159.5t101 -143.5v-25h-110q-65 52 -154 148t-129 159zM176 0v1096h166v-1096h-166z" />
-<glyph unicode="í" horiz-adv-x="518" d="M169 1241v25q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111zM176 0v1096h166v-1096h-166z" />
-<glyph unicode="î" horiz-adv-x="518" d="M-77 1241v23q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115zM176 0v1096h166v-1096h-166z" />
-<glyph unicode="ï" horiz-adv-x="518" d="M-20 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM176 0v1096h166v-1096h-166zM361 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="ð" horiz-adv-x="1221" d="M113 475q0 230 131.5 361t351.5 131q226 0 326 -121l8 4q-57 214 -262 405l-271 -155l-73 108l233 133q-92 62 -186 111l69 117q156 -73 258 -148l238 138l76 -107l-207 -119q152 -143 234.5 -342t82.5 -428q0 -281 -130.5 -432t-377.5 -151q-222 0 -361.5 134.5 t-139.5 360.5zM281 469q0 -167 87.5 -258.5t249.5 -91.5q175 0 255.5 100.5t80.5 292.5q0 147 -90 232t-246 85q-337 0 -337 -360z" />
-<glyph unicode="ñ" horiz-adv-x="1257" d="M176 0v1096h135l27 -150h8q51 81 143 125.5t205 44.5q198 0 298 -95.5t100 -305.5v-715h-166v709q0 134 -61 200t-191 66q-172 0 -252 -93t-80 -307v-575h-166zM278 1241q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99 q-13 -121 -69.5 -189.5t-150.5 -68.5q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98z" />
-<glyph unicode="ò" horiz-adv-x="1237" d="M115 549q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319zM349 1548v21 h203q32 -69 89 -159.5t101 -143.5v-25h-110q-65 52 -154 148t-129 159z" />
-<glyph unicode="ó" horiz-adv-x="1237" d="M115 549q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319zM479 1241v25 q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111z" />
-<glyph unicode="ô" horiz-adv-x="1237" d="M115 549q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302zM282 1241v23q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115z M287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z" />
-<glyph unicode="õ" horiz-adv-x="1237" d="M115 549q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302zM249 1241q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5 t-150.5 -68.5q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z" />
-<glyph unicode="ö" horiz-adv-x="1237" d="M115 549q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319zM336 1393 q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM717 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="÷" d="M104 653v138h961v-138h-961zM471 373q0 60 29.5 90.5t83.5 30.5q52 0 81 -31.5t29 -89.5q0 -57 -29.5 -89t-80.5 -32q-52 0 -82.5 31.5t-30.5 89.5zM471 1071q0 60 29.5 90.5t83.5 30.5q52 0 81 -31.5t29 -89.5q0 -57 -29.5 -89t-80.5 -32q-52 0 -82.5 31.5t-30.5 89.5z " />
-<glyph unicode="ø" horiz-adv-x="1237" d="M115 549q0 268 134 417.5t372 149.5q154 0 270 -76l84 119l117 -76l-97 -133q127 -152 127 -401q0 -268 -135 -418.5t-373 -150.5q-154 0 -266 69l-84 -117l-114 78l94 131q-129 152 -129 408zM287 549q0 -171 53 -273l465 646q-75 53 -189 53q-163 0 -246 -107t-83 -319 zM434 170q71 -51 184 -51q163 0 247.5 109.5t84.5 320.5q0 164 -51 264z" />
-<glyph unicode="ù" horiz-adv-x="1257" d="M164 379v717h168v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304zM333 1548v21h203q32 -69 89 -159.5t101 -143.5v-25h-110q-65 52 -154 148t-129 159z" />
-<glyph unicode="ú" horiz-adv-x="1257" d="M164 379v717h168v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304zM506 1241v25q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111z" />
-<glyph unicode="û" horiz-adv-x="1257" d="M164 379v717h168v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304zM286 1241v23q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119 q-88 55 -221 186q-136 -134 -219 -186h-115z" />
-<glyph unicode="ü" horiz-adv-x="1257" d="M164 379v717h168v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304zM342 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5 q-37 0 -63.5 24.5t-26.5 74.5zM723 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="ý" horiz-adv-x="1032" d="M2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156zM411 1241v25q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111 z" />
-<glyph unicode="þ" horiz-adv-x="1255" d="M176 -492v2048h166v-466q0 -52 -6 -142h8q66 89 151 128.5t191 39.5q215 0 335 -150t120 -417q0 -268 -120.5 -418.5t-334.5 -150.5q-222 0 -344 161h-12l4 -34q8 -77 8 -140v-459h-166zM342 549q0 -231 77 -330.5t247 -99.5q303 0 303 432q0 215 -74 319.5t-231 104.5 q-168 0 -244 -92t-78 -293v-41z" />
-<glyph unicode="ÿ" horiz-adv-x="1032" d="M2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156zM234 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5 t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM615 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="Œ" horiz-adv-x="1890" d="M125 735q0 360 174 555t494 195q102 0 192 -23h782v-151h-589v-471h551v-150h-551v-538h589v-152h-768q-102 -20 -194 -20q-327 0 -503.5 196.5t-176.5 558.5zM305 733q0 -297 128.5 -450.5t375.5 -153.5q112 0 199 33v1141q-87 30 -197 30q-249 0 -377.5 -152.5 t-128.5 -447.5z" />
-<glyph unicode="œ" horiz-adv-x="1929" d="M113 549q0 265 131 415t366 150q131 0 233.5 -59.5t164.5 -173.5q58 112 154 172.5t222 60.5q201 0 320 -132.5t119 -358.5v-105h-729q8 -393 338 -393q94 0 174.5 17.5t167.5 56.5v-148q-88 -39 -164 -55t-180 -16q-293 0 -418 235q-62 -116 -166.5 -175.5t-241.5 -59.5 q-223 0 -357 152.5t-134 416.5zM287 549q0 -211 76 -320.5t243 -109.5q163 0 239.5 106.5t76.5 315.5q0 221 -77.5 327.5t-242.5 106.5q-166 0 -240.5 -108t-74.5 -318zM1098 653h544q0 158 -66 240t-194 82q-127 0 -199.5 -82t-84.5 -240z" />
-<glyph unicode="Ÿ" horiz-adv-x="1147" d="M0 1462h186l387 -731l390 731h184l-488 -895v-567h-172v559zM294 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM675 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5 t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="ˆ" horiz-adv-x="1212" d="M268 1241v23q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115z" />
-<glyph unicode="˜" horiz-adv-x="1212" d="M264 1241q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98z" />
-<glyph unicode=" " horiz-adv-x="953" />
-<glyph unicode=" " horiz-adv-x="1907" />
-<glyph unicode=" " horiz-adv-x="953" />
-<glyph unicode=" " horiz-adv-x="1907" />
-<glyph unicode=" " horiz-adv-x="635" />
-<glyph unicode=" " horiz-adv-x="476" />
-<glyph unicode=" " horiz-adv-x="317" />
-<glyph unicode=" " horiz-adv-x="317" />
-<glyph unicode=" " horiz-adv-x="238" />
-<glyph unicode=" " horiz-adv-x="381" />
-<glyph unicode=" " horiz-adv-x="105" />
-<glyph unicode="‐" horiz-adv-x="659" d="M84 473v152h491v-152h-491z" />
-<glyph unicode="‑" horiz-adv-x="659" d="M84 473v152h491v-152h-491z" />
-<glyph unicode="‒" horiz-adv-x="659" d="M84 473v152h491v-152h-491z" />
-<glyph unicode="–" horiz-adv-x="1024" d="M82 473v152h860v-152h-860z" />
-<glyph unicode="—" horiz-adv-x="2048" d="M82 473v152h1884v-152h-1884z" />
-<glyph unicode="‘" horiz-adv-x="348" d="M25 983q22 90 71 224t105 255h123q-66 -254 -103 -501h-184z" />
-<glyph unicode="’" horiz-adv-x="348" d="M25 961q70 285 102 501h182l15 -22q-26 -100 -75 -232.5t-102 -246.5h-122z" />
-<glyph unicode="‚" horiz-adv-x="502" d="M63 -264q27 104 59.5 257t45.5 245h182l15 -23q-26 -100 -75 -232.5t-102 -246.5h-125z" />
-<glyph unicode="“" horiz-adv-x="717" d="M25 983q22 90 71 224t105 255h123q-66 -254 -103 -501h-184zM391 983q56 215 178 479h123q-30 -115 -59.5 -259.5t-42.5 -241.5h-184z" />
-<glyph unicode="”" horiz-adv-x="717" d="M25 961q70 285 102 501h182l15 -22q-26 -100 -75 -232.5t-102 -246.5h-122zM391 961q26 100 59 254t46 247h182l14 -22q-24 -91 -72 -224t-104 -255h-125z" />
-<glyph unicode="„" horiz-adv-x="829" d="M25 -263q70 285 102 501h182l15 -22q-26 -100 -75 -232.5t-102 -246.5h-122zM391 -263q26 100 59 254t46 247h182l14 -22q-24 -91 -72 -224t-104 -255h-125z" />
-<glyph unicode="•" horiz-adv-x="770" d="M164 748q0 121 56.5 184t164.5 63q105 0 163 -62t58 -185q0 -119 -57.5 -183.5t-163.5 -64.5q-107 0 -164 65.5t-57 182.5z" />
-<glyph unicode="…" horiz-adv-x="1606" d="M152 106q0 67 30.5 101.5t87.5 34.5q58 0 90.5 -34.5t32.5 -101.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5zM682 106q0 67 30.5 101.5t87.5 34.5q58 0 90.5 -34.5t32.5 -101.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5zM1213 106 q0 67 30.5 101.5t87.5 34.5q58 0 90.5 -34.5t32.5 -101.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5z" />
-<glyph unicode=" " horiz-adv-x="381" />
-<glyph unicode="‹" horiz-adv-x="623" d="M82 524v27l342 407l119 -69l-289 -350l289 -351l-119 -71z" />
-<glyph unicode="›" horiz-adv-x="623" d="M80 188l287 351l-287 350l117 69l344 -407v-27l-344 -407z" />
-<glyph unicode=" " horiz-adv-x="476" />
-<glyph unicode="€" horiz-adv-x="1208" d="M63 506v129h152l-2 42v44l2 80h-152v129h164q39 261 185 407t383 146q201 0 366 -97l-71 -139q-166 86 -295 86q-319 0 -398 -403h510v-129h-524l-2 -57v-64l2 -45h463v-129h-447q37 -180 138.5 -278.5t271.5 -98.5q156 0 309 66v-150q-146 -65 -317 -65 q-237 0 -381.5 134.5t-190.5 391.5h-166z" />
-<glyph unicode="™" horiz-adv-x="1589" d="M37 1356v106h543v-106h-211v-615h-123v615h-209zM647 741v721h187l196 -559l203 559h180v-721h-127v420l6 137h-8l-211 -557h-104l-201 559h-8l6 -129v-430h-119z" />
-<glyph unicode="◼" horiz-adv-x="1095" d="M0 0v1095h1095v-1095h-1095z" />
-<hkern u1=""" u2="Ÿ" k="-20" />
-<hkern u1=""" u2="œ" k="123" />
-<hkern u1=""" u2="ü" k="61" />
-<hkern u1=""" u2="û" k="61" />
-<hkern u1=""" u2="ú" k="61" />
-<hkern u1=""" u2="ù" k="61" />
-<hkern u1=""" u2="ø" k="123" />
-<hkern u1=""" u2="ö" k="123" />
-<hkern u1=""" u2="õ" k="123" />
-<hkern u1=""" u2="ô" k="123" />
-<hkern u1=""" u2="ó" k="123" />
-<hkern u1=""" u2="ò" k="123" />
-<hkern u1=""" u2="ë" k="123" />
-<hkern u1=""" u2="ê" k="123" />
-<hkern u1=""" u2="é" k="123" />
-<hkern u1=""" u2="è" k="123" />
-<hkern u1=""" u2="ç" k="123" />
-<hkern u1=""" u2="æ" k="82" />
-<hkern u1=""" u2="å" k="82" />
-<hkern u1=""" u2="ä" k="82" />
-<hkern u1=""" u2="ã" k="82" />
-<hkern u1=""" u2="â" k="82" />
-<hkern u1=""" u2="á" k="82" />
-<hkern u1=""" u2="à" k="123" />
-<hkern u1=""" u2="Ý" k="-20" />
-<hkern u1=""" u2="Å" k="143" />
-<hkern u1=""" u2="Ä" k="143" />
-<hkern u1=""" u2="Ã" k="143" />
-<hkern u1=""" u2="Â" k="143" />
-<hkern u1=""" u2="Á" k="143" />
-<hkern u1=""" u2="À" k="143" />
-<hkern u1=""" u2="u" k="61" />
-<hkern u1=""" u2="s" k="61" />
-<hkern u1=""" u2="r" k="61" />
-<hkern u1=""" u2="q" k="123" />
-<hkern u1=""" u2="p" k="61" />
-<hkern u1=""" u2="o" k="123" />
-<hkern u1=""" u2="n" k="61" />
-<hkern u1=""" u2="m" k="61" />
-<hkern u1=""" u2="g" k="61" />
-<hkern u1=""" u2="e" k="123" />
-<hkern u1=""" u2="d" k="123" />
-<hkern u1=""" u2="c" k="123" />
-<hkern u1=""" u2="a" k="82" />
-<hkern u1=""" u2="Y" k="-20" />
-<hkern u1=""" u2="W" k="-41" />
-<hkern u1=""" u2="V" k="-41" />
-<hkern u1=""" u2="T" k="-41" />
-<hkern u1=""" u2="A" k="143" />
-<hkern u1="'" u2="Ÿ" k="-20" />
-<hkern u1="'" u2="œ" k="123" />
-<hkern u1="'" u2="ü" k="61" />
-<hkern u1="'" u2="û" k="61" />
-<hkern u1="'" u2="ú" k="61" />
-<hkern u1="'" u2="ù" k="61" />
-<hkern u1="'" u2="ø" k="123" />
-<hkern u1="'" u2="ö" k="123" />
-<hkern u1="'" u2="õ" k="123" />
-<hkern u1="'" u2="ô" k="123" />
-<hkern u1="'" u2="ó" k="123" />
-<hkern u1="'" u2="ò" k="123" />
-<hkern u1="'" u2="ë" k="123" />
-<hkern u1="'" u2="ê" k="123" />
-<hkern u1="'" u2="é" k="123" />
-<hkern u1="'" u2="è" k="123" />
-<hkern u1="'" u2="ç" k="123" />
-<hkern u1="'" u2="æ" k="82" />
-<hkern u1="'" u2="å" k="82" />
-<hkern u1="'" u2="ä" k="82" />
-<hkern u1="'" u2="ã" k="82" />
-<hkern u1="'" u2="â" k="82" />
-<hkern u1="'" u2="á" k="82" />
-<hkern u1="'" u2="à" k="123" />
-<hkern u1="'" u2="Ý" k="-20" />
-<hkern u1="'" u2="Å" k="143" />
-<hkern u1="'" u2="Ä" k="143" />
-<hkern u1="'" u2="Ã" k="143" />
-<hkern u1="'" u2="Â" k="143" />
-<hkern u1="'" u2="Á" k="143" />
-<hkern u1="'" u2="À" k="143" />
-<hkern u1="'" u2="u" k="61" />
-<hkern u1="'" u2="s" k="61" />
-<hkern u1="'" u2="r" k="61" />
-<hkern u1="'" u2="q" k="123" />
-<hkern u1="'" u2="p" k="61" />
-<hkern u1="'" u2="o" k="123" />
-<hkern u1="'" u2="n" k="61" />
-<hkern u1="'" u2="m" k="61" />
-<hkern u1="'" u2="g" k="61" />
-<hkern u1="'" u2="e" k="123" />
-<hkern u1="'" u2="d" k="123" />
-<hkern u1="'" u2="c" k="123" />
-<hkern u1="'" u2="a" k="82" />
-<hkern u1="'" u2="Y" k="-20" />
-<hkern u1="'" u2="W" k="-41" />
-<hkern u1="'" u2="V" k="-41" />
-<hkern u1="'" u2="T" k="-41" />
-<hkern u1="'" u2="A" k="143" />
-<hkern u1="(" u2="J" k="-184" />
-<hkern u1="," u2="Ÿ" k="123" />
-<hkern u1="," u2="Œ" k="102" />
-<hkern u1="," u2="Ý" k="123" />
-<hkern u1="," u2="Ü" k="41" />
-<hkern u1="," u2="Û" k="41" />
-<hkern u1="," u2="Ú" k="41" />
-<hkern u1="," u2="Ù" k="41" />
-<hkern u1="," u2="Ø" k="102" />
-<hkern u1="," u2="Ö" k="102" />
-<hkern u1="," u2="Õ" k="102" />
-<hkern u1="," u2="Ô" k="102" />
-<hkern u1="," u2="Ó" k="102" />
-<hkern u1="," u2="Ò" k="102" />
-<hkern u1="," u2="Ç" k="102" />
-<hkern u1="," u2="Y" k="123" />
-<hkern u1="," u2="W" k="123" />
-<hkern u1="," u2="V" k="123" />
-<hkern u1="," u2="U" k="41" />
-<hkern u1="," u2="T" k="143" />
-<hkern u1="," u2="Q" k="102" />
-<hkern u1="," u2="O" k="102" />
-<hkern u1="," u2="G" k="102" />
-<hkern u1="," u2="C" k="102" />
-<hkern u1="-" u2="T" k="82" />
-<hkern u1="." u2="Ÿ" k="123" />
-<hkern u1="." u2="Œ" k="102" />
-<hkern u1="." u2="Ý" k="123" />
-<hkern u1="." u2="Ü" k="41" />
-<hkern u1="." u2="Û" k="41" />
-<hkern u1="." u2="Ú" k="41" />
-<hkern u1="." u2="Ù" k="41" />
-<hkern u1="." u2="Ø" k="102" />
-<hkern u1="." u2="Ö" k="102" />
-<hkern u1="." u2="Õ" k="102" />
-<hkern u1="." u2="Ô" k="102" />
-<hkern u1="." u2="Ó" k="102" />
-<hkern u1="." u2="Ò" k="102" />
-<hkern u1="." u2="Ç" k="102" />
-<hkern u1="." u2="Y" k="123" />
-<hkern u1="." u2="W" k="123" />
-<hkern u1="." u2="V" k="123" />
-<hkern u1="." u2="U" k="41" />
-<hkern u1="." u2="T" k="143" />
-<hkern u1="." u2="Q" k="102" />
-<hkern u1="." u2="O" k="102" />
-<hkern u1="." u2="G" k="102" />
-<hkern u1="." u2="C" k="102" />
-<hkern u1="A" u2="”" k="143" />
-<hkern u1="A" u2="’" k="143" />
-<hkern u1="A" u2="Ÿ" k="123" />
-<hkern u1="A" u2="Œ" k="41" />
-<hkern u1="A" u2="Ý" k="123" />
-<hkern u1="A" u2="Ø" k="41" />
-<hkern u1="A" u2="Ö" k="41" />
-<hkern u1="A" u2="Õ" k="41" />
-<hkern u1="A" u2="Ô" k="41" />
-<hkern u1="A" u2="Ó" k="41" />
-<hkern u1="A" u2="Ò" k="41" />
-<hkern u1="A" u2="Ç" k="41" />
-<hkern u1="A" u2="Y" k="123" />
-<hkern u1="A" u2="W" k="82" />
-<hkern u1="A" u2="V" k="82" />
-<hkern u1="A" u2="T" k="143" />
-<hkern u1="A" u2="Q" k="41" />
-<hkern u1="A" u2="O" k="41" />
-<hkern u1="A" u2="J" k="-266" />
-<hkern u1="A" u2="G" k="41" />
-<hkern u1="A" u2="C" k="41" />
-<hkern u1="A" u2="'" k="143" />
-<hkern u1="A" u2=""" k="143" />
-<hkern u1="B" u2="„" k="82" />
-<hkern u1="B" u2="‚" k="82" />
-<hkern u1="B" u2="Ÿ" k="20" />
-<hkern u1="B" u2="Ý" k="20" />
-<hkern u1="B" u2="Å" k="41" />
-<hkern u1="B" u2="Ä" k="41" />
-<hkern u1="B" u2="Ã" k="41" />
-<hkern u1="B" u2="Â" k="41" />
-<hkern u1="B" u2="Á" k="41" />
-<hkern u1="B" u2="À" k="41" />
-<hkern u1="B" u2="Z" k="20" />
-<hkern u1="B" u2="Y" k="20" />
-<hkern u1="B" u2="X" k="41" />
-<hkern u1="B" u2="W" k="20" />
-<hkern u1="B" u2="V" k="20" />
-<hkern u1="B" u2="T" k="61" />
-<hkern u1="B" u2="A" k="41" />
-<hkern u1="B" u2="." k="82" />
-<hkern u1="B" u2="," k="82" />
-<hkern u1="C" u2="Œ" k="41" />
-<hkern u1="C" u2="Ø" k="41" />
-<hkern u1="C" u2="Ö" k="41" />
-<hkern u1="C" u2="Õ" k="41" />
-<hkern u1="C" u2="Ô" k="41" />
-<hkern u1="C" u2="Ó" k="41" />
-<hkern u1="C" u2="Ò" k="41" />
-<hkern u1="C" u2="Ç" k="41" />
-<hkern u1="C" u2="Q" k="41" />
-<hkern u1="C" u2="O" k="41" />
-<hkern u1="C" u2="G" k="41" />
-<hkern u1="C" u2="C" k="41" />
-<hkern u1="D" u2="„" k="82" />
-<hkern u1="D" u2="‚" k="82" />
-<hkern u1="D" u2="Ÿ" k="20" />
-<hkern u1="D" u2="Ý" k="20" />
-<hkern u1="D" u2="Å" k="41" />
-<hkern u1="D" u2="Ä" k="41" />
-<hkern u1="D" u2="Ã" k="41" />
-<hkern u1="D" u2="Â" k="41" />
-<hkern u1="D" u2="Á" k="41" />
-<hkern u1="D" u2="À" k="41" />
-<hkern u1="D" u2="Z" k="20" />
-<hkern u1="D" u2="Y" k="20" />
-<hkern u1="D" u2="X" k="41" />
-<hkern u1="D" u2="W" k="20" />
-<hkern u1="D" u2="V" k="20" />
-<hkern u1="D" u2="T" k="61" />
-<hkern u1="D" u2="A" k="41" />
-<hkern u1="D" u2="." k="82" />
-<hkern u1="D" u2="," k="82" />
-<hkern u1="E" u2="J" k="-123" />
-<hkern u1="F" u2="„" k="123" />
-<hkern u1="F" u2="‚" k="123" />
-<hkern u1="F" u2="Å" k="41" />
-<hkern u1="F" u2="Ä" k="41" />
-<hkern u1="F" u2="Ã" k="41" />
-<hkern u1="F" u2="Â" k="41" />
-<hkern u1="F" u2="Á" k="41" />
-<hkern u1="F" u2="À" k="41" />
-<hkern u1="F" u2="A" k="41" />
-<hkern u1="F" u2="?" k="-41" />
-<hkern u1="F" u2="." k="123" />
-<hkern u1="F" u2="," k="123" />
-<hkern u1="K" u2="Œ" k="41" />
-<hkern u1="K" u2="Ø" k="41" />
-<hkern u1="K" u2="Ö" k="41" />
-<hkern u1="K" u2="Õ" k="41" />
-<hkern u1="K" u2="Ô" k="41" />
-<hkern u1="K" u2="Ó" k="41" />
-<hkern u1="K" u2="Ò" k="41" />
-<hkern u1="K" u2="Ç" k="41" />
-<hkern u1="K" u2="Q" k="41" />
-<hkern u1="K" u2="O" k="41" />
-<hkern u1="K" u2="G" k="41" />
-<hkern u1="K" u2="C" k="41" />
-<hkern u1="L" u2="”" k="164" />
-<hkern u1="L" u2="’" k="164" />
-<hkern u1="L" u2="Ÿ" k="61" />
-<hkern u1="L" u2="Œ" k="41" />
-<hkern u1="L" u2="Ý" k="61" />
-<hkern u1="L" u2="Ü" k="20" />
-<hkern u1="L" u2="Û" k="20" />
-<hkern u1="L" u2="Ú" k="20" />
-<hkern u1="L" u2="Ù" k="20" />
-<hkern u1="L" u2="Ø" k="41" />
-<hkern u1="L" u2="Ö" k="41" />
-<hkern u1="L" u2="Õ" k="41" />
-<hkern u1="L" u2="Ô" k="41" />
-<hkern u1="L" u2="Ó" k="41" />
-<hkern u1="L" u2="Ò" k="41" />
-<hkern u1="L" u2="Ç" k="41" />
-<hkern u1="L" u2="Y" k="61" />
-<hkern u1="L" u2="W" k="41" />
-<hkern u1="L" u2="V" k="41" />
-<hkern u1="L" u2="U" k="20" />
-<hkern u1="L" u2="T" k="41" />
-<hkern u1="L" u2="Q" k="41" />
-<hkern u1="L" u2="O" k="41" />
-<hkern u1="L" u2="G" k="41" />
-<hkern u1="L" u2="C" k="41" />
-<hkern u1="L" u2="'" k="164" />
-<hkern u1="L" u2=""" k="164" />
-<hkern u1="O" u2="„" k="82" />
-<hkern u1="O" u2="‚" k="82" />
-<hkern u1="O" u2="Ÿ" k="20" />
-<hkern u1="O" u2="Ý" k="20" />
-<hkern u1="O" u2="Å" k="41" />
-<hkern u1="O" u2="Ä" k="41" />
-<hkern u1="O" u2="Ã" k="41" />
-<hkern u1="O" u2="Â" k="41" />
-<hkern u1="O" u2="Á" k="41" />
-<hkern u1="O" u2="À" k="41" />
-<hkern u1="O" u2="Z" k="20" />
-<hkern u1="O" u2="Y" k="20" />
-<hkern u1="O" u2="X" k="41" />
-<hkern u1="O" u2="W" k="20" />
-<hkern u1="O" u2="V" k="20" />
-<hkern u1="O" u2="T" k="61" />
-<hkern u1="O" u2="A" k="41" />
-<hkern u1="O" u2="." k="82" />
-<hkern u1="O" u2="," k="82" />
-<hkern u1="P" u2="„" k="266" />
-<hkern u1="P" u2="‚" k="266" />
-<hkern u1="P" u2="Å" k="102" />
-<hkern u1="P" u2="Ä" k="102" />
-<hkern u1="P" u2="Ã" k="102" />
-<hkern u1="P" u2="Â" k="102" />
-<hkern u1="P" u2="Á" k="102" />
-<hkern u1="P" u2="À" k="102" />
-<hkern u1="P" u2="Z" k="20" />
-<hkern u1="P" u2="X" k="41" />
-<hkern u1="P" u2="A" k="102" />
-<hkern u1="P" u2="." k="266" />
-<hkern u1="P" u2="," k="266" />
-<hkern u1="Q" u2="„" k="82" />
-<hkern u1="Q" u2="‚" k="82" />
-<hkern u1="Q" u2="Ÿ" k="20" />
-<hkern u1="Q" u2="Ý" k="20" />
-<hkern u1="Q" u2="Å" k="41" />
-<hkern u1="Q" u2="Ä" k="41" />
-<hkern u1="Q" u2="Ã" k="41" />
-<hkern u1="Q" u2="Â" k="41" />
-<hkern u1="Q" u2="Á" k="41" />
-<hkern u1="Q" u2="À" k="41" />
-<hkern u1="Q" u2="Z" k="20" />
-<hkern u1="Q" u2="Y" k="20" />
-<hkern u1="Q" u2="X" k="41" />
-<hkern u1="Q" u2="W" k="20" />
-<hkern u1="Q" u2="V" k="20" />
-<hkern u1="Q" u2="T" k="61" />
-<hkern u1="Q" u2="A" k="41" />
-<hkern u1="Q" u2="." k="82" />
-<hkern u1="Q" u2="," k="82" />
-<hkern u1="T" u2="„" k="123" />
-<hkern u1="T" u2="‚" k="123" />
-<hkern u1="T" u2="—" k="82" />
-<hkern u1="T" u2="–" k="82" />
-<hkern u1="T" u2="œ" k="143" />
-<hkern u1="T" u2="Œ" k="41" />
-<hkern u1="T" u2="ý" k="41" />
-<hkern u1="T" u2="ü" k="102" />
-<hkern u1="T" u2="û" k="102" />
-<hkern u1="T" u2="ú" k="102" />
-<hkern u1="T" u2="ù" k="102" />
-<hkern u1="T" u2="ø" k="143" />
-<hkern u1="T" u2="ö" k="143" />
-<hkern u1="T" u2="õ" k="143" />
-<hkern u1="T" u2="ô" k="143" />
-<hkern u1="T" u2="ó" k="143" />
-<hkern u1="T" u2="ò" k="143" />
-<hkern u1="T" u2="ë" k="143" />
-<hkern u1="T" u2="ê" k="143" />
-<hkern u1="T" u2="é" k="143" />
-<hkern u1="T" u2="è" k="143" />
-<hkern u1="T" u2="ç" k="143" />
-<hkern u1="T" u2="æ" k="164" />
-<hkern u1="T" u2="å" k="164" />
-<hkern u1="T" u2="ä" k="164" />
-<hkern u1="T" u2="ã" k="164" />
-<hkern u1="T" u2="â" k="164" />
-<hkern u1="T" u2="á" k="164" />
-<hkern u1="T" u2="à" k="143" />
-<hkern u1="T" u2="Ø" k="41" />
-<hkern u1="T" u2="Ö" k="41" />
-<hkern u1="T" u2="Õ" k="41" />
-<hkern u1="T" u2="Ô" k="41" />
-<hkern u1="T" u2="Ó" k="41" />
-<hkern u1="T" u2="Ò" k="41" />
-<hkern u1="T" u2="Ç" k="41" />
-<hkern u1="T" u2="Å" k="143" />
-<hkern u1="T" u2="Ä" k="143" />
-<hkern u1="T" u2="Ã" k="143" />
-<hkern u1="T" u2="Â" k="143" />
-<hkern u1="T" u2="Á" k="143" />
-<hkern u1="T" u2="À" k="143" />
-<hkern u1="T" u2="z" k="82" />
-<hkern u1="T" u2="y" k="41" />
-<hkern u1="T" u2="x" k="41" />
-<hkern u1="T" u2="w" k="41" />
-<hkern u1="T" u2="v" k="41" />
-<hkern u1="T" u2="u" k="102" />
-<hkern u1="T" u2="s" k="123" />
-<hkern u1="T" u2="r" k="102" />
-<hkern u1="T" u2="q" k="143" />
-<hkern u1="T" u2="p" k="102" />
-<hkern u1="T" u2="o" k="143" />
-<hkern u1="T" u2="n" k="102" />
-<hkern u1="T" u2="m" k="102" />
-<hkern u1="T" u2="g" k="143" />
-<hkern u1="T" u2="e" k="143" />
-<hkern u1="T" u2="d" k="143" />
-<hkern u1="T" u2="c" k="143" />
-<hkern u1="T" u2="a" k="164" />
-<hkern u1="T" u2="T" k="-41" />
-<hkern u1="T" u2="Q" k="41" />
-<hkern u1="T" u2="O" k="41" />
-<hkern u1="T" u2="G" k="41" />
-<hkern u1="T" u2="C" k="41" />
-<hkern u1="T" u2="A" k="143" />
-<hkern u1="T" u2="?" k="-41" />
-<hkern u1="T" u2="." k="123" />
-<hkern u1="T" u2="-" k="82" />
-<hkern u1="T" u2="," k="123" />
-<hkern u1="U" u2="„" k="41" />
-<hkern u1="U" u2="‚" k="41" />
-<hkern u1="U" u2="Å" k="20" />
-<hkern u1="U" u2="Ä" k="20" />
-<hkern u1="U" u2="Ã" k="20" />
-<hkern u1="U" u2="Â" k="20" />
-<hkern u1="U" u2="Á" k="20" />
-<hkern u1="U" u2="À" k="20" />
-<hkern u1="U" u2="A" k="20" />
-<hkern u1="U" u2="." k="41" />
-<hkern u1="U" u2="," k="41" />
-<hkern u1="V" u2="„" k="102" />
-<hkern u1="V" u2="‚" k="102" />
-<hkern u1="V" u2="œ" k="41" />
-<hkern u1="V" u2="Œ" k="20" />
-<hkern u1="V" u2="ü" k="20" />
-<hkern u1="V" u2="û" k="20" />
-<hkern u1="V" u2="ú" k="20" />
-<hkern u1="V" u2="ù" k="20" />
-<hkern u1="V" u2="ø" k="41" />
-<hkern u1="V" u2="ö" k="41" />
-<hkern u1="V" u2="õ" k="41" />
-<hkern u1="V" u2="ô" k="41" />
-<hkern u1="V" u2="ó" k="41" />
-<hkern u1="V" u2="ò" k="41" />
-<hkern u1="V" u2="ë" k="41" />
-<hkern u1="V" u2="ê" k="41" />
-<hkern u1="V" u2="é" k="41" />
-<hkern u1="V" u2="è" k="41" />
-<hkern u1="V" u2="ç" k="41" />
-<hkern u1="V" u2="æ" k="41" />
-<hkern u1="V" u2="å" k="41" />
-<hkern u1="V" u2="ä" k="41" />
-<hkern u1="V" u2="ã" k="41" />
-<hkern u1="V" u2="â" k="41" />
-<hkern u1="V" u2="á" k="41" />
-<hkern u1="V" u2="à" k="41" />
-<hkern u1="V" u2="Ø" k="20" />
-<hkern u1="V" u2="Ö" k="20" />
-<hkern u1="V" u2="Õ" k="20" />
-<hkern u1="V" u2="Ô" k="20" />
-<hkern u1="V" u2="Ó" k="20" />
-<hkern u1="V" u2="Ò" k="20" />
-<hkern u1="V" u2="Ç" k="20" />
-<hkern u1="V" u2="Å" k="82" />
-<hkern u1="V" u2="Ä" k="82" />
-<hkern u1="V" u2="Ã" k="82" />
-<hkern u1="V" u2="Â" k="82" />
-<hkern u1="V" u2="Á" k="82" />
-<hkern u1="V" u2="À" k="82" />
-<hkern u1="V" u2="u" k="20" />
-<hkern u1="V" u2="s" k="20" />
-<hkern u1="V" u2="r" k="20" />
-<hkern u1="V" u2="q" k="41" />
-<hkern u1="V" u2="p" k="20" />
-<hkern u1="V" u2="o" k="41" />
-<hkern u1="V" u2="n" k="20" />
-<hkern u1="V" u2="m" k="20" />
-<hkern u1="V" u2="g" k="20" />
-<hkern u1="V" u2="e" k="41" />
-<hkern u1="V" u2="d" k="41" />
-<hkern u1="V" u2="c" k="41" />
-<hkern u1="V" u2="a" k="41" />
-<hkern u1="V" u2="Q" k="20" />
-<hkern u1="V" u2="O" k="20" />
-<hkern u1="V" u2="G" k="20" />
-<hkern u1="V" u2="C" k="20" />
-<hkern u1="V" u2="A" k="82" />
-<hkern u1="V" u2="?" k="-41" />
-<hkern u1="V" u2="." k="102" />
-<hkern u1="V" u2="," k="102" />
-<hkern u1="W" u2="„" k="102" />
-<hkern u1="W" u2="‚" k="102" />
-<hkern u1="W" u2="œ" k="41" />
-<hkern u1="W" u2="Œ" k="20" />
-<hkern u1="W" u2="ü" k="20" />
-<hkern u1="W" u2="û" k="20" />
-<hkern u1="W" u2="ú" k="20" />
-<hkern u1="W" u2="ù" k="20" />
-<hkern u1="W" u2="ø" k="41" />
-<hkern u1="W" u2="ö" k="41" />
-<hkern u1="W" u2="õ" k="41" />
-<hkern u1="W" u2="ô" k="41" />
-<hkern u1="W" u2="ó" k="41" />
-<hkern u1="W" u2="ò" k="41" />
-<hkern u1="W" u2="ë" k="41" />
-<hkern u1="W" u2="ê" k="41" />
-<hkern u1="W" u2="é" k="41" />
-<hkern u1="W" u2="è" k="41" />
-<hkern u1="W" u2="ç" k="41" />
-<hkern u1="W" u2="æ" k="41" />
-<hkern u1="W" u2="å" k="41" />
-<hkern u1="W" u2="ä" k="41" />
-<hkern u1="W" u2="ã" k="41" />
-<hkern u1="W" u2="â" k="41" />
-<hkern u1="W" u2="á" k="41" />
-<hkern u1="W" u2="à" k="41" />
-<hkern u1="W" u2="Ø" k="20" />
-<hkern u1="W" u2="Ö" k="20" />
-<hkern u1="W" u2="Õ" k="20" />
-<hkern u1="W" u2="Ô" k="20" />
-<hkern u1="W" u2="Ó" k="20" />
-<hkern u1="W" u2="Ò" k="20" />
-<hkern u1="W" u2="Ç" k="20" />
-<hkern u1="W" u2="Å" k="82" />
-<hkern u1="W" u2="Ä" k="82" />
-<hkern u1="W" u2="Ã" k="82" />
-<hkern u1="W" u2="Â" k="82" />
-<hkern u1="W" u2="Á" k="82" />
-<hkern u1="W" u2="À" k="82" />
-<hkern u1="W" u2="u" k="20" />
-<hkern u1="W" u2="s" k="20" />
-<hkern u1="W" u2="r" k="20" />
-<hkern u1="W" u2="q" k="41" />
-<hkern u1="W" u2="p" k="20" />
-<hkern u1="W" u2="o" k="41" />
-<hkern u1="W" u2="n" k="20" />
-<hkern u1="W" u2="m" k="20" />
-<hkern u1="W" u2="g" k="20" />
-<hkern u1="W" u2="e" k="41" />
-<hkern u1="W" u2="d" k="41" />
-<hkern u1="W" u2="c" k="41" />
-<hkern u1="W" u2="a" k="41" />
-<hkern u1="W" u2="Q" k="20" />
-<hkern u1="W" u2="O" k="20" />
-<hkern u1="W" u2="G" k="20" />
-<hkern u1="W" u2="C" k="20" />
-<hkern u1="W" u2="A" k="82" />
-<hkern u1="W" u2="?" k="-41" />
-<hkern u1="W" u2="." k="102" />
-<hkern u1="W" u2="," k="102" />
-<hkern u1="X" u2="Œ" k="41" />
-<hkern u1="X" u2="Ø" k="41" />
-<hkern u1="X" u2="Ö" k="41" />
-<hkern u1="X" u2="Õ" k="41" />
-<hkern u1="X" u2="Ô" k="41" />
-<hkern u1="X" u2="Ó" k="41" />
-<hkern u1="X" u2="Ò" k="41" />
-<hkern u1="X" u2="Ç" k="41" />
-<hkern u1="X" u2="Q" k="41" />
-<hkern u1="X" u2="O" k="41" />
-<hkern u1="X" u2="G" k="41" />
-<hkern u1="X" u2="C" k="41" />
-<hkern u1="Y" u2="„" k="123" />
-<hkern u1="Y" u2="‚" k="123" />
-<hkern u1="Y" u2="œ" k="102" />
-<hkern u1="Y" u2="Œ" k="41" />
-<hkern u1="Y" u2="ü" k="61" />
-<hkern u1="Y" u2="û" k="61" />
-<hkern u1="Y" u2="ú" k="61" />
-<hkern u1="Y" u2="ù" k="61" />
-<hkern u1="Y" u2="ø" k="102" />
-<hkern u1="Y" u2="ö" k="102" />
-<hkern u1="Y" u2="õ" k="102" />
-<hkern u1="Y" u2="ô" k="102" />
-<hkern u1="Y" u2="ó" k="102" />
-<hkern u1="Y" u2="ò" k="102" />
-<hkern u1="Y" u2="ë" k="102" />
-<hkern u1="Y" u2="ê" k="102" />
-<hkern u1="Y" u2="é" k="102" />
-<hkern u1="Y" u2="è" k="102" />
-<hkern u1="Y" u2="ç" k="102" />
-<hkern u1="Y" u2="æ" k="102" />
-<hkern u1="Y" u2="å" k="102" />
-<hkern u1="Y" u2="ä" k="102" />
-<hkern u1="Y" u2="ã" k="102" />
-<hkern u1="Y" u2="â" k="102" />
-<hkern u1="Y" u2="á" k="102" />
-<hkern u1="Y" u2="à" k="102" />
-<hkern u1="Y" u2="Ø" k="41" />
-<hkern u1="Y" u2="Ö" k="41" />
-<hkern u1="Y" u2="Õ" k="41" />
-<hkern u1="Y" u2="Ô" k="41" />
-<hkern u1="Y" u2="Ó" k="41" />
-<hkern u1="Y" u2="Ò" k="41" />
-<hkern u1="Y" u2="Ç" k="41" />
-<hkern u1="Y" u2="Å" k="123" />
-<hkern u1="Y" u2="Ä" k="123" />
-<hkern u1="Y" u2="Ã" k="123" />
-<hkern u1="Y" u2="Â" k="123" />
-<hkern u1="Y" u2="Á" k="123" />
-<hkern u1="Y" u2="À" k="123" />
-<hkern u1="Y" u2="z" k="41" />
-<hkern u1="Y" u2="u" k="61" />
-<hkern u1="Y" u2="s" k="82" />
-<hkern u1="Y" u2="r" k="61" />
-<hkern u1="Y" u2="q" k="102" />
-<hkern u1="Y" u2="p" k="61" />
-<hkern u1="Y" u2="o" k="102" />
-<hkern u1="Y" u2="n" k="61" />
-<hkern u1="Y" u2="m" k="61" />
-<hkern u1="Y" u2="g" k="41" />
-<hkern u1="Y" u2="e" k="102" />
-<hkern u1="Y" u2="d" k="102" />
-<hkern u1="Y" u2="c" k="102" />
-<hkern u1="Y" u2="a" k="102" />
-<hkern u1="Y" u2="Q" k="41" />
-<hkern u1="Y" u2="O" k="41" />
-<hkern u1="Y" u2="G" k="41" />
-<hkern u1="Y" u2="C" k="41" />
-<hkern u1="Y" u2="A" k="123" />
-<hkern u1="Y" u2="?" k="-41" />
-<hkern u1="Y" u2="." k="123" />
-<hkern u1="Y" u2="," k="123" />
-<hkern u1="Z" u2="Œ" k="20" />
-<hkern u1="Z" u2="Ø" k="20" />
-<hkern u1="Z" u2="Ö" k="20" />
-<hkern u1="Z" u2="Õ" k="20" />
-<hkern u1="Z" u2="Ô" k="20" />
-<hkern u1="Z" u2="Ó" k="20" />
-<hkern u1="Z" u2="Ò" k="20" />
-<hkern u1="Z" u2="Ç" k="20" />
-<hkern u1="Z" u2="Q" k="20" />
-<hkern u1="Z" u2="O" k="20" />
-<hkern u1="Z" u2="G" k="20" />
-<hkern u1="Z" u2="C" k="20" />
-<hkern u1="[" u2="J" k="-184" />
-<hkern u1="a" u2="”" k="20" />
-<hkern u1="a" u2="’" k="20" />
-<hkern u1="a" u2="'" k="20" />
-<hkern u1="a" u2=""" k="20" />
-<hkern u1="b" u2="”" k="20" />
-<hkern u1="b" u2="’" k="20" />
-<hkern u1="b" u2="ý" k="41" />
-<hkern u1="b" u2="z" k="20" />
-<hkern u1="b" u2="y" k="41" />
-<hkern u1="b" u2="x" k="41" />
-<hkern u1="b" u2="w" k="41" />
-<hkern u1="b" u2="v" k="41" />
-<hkern u1="b" u2="'" k="20" />
-<hkern u1="b" u2=""" k="20" />
-<hkern u1="c" u2="”" k="-41" />
-<hkern u1="c" u2="’" k="-41" />
-<hkern u1="c" u2="'" k="-41" />
-<hkern u1="c" u2=""" k="-41" />
-<hkern u1="e" u2="”" k="20" />
-<hkern u1="e" u2="’" k="20" />
-<hkern u1="e" u2="ý" k="41" />
-<hkern u1="e" u2="z" k="20" />
-<hkern u1="e" u2="y" k="41" />
-<hkern u1="e" u2="x" k="41" />
-<hkern u1="e" u2="w" k="41" />
-<hkern u1="e" u2="v" k="41" />
-<hkern u1="e" u2="'" k="20" />
-<hkern u1="e" u2=""" k="20" />
-<hkern u1="f" u2="”" k="-123" />
-<hkern u1="f" u2="’" k="-123" />
-<hkern u1="f" u2="'" k="-123" />
-<hkern u1="f" u2=""" k="-123" />
-<hkern u1="h" u2="”" k="20" />
-<hkern u1="h" u2="’" k="20" />
-<hkern u1="h" u2="'" k="20" />
-<hkern u1="h" u2=""" k="20" />
-<hkern u1="k" u2="œ" k="41" />
-<hkern u1="k" u2="ø" k="41" />
-<hkern u1="k" u2="ö" k="41" />
-<hkern u1="k" u2="õ" k="41" />
-<hkern u1="k" u2="ô" k="41" />
-<hkern u1="k" u2="ó" k="41" />
-<hkern u1="k" u2="ò" k="41" />
-<hkern u1="k" u2="ë" k="41" />
-<hkern u1="k" u2="ê" k="41" />
-<hkern u1="k" u2="é" k="41" />
-<hkern u1="k" u2="è" k="41" />
-<hkern u1="k" u2="ç" k="41" />
-<hkern u1="k" u2="à" k="41" />
-<hkern u1="k" u2="q" k="41" />
-<hkern u1="k" u2="o" k="41" />
-<hkern u1="k" u2="e" k="41" />
-<hkern u1="k" u2="d" k="41" />
-<hkern u1="k" u2="c" k="41" />
-<hkern u1="m" u2="”" k="20" />
-<hkern u1="m" u2="’" k="20" />
-<hkern u1="m" u2="'" k="20" />
-<hkern u1="m" u2=""" k="20" />
-<hkern u1="n" u2="”" k="20" />
-<hkern u1="n" u2="’" k="20" />
-<hkern u1="n" u2="'" k="20" />
-<hkern u1="n" u2=""" k="20" />
-<hkern u1="o" u2="”" k="20" />
-<hkern u1="o" u2="’" k="20" />
-<hkern u1="o" u2="ý" k="41" />
-<hkern u1="o" u2="z" k="20" />
-<hkern u1="o" u2="y" k="41" />
-<hkern u1="o" u2="x" k="41" />
-<hkern u1="o" u2="w" k="41" />
-<hkern u1="o" u2="v" k="41" />
-<hkern u1="o" u2="'" k="20" />
-<hkern u1="o" u2=""" k="20" />
-<hkern u1="p" u2="”" k="20" />
-<hkern u1="p" u2="’" k="20" />
-<hkern u1="p" u2="ý" k="41" />
-<hkern u1="p" u2="z" k="20" />
-<hkern u1="p" u2="y" k="41" />
-<hkern u1="p" u2="x" k="41" />
-<hkern u1="p" u2="w" k="41" />
-<hkern u1="p" u2="v" k="41" />
-<hkern u1="p" u2="'" k="20" />
-<hkern u1="p" u2=""" k="20" />
-<hkern u1="r" u2="”" k="-82" />
-<hkern u1="r" u2="’" k="-82" />
-<hkern u1="r" u2="œ" k="41" />
-<hkern u1="r" u2="ø" k="41" />
-<hkern u1="r" u2="ö" k="41" />
-<hkern u1="r" u2="õ" k="41" />
-<hkern u1="r" u2="ô" k="41" />
-<hkern u1="r" u2="ó" k="41" />
-<hkern u1="r" u2="ò" k="41" />
-<hkern u1="r" u2="ë" k="41" />
-<hkern u1="r" u2="ê" k="41" />
-<hkern u1="r" u2="é" k="41" />
-<hkern u1="r" u2="è" k="41" />
-<hkern u1="r" u2="ç" k="41" />
-<hkern u1="r" u2="æ" k="41" />
-<hkern u1="r" u2="å" k="41" />
-<hkern u1="r" u2="ä" k="41" />
-<hkern u1="r" u2="ã" k="41" />
-<hkern u1="r" u2="â" k="41" />
-<hkern u1="r" u2="á" k="41" />
-<hkern u1="r" u2="à" k="41" />
-<hkern u1="r" u2="q" k="41" />
-<hkern u1="r" u2="o" k="41" />
-<hkern u1="r" u2="g" k="20" />
-<hkern u1="r" u2="e" k="41" />
-<hkern u1="r" u2="d" k="41" />
-<hkern u1="r" u2="c" k="41" />
-<hkern u1="r" u2="a" k="41" />
-<hkern u1="r" u2="'" k="-82" />
-<hkern u1="r" u2=""" k="-82" />
-<hkern u1="t" u2="”" k="-41" />
-<hkern u1="t" u2="’" k="-41" />
-<hkern u1="t" u2="'" k="-41" />
-<hkern u1="t" u2=""" k="-41" />
-<hkern u1="v" u2="„" k="82" />
-<hkern u1="v" u2="”" k="-82" />
-<hkern u1="v" u2="‚" k="82" />
-<hkern u1="v" u2="’" k="-82" />
-<hkern u1="v" u2="?" k="-41" />
-<hkern u1="v" u2="." k="82" />
-<hkern u1="v" u2="," k="82" />
-<hkern u1="v" u2="'" k="-82" />
-<hkern u1="v" u2=""" k="-82" />
-<hkern u1="w" u2="„" k="82" />
-<hkern u1="w" u2="”" k="-82" />
-<hkern u1="w" u2="‚" k="82" />
-<hkern u1="w" u2="’" k="-82" />
-<hkern u1="w" u2="?" k="-41" />
-<hkern u1="w" u2="." k="82" />
-<hkern u1="w" u2="," k="82" />
-<hkern u1="w" u2="'" k="-82" />
-<hkern u1="w" u2=""" k="-82" />
-<hkern u1="x" u2="œ" k="41" />
-<hkern u1="x" u2="ø" k="41" />
-<hkern u1="x" u2="ö" k="41" />
-<hkern u1="x" u2="õ" k="41" />
-<hkern u1="x" u2="ô" k="41" />
-<hkern u1="x" u2="ó" k="41" />
-<hkern u1="x" u2="ò" k="41" />
-<hkern u1="x" u2="ë" k="41" />
-<hkern u1="x" u2="ê" k="41" />
-<hkern u1="x" u2="é" k="41" />
-<hkern u1="x" u2="è" k="41" />
-<hkern u1="x" u2="ç" k="41" />
-<hkern u1="x" u2="à" k="41" />
-<hkern u1="x" u2="q" k="41" />
-<hkern u1="x" u2="o" k="41" />
-<hkern u1="x" u2="e" k="41" />
-<hkern u1="x" u2="d" k="41" />
-<hkern u1="x" u2="c" k="41" />
-<hkern u1="y" u2="„" k="82" />
-<hkern u1="y" u2="”" k="-82" />
-<hkern u1="y" u2="‚" k="82" />
-<hkern u1="y" u2="’" k="-82" />
-<hkern u1="y" u2="?" k="-41" />
-<hkern u1="y" u2="." k="82" />
-<hkern u1="y" u2="," k="82" />
-<hkern u1="y" u2="'" k="-82" />
-<hkern u1="y" u2=""" k="-82" />
-<hkern u1="{" u2="J" k="-184" />
-<hkern u1="À" u2="”" k="143" />
-<hkern u1="À" u2="’" k="143" />
-<hkern u1="À" u2="Ÿ" k="123" />
-<hkern u1="À" u2="Œ" k="41" />
-<hkern u1="À" u2="Ý" k="123" />
-<hkern u1="À" u2="Ø" k="41" />
-<hkern u1="À" u2="Ö" k="41" />
-<hkern u1="À" u2="Õ" k="41" />
-<hkern u1="À" u2="Ô" k="41" />
-<hkern u1="À" u2="Ó" k="41" />
-<hkern u1="À" u2="Ò" k="41" />
-<hkern u1="À" u2="Ç" k="41" />
-<hkern u1="À" u2="Y" k="123" />
-<hkern u1="À" u2="W" k="82" />
-<hkern u1="À" u2="V" k="82" />
-<hkern u1="À" u2="T" k="143" />
-<hkern u1="À" u2="Q" k="41" />
-<hkern u1="À" u2="O" k="41" />
-<hkern u1="À" u2="J" k="-266" />
-<hkern u1="À" u2="G" k="41" />
-<hkern u1="À" u2="C" k="41" />
-<hkern u1="À" u2="'" k="143" />
-<hkern u1="À" u2=""" k="143" />
-<hkern u1="Á" u2="”" k="143" />
-<hkern u1="Á" u2="’" k="143" />
-<hkern u1="Á" u2="Ÿ" k="123" />
-<hkern u1="Á" u2="Œ" k="41" />
-<hkern u1="Á" u2="Ý" k="123" />
-<hkern u1="Á" u2="Ø" k="41" />
-<hkern u1="Á" u2="Ö" k="41" />
-<hkern u1="Á" u2="Õ" k="41" />
-<hkern u1="Á" u2="Ô" k="41" />
-<hkern u1="Á" u2="Ó" k="41" />
-<hkern u1="Á" u2="Ò" k="41" />
-<hkern u1="Á" u2="Ç" k="41" />
-<hkern u1="Á" u2="Y" k="123" />
-<hkern u1="Á" u2="W" k="82" />
-<hkern u1="Á" u2="V" k="82" />
-<hkern u1="Á" u2="T" k="143" />
-<hkern u1="Á" u2="Q" k="41" />
-<hkern u1="Á" u2="O" k="41" />
-<hkern u1="Á" u2="J" k="-266" />
-<hkern u1="Á" u2="G" k="41" />
-<hkern u1="Á" u2="C" k="41" />
-<hkern u1="Á" u2="'" k="143" />
-<hkern u1="Á" u2=""" k="143" />
-<hkern u1="Â" u2="”" k="143" />
-<hkern u1="Â" u2="’" k="143" />
-<hkern u1="Â" u2="Ÿ" k="123" />
-<hkern u1="Â" u2="Œ" k="41" />
-<hkern u1="Â" u2="Ý" k="123" />
-<hkern u1="Â" u2="Ø" k="41" />
-<hkern u1="Â" u2="Ö" k="41" />
-<hkern u1="Â" u2="Õ" k="41" />
-<hkern u1="Â" u2="Ô" k="41" />
-<hkern u1="Â" u2="Ó" k="41" />
-<hkern u1="Â" u2="Ò" k="41" />
-<hkern u1="Â" u2="Ç" k="41" />
-<hkern u1="Â" u2="Y" k="123" />
-<hkern u1="Â" u2="W" k="82" />
-<hkern u1="Â" u2="V" k="82" />
-<hkern u1="Â" u2="T" k="143" />
-<hkern u1="Â" u2="Q" k="41" />
-<hkern u1="Â" u2="O" k="41" />
-<hkern u1="Â" u2="J" k="-266" />
-<hkern u1="Â" u2="G" k="41" />
-<hkern u1="Â" u2="C" k="41" />
-<hkern u1="Â" u2="'" k="143" />
-<hkern u1="Â" u2=""" k="143" />
-<hkern u1="Ã" u2="”" k="143" />
-<hkern u1="Ã" u2="’" k="143" />
-<hkern u1="Ã" u2="Ÿ" k="123" />
-<hkern u1="Ã" u2="Œ" k="41" />
-<hkern u1="Ã" u2="Ý" k="123" />
-<hkern u1="Ã" u2="Ø" k="41" />
-<hkern u1="Ã" u2="Ö" k="41" />
-<hkern u1="Ã" u2="Õ" k="41" />
-<hkern u1="Ã" u2="Ô" k="41" />
-<hkern u1="Ã" u2="Ó" k="41" />
-<hkern u1="Ã" u2="Ò" k="41" />
-<hkern u1="Ã" u2="Ç" k="41" />
-<hkern u1="Ã" u2="Y" k="123" />
-<hkern u1="Ã" u2="W" k="82" />
-<hkern u1="Ã" u2="V" k="82" />
-<hkern u1="Ã" u2="T" k="143" />
-<hkern u1="Ã" u2="Q" k="41" />
-<hkern u1="Ã" u2="O" k="41" />
-<hkern u1="Ã" u2="J" k="-266" />
-<hkern u1="Ã" u2="G" k="41" />
-<hkern u1="Ã" u2="C" k="41" />
-<hkern u1="Ã" u2="'" k="143" />
-<hkern u1="Ã" u2=""" k="143" />
-<hkern u1="Ä" u2="”" k="143" />
-<hkern u1="Ä" u2="’" k="143" />
-<hkern u1="Ä" u2="Ÿ" k="123" />
-<hkern u1="Ä" u2="Œ" k="41" />
-<hkern u1="Ä" u2="Ý" k="123" />
-<hkern u1="Ä" u2="Ø" k="41" />
-<hkern u1="Ä" u2="Ö" k="41" />
-<hkern u1="Ä" u2="Õ" k="41" />
-<hkern u1="Ä" u2="Ô" k="41" />
-<hkern u1="Ä" u2="Ó" k="41" />
-<hkern u1="Ä" u2="Ò" k="41" />
-<hkern u1="Ä" u2="Ç" k="41" />
-<hkern u1="Ä" u2="Y" k="123" />
-<hkern u1="Ä" u2="W" k="82" />
-<hkern u1="Ä" u2="V" k="82" />
-<hkern u1="Ä" u2="T" k="143" />
-<hkern u1="Ä" u2="Q" k="41" />
-<hkern u1="Ä" u2="O" k="41" />
-<hkern u1="Ä" u2="J" k="-266" />
-<hkern u1="Ä" u2="G" k="41" />
-<hkern u1="Ä" u2="C" k="41" />
-<hkern u1="Ä" u2="'" k="143" />
-<hkern u1="Ä" u2=""" k="143" />
-<hkern u1="Å" u2="”" k="143" />
-<hkern u1="Å" u2="’" k="143" />
-<hkern u1="Å" u2="Ÿ" k="123" />
-<hkern u1="Å" u2="Œ" k="41" />
-<hkern u1="Å" u2="Ý" k="123" />
-<hkern u1="Å" u2="Ø" k="41" />
-<hkern u1="Å" u2="Ö" k="41" />
-<hkern u1="Å" u2="Õ" k="41" />
-<hkern u1="Å" u2="Ô" k="41" />
-<hkern u1="Å" u2="Ó" k="41" />
-<hkern u1="Å" u2="Ò" k="41" />
-<hkern u1="Å" u2="Ç" k="41" />
-<hkern u1="Å" u2="Y" k="123" />
-<hkern u1="Å" u2="W" k="82" />
-<hkern u1="Å" u2="V" k="82" />
-<hkern u1="Å" u2="T" k="143" />
-<hkern u1="Å" u2="Q" k="41" />
-<hkern u1="Å" u2="O" k="41" />
-<hkern u1="Å" u2="J" k="-266" />
-<hkern u1="Å" u2="G" k="41" />
-<hkern u1="Å" u2="C" k="41" />
-<hkern u1="Å" u2="'" k="143" />
-<hkern u1="Å" u2=""" k="143" />
-<hkern u1="Æ" u2="J" k="-123" />
-<hkern u1="Ç" u2="Œ" k="41" />
-<hkern u1="Ç" u2="Ø" k="41" />
-<hkern u1="Ç" u2="Ö" k="41" />
-<hkern u1="Ç" u2="Õ" k="41" />
-<hkern u1="Ç" u2="Ô" k="41" />
-<hkern u1="Ç" u2="Ó" k="41" />
-<hkern u1="Ç" u2="Ò" k="41" />
-<hkern u1="Ç" u2="Ç" k="41" />
-<hkern u1="Ç" u2="Q" k="41" />
-<hkern u1="Ç" u2="O" k="41" />
-<hkern u1="Ç" u2="G" k="41" />
-<hkern u1="Ç" u2="C" k="41" />
-<hkern u1="È" u2="J" k="-123" />
-<hkern u1="É" u2="J" k="-123" />
-<hkern u1="Ê" u2="J" k="-123" />
-<hkern u1="Ë" u2="J" k="-123" />
-<hkern u1="Ð" u2="„" k="82" />
-<hkern u1="Ð" u2="‚" k="82" />
-<hkern u1="Ð" u2="Ÿ" k="20" />
-<hkern u1="Ð" u2="Ý" k="20" />
-<hkern u1="Ð" u2="Å" k="41" />
-<hkern u1="Ð" u2="Ä" k="41" />
-<hkern u1="Ð" u2="Ã" k="41" />
-<hkern u1="Ð" u2="Â" k="41" />
-<hkern u1="Ð" u2="Á" k="41" />
-<hkern u1="Ð" u2="À" k="41" />
-<hkern u1="Ð" u2="Z" k="20" />
-<hkern u1="Ð" u2="Y" k="20" />
-<hkern u1="Ð" u2="X" k="41" />
-<hkern u1="Ð" u2="W" k="20" />
-<hkern u1="Ð" u2="V" k="20" />
-<hkern u1="Ð" u2="T" k="61" />
-<hkern u1="Ð" u2="A" k="41" />
-<hkern u1="Ð" u2="." k="82" />
-<hkern u1="Ð" u2="," k="82" />
-<hkern u1="Ò" u2="„" k="82" />
-<hkern u1="Ò" u2="‚" k="82" />
-<hkern u1="Ò" u2="Ÿ" k="20" />
-<hkern u1="Ò" u2="Ý" k="20" />
-<hkern u1="Ò" u2="Å" k="41" />
-<hkern u1="Ò" u2="Ä" k="41" />
-<hkern u1="Ò" u2="Ã" k="41" />
-<hkern u1="Ò" u2="Â" k="41" />
-<hkern u1="Ò" u2="Á" k="41" />
-<hkern u1="Ò" u2="À" k="41" />
-<hkern u1="Ò" u2="Z" k="20" />
-<hkern u1="Ò" u2="Y" k="20" />
-<hkern u1="Ò" u2="X" k="41" />
-<hkern u1="Ò" u2="W" k="20" />
-<hkern u1="Ò" u2="V" k="20" />
-<hkern u1="Ò" u2="T" k="61" />
-<hkern u1="Ò" u2="A" k="41" />
-<hkern u1="Ò" u2="." k="82" />
-<hkern u1="Ò" u2="," k="82" />
-<hkern u1="Ó" u2="„" k="82" />
-<hkern u1="Ó" u2="‚" k="82" />
-<hkern u1="Ó" u2="Ÿ" k="20" />
-<hkern u1="Ó" u2="Ý" k="20" />
-<hkern u1="Ó" u2="Å" k="41" />
-<hkern u1="Ó" u2="Ä" k="41" />
-<hkern u1="Ó" u2="Ã" k="41" />
-<hkern u1="Ó" u2="Â" k="41" />
-<hkern u1="Ó" u2="Á" k="41" />
-<hkern u1="Ó" u2="À" k="41" />
-<hkern u1="Ó" u2="Z" k="20" />
-<hkern u1="Ó" u2="Y" k="20" />
-<hkern u1="Ó" u2="X" k="41" />
-<hkern u1="Ó" u2="W" k="20" />
-<hkern u1="Ó" u2="V" k="20" />
-<hkern u1="Ó" u2="T" k="61" />
-<hkern u1="Ó" u2="A" k="41" />
-<hkern u1="Ó" u2="." k="82" />
-<hkern u1="Ó" u2="," k="82" />
-<hkern u1="Ô" u2="„" k="82" />
-<hkern u1="Ô" u2="‚" k="82" />
-<hkern u1="Ô" u2="Ÿ" k="20" />
-<hkern u1="Ô" u2="Ý" k="20" />
-<hkern u1="Ô" u2="Å" k="41" />
-<hkern u1="Ô" u2="Ä" k="41" />
-<hkern u1="Ô" u2="Ã" k="41" />
-<hkern u1="Ô" u2="Â" k="41" />
-<hkern u1="Ô" u2="Á" k="41" />
-<hkern u1="Ô" u2="À" k="41" />
-<hkern u1="Ô" u2="Z" k="20" />
-<hkern u1="Ô" u2="Y" k="20" />
-<hkern u1="Ô" u2="X" k="41" />
-<hkern u1="Ô" u2="W" k="20" />
-<hkern u1="Ô" u2="V" k="20" />
-<hkern u1="Ô" u2="T" k="61" />
-<hkern u1="Ô" u2="A" k="41" />
-<hkern u1="Ô" u2="." k="82" />
-<hkern u1="Ô" u2="," k="82" />
-<hkern u1="Õ" u2="„" k="82" />
-<hkern u1="Õ" u2="‚" k="82" />
-<hkern u1="Õ" u2="Ÿ" k="20" />
-<hkern u1="Õ" u2="Ý" k="20" />
-<hkern u1="Õ" u2="Å" k="41" />
-<hkern u1="Õ" u2="Ä" k="41" />
-<hkern u1="Õ" u2="Ã" k="41" />
-<hkern u1="Õ" u2="Â" k="41" />
-<hkern u1="Õ" u2="Á" k="41" />
-<hkern u1="Õ" u2="À" k="41" />
-<hkern u1="Õ" u2="Z" k="20" />
-<hkern u1="Õ" u2="Y" k="20" />
-<hkern u1="Õ" u2="X" k="41" />
-<hkern u1="Õ" u2="W" k="20" />
-<hkern u1="Õ" u2="V" k="20" />
-<hkern u1="Õ" u2="T" k="61" />
-<hkern u1="Õ" u2="A" k="41" />
-<hkern u1="Õ" u2="." k="82" />
-<hkern u1="Õ" u2="," k="82" />
-<hkern u1="Ö" u2="„" k="82" />
-<hkern u1="Ö" u2="‚" k="82" />
-<hkern u1="Ö" u2="Ÿ" k="20" />
-<hkern u1="Ö" u2="Ý" k="20" />
-<hkern u1="Ö" u2="Å" k="41" />
-<hkern u1="Ö" u2="Ä" k="41" />
-<hkern u1="Ö" u2="Ã" k="41" />
-<hkern u1="Ö" u2="Â" k="41" />
-<hkern u1="Ö" u2="Á" k="41" />
-<hkern u1="Ö" u2="À" k="41" />
-<hkern u1="Ö" u2="Z" k="20" />
-<hkern u1="Ö" u2="Y" k="20" />
-<hkern u1="Ö" u2="X" k="41" />
-<hkern u1="Ö" u2="W" k="20" />
-<hkern u1="Ö" u2="V" k="20" />
-<hkern u1="Ö" u2="T" k="61" />
-<hkern u1="Ö" u2="A" k="41" />
-<hkern u1="Ö" u2="." k="82" />
-<hkern u1="Ö" u2="," k="82" />
-<hkern u1="Ø" u2="„" k="82" />
-<hkern u1="Ø" u2="‚" k="82" />
-<hkern u1="Ø" u2="Ÿ" k="20" />
-<hkern u1="Ø" u2="Ý" k="20" />
-<hkern u1="Ø" u2="Å" k="41" />
-<hkern u1="Ø" u2="Ä" k="41" />
-<hkern u1="Ø" u2="Ã" k="41" />
-<hkern u1="Ø" u2="Â" k="41" />
-<hkern u1="Ø" u2="Á" k="41" />
-<hkern u1="Ø" u2="À" k="41" />
-<hkern u1="Ø" u2="Z" k="20" />
-<hkern u1="Ø" u2="Y" k="20" />
-<hkern u1="Ø" u2="X" k="41" />
-<hkern u1="Ø" u2="W" k="20" />
-<hkern u1="Ø" u2="V" k="20" />
-<hkern u1="Ø" u2="T" k="61" />
-<hkern u1="Ø" u2="A" k="41" />
-<hkern u1="Ø" u2="." k="82" />
-<hkern u1="Ø" u2="," k="82" />
-<hkern u1="Ù" u2="„" k="41" />
-<hkern u1="Ù" u2="‚" k="41" />
-<hkern u1="Ù" u2="Å" k="20" />
-<hkern u1="Ù" u2="Ä" k="20" />
-<hkern u1="Ù" u2="Ã" k="20" />
-<hkern u1="Ù" u2="Â" k="20" />
-<hkern u1="Ù" u2="Á" k="20" />
-<hkern u1="Ù" u2="À" k="20" />
-<hkern u1="Ù" u2="A" k="20" />
-<hkern u1="Ù" u2="." k="41" />
-<hkern u1="Ù" u2="," k="41" />
-<hkern u1="Ú" u2="„" k="41" />
-<hkern u1="Ú" u2="‚" k="41" />
-<hkern u1="Ú" u2="Å" k="20" />
-<hkern u1="Ú" u2="Ä" k="20" />
-<hkern u1="Ú" u2="Ã" k="20" />
-<hkern u1="Ú" u2="Â" k="20" />
-<hkern u1="Ú" u2="Á" k="20" />
-<hkern u1="Ú" u2="À" k="20" />
-<hkern u1="Ú" u2="A" k="20" />
-<hkern u1="Ú" u2="." k="41" />
-<hkern u1="Ú" u2="," k="41" />
-<hkern u1="Û" u2="„" k="41" />
-<hkern u1="Û" u2="‚" k="41" />
-<hkern u1="Û" u2="Å" k="20" />
-<hkern u1="Û" u2="Ä" k="20" />
-<hkern u1="Û" u2="Ã" k="20" />
-<hkern u1="Û" u2="Â" k="20" />
-<hkern u1="Û" u2="Á" k="20" />
-<hkern u1="Û" u2="À" k="20" />
-<hkern u1="Û" u2="A" k="20" />
-<hkern u1="Û" u2="." k="41" />
-<hkern u1="Û" u2="," k="41" />
-<hkern u1="Ü" u2="„" k="41" />
-<hkern u1="Ü" u2="‚" k="41" />
-<hkern u1="Ü" u2="Å" k="20" />
-<hkern u1="Ü" u2="Ä" k="20" />
-<hkern u1="Ü" u2="Ã" k="20" />
-<hkern u1="Ü" u2="Â" k="20" />
-<hkern u1="Ü" u2="Á" k="20" />
-<hkern u1="Ü" u2="À" k="20" />
-<hkern u1="Ü" u2="A" k="20" />
-<hkern u1="Ü" u2="." k="41" />
-<hkern u1="Ü" u2="," k="41" />
-<hkern u1="Ý" u2="„" k="123" />
-<hkern u1="Ý" u2="‚" k="123" />
-<hkern u1="Ý" u2="œ" k="102" />
-<hkern u1="Ý" u2="Œ" k="41" />
-<hkern u1="Ý" u2="ü" k="61" />
-<hkern u1="Ý" u2="û" k="61" />
-<hkern u1="Ý" u2="ú" k="61" />
-<hkern u1="Ý" u2="ù" k="61" />
-<hkern u1="Ý" u2="ø" k="102" />
-<hkern u1="Ý" u2="ö" k="102" />
-<hkern u1="Ý" u2="õ" k="102" />
-<hkern u1="Ý" u2="ô" k="102" />
-<hkern u1="Ý" u2="ó" k="102" />
-<hkern u1="Ý" u2="ò" k="102" />
-<hkern u1="Ý" u2="ë" k="102" />
-<hkern u1="Ý" u2="ê" k="102" />
-<hkern u1="Ý" u2="é" k="102" />
-<hkern u1="Ý" u2="è" k="102" />
-<hkern u1="Ý" u2="ç" k="102" />
-<hkern u1="Ý" u2="æ" k="102" />
-<hkern u1="Ý" u2="å" k="102" />
-<hkern u1="Ý" u2="ä" k="102" />
-<hkern u1="Ý" u2="ã" k="102" />
-<hkern u1="Ý" u2="â" k="102" />
-<hkern u1="Ý" u2="á" k="102" />
-<hkern u1="Ý" u2="à" k="102" />
-<hkern u1="Ý" u2="Ø" k="41" />
-<hkern u1="Ý" u2="Ö" k="41" />
-<hkern u1="Ý" u2="Õ" k="41" />
-<hkern u1="Ý" u2="Ô" k="41" />
-<hkern u1="Ý" u2="Ó" k="41" />
-<hkern u1="Ý" u2="Ò" k="41" />
-<hkern u1="Ý" u2="Ç" k="41" />
-<hkern u1="Ý" u2="Å" k="123" />
-<hkern u1="Ý" u2="Ä" k="123" />
-<hkern u1="Ý" u2="Ã" k="123" />
-<hkern u1="Ý" u2="Â" k="123" />
-<hkern u1="Ý" u2="Á" k="123" />
-<hkern u1="Ý" u2="À" k="123" />
-<hkern u1="Ý" u2="z" k="41" />
-<hkern u1="Ý" u2="u" k="61" />
-<hkern u1="Ý" u2="s" k="82" />
-<hkern u1="Ý" u2="r" k="61" />
-<hkern u1="Ý" u2="q" k="102" />
-<hkern u1="Ý" u2="p" k="61" />
-<hkern u1="Ý" u2="o" k="102" />
-<hkern u1="Ý" u2="n" k="61" />
-<hkern u1="Ý" u2="m" k="61" />
-<hkern u1="Ý" u2="g" k="41" />
-<hkern u1="Ý" u2="e" k="102" />
-<hkern u1="Ý" u2="d" k="102" />
-<hkern u1="Ý" u2="c" k="102" />
-<hkern u1="Ý" u2="a" k="102" />
-<hkern u1="Ý" u2="Q" k="41" />
-<hkern u1="Ý" u2="O" k="41" />
-<hkern u1="Ý" u2="G" k="41" />
-<hkern u1="Ý" u2="C" k="41" />
-<hkern u1="Ý" u2="A" k="123" />
-<hkern u1="Ý" u2="?" k="-41" />
-<hkern u1="Ý" u2="." k="123" />
-<hkern u1="Ý" u2="," k="123" />
-<hkern u1="Þ" u2="„" k="266" />
-<hkern u1="Þ" u2="‚" k="266" />
-<hkern u1="Þ" u2="Å" k="102" />
-<hkern u1="Þ" u2="Ä" k="102" />
-<hkern u1="Þ" u2="Ã" k="102" />
-<hkern u1="Þ" u2="Â" k="102" />
-<hkern u1="Þ" u2="Á" k="102" />
-<hkern u1="Þ" u2="À" k="102" />
-<hkern u1="Þ" u2="Z" k="20" />
-<hkern u1="Þ" u2="X" k="41" />
-<hkern u1="Þ" u2="A" k="102" />
-<hkern u1="Þ" u2="." k="266" />
-<hkern u1="Þ" u2="," k="266" />
-<hkern u1="à" u2="”" k="20" />
-<hkern u1="à" u2="’" k="20" />
-<hkern u1="à" u2="'" k="20" />
-<hkern u1="à" u2=""" k="20" />
-<hkern u1="á" u2="”" k="20" />
-<hkern u1="á" u2="’" k="20" />
-<hkern u1="á" u2="'" k="20" />
-<hkern u1="á" u2=""" k="20" />
-<hkern u1="â" u2="”" k="20" />
-<hkern u1="â" u2="’" k="20" />
-<hkern u1="â" u2="'" k="20" />
-<hkern u1="â" u2=""" k="20" />
-<hkern u1="ã" u2="”" k="20" />
-<hkern u1="ã" u2="’" k="20" />
-<hkern u1="ã" u2="'" k="20" />
-<hkern u1="ã" u2=""" k="20" />
-<hkern u1="ä" u2="”" k="20" />
-<hkern u1="ä" u2="’" k="20" />
-<hkern u1="ä" u2="'" k="20" />
-<hkern u1="ä" u2=""" k="20" />
-<hkern u1="å" u2="”" k="20" />
-<hkern u1="å" u2="’" k="20" />
-<hkern u1="å" u2="'" k="20" />
-<hkern u1="å" u2=""" k="20" />
-<hkern u1="è" u2="”" k="20" />
-<hkern u1="è" u2="’" k="20" />
-<hkern u1="è" u2="ý" k="41" />
-<hkern u1="è" u2="z" k="20" />
-<hkern u1="è" u2="y" k="41" />
-<hkern u1="è" u2="x" k="41" />
-<hkern u1="è" u2="w" k="41" />
-<hkern u1="è" u2="v" k="41" />
-<hkern u1="è" u2="'" k="20" />
-<hkern u1="è" u2=""" k="20" />
-<hkern u1="é" u2="”" k="20" />
-<hkern u1="é" u2="’" k="20" />
-<hkern u1="é" u2="ý" k="41" />
-<hkern u1="é" u2="z" k="20" />
-<hkern u1="é" u2="y" k="41" />
-<hkern u1="é" u2="x" k="41" />
-<hkern u1="é" u2="w" k="41" />
-<hkern u1="é" u2="v" k="41" />
-<hkern u1="é" u2="'" k="20" />
-<hkern u1="é" u2=""" k="20" />
-<hkern u1="ê" u2="”" k="20" />
-<hkern u1="ê" u2="’" k="20" />
-<hkern u1="ê" u2="ý" k="41" />
-<hkern u1="ê" u2="z" k="20" />
-<hkern u1="ê" u2="y" k="41" />
-<hkern u1="ê" u2="x" k="41" />
-<hkern u1="ê" u2="w" k="41" />
-<hkern u1="ê" u2="v" k="41" />
-<hkern u1="ê" u2="'" k="20" />
-<hkern u1="ê" u2=""" k="20" />
-<hkern u1="ë" u2="”" k="20" />
-<hkern u1="ë" u2="’" k="20" />
-<hkern u1="ë" u2="ý" k="41" />
-<hkern u1="ë" u2="z" k="20" />
-<hkern u1="ë" u2="y" k="41" />
-<hkern u1="ë" u2="x" k="41" />
-<hkern u1="ë" u2="w" k="41" />
-<hkern u1="ë" u2="v" k="41" />
-<hkern u1="ë" u2="'" k="20" />
-<hkern u1="ë" u2=""" k="20" />
-<hkern u1="ð" u2="”" k="20" />
-<hkern u1="ð" u2="’" k="20" />
-<hkern u1="ð" u2="ý" k="41" />
-<hkern u1="ð" u2="z" k="20" />
-<hkern u1="ð" u2="y" k="41" />
-<hkern u1="ð" u2="x" k="41" />
-<hkern u1="ð" u2="w" k="41" />
-<hkern u1="ð" u2="v" k="41" />
-<hkern u1="ð" u2="'" k="20" />
-<hkern u1="ð" u2=""" k="20" />
-<hkern u1="ò" u2="”" k="20" />
-<hkern u1="ò" u2="’" k="20" />
-<hkern u1="ò" u2="ý" k="41" />
-<hkern u1="ò" u2="z" k="20" />
-<hkern u1="ò" u2="y" k="41" />
-<hkern u1="ò" u2="x" k="41" />
-<hkern u1="ò" u2="w" k="41" />
-<hkern u1="ò" u2="v" k="41" />
-<hkern u1="ò" u2="'" k="20" />
-<hkern u1="ò" u2=""" k="20" />
-<hkern u1="ó" u2="”" k="20" />
-<hkern u1="ó" u2="’" k="20" />
-<hkern u1="ó" u2="ý" k="41" />
-<hkern u1="ó" u2="z" k="20" />
-<hkern u1="ó" u2="y" k="41" />
-<hkern u1="ó" u2="x" k="41" />
-<hkern u1="ó" u2="w" k="41" />
-<hkern u1="ó" u2="v" k="41" />
-<hkern u1="ó" u2="'" k="20" />
-<hkern u1="ó" u2=""" k="20" />
-<hkern u1="ô" u2="”" k="20" />
-<hkern u1="ô" u2="’" k="20" />
-<hkern u1="ô" u2="ý" k="41" />
-<hkern u1="ô" u2="z" k="20" />
-<hkern u1="ô" u2="y" k="41" />
-<hkern u1="ô" u2="x" k="41" />
-<hkern u1="ô" u2="w" k="41" />
-<hkern u1="ô" u2="v" k="41" />
-<hkern u1="ô" u2="'" k="20" />
-<hkern u1="ô" u2=""" k="20" />
-<hkern u1="ö" u2="”" k="41" />
-<hkern u1="ö" u2="’" k="41" />
-<hkern u1="ö" u2="'" k="41" />
-<hkern u1="ö" u2=""" k="41" />
-<hkern u1="ø" u2="”" k="20" />
-<hkern u1="ø" u2="’" k="20" />
-<hkern u1="ø" u2="ý" k="41" />
-<hkern u1="ø" u2="z" k="20" />
-<hkern u1="ø" u2="y" k="41" />
-<hkern u1="ø" u2="x" k="41" />
-<hkern u1="ø" u2="w" k="41" />
-<hkern u1="ø" u2="v" k="41" />
-<hkern u1="ø" u2="'" k="20" />
-<hkern u1="ø" u2=""" k="20" />
-<hkern u1="ý" u2="„" k="82" />
-<hkern u1="ý" u2="”" k="-82" />
-<hkern u1="ý" u2="‚" k="82" />
-<hkern u1="ý" u2="’" k="-82" />
-<hkern u1="ý" u2="?" k="-41" />
-<hkern u1="ý" u2="." k="82" />
-<hkern u1="ý" u2="," k="82" />
-<hkern u1="ý" u2="'" k="-82" />
-<hkern u1="ý" u2=""" k="-82" />
-<hkern u1="þ" u2="”" k="20" />
-<hkern u1="þ" u2="’" k="20" />
-<hkern u1="þ" u2="ý" k="41" />
-<hkern u1="þ" u2="z" k="20" />
-<hkern u1="þ" u2="y" k="41" />
-<hkern u1="þ" u2="x" k="41" />
-<hkern u1="þ" u2="w" k="41" />
-<hkern u1="þ" u2="v" k="41" />
-<hkern u1="þ" u2="'" k="20" />
-<hkern u1="þ" u2=""" k="20" />
-<hkern u1="ÿ" u2="„" k="82" />
-<hkern u1="ÿ" u2="”" k="-82" />
-<hkern u1="ÿ" u2="‚" k="82" />
-<hkern u1="ÿ" u2="’" k="-82" />
-<hkern u1="ÿ" u2="?" k="-41" />
-<hkern u1="ÿ" u2="." k="82" />
-<hkern u1="ÿ" u2="," k="82" />
-<hkern u1="ÿ" u2="'" k="-82" />
-<hkern u1="ÿ" u2=""" k="-82" />
-<hkern u1="Œ" u2="J" k="-123" />
-<hkern u1="Ÿ" u2="„" k="123" />
-<hkern u1="Ÿ" u2="‚" k="123" />
-<hkern u1="Ÿ" u2="œ" k="102" />
-<hkern u1="Ÿ" u2="Œ" k="41" />
-<hkern u1="Ÿ" u2="ü" k="61" />
-<hkern u1="Ÿ" u2="û" k="61" />
-<hkern u1="Ÿ" u2="ú" k="61" />
-<hkern u1="Ÿ" u2="ù" k="61" />
-<hkern u1="Ÿ" u2="ø" k="102" />
-<hkern u1="Ÿ" u2="ö" k="102" />
-<hkern u1="Ÿ" u2="õ" k="102" />
-<hkern u1="Ÿ" u2="ô" k="102" />
-<hkern u1="Ÿ" u2="ó" k="102" />
-<hkern u1="Ÿ" u2="ò" k="102" />
-<hkern u1="Ÿ" u2="ë" k="102" />
-<hkern u1="Ÿ" u2="ê" k="102" />
-<hkern u1="Ÿ" u2="é" k="102" />
-<hkern u1="Ÿ" u2="è" k="102" />
-<hkern u1="Ÿ" u2="ç" k="102" />
-<hkern u1="Ÿ" u2="æ" k="102" />
-<hkern u1="Ÿ" u2="å" k="102" />
-<hkern u1="Ÿ" u2="ä" k="102" />
-<hkern u1="Ÿ" u2="ã" k="102" />
-<hkern u1="Ÿ" u2="â" k="102" />
-<hkern u1="Ÿ" u2="á" k="102" />
-<hkern u1="Ÿ" u2="à" k="102" />
-<hkern u1="Ÿ" u2="Ø" k="41" />
-<hkern u1="Ÿ" u2="Ö" k="41" />
-<hkern u1="Ÿ" u2="Õ" k="41" />
-<hkern u1="Ÿ" u2="Ô" k="41" />
-<hkern u1="Ÿ" u2="Ó" k="41" />
-<hkern u1="Ÿ" u2="Ò" k="41" />
-<hkern u1="Ÿ" u2="Ç" k="41" />
-<hkern u1="Ÿ" u2="Å" k="123" />
-<hkern u1="Ÿ" u2="Ä" k="123" />
-<hkern u1="Ÿ" u2="Ã" k="123" />
-<hkern u1="Ÿ" u2="Â" k="123" />
-<hkern u1="Ÿ" u2="Á" k="123" />
-<hkern u1="Ÿ" u2="À" k="123" />
-<hkern u1="Ÿ" u2="z" k="41" />
-<hkern u1="Ÿ" u2="u" k="61" />
-<hkern u1="Ÿ" u2="s" k="82" />
-<hkern u1="Ÿ" u2="r" k="61" />
-<hkern u1="Ÿ" u2="q" k="102" />
-<hkern u1="Ÿ" u2="p" k="61" />
-<hkern u1="Ÿ" u2="o" k="102" />
-<hkern u1="Ÿ" u2="n" k="61" />
-<hkern u1="Ÿ" u2="m" k="61" />
-<hkern u1="Ÿ" u2="g" k="41" />
-<hkern u1="Ÿ" u2="e" k="102" />
-<hkern u1="Ÿ" u2="d" k="102" />
-<hkern u1="Ÿ" u2="c" k="102" />
-<hkern u1="Ÿ" u2="a" k="102" />
-<hkern u1="Ÿ" u2="Q" k="41" />
-<hkern u1="Ÿ" u2="O" k="41" />
-<hkern u1="Ÿ" u2="G" k="41" />
-<hkern u1="Ÿ" u2="C" k="41" />
-<hkern u1="Ÿ" u2="A" k="123" />
-<hkern u1="Ÿ" u2="?" k="-41" />
-<hkern u1="Ÿ" u2="." k="123" />
-<hkern u1="Ÿ" u2="," k="123" />
-<hkern u1="–" u2="T" k="82" />
-<hkern u1="—" u2="T" k="82" />
-<hkern u1="‘" u2="Ÿ" k="-20" />
-<hkern u1="‘" u2="œ" k="123" />
-<hkern u1="‘" u2="ü" k="61" />
-<hkern u1="‘" u2="û" k="61" />
-<hkern u1="‘" u2="ú" k="61" />
-<hkern u1="‘" u2="ù" k="61" />
-<hkern u1="‘" u2="ø" k="123" />
-<hkern u1="‘" u2="ö" k="123" />
-<hkern u1="‘" u2="õ" k="123" />
-<hkern u1="‘" u2="ô" k="123" />
-<hkern u1="‘" u2="ó" k="123" />
-<hkern u1="‘" u2="ò" k="123" />
-<hkern u1="‘" u2="ë" k="123" />
-<hkern u1="‘" u2="ê" k="123" />
-<hkern u1="‘" u2="é" k="123" />
-<hkern u1="‘" u2="è" k="123" />
-<hkern u1="‘" u2="ç" k="123" />
-<hkern u1="‘" u2="æ" k="82" />
-<hkern u1="‘" u2="å" k="82" />
-<hkern u1="‘" u2="ä" k="82" />
-<hkern u1="‘" u2="ã" k="82" />
-<hkern u1="‘" u2="â" k="82" />
-<hkern u1="‘" u2="á" k="82" />
-<hkern u1="‘" u2="à" k="123" />
-<hkern u1="‘" u2="Ý" k="-20" />
-<hkern u1="‘" u2="Å" k="143" />
-<hkern u1="‘" u2="Ä" k="143" />
-<hkern u1="‘" u2="Ã" k="143" />
-<hkern u1="‘" u2="Â" k="143" />
-<hkern u1="‘" u2="Á" k="143" />
-<hkern u1="‘" u2="À" k="143" />
-<hkern u1="‘" u2="u" k="61" />
-<hkern u1="‘" u2="s" k="61" />
-<hkern u1="‘" u2="r" k="61" />
-<hkern u1="‘" u2="q" k="123" />
-<hkern u1="‘" u2="p" k="61" />
-<hkern u1="‘" u2="o" k="123" />
-<hkern u1="‘" u2="n" k="61" />
-<hkern u1="‘" u2="m" k="61" />
-<hkern u1="‘" u2="g" k="61" />
-<hkern u1="‘" u2="e" k="123" />
-<hkern u1="‘" u2="d" k="123" />
-<hkern u1="‘" u2="c" k="123" />
-<hkern u1="‘" u2="a" k="82" />
-<hkern u1="‘" u2="Y" k="-20" />
-<hkern u1="‘" u2="W" k="-41" />
-<hkern u1="‘" u2="V" k="-41" />
-<hkern u1="‘" u2="T" k="-41" />
-<hkern u1="‘" u2="A" k="143" />
-<hkern u1="’" u2="Ÿ" k="-20" />
-<hkern u1="’" u2="œ" k="123" />
-<hkern u1="’" u2="ü" k="61" />
-<hkern u1="’" u2="û" k="61" />
-<hkern u1="’" u2="ú" k="61" />
-<hkern u1="’" u2="ù" k="61" />
-<hkern u1="’" u2="ø" k="123" />
-<hkern u1="’" u2="ö" k="123" />
-<hkern u1="’" u2="õ" k="123" />
-<hkern u1="’" u2="ô" k="123" />
-<hkern u1="’" u2="ó" k="123" />
-<hkern u1="’" u2="ò" k="123" />
-<hkern u1="’" u2="ë" k="123" />
-<hkern u1="’" u2="ê" k="123" />
-<hkern u1="’" u2="é" k="123" />
-<hkern u1="’" u2="è" k="123" />
-<hkern u1="’" u2="ç" k="123" />
-<hkern u1="’" u2="æ" k="82" />
-<hkern u1="’" u2="å" k="82" />
-<hkern u1="’" u2="ä" k="82" />
-<hkern u1="’" u2="ã" k="82" />
-<hkern u1="’" u2="â" k="82" />
-<hkern u1="’" u2="á" k="82" />
-<hkern u1="’" u2="à" k="123" />
-<hkern u1="’" u2="Ý" k="-20" />
-<hkern u1="’" u2="Å" k="143" />
-<hkern u1="’" u2="Ä" k="143" />
-<hkern u1="’" u2="Ã" k="143" />
-<hkern u1="’" u2="Â" k="143" />
-<hkern u1="’" u2="Á" k="143" />
-<hkern u1="’" u2="À" k="143" />
-<hkern u1="’" u2="u" k="61" />
-<hkern u1="’" u2="s" k="61" />
-<hkern u1="’" u2="r" k="61" />
-<hkern u1="’" u2="q" k="123" />
-<hkern u1="’" u2="p" k="61" />
-<hkern u1="’" u2="o" k="123" />
-<hkern u1="’" u2="n" k="61" />
-<hkern u1="’" u2="m" k="61" />
-<hkern u1="’" u2="g" k="61" />
-<hkern u1="’" u2="e" k="123" />
-<hkern u1="’" u2="d" k="123" />
-<hkern u1="’" u2="c" k="123" />
-<hkern u1="’" u2="a" k="82" />
-<hkern u1="’" u2="Y" k="-20" />
-<hkern u1="’" u2="W" k="-41" />
-<hkern u1="’" u2="V" k="-41" />
-<hkern u1="’" u2="T" k="-41" />
-<hkern u1="’" u2="A" k="143" />
-<hkern u1="‚" u2="Ÿ" k="123" />
-<hkern u1="‚" u2="Œ" k="102" />
-<hkern u1="‚" u2="Ý" k="123" />
-<hkern u1="‚" u2="Ü" k="41" />
-<hkern u1="‚" u2="Û" k="41" />
-<hkern u1="‚" u2="Ú" k="41" />
-<hkern u1="‚" u2="Ù" k="41" />
-<hkern u1="‚" u2="Ø" k="102" />
-<hkern u1="‚" u2="Ö" k="102" />
-<hkern u1="‚" u2="Õ" k="102" />
-<hkern u1="‚" u2="Ô" k="102" />
-<hkern u1="‚" u2="Ó" k="102" />
-<hkern u1="‚" u2="Ò" k="102" />
-<hkern u1="‚" u2="Ç" k="102" />
-<hkern u1="‚" u2="Y" k="123" />
-<hkern u1="‚" u2="W" k="123" />
-<hkern u1="‚" u2="V" k="123" />
-<hkern u1="‚" u2="U" k="41" />
-<hkern u1="‚" u2="T" k="143" />
-<hkern u1="‚" u2="Q" k="102" />
-<hkern u1="‚" u2="O" k="102" />
-<hkern u1="‚" u2="G" k="102" />
-<hkern u1="‚" u2="C" k="102" />
-<hkern u1="“" u2="Ÿ" k="-20" />
-<hkern u1="“" u2="œ" k="123" />
-<hkern u1="“" u2="ü" k="61" />
-<hkern u1="“" u2="û" k="61" />
-<hkern u1="“" u2="ú" k="61" />
-<hkern u1="“" u2="ù" k="61" />
-<hkern u1="“" u2="ø" k="123" />
-<hkern u1="“" u2="ö" k="123" />
-<hkern u1="“" u2="õ" k="123" />
-<hkern u1="“" u2="ô" k="123" />
-<hkern u1="“" u2="ó" k="123" />
-<hkern u1="“" u2="ò" k="123" />
-<hkern u1="“" u2="ë" k="123" />
-<hkern u1="“" u2="ê" k="123" />
-<hkern u1="“" u2="é" k="123" />
-<hkern u1="“" u2="è" k="123" />
-<hkern u1="“" u2="ç" k="123" />
-<hkern u1="“" u2="æ" k="82" />
-<hkern u1="“" u2="å" k="82" />
-<hkern u1="“" u2="ä" k="82" />
-<hkern u1="“" u2="ã" k="82" />
-<hkern u1="“" u2="â" k="82" />
-<hkern u1="“" u2="á" k="82" />
-<hkern u1="“" u2="à" k="123" />
-<hkern u1="“" u2="Ý" k="-20" />
-<hkern u1="“" u2="Å" k="143" />
-<hkern u1="“" u2="Ä" k="143" />
-<hkern u1="“" u2="Ã" k="143" />
-<hkern u1="“" u2="Â" k="143" />
-<hkern u1="“" u2="Á" k="143" />
-<hkern u1="“" u2="À" k="143" />
-<hkern u1="“" u2="u" k="61" />
-<hkern u1="“" u2="s" k="61" />
-<hkern u1="“" u2="r" k="61" />
-<hkern u1="“" u2="q" k="123" />
-<hkern u1="“" u2="p" k="61" />
-<hkern u1="“" u2="o" k="123" />
-<hkern u1="“" u2="n" k="61" />
-<hkern u1="“" u2="m" k="61" />
-<hkern u1="“" u2="g" k="61" />
-<hkern u1="“" u2="e" k="123" />
-<hkern u1="“" u2="d" k="123" />
-<hkern u1="“" u2="c" k="123" />
-<hkern u1="“" u2="a" k="82" />
-<hkern u1="“" u2="Y" k="-20" />
-<hkern u1="“" u2="W" k="-41" />
-<hkern u1="“" u2="V" k="-41" />
-<hkern u1="“" u2="T" k="-41" />
-<hkern u1="“" u2="A" k="143" />
-<hkern u1="„" u2="Ÿ" k="123" />
-<hkern u1="„" u2="Œ" k="102" />
-<hkern u1="„" u2="Ý" k="123" />
-<hkern u1="„" u2="Ü" k="41" />
-<hkern u1="„" u2="Û" k="41" />
-<hkern u1="„" u2="Ú" k="41" />
-<hkern u1="„" u2="Ù" k="41" />
-<hkern u1="„" u2="Ø" k="102" />
-<hkern u1="„" u2="Ö" k="102" />
-<hkern u1="„" u2="Õ" k="102" />
-<hkern u1="„" u2="Ô" k="102" />
-<hkern u1="„" u2="Ó" k="102" />
-<hkern u1="„" u2="Ò" k="102" />
-<hkern u1="„" u2="Ç" k="102" />
-<hkern u1="„" u2="Y" k="123" />
-<hkern u1="„" u2="W" k="123" />
-<hkern u1="„" u2="V" k="123" />
-<hkern u1="„" u2="U" k="41" />
-<hkern u1="„" u2="T" k="143" />
-<hkern u1="„" u2="Q" k="102" />
-<hkern u1="„" u2="O" k="102" />
-<hkern u1="„" u2="G" k="102" />
-<hkern u1="„" u2="C" k="102" />
-</font>
-</defs></svg>
\ No newline at end of file
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/open-sans-regular.ttf b/plugins/wordpress-mobile-pack/admin/sass/fonts/open-sans-regular.ttf
deleted file mode 100755
index b3a0b0c..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/open-sans-regular.ttf and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/open-sans-regular.woff b/plugins/wordpress-mobile-pack/admin/sass/fonts/open-sans-regular.woff
deleted file mode 100755
index 8b67923..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/open-sans-regular.woff and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-italic.eot b/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-italic.eot
deleted file mode 100755
index c4b25ee..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-italic.eot and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-italic.svg b/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-italic.svg
deleted file mode 100755
index ff082d0..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-italic.svg
+++ /dev/null
@@ -1,1825 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="open_sansitalic" horiz-adv-x="1128" >
-<font-face units-per-em="2048" ascent="1638" descent="-410" />
-<missing-glyph horiz-adv-x="532" />
-<glyph unicode="fi" horiz-adv-x="1165" d="M-229 -330q64 -22 112 -22q76 0 117 62t66 177l227 1082h-193l13 67l206 66l23 100q46 200 127.5 282.5t241.5 82.5q40 0 98 -11.5t90 -25.5l-43 -129q-76 29 -137 29q-87 0 -133.5 -48.5t-75.5 -177.5l-25 -108h238l-25 -127h-237l-232 -1098q-39 -189 -120 -276 t-213 -87q-69 0 -125 21v141zM702 0l234 1096h168l-234 -1096h-168zM983 1376q0 56 32 91.5t83 35.5q88 0 88 -90q0 -55 -33.5 -93t-77.5 -38q-40 0 -66 24.5t-26 69.5z" />
-<glyph unicode="fl" horiz-adv-x="1165" d="M-229 -330q64 -22 112 -22q76 0 117 62t66 177l227 1082h-193l13 67l206 66l23 100q46 200 127.5 282.5t241.5 82.5q40 0 98 -11.5t90 -25.5l-43 -129q-76 29 -137 29q-87 0 -133.5 -48.5t-75.5 -177.5l-25 -108h238l-25 -127h-237l-232 -1098q-39 -189 -120 -276 t-213 -87q-69 0 -125 21v141zM700 0l332 1556h168l-332 -1556h-168z" />
-<glyph unicode="ffi" horiz-adv-x="1815" d="M-229 -330q64 -22 112 -22q70 0 114 58t69 181l227 1082h-193l13 67l206 66l23 100q46 200 127.5 282.5t241.5 82.5q40 0 98 -11.5t90 -25.5l-43 -129q-76 29 -137 29q-87 0 -133.5 -48.5t-75.5 -177.5l-25 -108h482l24 108q45 197 126 280t243 83q41 0 97.5 -11 t92.5 -26l-45 -129q-76 29 -137 29q-89 0 -135 -51t-74 -175l-24 -108h239l-26 -127h-238l-231 -1098q-43 -195 -123.5 -279t-210.5 -84q-71 0 -125 21v141q61 -22 115 -22q68 0 111 57.5t69 181.5l227 1082h-481l-232 -1098q-39 -189 -120 -276t-213 -87q-69 0 -125 21v141 zM1354 0l233 1096h168l-233 -1096h-168zM1634 1376q0 54 32 90.5t83 36.5q88 0 88 -90q0 -55 -33.5 -93t-77.5 -38q-38 0 -65 24.5t-27 69.5z" />
-<glyph unicode="ffl" horiz-adv-x="1815" d="M-229 -330q64 -22 112 -22q70 0 114 58t69 181l227 1082h-193l13 67l206 66l23 100q46 200 127.5 282.5t241.5 82.5q40 0 98 -11.5t90 -25.5l-43 -129q-76 29 -137 29q-87 0 -133.5 -48.5t-75.5 -177.5l-25 -108h482l24 108q45 197 126 280t243 83q41 0 97.5 -11 t92.5 -26l-45 -129q-76 29 -137 29q-89 0 -135 -51t-74 -175l-24 -108h239l-26 -127h-238l-231 -1098q-43 -195 -123.5 -279t-210.5 -84q-71 0 -125 21v141q61 -22 115 -22q68 0 111 57.5t69 181.5l227 1082h-481l-232 -1098q-39 -189 -120 -276t-213 -87q-69 0 -125 21v141 zM1352 0l331 1556h168l-331 -1556h-168z" />
-<glyph horiz-adv-x="2048" />
-<glyph horiz-adv-x="2048" />
-<glyph unicode="
" horiz-adv-x="1044" />
-<glyph unicode=" " horiz-adv-x="532" />
-<glyph unicode="	" horiz-adv-x="532" />
-<glyph unicode=" " horiz-adv-x="532" />
-<glyph unicode="!" horiz-adv-x="530" d="M43 78q0 76 39.5 120t107.5 44q45 0 73 -27.5t28 -81.5q0 -68 -39 -115t-105 -47q-49 0 -76.5 28t-27.5 79zM172 403q49 307 176 1059h207l-274 -1059h-109z" />
-<glyph unicode=""" horiz-adv-x="791" d="M225 934l72 528h188l-153 -528h-107zM573 934l72 528h189l-154 -528h-107z" />
-<glyph unicode="#" horiz-adv-x="1323" d="M63 430l13 129h284l101 340h-277l13 127h301l123 436h139l-125 -436h305l127 436h133l-125 -436h264l-12 -127h-291l-98 -340h285l-13 -129h-309l-125 -430h-139l129 430h-303l-127 -430h-133l121 430h-261zM500 559h303l96 340h-303z" />
-<glyph unicode="$" d="M72 176v154q82 -41 175.5 -63.5t166.5 -22.5l98 452q-139 49 -201.5 123.5t-62.5 188.5q0 159 108 255t299 113l39 176h133l-39 -178q159 -12 283 -76l-63 -135q-121 63 -248 72l-94 -440q149 -55 212.5 -125t63.5 -178q0 -162 -112.5 -263t-309.5 -123l-49 -225h-133 l49 223q-195 14 -315 72zM401 1010q0 -53 34.5 -97.5t107.5 -70.5l84 393q-108 -11 -167 -69t-59 -156zM549 250q107 13 170 75t63 154q0 54 -33 96t-114 74z" />
-<glyph unicode="%" horiz-adv-x="1624" d="M168 860q0 166 50.5 318.5t136.5 228.5t200 76q116 0 176 -72t60 -205q0 -108 -32 -237.5t-82.5 -217.5t-120.5 -137t-157 -49q-109 0 -170 75t-61 220zM231 0l1086 1462h151l-1085 -1462h-152zM307 864q0 -172 107 -172q52 0 94 39.5t73.5 114t50.5 175t19 171.5 q0 166 -108 166q-66 0 -119 -63t-85 -187.5t-32 -243.5zM909 274q0 166 50.5 318.5t136.5 228.5t200 76q116 0 176 -71.5t60 -204.5q0 -107 -31.5 -236t-82 -217.5t-121 -138t-156.5 -49.5q-110 0 -171 74.5t-61 219.5zM1049 279q0 -173 106 -173q65 0 117 65t86.5 198.5 t34.5 236.5q0 166 -109 166q-67 0 -119.5 -64.5t-84 -188.5t-31.5 -240z" />
-<glyph unicode="&" horiz-adv-x="1372" d="M66 342q0 148 90 257.5t303 211.5q-103 165 -103 309q0 164 106 264.5t281 100.5q149 0 236.5 -79t87.5 -212q0 -78 -32.5 -137t-87.5 -108t-127.5 -90t-153.5 -83l278 -389q127 110 199 295h168q-101 -236 -283 -412l203 -270h-201l-117 166q-120 -100 -230 -143 t-247 -43q-168 0 -269 96t-101 266zM229 354q0 -106 66.5 -170.5t175.5 -64.5q87 0 168 33t195 124l-306 433q-128 -67 -184 -116t-85.5 -107.5t-29.5 -131.5zM516 1118q0 -120 82 -235q139 71 191 110t83 85t31 104q0 77 -42.5 121.5t-123.5 44.5q-105 0 -163 -60t-58 -170 z" />
-<glyph unicode="'" horiz-adv-x="444" d="M225 934l72 528h188l-153 -528h-107z" />
-<glyph unicode="(" horiz-adv-x="584" d="M82 272q0 339 120 627t384 563h157q-246 -270 -371.5 -570t-125.5 -618q0 -339 114 -598h-131q-147 266 -147 596z" />
-<glyph unicode=")" horiz-adv-x="584" d="M-160 -324q496 551 496 1188q0 341 -113 598h131q146 -269 146 -598q0 -341 -121.5 -629.5t-382.5 -558.5h-156z" />
-<glyph unicode="*" horiz-adv-x="1130" d="M215 1194l55 154l371 -185l41 400l172 -35l-123 -383l422 18l-8 -157l-393 47l180 -383l-166 -52l-113 406l-258 -344l-116 121l309 284z" />
-<glyph unicode="+" d="M127 651v142h389v391h141v-391h390v-142h-390v-387h-141v387h-389z" />
-<glyph unicode="," horiz-adv-x="492" d="M-100 -264q126 286 204 502h187l8 -23q-113 -235 -270 -479h-129z" />
-<glyph unicode="-" horiz-adv-x="639" d="M55 469l35 158h479l-34 -158h-480z" />
-<glyph unicode="." horiz-adv-x="518" d="M43 74q0 77 40.5 122.5t111.5 45.5q43 0 69.5 -26t26.5 -79q0 -71 -40 -118.5t-108 -47.5q-46 0 -73 26t-27 77z" />
-<glyph unicode="/" horiz-adv-x="717" d="M-94 0l813 1462h174l-813 -1462h-174z" />
-<glyph unicode="0" d="M121 477q0 270 82 514.5t216.5 369t307.5 124.5q365 0 365 -471q0 -295 -78.5 -539t-214 -369.5t-314.5 -125.5q-176 0 -270 127.5t-94 369.5zM293 479q0 -172 50 -264t161 -92q115 0 209 114t150.5 328t56.5 453q0 323 -203 323q-113 0 -209 -115.5t-155.5 -323 t-59.5 -423.5z" />
-<glyph unicode="1" d="M303 1178l449 284h149l-313 -1462h-172l196 913q59 261 88 359q-50 -53 -139 -111l-178 -110z" />
-<glyph unicode="2" d="M12 0l31 147l465 420q102 93 176.5 163.5t123 133t72 124t23.5 136.5q0 99 -60 157t-163 58q-77 0 -150.5 -28.5t-162.5 -96.5l-82 115q191 154 413 154q176 0 278.5 -88.5t102.5 -243.5q0 -111 -39.5 -204t-131 -197t-294.5 -281l-352 -307v-8h678l-29 -154h-899z" />
-<glyph unicode="3" d="M47 59v164q94 -49 199 -75.5t190 -26.5q162 0 252 79.5t90 217.5q0 131 -79 198.5t-220 67.5h-131l31 143h139q165 0 274 87t109 227q0 92 -58 146t-157 54q-80 0 -157 -27t-175 -93l-80 118q195 144 424 144q179 0 277 -87t98 -237q0 -156 -101 -264.5t-280 -140.5v-9 q124 -23 195 -106.5t71 -208.5q0 -133 -62 -234.5t-181 -158.5t-283 -57q-210 0 -385 79z" />
-<glyph unicode="4" d="M16 334l29 158l834 978h196l-207 -983h232l-33 -153h-233l-72 -334h-164l74 334h-656zM219 487h486q46 220 78 373t116 445h-8q-17 -29 -66.5 -96.5t-72.5 -96.5z" />
-<glyph unicode="5" d="M80 59v164q164 -102 334 -102q191 0 298 96t107 268q0 126 -73.5 199.5t-204.5 73.5q-48 0 -97 -6.5t-139 -30.5l-74 57l197 684h668l-33 -153h-522l-127 -439q87 23 184 23q182 0 289.5 -104.5t107.5 -282.5q0 -161 -73 -283t-204 -182.5t-308 -60.5q-193 0 -330 79z " />
-<glyph unicode="6" d="M133 424q0 209 60.5 415t163.5 351.5t246 219t327 73.5q111 0 184 -23l-35 -145q-68 22 -170 22q-212 0 -356.5 -149t-212.5 -443h8q59 79 146.5 126t193.5 47q154 0 244 -98.5t90 -270.5q0 -161 -66.5 -294.5t-180.5 -204t-261 -70.5q-182 0 -281.5 115t-99.5 329z M299 416q0 -137 60.5 -216t172.5 -79q94 0 167.5 54t114 149t40.5 208q0 248 -221 248q-66 0 -128 -28.5t-110 -76t-72 -104.5t-24 -155z" />
-<glyph unicode="7" d="M174 0l768 1313h-719l31 149h891l-27 -139l-764 -1323h-180z" />
-<glyph unicode="8" d="M96 346q0 148 95 256t296 184q-95 69 -135.5 144.5t-40.5 171.5q0 111 54.5 198.5t153.5 136t222 48.5q174 0 271.5 -86.5t97.5 -235.5q0 -129 -78 -225t-266 -176q127 -78 180 -165t53 -202q0 -122 -60 -217.5t-172.5 -146.5t-264.5 -51q-190 0 -298 98.5t-108 267.5z M270 354q0 -107 69 -170t181 -63q139 0 222 74t83 196q0 99 -52 174t-165 135q-185 -60 -261.5 -143.5t-76.5 -202.5zM479 1100q0 -82 39 -144t127 -116q161 60 228 131.5t67 173.5q0 90 -57.5 143t-153.5 53q-114 0 -182 -65.5t-68 -175.5z" />
-<glyph unicode="9" d="M98 14v158q134 -47 246 -47q202 0 327 141t189 441h-10q-51 -75 -132.5 -118.5t-180.5 -43.5q-169 0 -261 98.5t-92 288.5q0 153 64.5 280.5t180 199t259.5 71.5q180 0 279.5 -114.5t99.5 -334.5q0 -194 -56 -406.5t-147.5 -360t-221.5 -217.5t-302 -70q-136 0 -242 34z M350 938q0 -124 54.5 -190t162.5 -66q76 0 140 28.5t108.5 81.5t65 114t20.5 151q0 131 -59 207.5t-160 76.5q-150 0 -241 -113t-91 -290z" />
-<glyph unicode=":" horiz-adv-x="518" d="M43 74q0 77 40.5 122.5t111.5 45.5q43 0 69.5 -26t26.5 -79q0 -71 -40 -118.5t-108 -47.5q-46 0 -73 26t-27 77zM203 956q0 77 40 122.5t111 45.5q97 0 97 -104q0 -73 -41.5 -119.5t-106.5 -46.5q-46 0 -73 26.5t-27 75.5z" />
-<glyph unicode=";" horiz-adv-x="518" d="M-100 -264q126 286 204 502h187l8 -23q-113 -235 -270 -479h-129zM203 956q0 77 40 122.5t111 45.5q97 0 97 -104q0 -73 -41.5 -119.5t-106.5 -46.5q-46 0 -73 26.5t-27 75.5z" />
-<glyph unicode="<" d="M121 664v98l919 479v-149l-747 -371l747 -328v-151z" />
-<glyph unicode="=" d="M127 444v142h920v-142h-920zM127 858v139h920v-139h-920z" />
-<glyph unicode=">" d="M121 242v151l745 328l-745 371v149l919 -479v-98z" />
-<glyph unicode="?" horiz-adv-x="874" d="M158 74q0 77 40 122.5t111 45.5q44 0 70.5 -26t26.5 -79q0 -73 -41.5 -119.5t-106.5 -46.5q-46 0 -73 26t-27 77zM197 1382q92 51 192 76t182 25q167 0 259 -84t92 -238q0 -123 -65.5 -226.5t-225.5 -223.5q-125 -91 -169 -147.5t-67 -160.5h-135q22 130 72.5 213.5 t165.5 174.5q128 100 168 144t63 94t23 112q0 93 -51.5 143.5t-147.5 50.5q-81 0 -155 -25.5t-140 -56.5z" />
-<glyph unicode="@" horiz-adv-x="1735" d="M111 504q0 261 126.5 485.5t343.5 347.5t486 123q191 0 329 -75.5t210.5 -213.5t72.5 -319q0 -179 -55 -324t-155 -227t-222 -82q-197 0 -213 184h-8q-111 -184 -291 -184q-115 0 -180.5 75.5t-65.5 209.5q0 157 68 284t188.5 199t260.5 72q65 0 127.5 -12t150.5 -48 q-64 -242 -98 -368t-31 -172q0 -117 102 -117q78 0 141.5 67t100.5 183.5t37 243.5q0 239 -128 367t-370 128q-228 0 -406.5 -107t-277 -295.5t-98.5 -416.5q0 -270 143.5 -418.5t409.5 -148.5q197 0 420 86v-127q-219 -90 -443 -90q-314 0 -494.5 184.5t-180.5 505.5z M639 518q0 -93 33 -134.5t98 -41.5q187 0 272 315l70 258q-63 23 -127 23q-94 0 -174 -55t-126 -153t-46 -212z" />
-<glyph unicode="A" horiz-adv-x="1137" d="M-117 0l799 1462h174l184 -1462h-170l-57 465h-496l-245 -465h-189zM401 621h394l-35 299q-24 179 -29 350q-37 -88 -80.5 -175t-249.5 -474z" />
-<glyph unicode="B" horiz-adv-x="1225" d="M86 0l309 1462h375q432 0 432 -336q0 -141 -87 -238t-245 -126v-10q115 -32 176.5 -110.5t61.5 -188.5q0 -212 -152 -332.5t-407 -120.5h-463zM287 145h266q181 0 278 80.5t97 227.5q0 116 -74.5 177.5t-214.5 61.5h-236zM434 836h248q156 0 249 73t93 199 q0 104 -66.5 155.5t-209.5 51.5h-211z" />
-<glyph unicode="C" horiz-adv-x="1198" d="M150 537q0 261 105.5 485.5t283.5 342.5t403 118q197 0 348 -80l-69 -141q-138 69 -279 69q-174 0 -311.5 -97t-218 -284.5t-80.5 -408.5q0 -187 97.5 -298.5t268.5 -111.5q139 0 322 57v-149q-86 -31 -164 -45t-188 -14q-242 0 -380 149.5t-138 407.5z" />
-<glyph unicode="D" horiz-adv-x="1364" d="M86 0l309 1462h342q276 0 419.5 -149.5t143.5 -435.5q0 -261 -105 -461t-300 -308t-457 -108h-352zM287 147h162q202 0 355 91.5t234.5 258.5t81.5 382t-103 325.5t-302 110.5h-178z" />
-<glyph unicode="E" horiz-adv-x="1047" d="M86 0l309 1462h735l-32 -153h-566l-98 -469h527l-29 -152h-529l-114 -536h565l-33 -152h-735z" />
-<glyph unicode="F" horiz-adv-x="967" d="M86 0l309 1462h735l-30 -153h-568l-110 -533h528l-32 -153h-529l-131 -623h-172z" />
-<glyph unicode="G" horiz-adv-x="1386" d="M150 528q0 269 101.5 489.5t281.5 343t399 122.5q117 0 219.5 -20t206.5 -64l-66 -152q-77 34 -165.5 59t-194.5 25q-169 0 -307.5 -101.5t-215.5 -283.5t-77 -407q0 -190 102.5 -299t286.5 -109q154 0 260 39l96 444h-289l33 152h459l-154 -711q-216 -75 -419 -75 q-264 0 -410.5 144.5t-146.5 403.5z" />
-<glyph unicode="H" horiz-adv-x="1389" d="M86 0l309 1462h170l-131 -622h660l133 622h168l-310 -1462h-167l143 688h-660l-145 -688h-170z" />
-<glyph unicode="I" horiz-adv-x="559" d="M86 0l311 1462h168l-311 -1462h-168z" />
-<glyph unicode="J" horiz-adv-x="547" d="M-319 -360l6 147q69 -20 145 -20q100 0 165.5 62.5t90.5 182.5l307 1450h170l-309 -1468q-79 -379 -422 -379q-105 0 -153 25z" />
-<glyph unicode="K" horiz-adv-x="1141" d="M86 0l309 1462h170l-151 -710l700 710h209l-639 -637l350 -825h-186q-72 181 -146.5 359.5t-146.5 361.5l-174 -131l-125 -590h-170z" />
-<glyph unicode="L" horiz-adv-x="971" d="M86 0l309 1462h170l-276 -1308h565l-33 -154h-735z" />
-<glyph unicode="M" horiz-adv-x="1714" d="M84 0l309 1462h244l149 -1204h9l659 1204h266l-303 -1462h-174q126 590 193 905.5t94 392.5h-6l-717 -1298h-131l-166 1296h-8q-7 -72 -28.5 -197.5t-37.5 -199.5l-190 -899h-162z" />
-<glyph unicode="N" horiz-adv-x="1438" d="M84 0l309 1462h180l459 -1220h6q30 224 72 405l174 815h164l-309 -1462h-181l-460 1223h-6q-32 -221 -74 -418l-172 -805h-162z" />
-<glyph unicode="O" horiz-adv-x="1475" d="M150 549q0 264 96 482t263.5 336t377.5 118q244 0 384 -154t140 -424q0 -269 -88 -481.5t-252 -329t-379 -116.5q-256 0 -399 149.5t-143 419.5zM332 553q0 -199 98 -310.5t266 -111.5q152 0 272.5 97.5t190.5 279.5t70 403q0 199 -94 310.5t-261 111.5q-157 0 -281 -101 t-192.5 -281t-68.5 -398z" />
-<glyph unicode="P" horiz-adv-x="1159" d="M86 0l309 1462h330q214 0 324 -94.5t110 -282.5q0 -248 -164 -379t-481 -131h-135l-123 -575h-170zM410 721h133q216 0 328 91t112 267q0 125 -69.5 180.5t-213.5 55.5h-163z" />
-<glyph unicode="Q" horiz-adv-x="1475" d="M150 549q0 264 96 482t263.5 336t377.5 118q244 0 384 -154t140 -424q0 -333 -139 -576t-375 -321l274 -358h-219l-227 330l-17 -2h-16q-256 0 -399 149.5t-143 419.5zM332 553q0 -199 98 -310.5t266 -111.5q158 0 279 100t187.5 280.5t66.5 399.5q0 199 -94 310.5 t-261 111.5q-157 0 -281 -101t-192.5 -281t-68.5 -398z" />
-<glyph unicode="R" horiz-adv-x="1165" d="M86 0l309 1462h320q446 0 446 -366q0 -348 -368 -449l239 -647h-186l-209 608h-252l-129 -608h-170zM416 754h168q193 0 297 85t104 244q0 121 -67.5 175.5t-219.5 54.5h-166q-102 -494 -116 -559z" />
-<glyph unicode="S" horiz-adv-x="1028" d="M39 43v170q162 -84 340 -84q162 0 257 75.5t95 207.5q0 78 -52.5 137.5t-195.5 140.5q-151 85 -209.5 170t-58.5 201q0 187 132 304.5t347 117.5q99 0 184.5 -19t180.5 -65l-66 -150q-66 38 -148 60t-151 22q-134 0 -215.5 -69.5t-81.5 -188.5q0 -54 17 -92.5t54 -72.5 t142 -95q147 -88 198.5 -138t78 -110.5t26.5 -140.5q0 -211 -140.5 -327.5t-395.5 -116.5q-106 0 -186.5 14.5t-151.5 48.5z" />
-<glyph unicode="T" horiz-adv-x="1020" d="M186 1311l33 151h985l-30 -151h-408l-279 -1311h-172l277 1311h-406z" />
-<glyph unicode="U" horiz-adv-x="1384" d="M164 383q0 81 24 201l189 878h170l-191 -891q-22 -106 -22 -188q0 -117 73 -184.5t218 -67.5q172 0 267.5 87.5t139.5 289.5l205 954h170l-205 -966q-55 -263 -197.5 -389.5t-388.5 -126.5q-230 0 -341 104t-111 299z" />
-<glyph unicode="V" horiz-adv-x="1122" d="M188 1462h170l97 -930q20 -196 20 -335h4q61 144 162 338l479 927h191l-781 -1462h-180z" />
-<glyph unicode="W" horiz-adv-x="1745" d="M223 1462h170l31 -901l2 -88q0 -98 -10 -258h6q89 243 156 383l405 864h178l43 -860q9 -153 9 -304l-1 -83h9q75 224 131 354l387 893h182l-664 -1462h-170l-49 965q-8 136 -8 282h-6q-25 -72 -61 -154.5t-504 -1092.5h-174z" />
-<glyph unicode="X" horiz-adv-x="1063" d="M-104 0l596 776l-263 686h172l203 -563l443 563h186l-555 -694l278 -768h-180l-213 641l-481 -641h-186z" />
-<glyph unicode="Y" horiz-adv-x="1030" d="M188 1462h170l179 -747l489 747h193l-627 -921l-113 -541h-172l119 549z" />
-<glyph unicode="Z" horiz-adv-x="1087" d="M-16 0l28 137l924 1170h-655l32 155h858l-26 -139l-924 -1169h697l-33 -154h-901z" />
-<glyph unicode="[" horiz-adv-x="586" d="M-16 -324l381 1786h387l-31 -141h-227l-318 -1503h227l-32 -142h-387z" />
-<glyph unicode="\" horiz-adv-x="717" d="M221 1462h154l217 -1462h-154z" />
-<glyph unicode="]" horiz-adv-x="586" d="M-150 -324l31 142h225l320 1503h-227l30 141h389l-380 -1786h-388z" />
-<glyph unicode="^" horiz-adv-x="1059" d="M53 553l598 920h109l266 -920h-145l-201 747l-467 -747h-160z" />
-<glyph unicode="_" horiz-adv-x="807" d="M-188 -324l30 140h811l-30 -140h-811z" />
-<glyph unicode="`" horiz-adv-x="1135" d="M575 1548v21h181q43 -136 147 -303v-25h-104q-61 61 -128.5 154t-95.5 153z" />
-<glyph unicode="a" horiz-adv-x="1157" d="M98 350q0 208 71 386t196 279t274 101q92 0 164 -49.5t112 -142.5h11l67 172h127l-233 -1096h-133l26 209h-8q-179 -229 -377 -229q-139 0 -218 99t-79 271zM270 346q0 -114 47 -170.5t132 -56.5q97 0 193 92.5t156 241t60 297.5q0 103 -56 164t-147 61 q-104 0 -193.5 -86t-140.5 -233t-51 -310z" />
-<glyph unicode="b" horiz-adv-x="1182" d="M59 0l330 1556h168q-51 -242 -78.5 -370.5t-75.5 -300.5h9q93 118 183.5 173.5t186.5 55.5q141 0 220 -99t79 -272q0 -209 -68.5 -386.5t-191 -277t-276.5 -99.5q-97 0 -170.5 51t-110.5 139h-10l-70 -170h-125zM319 346q0 -110 55.5 -168.5t160.5 -58.5q99 0 184.5 81 t137.5 230.5t52 317.5q0 227 -178 227q-96 0 -195.5 -95t-158 -239t-58.5 -295z" />
-<glyph unicode="c" horiz-adv-x="922" d="M98 389q0 200 74 369t204.5 263.5t293.5 94.5q137 0 268 -51l-47 -141q-120 51 -219 51q-112 0 -204.5 -76.5t-145 -213t-52.5 -296.5q0 -128 66.5 -199t183.5 -71q72 0 136 20t126 47v-143q-124 -63 -276 -63q-194 0 -301 107t-107 302z" />
-<glyph unicode="d" horiz-adv-x="1182" d="M98 350q0 214 72 392t194.5 275t274.5 97q194 0 281 -190h10q17 155 45 274l78 358h166l-330 -1556h-139l22 209h-8q-101 -125 -189 -177t-182 -52q-139 0 -217 98t-78 272zM270 346q0 -227 179 -227q94 0 194 93.5t158.5 239t58.5 296.5q0 111 -54 169t-157 58 q-101 0 -187.5 -82.5t-139 -232t-52.5 -314.5z" />
-<glyph unicode="e" horiz-adv-x="1010" d="M98 391q0 188 74.5 360.5t197.5 268.5t271 96q153 0 230 -66.5t77 -185.5q0 -180 -166 -282.5t-475 -102.5h-33l-4 -80q0 -131 61.5 -204.5t190.5 -73.5q63 0 129.5 18t165.5 66v-146q-94 -44 -166 -61.5t-159 -17.5q-184 0 -289 109t-105 302zM299 618h12 q228 0 349.5 59.5t121.5 172.5q0 53 -36.5 88t-114.5 35q-103 0 -193.5 -94t-138.5 -261z" />
-<glyph unicode="f" horiz-adv-x="641" d="M-229 -330q64 -22 112 -22q76 0 117 62t66 177l227 1082h-193l13 67l206 66l23 100q46 200 127.5 282.5t241.5 82.5q40 0 98 -11.5t90 -25.5l-43 -129q-76 29 -137 29q-87 0 -133.5 -48.5t-75.5 -177.5l-25 -108h238l-25 -127h-237l-232 -1098q-39 -189 -120 -276 t-213 -87q-69 0 -125 21v141z" />
-<glyph unicode="g" horiz-adv-x="1026" d="M-127 -211q0 105 72 182t233 131q-78 41 -78 121q0 69 51 118.5t142 92.5q-63 32 -103 94.5t-40 145.5q0 194 119.5 318t305.5 124q78 0 154 -20h371l-25 -107l-211 -24q41 -62 41 -158q0 -191 -116.5 -304.5t-311.5 -113.5q-55 0 -84 8q-139 -53 -139 -131 q0 -41 33 -54.5t96 -21.5l117 -14q181 -22 262.5 -88t81.5 -194q0 -184 -146 -285t-411 -101q-194 0 -304 73.5t-110 207.5zM35 -195q0 -77 65 -122t193 -45q182 0 284.5 63.5t102.5 179.5q0 62 -54 98t-184 50l-159 16q-120 -25 -184 -88t-64 -152zM313 680 q0 -85 45 -129.5t125 -44.5q79 0 138 42t90.5 115.5t31.5 159.5q0 82 -44 125t-126 43q-78 0 -136.5 -40.5t-91 -113t-32.5 -157.5z" />
-<glyph unicode="h" horiz-adv-x="1182" d="M59 0l330 1556h168q-18 -82 -34.5 -159t-34 -156.5t-38 -166.5t-47.5 -189h11q94 123 185.5 176t191.5 53q131 0 202.5 -72t71.5 -204q0 -62 -23 -166q-39 -193 -145 -672h-168l148 692q18 94 18 135q0 148 -147 148q-89 0 -173.5 -59t-149 -171.5t-97.5 -271.5 l-101 -473h-168z" />
-<glyph unicode="i" horiz-adv-x="520" d="M59 0l234 1096h168l-234 -1096h-168zM340 1376q0 56 32 91.5t83 35.5q88 0 88 -90q0 -55 -33.5 -93t-77.5 -38q-40 0 -66 24.5t-26 69.5z" />
-<glyph unicode="j" horiz-adv-x="520" d="M-258 -330q61 -22 119 -22q125 0 168 205l264 1243h166l-266 -1258q-36 -171 -114.5 -250.5t-213.5 -79.5q-69 0 -123 21v141zM340 1376q0 56 32 91.5t83 35.5q86 0 86 -90q0 -55 -33.5 -93t-77.5 -38q-38 0 -64 24.5t-26 69.5z" />
-<glyph unicode="k" horiz-adv-x="999" d="M57 0l330 1556h170l-129 -602t-102 -395h4l526 537h201l-469 -467l295 -629h-187l-235 524l-152 -123l-82 -401h-170z" />
-<glyph unicode="l" horiz-adv-x="520" d="M57 0l332 1556h168l-332 -1556h-168z" />
-<glyph unicode="m" horiz-adv-x="1786" d="M59 0l234 1096h139l-22 -203h10q87 119 173.5 171t178.5 52q113 0 174 -65t72 -181h8q86 125 183 185.5t196 60.5q127 0 196.5 -68t69.5 -198q0 -68 -22 -178l-144 -672h-170l148 692q20 104 20 146q0 62 -34.5 99.5t-108.5 37.5q-81 0 -160 -58t-138.5 -164.5 t-90.5 -252.5l-107 -500h-168l148 692q18 94 18 135q0 70 -31 109t-106 39q-84 0 -163.5 -60t-140 -171.5t-93.5 -268.5l-101 -475h-168z" />
-<glyph unicode="n" horiz-adv-x="1182" d="M59 0l234 1096h139l-22 -203h10q96 122 185.5 172.5t185.5 50.5q127 0 200.5 -69.5t73.5 -194.5q0 -79 -23 -180l-143 -672h-170l148 692q20 104 20 144q0 63 -35.5 101t-113.5 38q-89 0 -173.5 -60t-149 -171t-97.5 -269l-101 -475h-168z" />
-<glyph unicode="o" horiz-adv-x="1149" d="M98 406q0 190 73 357.5t197 257t275 89.5q190 0 300 -112.5t110 -309.5q0 -188 -72 -355t-195 -258t-278 -91q-192 0 -301 113t-109 309zM270 397q0 -131 63.5 -202.5t182.5 -71.5q104 0 187 73t129.5 207.5t46.5 307.5q0 115 -62.5 186.5t-169.5 71.5q-109 0 -195.5 -74 t-134 -205.5t-47.5 -292.5z" />
-<glyph unicode="p" horiz-adv-x="1182" d="M-43 -492l336 1588h139l-26 -209h8q179 227 372 227q137 0 216 -97.5t79 -273.5q0 -212 -69 -389t-191 -275.5t-276 -98.5q-97 0 -170 50t-113 140h-10l-4 -38q-3 -25 -10.5 -70t-114.5 -554h-166zM319 346q0 -110 55.5 -168.5t160.5 -58.5q99 0 184.5 81t137.5 230.5 t52 317.5q0 227 -178 227q-96 0 -195.5 -95t-158 -239t-58.5 -295z" />
-<glyph unicode="q" horiz-adv-x="1182" d="M98 350q0 212 72.5 392t196 277t274.5 97q94 0 165.5 -50.5t108.5 -141.5h13l67 172h125l-336 -1588h-166l101 480q9 45 57 221h-8q-95 -121 -185 -175t-186 -54q-140 0 -219.5 97.5t-79.5 272.5zM270 346q0 -227 179 -227q92 0 190 92t158.5 237t60.5 300 q0 105 -54.5 166t-152.5 61q-101 0 -189 -84.5t-140 -233t-52 -311.5z" />
-<glyph unicode="r" horiz-adv-x="811" d="M59 0l234 1096h139l-22 -203h10q72 95 119 136.5t98.5 64t114.5 22.5q69 0 120 -14l-36 -150q-53 13 -105 13q-91 0 -170.5 -60t-139 -166.5t-87.5 -236.5l-107 -502h-168z" />
-<glyph unicode="s" horiz-adv-x="877" d="M8 49v158q70 -42 151 -65t150 -23q126 0 190 50t64 128q0 57 -35 96t-151 107q-130 73 -184 143t-54 166q0 138 101 222.5t266 84.5q171 0 330 -74l-54 -137l-56 25q-101 43 -220 43q-93 0 -146 -43.5t-53 -112.5q0 -56 35.5 -96t146.5 -103q107 -60 153.5 -103 t69.5 -92.5t23 -111.5q0 -156 -110.5 -243.5t-311.5 -87.5q-169 0 -305 69z" />
-<glyph unicode="t" horiz-adv-x="664" d="M90 969l14 73l185 78l125 228h98l-55 -252h274l-26 -127h-273l-129 -604q-18 -87 -18 -132q0 -56 29 -86t81 -30q55 0 144 26v-129q-34 -14 -84 -24t-80 -10q-125 0 -191.5 59.5t-66.5 177.5q0 66 18 150l127 602h-172z" />
-<glyph unicode="u" horiz-adv-x="1182" d="M113 248q0 62 22 172l146 676h170l-150 -695q-18 -89 -18 -139q0 -143 147 -143q88 0 173 60t150 172t99 270l100 475h166l-231 -1096h-139l22 203h-12q-98 -125 -187 -174t-184 -49q-128 0 -201 69.5t-73 198.5z" />
-<glyph unicode="v" horiz-adv-x="946" d="M98 1096h168l64 -613q24 -258 24 -362h6q127 275 179 371l325 604h178l-591 -1096h-228z" />
-<glyph unicode="w" horiz-adv-x="1468" d="M117 1096h164l18 -594v-88q0 -147 -8 -269h6q47 124 137 322l295 629h182l37 -594q6 -168 6 -262v-53l-2 -42h6q28 86 83 218.5t323 732.5h178l-506 -1096h-205l-32 602q-4 94 -4 172v156h-9l-50 -118l-83 -189l-291 -623h-202z" />
-<glyph unicode="x" horiz-adv-x="979" d="M-74 0l475 565l-239 531h170l174 -412l330 412h194l-455 -539l252 -557h-168l-192 434l-346 -434h-195z" />
-<glyph unicode="y" horiz-adv-x="946" d="M-197 -336q63 -18 131 -18q82 0 140.5 50.5t113.5 149.5l76 136l-166 1114h168l74 -545q10 -69 19.5 -203.5t9.5 -216.5h6q35 87 87 200t77 156l325 609h178l-696 -1282q-93 -172 -184 -239t-219 -67q-72 0 -140 21v135z" />
-<glyph unicode="z" horiz-adv-x="909" d="M-29 0l23 117l694 854h-479l27 125h657l-29 -140l-680 -831h531l-25 -125h-719z" />
-<glyph unicode="{" horiz-adv-x="715" d="M27 514l32 143q118 0 189.5 43.5t93.5 147.5l68 326q34 160 117.5 224t254.5 64h33l-31 -141q-105 0 -151 -36.5t-66 -123.5l-71 -321q-28 -123 -91 -184t-167 -78v-5q151 -41 151 -213q0 -59 -18 -131l-47 -211q-15 -58 -15 -98q0 -53 36.5 -77.5t119.5 -24.5v-142h-23 q-141 0 -216.5 52.5t-75.5 171.5q0 52 20 141q33 146 51.5 227.5t14.5 102.5q0 143 -209 143z" />
-<glyph unicode="|" d="M541 -496v2052h139v-2052h-139z" />
-<glyph unicode="}" horiz-adv-x="715" d="M-74 -182q115 0 167 36t71 123l72 322q25 117 88 179.5t170 80.5v6q-150 42 -150 211q0 59 18 131l50 213q14 65 14 99q0 53 -40.5 77.5t-139.5 24.5l28 141h11q144 0 220.5 -52.5t76.5 -170.5q0 -48 -21 -141l-49 -219q-16 -68 -16 -111q0 -143 209 -143l-33 -144 q-119 0 -190 -43t-93 -147l-67 -326q-36 -164 -119 -226.5t-264 -62.5h-13v142z" />
-<glyph unicode="~" d="M115 592v151q98 109 243 109q69 0 127 -14.5t144 -51.5q64 -27 112.5 -41t98.5 -14q55 0 119.5 33t115.5 88v-150q-100 -110 -244 -110q-72 0 -135 16.5t-135 48.5q-75 32 -120 44t-93 12q-54 0 -118.5 -34.5t-114.5 -86.5z" />
-<glyph unicode="¡" horiz-adv-x="530" d="M-14 -373l274 1057h109l-176 -1057h-207zM250 950q0 76 40.5 122t110.5 46q44 0 70.5 -26t26.5 -80q0 -71 -40.5 -117.5t-105.5 -46.5q-48 0 -75 25.5t-27 76.5z" />
-<glyph unicode="¢" d="M225 590q0 185 63.5 344t178.5 258.5t260 120.5l35 170h123l-37 -168q119 -9 217 -49l-47 -142q-109 52 -219 52q-112 0 -204.5 -76.5t-145 -213t-52.5 -296.5q0 -125 66 -198t184 -73q72 0 136 20t126 48v-143q-123 -62 -286 -66l-41 -198h-125l43 215 q-132 34 -203.5 137.5t-71.5 257.5z" />
-<glyph unicode="£" d="M-23 0l27 141q205 46 258 289l47 221h-200l26 127h201l76 350q75 353 430 353q184 0 336 -86l-66 -133q-146 79 -278 79q-213 0 -263 -237l-69 -326h370l-26 -127h-371l-47 -219q-22 -98 -66 -166.5t-124 -111.5h725l-33 -154h-953z" />
-<glyph unicode="¤" d="M168 1067l92 92l127 -129q103 70 217 70t215 -70l129 129l92 -90l-129 -129q70 -104 70 -217q0 -119 -70 -217l127 -127l-90 -90l-129 127q-98 -68 -215 -68q-119 0 -217 70l-127 -127l-90 90l127 127q-68 96 -68 215q0 117 68 215zM358 723q0 -103 71.5 -174.5 t174.5 -71.5q104 0 177 71.5t73 174.5q0 104 -73 177t-177 73q-102 0 -174 -72.5t-72 -177.5z" />
-<glyph unicode="¥" d="M127 266l29 133h290l33 160h-291l29 133h225l-202 770h163l179 -747l491 747h187l-533 -770h231l-28 -133h-297l-33 -160h297l-29 -133h-295l-57 -266h-154l56 266h-291z" />
-<glyph unicode="¦" d="M541 281h139v-777h-139v777zM541 780v776h139v-776h-139z" />
-<glyph unicode="§" horiz-adv-x="995" d="M59 53v148q56 -34 136.5 -56t156.5 -22q133 0 204 44.5t71 129.5q0 48 -50.5 89t-152.5 87q-138 61 -194 130.5t-56 166.5q0 201 238 307q-119 70 -119 203q0 127 103.5 206t279.5 79q189 0 321 -68l-53 -123q-148 60 -266 60q-102 0 -162.5 -40.5t-60.5 -109.5 q0 -49 38 -83.5t162 -90.5q100 -44 149 -83.5t75 -89.5t26 -114q0 -97 -61 -180t-172 -139q114 -71 114 -189q0 -152 -114 -237.5t-318 -85.5q-176 0 -295 61zM326 791q0 -70 50.5 -117t198.5 -111q80 44 127.5 107t47.5 131q0 60 -49.5 105.5t-186.5 103.5 q-82 -26 -135 -87.5t-53 -131.5z" />
-<glyph unicode="¨" horiz-adv-x="1135" d="M457 1378q0 46 28 79.5t74 33.5q78 0 78 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62zM821 1378q0 46 28 79.5t75 33.5q77 0 77 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62z" />
-<glyph unicode="©" horiz-adv-x="1704" d="M139 731q0 200 100 375t275 276t377 101q197 0 370 -97t277 -272t104 -383q0 -204 -100.5 -376.5t-273 -273.5t-377.5 -101q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM244 731q0 -173 87 -323.5t237.5 -237t322.5 -86.5q174 0 323 87t236.5 235.5t87.5 324.5 q0 174 -87 323t-235.5 236.5t-324.5 87.5q-174 0 -323 -87t-236.5 -235.5t-87.5 -324.5zM520 733q0 208 110 330.5t300 122.5q130 0 248 -60l-60 -120q-106 53 -190 53q-125 0 -191.5 -87t-66.5 -241q0 -169 65 -249.5t193 -80.5q82 0 211 43v-122q-66 -28 -113 -38 t-104 -10q-192 0 -297 119.5t-105 339.5z" />
-<glyph unicode="ª" horiz-adv-x="686" d="M170 1014q0 127 41.5 234.5t116.5 169t170 61.5q114 0 153 -103h6l37 90h86l-139 -665h-92l14 117h-4q-40 -56 -90 -93t-123 -37q-77 0 -126.5 60t-49.5 166zM283 1030q0 -139 98 -139q61 0 112.5 49t86 137.5t34.5 167.5q0 62 -28.5 96.5t-85.5 34.5q-92 0 -154.5 -103 t-62.5 -243z" />
-<glyph unicode="«" horiz-adv-x="958" d="M88 555v29l391 374l78 -81l-297 -328l172 -387l-113 -49zM483 510v31l367 405l86 -69l-283 -365l158 -350l-113 -49z" />
-<glyph unicode="¬" d="M127 651v142h920v-529h-140v387h-780z" />
-<glyph unicode="­" horiz-adv-x="639" d="M55 469l35 158h479l-34 -158h-480z" />
-<glyph unicode="®" horiz-adv-x="1704" d="M139 731q0 200 100 375t275 276t377 101q197 0 370 -97t277 -272t104 -383q0 -204 -100.5 -376.5t-273 -273.5t-377.5 -101q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM244 731q0 -173 87 -323.5t237.5 -237t322.5 -86.5q174 0 323 87t236.5 235.5t87.5 324.5 q0 174 -87 323t-235.5 236.5t-324.5 87.5q-174 0 -323 -87t-236.5 -235.5t-87.5 -324.5zM645 291v880h229q163 0 241.5 -63t78.5 -193q0 -78 -47.5 -141t-132.5 -98l227 -385h-149l-207 352h-113v-352h-127zM772 762h92q195 0 195 149q0 76 -47.5 107t-149.5 31h-90v-287z " />
-<glyph unicode="¯" horiz-adv-x="782" d="M227 1556l33 132h787l-35 -132h-785z" />
-<glyph unicode="°" horiz-adv-x="877" d="M215 1171q0 128 90.5 220t220.5 92q83 0 155.5 -41.5t114.5 -114t42 -156.5q0 -128 -90.5 -218.5t-221.5 -90.5t-221 90.5t-90 218.5zM328 1171q0 -80 58 -138t140 -58q83 0 140 58.5t57 137.5q0 82 -57.5 140.5t-139.5 58.5q-80 0 -139 -58.5t-59 -140.5z" />
-<glyph unicode="±" d="M127 0v141h920v-141h-920zM127 643v141h389v392h141v-392h390v-141h-390v-387h-141v387h-389z" />
-<glyph unicode="²" horiz-adv-x="717" d="M96 586l23 106l264 228q115 100 158.5 149.5t63.5 93t20 90.5q0 53 -31 85t-90 32q-90 0 -195 -80l-59 90q125 101 274 101q109 0 171.5 -56.5t62.5 -150.5q0 -99 -52.5 -179.5t-197.5 -205.5l-221 -187h395l-25 -116h-561z" />
-<glyph unicode="³" horiz-adv-x="717" d="M119 625v127q125 -72 239 -72q205 0 205 170q0 137 -178 137h-90l22 107h95q97 0 155 41t58 112q0 60 -34.5 90.5t-93.5 30.5q-102 0 -196 -68l-55 93q109 88 268 88q114 0 178 -56t64 -151q0 -180 -207 -234v-4q69 -17 108 -68t39 -120q0 -132 -91 -205.5t-253 -73.5 q-125 0 -233 56z" />
-<glyph unicode="´" horiz-adv-x="1135" d="M532 1241v27q56 60 125.5 151.5t106.5 149.5h190v-21q-38 -49 -140 -151t-177 -156h-105z" />
-<glyph unicode="µ" horiz-adv-x="1194" d="M-43 -492l336 1588h168l-148 -695q-18 -92 -18 -135q0 -147 147 -147q89 0 172 59t148.5 171t99.5 269l105 478h163l-233 -1096h-139l24 205h-12q-93 -121 -183 -173t-188 -52q-112 0 -163 96h-9q-11 -78 -22.5 -148t-83.5 -420h-164z" />
-<glyph unicode="¶" horiz-adv-x="1341" d="M199 1042q0 260 109 387t341 127h557v-1816h-114v1661h-213v-1661h-115v819q-62 -18 -146 -18q-216 0 -317.5 125t-101.5 376z" />
-<glyph unicode="·" horiz-adv-x="518" d="M170 690q0 77 40.5 122.5t111.5 45.5q43 0 69.5 -26t26.5 -79q0 -71 -40 -118.5t-108 -47.5q-46 0 -73 26t-27 77z" />
-<glyph unicode="¸" horiz-adv-x="420" d="M-170 -383q38 -6 68 -6q174 0 174 110q0 46 -39 67.5t-99 29.5l101 182h106l-61 -121q131 -38 131 -155q0 -98 -81 -157t-214 -59q-41 0 -86 9v100z" />
-<glyph unicode="¹" horiz-adv-x="717" d="M258 1280l279 182h118l-186 -876h-135l112 526q25 103 58 225q-25 -25 -50 -46.5t-145 -100.5z" />
-<glyph unicode="º" horiz-adv-x="688" d="M168 1055q0 117 42 215.5t117.5 153.5t174.5 55q117 0 180 -67t63 -193q0 -191 -88.5 -311t-240.5 -120q-113 0 -180.5 71t-67.5 196zM281 1059q0 -85 38 -127.5t107 -42.5q94 0 152.5 88.5t58.5 232.5q0 166 -137 166q-102 0 -160.5 -87.5t-58.5 -229.5z" />
-<glyph unicode="»" horiz-adv-x="958" d="M23 197l282 360l-158 354l113 50l217 -402v-31l-368 -401zM401 197l297 323l-172 391l113 50l233 -447v-29l-393 -370z" />
-<glyph unicode="¼" horiz-adv-x="1518" d="M123 0l1085 1462h154l-1086 -1462h-153zM204 1280l279 182h118l-186 -876h-135l112 526q25 103 58 225q-25 -25 -50 -46.5t-145 -100.5zM706 203l23 101l481 579h133l-121 -563h127l-22 -117h-129l-43 -202h-127l43 202h-365zM870 320h225q69 322 90 395 q-20 -36 -110 -149z" />
-<glyph unicode="½" horiz-adv-x="1518" d="M66 0l1085 1462h154l-1086 -1462h-153zM148 1280l279 182h118l-186 -876h-135l112 526q25 103 58 225q-25 -25 -50 -46.5t-145 -100.5zM782 1l23 106l264 228q115 100 158.5 149.5t63.5 93t20 90.5q0 53 -31 85t-90 32q-90 0 -195 -80l-59 90q125 101 274 101 q109 0 171.5 -56.5t62.5 -150.5q0 -99 -52.5 -179.5t-197.5 -205.5l-221 -187h395l-25 -116h-561z" />
-<glyph unicode="¾" horiz-adv-x="1565" d="M87 625v127q125 -72 239 -72q205 0 205 170q0 137 -178 137h-90l22 107h95q97 0 155 41t58 112q0 60 -34.5 90.5t-93.5 30.5q-102 0 -196 -68l-55 93q109 88 268 88q114 0 178 -56t64 -151q0 -180 -207 -234v-4q69 -17 108 -68t39 -120q0 -132 -91 -205.5t-253 -73.5 q-125 0 -233 56zM273 0l1085 1462h154l-1086 -1462h-153zM856 203l23 101l481 579h133l-121 -563h127l-22 -117h-129l-43 -202h-127l43 202h-365zM1020 320h225q69 322 90 395q-20 -36 -110 -149z" />
-<glyph unicode="¿" horiz-adv-x="874" d="M-4 -78q0 124 66 228t225 223q132 98 172.5 152.5t62.5 154.5h135q-22 -130 -72 -212t-165 -175l-95 -75q-159 -127 -159 -275q0 -93 51.5 -144t147.5 -51q80 0 154 25.5t140 56.5l62 -129q-90 -48 -189 -74t-186 -26q-168 0 -259 83.5t-91 237.5zM512 946q0 71 40 118.5 t107 47.5q47 0 74 -25.5t27 -76.5q0 -77 -40.5 -122.5t-111.5 -45.5q-43 0 -69.5 26t-26.5 78z" />
-<glyph unicode="À" horiz-adv-x="1137" d="M-117 0l799 1462h174l184 -1462h-170l-57 465h-496l-245 -465h-189zM401 621h394l-35 299q-24 179 -29 350q-37 -88 -80.5 -175t-249.5 -474zM535 1886v21h181q43 -136 147 -303v-25h-104q-61 61 -128.5 154t-95.5 153z" />
-<glyph unicode="Á" horiz-adv-x="1137" d="M-117 0l799 1462h174l184 -1462h-170l-57 465h-496l-245 -465h-189zM401 621h394l-35 299q-24 179 -29 350q-37 -88 -80.5 -175t-249.5 -474zM679 1579v27q56 60 125.5 151.5t106.5 149.5h190v-21q-38 -49 -140 -151t-177 -156h-105z" />
-<glyph unicode="Â" horiz-adv-x="1137" d="M-117 0l799 1462h174l184 -1462h-170l-57 465h-496l-245 -465h-189zM401 621h394l-35 299q-24 179 -29 350q-37 -88 -80.5 -175t-249.5 -474zM465 1579v27q145 133 204.5 197.5t82.5 103.5h158q37 -99 128 -235l42 -66v-27h-103q-57 48 -161 189q-134 -119 -242 -189 h-109z" />
-<glyph unicode="Ã" horiz-adv-x="1137" d="M-117 0l799 1462h174l184 -1462h-170l-57 465h-496l-245 -465h-189zM401 621h394l-35 299q-24 179 -29 350q-37 -88 -80.5 -175t-249.5 -474zM432 1579q58 258 231 258q44 0 83.5 -18t75 -39.5t66.5 -39.5t58 -18q44 0 69.5 27t51.5 90h100q-66 -258 -233 -258 q-40 0 -77.5 17.5t-73 39t-69 39t-65.5 17.5q-44 0 -69.5 -28.5t-47.5 -86.5h-100z" />
-<glyph unicode="Ä" horiz-adv-x="1137" d="M-117 0l799 1462h174l184 -1462h-170l-57 465h-496l-245 -465h-189zM401 621h394l-35 299q-24 179 -29 350q-37 -88 -80.5 -175t-249.5 -474zM523 1716q0 46 28 79.5t74 33.5q78 0 78 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62zM887 1716q0 46 28 79.5 t75 33.5q77 0 77 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62z" />
-<glyph unicode="Å" horiz-adv-x="1137" d="M-117 0l799 1462h174l184 -1462h-170l-57 465h-496l-245 -465h-189zM401 621h394l-35 299q-24 179 -29 350q-37 -88 -80.5 -175t-249.5 -474zM553 1583q0 94 62 152.5t157 58.5q101 0 160 -57t59 -152q0 -99 -60 -157t-159 -58q-101 0 -160 57.5t-59 155.5zM657 1583 q0 -54 29.5 -84.5t85.5 -30.5q51 0 83 30.5t32 84.5q0 53 -32 84t-83 31q-49 0 -82 -31t-33 -84z" />
-<glyph unicode="Æ" horiz-adv-x="1673" d="M-119 0l938 1462h938l-33 -153h-565l-100 -469h528l-28 -150h-529l-115 -538h566l-33 -152h-737l98 465h-438l-293 -465h-197zM469 621h371l147 688h-84z" />
-<glyph unicode="Ç" horiz-adv-x="1198" d="M150 537q0 261 105.5 485.5t283.5 342.5t403 118q197 0 348 -80l-69 -141q-138 69 -279 69q-174 0 -311.5 -97t-218 -284.5t-80.5 -408.5q0 -187 97.5 -298.5t268.5 -111.5q139 0 322 57v-149q-86 -31 -164 -45t-188 -14q-242 0 -380 149.5t-138 407.5zM377 -383 q38 -6 68 -6q174 0 174 110q0 46 -39 67.5t-99 29.5l101 182h106l-61 -121q131 -38 131 -155q0 -98 -81 -157t-214 -59q-41 0 -86 9v100z" />
-<glyph unicode="È" horiz-adv-x="1047" d="M86 0l309 1462h735l-32 -153h-566l-98 -469h527l-29 -152h-529l-114 -536h565l-33 -152h-735zM570 1886v21h181q43 -136 147 -303v-25h-104q-61 61 -128.5 154t-95.5 153z" />
-<glyph unicode="É" horiz-adv-x="1047" d="M86 0l309 1462h735l-32 -153h-566l-98 -469h527l-29 -152h-529l-114 -536h565l-33 -152h-735zM657 1579v27q56 60 125.5 151.5t106.5 149.5h190v-21q-38 -49 -140 -151t-177 -156h-105z" />
-<glyph unicode="Ê" horiz-adv-x="1047" d="M86 0l309 1462h735l-32 -153h-566l-98 -469h527l-29 -152h-529l-114 -536h565l-33 -152h-735zM469 1579v27q145 133 204.5 197.5t82.5 103.5h158q37 -99 128 -235l42 -66v-27h-103q-57 48 -161 189q-134 -119 -242 -189h-109z" />
-<glyph unicode="Ë" horiz-adv-x="1047" d="M86 0l309 1462h735l-32 -153h-566l-98 -469h527l-29 -152h-529l-114 -536h565l-33 -152h-735zM523 1716q0 46 28 79.5t74 33.5q78 0 78 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62zM887 1716q0 46 28 79.5t75 33.5q77 0 77 -80q0 -49 -29.5 -83t-68.5 -34 q-35 0 -58.5 22t-23.5 62z" />
-<glyph unicode="Ì" horiz-adv-x="559" d="M86 0l311 1462h168l-311 -1462h-168zM265 1886v21h181q43 -136 147 -303v-25h-104q-61 61 -128.5 154t-95.5 153z" />
-<glyph unicode="Í" horiz-adv-x="559" d="M86 0l311 1462h168l-311 -1462h-168zM412 1579v27q56 60 125.5 151.5t106.5 149.5h190v-21q-38 -49 -140 -151t-177 -156h-105z" />
-<glyph unicode="Î" horiz-adv-x="559" d="M86 0l311 1462h168l-311 -1462h-168zM193 1579v27q145 133 204.5 197.5t82.5 103.5h158q37 -99 128 -235l42 -66v-27h-103q-57 48 -161 189q-134 -119 -242 -189h-109z" />
-<glyph unicode="Ï" horiz-adv-x="559" d="M86 0l311 1462h168l-311 -1462h-168zM265 1716q0 46 28 79.5t74 33.5q78 0 78 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62zM629 1716q0 46 28 79.5t75 33.5q77 0 77 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62z" />
-<glyph unicode="Ð" horiz-adv-x="1364" d="M72 649l32 150h150l141 663h342q276 0 419.5 -149.5t143.5 -435.5q0 -261 -105 -461t-300 -308t-457 -108h-352l135 649h-149zM287 147h162q202 0 355 91.5t234.5 258.5t81.5 382t-103 325.5t-302 110.5h-178l-111 -516h330l-33 -150h-330z" />
-<glyph unicode="Ñ" horiz-adv-x="1438" d="M84 0l309 1462h180l459 -1220h6q30 224 72 405l174 815h164l-309 -1462h-181l-460 1223h-6q-32 -221 -74 -418l-172 -805h-162zM600 1579q58 258 231 258q44 0 83.5 -18t75 -39.5t66.5 -39.5t58 -18q44 0 69.5 27t51.5 90h100q-66 -258 -233 -258q-40 0 -77.5 17.5 t-73 39t-69 39t-65.5 17.5q-44 0 -69.5 -28.5t-47.5 -86.5h-100z" />
-<glyph unicode="Ò" horiz-adv-x="1475" d="M150 549q0 264 96 482t263.5 336t377.5 118q244 0 384 -154t140 -424q0 -269 -88 -481.5t-252 -329t-379 -116.5q-256 0 -399 149.5t-143 419.5zM332 553q0 -199 98 -310.5t266 -111.5q152 0 272.5 97.5t190.5 279.5t70 403q0 199 -94 310.5t-261 111.5q-157 0 -281 -101 t-192.5 -281t-68.5 -398zM679 1886v21h181q43 -136 147 -303v-25h-104q-61 61 -128.5 154t-95.5 153z" />
-<glyph unicode="Ó" horiz-adv-x="1475" d="M150 549q0 264 96 482t263.5 336t377.5 118q244 0 384 -154t140 -424q0 -269 -88 -481.5t-252 -329t-379 -116.5q-256 0 -399 149.5t-143 419.5zM332 553q0 -199 98 -310.5t266 -111.5q152 0 272.5 97.5t190.5 279.5t70 403q0 199 -94 310.5t-261 111.5q-157 0 -281 -101 t-192.5 -281t-68.5 -398zM821 1579v27q56 60 125.5 151.5t106.5 149.5h190v-21q-38 -49 -140 -151t-177 -156h-105z" />
-<glyph unicode="Ô" horiz-adv-x="1475" d="M150 549q0 264 96 482t263.5 336t377.5 118q244 0 384 -154t140 -424q0 -269 -88 -481.5t-252 -329t-379 -116.5q-256 0 -399 149.5t-143 419.5zM332 553q0 -199 98 -310.5t266 -111.5q152 0 272.5 97.5t190.5 279.5t70 403q0 199 -94 310.5t-261 111.5q-157 0 -281 -101 t-192.5 -281t-68.5 -398zM612 1579v27q145 133 204.5 197.5t82.5 103.5h158q37 -99 128 -235l42 -66v-27h-103q-57 48 -161 189q-134 -119 -242 -189h-109z" />
-<glyph unicode="Õ" horiz-adv-x="1475" d="M150 549q0 264 96 482t263.5 336t377.5 118q244 0 384 -154t140 -424q0 -269 -88 -481.5t-252 -329t-379 -116.5q-256 0 -399 149.5t-143 419.5zM332 553q0 -199 98 -310.5t266 -111.5q152 0 272.5 97.5t190.5 279.5t70 403q0 199 -94 310.5t-261 111.5q-157 0 -281 -101 t-192.5 -281t-68.5 -398zM565 1579q58 258 231 258q44 0 83.5 -18t75 -39.5t66.5 -39.5t58 -18q44 0 69.5 27t51.5 90h100q-66 -258 -233 -258q-40 0 -77.5 17.5t-73 39t-69 39t-65.5 17.5q-44 0 -69.5 -28.5t-47.5 -86.5h-100z" />
-<glyph unicode="Ö" horiz-adv-x="1475" d="M150 549q0 264 96 482t263.5 336t377.5 118q244 0 384 -154t140 -424q0 -269 -88 -481.5t-252 -329t-379 -116.5q-256 0 -399 149.5t-143 419.5zM332 553q0 -199 98 -310.5t266 -111.5q152 0 272.5 97.5t190.5 279.5t70 403q0 199 -94 310.5t-261 111.5q-157 0 -281 -101 t-192.5 -281t-68.5 -398zM664 1716q0 46 28 79.5t74 33.5q78 0 78 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62zM1028 1716q0 46 28 79.5t75 33.5q77 0 77 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62z" />
-<glyph unicode="×" d="M168 1044l98 99l320 -320l323 320l99 -96l-324 -324l322 -322l-97 -96l-323 320l-320 -318l-96 96l317 320z" />
-<glyph unicode="Ø" horiz-adv-x="1475" d="M119 8l137 170q-106 136 -106 371q0 264 96 482t263.5 336t377.5 118q99 0 178.5 -27t151.5 -84l131 166l114 -92l-149 -184q48 -62 73 -156t25 -201q0 -269 -88 -481.5t-252 -329t-379 -116.5q-200 0 -332 96l-129 -160zM332 553q0 -135 41 -227l737 919q-90 88 -236 88 q-157 0 -281 -101t-192.5 -281t-68.5 -398zM463 205q91 -74 233 -74q152 0 272.5 97.5t190.5 279.5t70 403q0 118 -33 205z" />
-<glyph unicode="Ù" horiz-adv-x="1384" d="M164 383q0 81 24 201l189 878h170l-191 -891q-22 -106 -22 -188q0 -117 73 -184.5t218 -67.5q172 0 267.5 87.5t139.5 289.5l205 954h170l-205 -966q-55 -263 -197.5 -389.5t-388.5 -126.5q-230 0 -341 104t-111 299zM663 1886v21h181q43 -136 147 -303v-25h-104 q-61 61 -128.5 154t-95.5 153z" />
-<glyph unicode="Ú" horiz-adv-x="1384" d="M164 383q0 81 24 201l189 878h170l-191 -891q-22 -106 -22 -188q0 -117 73 -184.5t218 -67.5q172 0 267.5 87.5t139.5 289.5l205 954h170l-205 -966q-55 -263 -197.5 -389.5t-388.5 -126.5q-230 0 -341 104t-111 299zM823 1579v27q56 60 125.5 151.5t106.5 149.5h190v-21 q-38 -49 -140 -151t-177 -156h-105z" />
-<glyph unicode="Û" horiz-adv-x="1384" d="M164 383q0 81 24 201l189 878h170l-191 -891q-22 -106 -22 -188q0 -117 73 -184.5t218 -67.5q172 0 267.5 87.5t139.5 289.5l205 954h170l-205 -966q-55 -263 -197.5 -389.5t-388.5 -126.5q-230 0 -341 104t-111 299zM602 1579v27q145 133 204.5 197.5t82.5 103.5h158 q37 -99 128 -235l42 -66v-27h-103q-57 48 -161 189q-134 -119 -242 -189h-109z" />
-<glyph unicode="Ü" horiz-adv-x="1384" d="M164 383q0 81 24 201l189 878h170l-191 -891q-22 -106 -22 -188q0 -117 73 -184.5t218 -67.5q172 0 267.5 87.5t139.5 289.5l205 954h170l-205 -966q-55 -263 -197.5 -389.5t-388.5 -126.5q-230 0 -341 104t-111 299zM643 1716q0 46 28 79.5t74 33.5q78 0 78 -80 q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62zM1007 1716q0 46 28 79.5t75 33.5q77 0 77 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62z" />
-<glyph unicode="Ý" horiz-adv-x="1030" d="M188 1462h170l179 -747l489 747h193l-627 -921l-113 -541h-172l119 549zM616 1579v27q56 60 125.5 151.5t106.5 149.5h190v-21q-38 -49 -140 -151t-177 -156h-105z" />
-<glyph unicode="Þ" horiz-adv-x="1159" d="M86 0l309 1462h170l-53 -256h160q213 0 323.5 -95t110.5 -282q0 -248 -164 -379t-483 -131h-133l-70 -319h-170zM354 465h135q215 0 328 91t113 267q0 126 -70 181t-215 55h-166z" />
-<glyph unicode="ß" horiz-adv-x="1182" d="M-256 -328q61 -22 111 -22q65 0 107 47.5t65 157.5l280 1314q43 200 156 299t307 99q162 0 252 -71t90 -196q0 -57 -21 -106.5t-61.5 -95t-178.5 -150.5q-110 -83 -110 -151q0 -56 95 -122q47 -34 101 -87.5t79.5 -110t25.5 -123.5q0 -175 -108.5 -274.5t-292.5 -99.5 q-175 0 -268 71v160q51 -41 118.5 -66.5t129.5 -25.5q113 0 181 58t68 159q0 40 -10.5 71t-33.5 59t-89 83q-88 69 -122.5 124t-34.5 115q0 53 18.5 96t49.5 78.5t124 104.5q80 56 111 87.5t48 65t17 70.5q0 64 -52.5 100.5t-141.5 36.5q-119 0 -186 -62.5t-95 -190.5 l-274 -1303q-40 -189 -121 -276t-211 -87q-69 0 -123 21v143z" />
-<glyph unicode="à" horiz-adv-x="1157" d="M98 350q0 208 71 386t196 279t274 101q92 0 164 -49.5t112 -142.5h11l67 172h127l-233 -1096h-133l26 209h-8q-179 -229 -377 -229q-139 0 -218 99t-79 271zM270 346q0 -114 47 -170.5t132 -56.5q97 0 193 92.5t156 241t60 297.5q0 103 -56 164t-147 61 q-104 0 -193.5 -86t-140.5 -233t-51 -310zM496 1548v21h181q43 -136 147 -303v-25h-104q-61 61 -128.5 154t-95.5 153z" />
-<glyph unicode="á" horiz-adv-x="1157" d="M98 350q0 208 71 386t196 279t274 101q92 0 164 -49.5t112 -142.5h11l67 172h127l-233 -1096h-133l26 209h-8q-179 -229 -377 -229q-139 0 -218 99t-79 271zM270 346q0 -114 47 -170.5t132 -56.5q97 0 193 92.5t156 241t60 297.5q0 103 -56 164t-147 61 q-104 0 -193.5 -86t-140.5 -233t-51 -310zM600 1241v27q56 60 125.5 151.5t106.5 149.5h190v-21q-38 -49 -140 -151t-177 -156h-105z" />
-<glyph unicode="â" horiz-adv-x="1157" d="M98 350q0 208 71 386t196 279t274 101q92 0 164 -49.5t112 -142.5h11l67 172h127l-233 -1096h-133l26 209h-8q-179 -229 -377 -229q-139 0 -218 99t-79 271zM270 346q0 -114 47 -170.5t132 -56.5q97 0 193 92.5t156 241t60 297.5q0 103 -56 164t-147 61 q-104 0 -193.5 -86t-140.5 -233t-51 -310zM390 1241v27q145 133 204.5 197.5t82.5 103.5h158q37 -99 128 -235l42 -66v-27h-103q-57 48 -161 189q-134 -119 -242 -189h-109z" />
-<glyph unicode="ã" horiz-adv-x="1157" d="M98 350q0 208 71 386t196 279t274 101q92 0 164 -49.5t112 -142.5h11l67 172h127l-233 -1096h-133l26 209h-8q-179 -229 -377 -229q-139 0 -218 99t-79 271zM270 346q0 -114 47 -170.5t132 -56.5q97 0 193 92.5t156 241t60 297.5q0 103 -56 164t-147 61 q-104 0 -193.5 -86t-140.5 -233t-51 -310zM354 1241q58 258 231 258q44 0 83.5 -18t75 -39.5t66.5 -39.5t58 -18q44 0 69.5 27t51.5 90h100q-66 -258 -233 -258q-40 0 -77.5 17.5t-73 39t-69 39t-65.5 17.5q-44 0 -69.5 -28.5t-47.5 -86.5h-100z" />
-<glyph unicode="ä" horiz-adv-x="1157" d="M98 350q0 208 71 386t196 279t274 101q92 0 164 -49.5t112 -142.5h11l67 172h127l-233 -1096h-133l26 209h-8q-179 -229 -377 -229q-139 0 -218 99t-79 271zM270 346q0 -114 47 -170.5t132 -56.5q97 0 193 92.5t156 241t60 297.5q0 103 -56 164t-147 61 q-104 0 -193.5 -86t-140.5 -233t-51 -310zM454 1378q0 46 28 79.5t74 33.5q78 0 78 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62zM818 1378q0 46 28 79.5t75 33.5q77 0 77 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62z" />
-<glyph unicode="å" horiz-adv-x="1157" d="M98 350q0 208 71 386t196 279t274 101q92 0 164 -49.5t112 -142.5h11l67 172h127l-233 -1096h-133l26 209h-8q-179 -229 -377 -229q-139 0 -218 99t-79 271zM270 346q0 -114 47 -170.5t132 -56.5q97 0 193 92.5t156 241t60 297.5q0 103 -56 164t-147 61 q-104 0 -193.5 -86t-140.5 -233t-51 -310zM513 1454q0 94 62 152.5t157 58.5q101 0 160 -57t59 -152q0 -99 -60 -157t-159 -58q-101 0 -160 57.5t-59 155.5zM617 1454q0 -54 29.5 -84.5t85.5 -30.5q51 0 83 30.5t32 84.5q0 53 -32 84t-83 31q-49 0 -82 -31t-33 -84z" />
-<glyph unicode="æ" horiz-adv-x="1669" d="M98 348q0 206 70.5 385t191.5 281t263 102q82 0 145 -48.5t102 -143.5h11l67 172h109l-31 -146q123 166 332 166q119 0 192.5 -68t73.5 -184q0 -182 -166.5 -283.5t-472.5 -101.5h-39l-4 -80q0 -131 62.5 -204.5t193.5 -73.5q55 0 116.5 16.5t178.5 67.5v-150 q-164 -75 -328 -75q-108 0 -189.5 39.5t-121.5 119.5l-31 -139h-114l26 209h-8q-109 -132 -191.5 -180.5t-177.5 -48.5q-122 0 -191 99t-69 269zM270 348q0 -114 37 -171.5t105 -57.5q95 0 188.5 91.5t153 240.5t59.5 299q0 103 -45.5 164t-122.5 61q-99 0 -187 -86.5 t-138 -231.5t-50 -309zM973 618h14q226 0 348.5 58.5t122.5 169.5q0 61 -35 94t-98 33q-117 0 -211 -94.5t-141 -260.5z" />
-<glyph unicode="ç" horiz-adv-x="922" d="M98 389q0 200 74 369t204.5 263.5t293.5 94.5q137 0 268 -51l-47 -141q-120 51 -219 51q-112 0 -204.5 -76.5t-145 -213t-52.5 -296.5q0 -128 66.5 -199t183.5 -71q72 0 136 20t126 47v-143q-124 -63 -276 -63q-194 0 -301 107t-107 302zM211 -383q38 -6 68 -6 q174 0 174 110q0 46 -39 67.5t-99 29.5l101 182h106l-61 -121q131 -38 131 -155q0 -98 -81 -157t-214 -59q-41 0 -86 9v100z" />
-<glyph unicode="è" horiz-adv-x="1010" d="M98 391q0 188 74.5 360.5t197.5 268.5t271 96q153 0 230 -66.5t77 -185.5q0 -180 -166 -282.5t-475 -102.5h-33l-4 -80q0 -131 61.5 -204.5t190.5 -73.5q63 0 129.5 18t165.5 66v-146q-94 -44 -166 -61.5t-159 -17.5q-184 0 -289 109t-105 302zM299 618h12 q228 0 349.5 59.5t121.5 172.5q0 53 -36.5 88t-114.5 35q-103 0 -193.5 -94t-138.5 -261zM449 1548v21h181q43 -136 147 -303v-25h-104q-61 61 -128.5 154t-95.5 153z" />
-<glyph unicode="é" horiz-adv-x="1010" d="M98 391q0 188 74.5 360.5t197.5 268.5t271 96q153 0 230 -66.5t77 -185.5q0 -180 -166 -282.5t-475 -102.5h-33l-4 -80q0 -131 61.5 -204.5t190.5 -73.5q63 0 129.5 18t165.5 66v-146q-94 -44 -166 -61.5t-159 -17.5q-184 0 -289 109t-105 302zM299 618h12 q228 0 349.5 59.5t121.5 172.5q0 53 -36.5 88t-114.5 35q-103 0 -193.5 -94t-138.5 -261zM585 1241v27q56 60 125.5 151.5t106.5 149.5h190v-21q-38 -49 -140 -151t-177 -156h-105z" />
-<glyph unicode="ê" horiz-adv-x="1010" d="M98 391q0 188 74.5 360.5t197.5 268.5t271 96q153 0 230 -66.5t77 -185.5q0 -180 -166 -282.5t-475 -102.5h-33l-4 -80q0 -131 61.5 -204.5t190.5 -73.5q63 0 129.5 18t165.5 66v-146q-94 -44 -166 -61.5t-159 -17.5q-184 0 -289 109t-105 302zM299 618h12 q228 0 349.5 59.5t121.5 172.5q0 53 -36.5 88t-114.5 35q-103 0 -193.5 -94t-138.5 -261zM351 1241v27q145 133 204.5 197.5t82.5 103.5h158q37 -99 128 -235l42 -66v-27h-103q-57 48 -161 189q-134 -119 -242 -189h-109z" />
-<glyph unicode="ë" horiz-adv-x="1010" d="M98 391q0 188 74.5 360.5t197.5 268.5t271 96q153 0 230 -66.5t77 -185.5q0 -180 -166 -282.5t-475 -102.5h-33l-4 -80q0 -131 61.5 -204.5t190.5 -73.5q63 0 129.5 18t165.5 66v-146q-94 -44 -166 -61.5t-159 -17.5q-184 0 -289 109t-105 302zM299 618h12 q228 0 349.5 59.5t121.5 172.5q0 53 -36.5 88t-114.5 35q-103 0 -193.5 -94t-138.5 -261zM413 1378q0 46 28 79.5t74 33.5q78 0 78 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62zM777 1378q0 46 28 79.5t75 33.5q77 0 77 -80q0 -49 -29.5 -83t-68.5 -34 q-35 0 -58.5 22t-23.5 62z" />
-<glyph unicode="ì" horiz-adv-x="520" d="M59 0l234 1096h168l-234 -1096h-168zM164 1548v21h181q43 -136 147 -303v-25h-104q-61 61 -128.5 154t-95.5 153z" />
-<glyph unicode="í" horiz-adv-x="520" d="M59 0l234 1096h168l-234 -1096h-168zM324 1241v27q56 60 125.5 151.5t106.5 149.5h190v-21q-38 -49 -140 -151t-177 -156h-105z" />
-<glyph unicode="î" horiz-adv-x="520" d="M59 0l234 1096h168l-234 -1096h-168zM93 1241v27q145 133 204.5 197.5t82.5 103.5h158q37 -99 128 -235l42 -66v-27h-103q-57 48 -161 189q-134 -119 -242 -189h-109z" />
-<glyph unicode="ï" horiz-adv-x="520" d="M59 0l234 1096h168l-234 -1096h-168zM161 1378q0 46 28 79.5t74 33.5q78 0 78 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62zM525 1378q0 46 28 79.5t75 33.5q77 0 77 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62z" />
-<glyph unicode="ð" horiz-adv-x="1165" d="M90 373q0 160 67.5 298t187 217t267.5 79q105 0 181.5 -45.5t111.5 -124.5l6 2v17q0 136 -36.5 240t-110.5 197l-270 -149l-56 108l238 131q-66 58 -146 113l95 117q118 -84 188 -154l260 146l64 -105l-240 -133q87 -115 126.5 -240.5t39.5 -269.5q0 -253 -71.5 -447 t-203 -292t-311.5 -98q-182 0 -284.5 104t-102.5 289zM262 377q0 -126 57.5 -191t167.5 -65q107 0 190 56t134 168t51 226q0 118 -65.5 187t-178.5 69q-109 0 -189 -57.5t-123.5 -161t-43.5 -231.5z" />
-<glyph unicode="ñ" horiz-adv-x="1182" d="M59 0l234 1096h139l-22 -203h10q96 122 185.5 172.5t185.5 50.5q127 0 200.5 -69.5t73.5 -194.5q0 -79 -23 -180l-143 -672h-170l148 692q20 104 20 144q0 63 -35.5 101t-113.5 38q-89 0 -173.5 -60t-149 -171t-97.5 -269l-101 -475h-168zM369 1241q58 258 231 258 q44 0 83.5 -18t75 -39.5t66.5 -39.5t58 -18q44 0 69.5 27t51.5 90h100q-66 -258 -233 -258q-40 0 -77.5 17.5t-73 39t-69 39t-65.5 17.5q-44 0 -69.5 -28.5t-47.5 -86.5h-100z" />
-<glyph unicode="ò" horiz-adv-x="1149" d="M98 406q0 190 73 357.5t197 257t275 89.5q190 0 300 -112.5t110 -309.5q0 -188 -72 -355t-195 -258t-278 -91q-192 0 -301 113t-109 309zM270 397q0 -131 63.5 -202.5t182.5 -71.5q104 0 187 73t129.5 207.5t46.5 307.5q0 115 -62.5 186.5t-169.5 71.5q-109 0 -195.5 -74 t-134 -205.5t-47.5 -292.5zM470 1548v21h181q43 -136 147 -303v-25h-104q-61 61 -128.5 154t-95.5 153z" />
-<glyph unicode="ó" horiz-adv-x="1149" d="M98 406q0 190 73 357.5t197 257t275 89.5q190 0 300 -112.5t110 -309.5q0 -188 -72 -355t-195 -258t-278 -91q-192 0 -301 113t-109 309zM270 397q0 -131 63.5 -202.5t182.5 -71.5q104 0 187 73t129.5 207.5t46.5 307.5q0 115 -62.5 186.5t-169.5 71.5q-109 0 -195.5 -74 t-134 -205.5t-47.5 -292.5zM589 1241v27q56 60 125.5 151.5t106.5 149.5h190v-21q-38 -49 -140 -151t-177 -156h-105z" />
-<glyph unicode="ô" horiz-adv-x="1149" d="M98 406q0 190 73 357.5t197 257t275 89.5q190 0 300 -112.5t110 -309.5q0 -188 -72 -355t-195 -258t-278 -91q-192 0 -301 113t-109 309zM270 397q0 -131 63.5 -202.5t182.5 -71.5q104 0 187 73t129.5 207.5t46.5 307.5q0 115 -62.5 186.5t-169.5 71.5q-109 0 -195.5 -74 t-134 -205.5t-47.5 -292.5zM382 1241v27q145 133 204.5 197.5t82.5 103.5h158q37 -99 128 -235l42 -66v-27h-103q-57 48 -161 189q-134 -119 -242 -189h-109z" />
-<glyph unicode="õ" horiz-adv-x="1149" d="M98 406q0 190 73 357.5t197 257t275 89.5q190 0 300 -112.5t110 -309.5q0 -188 -72 -355t-195 -258t-278 -91q-192 0 -301 113t-109 309zM270 397q0 -131 63.5 -202.5t182.5 -71.5q104 0 187 73t129.5 207.5t46.5 307.5q0 115 -62.5 186.5t-169.5 71.5q-109 0 -195.5 -74 t-134 -205.5t-47.5 -292.5zM342 1241q58 258 231 258q44 0 83.5 -18t75 -39.5t66.5 -39.5t58 -18q44 0 69.5 27t51.5 90h100q-66 -258 -233 -258q-40 0 -77.5 17.5t-73 39t-69 39t-65.5 17.5q-44 0 -69.5 -28.5t-47.5 -86.5h-100z" />
-<glyph unicode="ö" horiz-adv-x="1149" d="M98 406q0 190 73 357.5t197 257t275 89.5q190 0 300 -112.5t110 -309.5q0 -188 -72 -355t-195 -258t-278 -91q-192 0 -301 113t-109 309zM270 397q0 -131 63.5 -202.5t182.5 -71.5q104 0 187 73t129.5 207.5t46.5 307.5q0 115 -62.5 186.5t-169.5 71.5q-109 0 -195.5 -74 t-134 -205.5t-47.5 -292.5zM433 1378q0 46 28 79.5t74 33.5q78 0 78 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62zM797 1378q0 46 28 79.5t75 33.5q77 0 77 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62z" />
-<glyph unicode="÷" d="M127 651v142h920v-142h-920zM475 373q0 121 111 121q53 0 82.5 -30.5t29.5 -90.5q0 -58 -30 -89.5t-82 -31.5t-81.5 31t-29.5 90zM475 1071q0 121 111 121q53 0 82.5 -30.5t29.5 -90.5q0 -58 -30 -89.5t-82 -31.5t-81.5 31t-29.5 90z" />
-<glyph unicode="ø" horiz-adv-x="1149" d="M61 6l109 135q-68 103 -68 265q0 194 73.5 361t195.5 255t272 88q146 0 252 -68l104 129l105 -79l-119 -129q62 -97 62 -258q0 -189 -69.5 -360t-191.5 -266t-276 -95q-146 0 -246 65l-98 -125zM264 416q0 -92 17 -137l518 645q-54 47 -152 47q-108 0 -195.5 -73 t-137.5 -202t-50 -280zM358 166q57 -45 158 -45q103 0 188.5 71.5t133 200.5t47.5 295q0 84 -13 119z" />
-<glyph unicode="ù" horiz-adv-x="1182" d="M113 248q0 62 22 172l146 676h170l-150 -695q-18 -89 -18 -139q0 -143 147 -143q88 0 173 60t150 172t99 270l100 475h166l-231 -1096h-139l22 203h-12q-98 -125 -187 -174t-184 -49q-128 0 -201 69.5t-73 198.5zM472 1548v21h181q43 -136 147 -303v-25h-104 q-61 61 -128.5 154t-95.5 153z" />
-<glyph unicode="ú" horiz-adv-x="1182" d="M113 248q0 62 22 172l146 676h170l-150 -695q-18 -89 -18 -139q0 -143 147 -143q88 0 173 60t150 172t99 270l100 475h166l-231 -1096h-139l22 203h-12q-98 -125 -187 -174t-184 -49q-128 0 -201 69.5t-73 198.5zM636 1241v27q56 60 125.5 151.5t106.5 149.5h190v-21 q-38 -49 -140 -151t-177 -156h-105z" />
-<glyph unicode="û" horiz-adv-x="1182" d="M113 248q0 62 22 172l146 676h170l-150 -695q-18 -89 -18 -139q0 -143 147 -143q88 0 173 60t150 172t99 270l100 475h166l-231 -1096h-139l22 203h-12q-98 -125 -187 -174t-184 -49q-128 0 -201 69.5t-73 198.5zM409 1241v27q145 133 204.5 197.5t82.5 103.5h158 q37 -99 128 -235l42 -66v-27h-103q-57 48 -161 189q-134 -119 -242 -189h-109z" />
-<glyph unicode="ü" horiz-adv-x="1182" d="M113 248q0 62 22 172l146 676h170l-150 -695q-18 -89 -18 -139q0 -143 147 -143q88 0 173 60t150 172t99 270l100 475h166l-231 -1096h-139l22 203h-12q-98 -125 -187 -174t-184 -49q-128 0 -201 69.5t-73 198.5zM457 1378q0 46 28 79.5t74 33.5q78 0 78 -80 q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62zM821 1378q0 46 28 79.5t75 33.5q77 0 77 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62z" />
-<glyph unicode="ý" horiz-adv-x="946" d="M-197 -336q63 -18 131 -18q82 0 140.5 50.5t113.5 149.5l76 136l-166 1114h168l74 -545q10 -69 19.5 -203.5t9.5 -216.5h6q35 87 87 200t77 156l325 609h178l-696 -1282q-93 -172 -184 -239t-219 -67q-72 0 -140 21v135zM500 1241v27q56 60 125.5 151.5t106.5 149.5h190 v-21q-38 -49 -140 -151t-177 -156h-105z" />
-<glyph unicode="þ" horiz-adv-x="1182" d="M-43 -492l432 2048h168q-95 -441 -115 -522t-39 -149h9q101 125 189 177t183 52q139 0 218 -97.5t79 -273.5q0 -212 -69 -389t-191 -275.5t-276 -98.5q-98 0 -172 51t-113 139h-10q-8 -104 -25 -176l-102 -486h-166zM319 346q0 -110 55.5 -168.5t160.5 -58.5 q99 0 184.5 81t137.5 230.5t52 317.5q0 227 -178 227q-96 0 -195.5 -95t-158 -239t-58.5 -295z" />
-<glyph unicode="ÿ" horiz-adv-x="946" d="M-197 -336q63 -18 131 -18q82 0 140.5 50.5t113.5 149.5l76 136l-166 1114h168l74 -545q10 -69 19.5 -203.5t9.5 -216.5h6q35 87 87 200t77 156l325 609h178l-696 -1282q-93 -172 -184 -239t-219 -67q-72 0 -140 21v135zM335 1378q0 46 28 79.5t74 33.5q78 0 78 -80 q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62zM699 1378q0 46 28 79.5t75 33.5q77 0 77 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62z" />
-<glyph unicode="Œ" horiz-adv-x="1751" d="M150 549q0 264 96 482t263.5 336t377.5 118q152 0 237 -23h709l-31 -153h-565l-100 -469h528l-31 -150h-528l-115 -538h565l-32 -152h-674q-78 -20 -158 -20q-256 0 -399 149.5t-143 419.5zM332 553q0 -199 98 -310.5t266 -111.5q69 0 123 19l246 1161q-76 22 -191 22 q-157 0 -281 -101t-192.5 -281t-68.5 -398z" />
-<glyph unicode="œ" horiz-adv-x="1769" d="M98 406q0 193 75 360t201 255.5t281 88.5q270 0 359 -225q75 109 177.5 170t221.5 61q139 0 217 -65.5t78 -186.5q0 -183 -164.5 -284t-468.5 -101h-41l-4 -80q0 -131 61.5 -204.5t190.5 -73.5q75 0 145 24.5t150 59.5v-150q-162 -75 -326 -75q-270 0 -356 225 q-69 -107 -171.5 -164t-225.5 -57q-184 0 -292 114t-108 308zM270 410q0 -141 62 -214t172 -73q177 0 278 160.5t101 427.5q0 124 -59.5 191t-174.5 67q-109 0 -196 -73t-135 -202t-48 -284zM1053 618h18q231 0 351 61t120 177q0 48 -32 82.5t-97 34.5q-125 0 -220.5 -94.5 t-139.5 -260.5z" />
-<glyph unicode="Ÿ" horiz-adv-x="1030" d="M188 1462h170l179 -747l489 747h193l-627 -921l-113 -541h-172l119 549zM452 1716q0 46 28 79.5t74 33.5q78 0 78 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22t-23.5 62zM816 1716q0 46 28 79.5t75 33.5q77 0 77 -80q0 -49 -29.5 -83t-68.5 -34q-35 0 -58.5 22 t-23.5 62z" />
-<glyph unicode="ˆ" horiz-adv-x="1135" d="M399 1241v27q145 133 204.5 197.5t82.5 103.5h158q37 -99 128 -235l42 -66v-27h-103q-57 48 -161 189q-134 -119 -242 -189h-109z" />
-<glyph unicode="˜" horiz-adv-x="1135" d="M336 1241q58 258 231 258q44 0 83.5 -18t75 -39.5t66.5 -39.5t58 -18q44 0 69.5 27t51.5 90h100q-66 -258 -233 -258q-40 0 -77.5 17.5t-73 39t-69 39t-65.5 17.5q-44 0 -69.5 -28.5t-47.5 -86.5h-100z" />
-<glyph unicode=" " horiz-adv-x="953" />
-<glyph unicode=" " horiz-adv-x="1907" />
-<glyph unicode=" " horiz-adv-x="953" />
-<glyph unicode=" " horiz-adv-x="1907" />
-<glyph unicode=" " horiz-adv-x="635" />
-<glyph unicode=" " horiz-adv-x="476" />
-<glyph unicode=" " horiz-adv-x="317" />
-<glyph unicode=" " horiz-adv-x="317" />
-<glyph unicode=" " horiz-adv-x="238" />
-<glyph unicode=" " horiz-adv-x="381" />
-<glyph unicode=" " horiz-adv-x="105" />
-<glyph unicode="‐" horiz-adv-x="639" d="M55 469l35 158h479l-34 -158h-480z" />
-<glyph unicode="‑" horiz-adv-x="639" d="M55 469l35 158h479l-34 -158h-480z" />
-<glyph unicode="‒" horiz-adv-x="639" d="M55 469l35 158h479l-34 -158h-480z" />
-<glyph unicode="–" horiz-adv-x="983" d="M55 469l35 160h823l-34 -160h-824z" />
-<glyph unicode="—" horiz-adv-x="1966" d="M55 469l35 160h1806l-34 -160h-1807z" />
-<glyph unicode="‘" horiz-adv-x="348" d="M123 983q98 211 270 479h127q-147 -345 -203 -501h-188z" />
-<glyph unicode="’" horiz-adv-x="348" d="M125 961q134 298 203 501h188l8 -22q-40 -91 -111 -218.5t-159 -260.5h-129z" />
-<glyph unicode="‚" horiz-adv-x="492" d="M-100 -264q126 286 204 502h187l8 -23q-113 -235 -270 -479h-129z" />
-<glyph unicode="“" horiz-adv-x="719" d="M123 983q98 211 270 479h127q-147 -345 -203 -501h-188zM492 983q80 181 272 479h127q-162 -379 -203 -501h-188z" />
-<glyph unicode="”" horiz-adv-x="719" d="M125 961q134 298 203 501h188l8 -22q-40 -91 -111 -218.5t-159 -260.5h-129zM494 961q57 126 115.5 272.5t86.5 228.5h189l10 -22q-94 -206 -274 -479h-127z" />
-<glyph unicode="„" horiz-adv-x="858" d="M-100 -264q126 286 204 502h187l8 -23q-113 -235 -270 -479h-129zM268 -264q140 316 203 502h188l9 -23q-95 -205 -271 -479h-129z" />
-<glyph unicode="•" horiz-adv-x="774" d="M199 684q0 145 73.5 231t198.5 86q92 0 139 -49t47 -141q0 -141 -74 -230t-202 -89q-89 0 -135.5 49.5t-46.5 142.5z" />
-<glyph unicode="…" horiz-adv-x="1563" d="M43 74q0 77 40.5 122.5t111.5 45.5q43 0 69.5 -26t26.5 -79q0 -71 -40 -118.5t-108 -47.5q-46 0 -73 26t-27 77zM563 74q0 77 40.5 122.5t111.5 45.5q43 0 69.5 -26t26.5 -79q0 -71 -40 -118.5t-108 -47.5q-46 0 -73 26t-27 77zM1085 74q0 77 40.5 122.5t111.5 45.5 q43 0 69.5 -26t26.5 -79q0 -71 -40 -118.5t-108 -47.5q-46 0 -73 26t-27 77z" />
-<glyph unicode=" " horiz-adv-x="381" />
-<glyph unicode="‹" horiz-adv-x="580" d="M88 549v29l391 380l78 -81l-297 -334l172 -381l-113 -49z" />
-<glyph unicode="›" horiz-adv-x="580" d="M23 197l296 333l-172 381l113 50l232 -437v-28l-392 -381z" />
-<glyph unicode=" " horiz-adv-x="476" />
-<glyph unicode="€" d="M63 504l27 131h154q8 80 30 164h-151l27 133h159q97 267 259.5 408t369.5 141q89 0 160 -21.5t141 -70.5l-80 -138q-113 78 -231 78q-140 0 -254 -99t-189 -298h426l-26 -133h-441q-21 -65 -32 -164h381l-29 -131h-361q0 -373 297 -373q123 0 256 55v-147 q-127 -59 -278 -59q-212 0 -328.5 133.5t-116.5 378.5v12h-170z" />
-<glyph unicode="™" horiz-adv-x="1534" d="M121 1358v104h516v-104h-199v-617h-121v617h-196zM705 741v721h180l182 -557l193 557h170v-721h-121v430q0 73 4 121h-6l-197 -551h-96l-189 551h-6q4 -52 4 -121v-430h-118z" />
-<glyph unicode="◼" horiz-adv-x="1095" d="M0 0v1095h1095v-1095h-1095z" />
-<hkern u1=""" u2="Ÿ" k="-20" />
-<hkern u1=""" u2="œ" k="123" />
-<hkern u1=""" u2="ü" k="61" />
-<hkern u1=""" u2="û" k="61" />
-<hkern u1=""" u2="ú" k="61" />
-<hkern u1=""" u2="ù" k="61" />
-<hkern u1=""" u2="ø" k="123" />
-<hkern u1=""" u2="ö" k="123" />
-<hkern u1=""" u2="õ" k="123" />
-<hkern u1=""" u2="ô" k="123" />
-<hkern u1=""" u2="ó" k="123" />
-<hkern u1=""" u2="ò" k="123" />
-<hkern u1=""" u2="ë" k="123" />
-<hkern u1=""" u2="ê" k="123" />
-<hkern u1=""" u2="é" k="123" />
-<hkern u1=""" u2="è" k="123" />
-<hkern u1=""" u2="ç" k="123" />
-<hkern u1=""" u2="æ" k="82" />
-<hkern u1=""" u2="å" k="82" />
-<hkern u1=""" u2="ä" k="82" />
-<hkern u1=""" u2="ã" k="82" />
-<hkern u1=""" u2="â" k="82" />
-<hkern u1=""" u2="á" k="82" />
-<hkern u1=""" u2="à" k="123" />
-<hkern u1=""" u2="Ý" k="-20" />
-<hkern u1=""" u2="Å" k="143" />
-<hkern u1=""" u2="Ä" k="143" />
-<hkern u1=""" u2="Ã" k="143" />
-<hkern u1=""" u2="Â" k="143" />
-<hkern u1=""" u2="Á" k="143" />
-<hkern u1=""" u2="À" k="143" />
-<hkern u1=""" u2="u" k="61" />
-<hkern u1=""" u2="s" k="61" />
-<hkern u1=""" u2="r" k="61" />
-<hkern u1=""" u2="q" k="123" />
-<hkern u1=""" u2="p" k="61" />
-<hkern u1=""" u2="o" k="123" />
-<hkern u1=""" u2="n" k="61" />
-<hkern u1=""" u2="m" k="61" />
-<hkern u1=""" u2="g" k="61" />
-<hkern u1=""" u2="e" k="123" />
-<hkern u1=""" u2="d" k="123" />
-<hkern u1=""" u2="c" k="123" />
-<hkern u1=""" u2="a" k="82" />
-<hkern u1=""" u2="Y" k="-20" />
-<hkern u1=""" u2="W" k="-41" />
-<hkern u1=""" u2="V" k="-41" />
-<hkern u1=""" u2="T" k="-41" />
-<hkern u1=""" u2="A" k="143" />
-<hkern u1="'" u2="Ÿ" k="-20" />
-<hkern u1="'" u2="œ" k="123" />
-<hkern u1="'" u2="ü" k="61" />
-<hkern u1="'" u2="û" k="61" />
-<hkern u1="'" u2="ú" k="61" />
-<hkern u1="'" u2="ù" k="61" />
-<hkern u1="'" u2="ø" k="123" />
-<hkern u1="'" u2="ö" k="123" />
-<hkern u1="'" u2="õ" k="123" />
-<hkern u1="'" u2="ô" k="123" />
-<hkern u1="'" u2="ó" k="123" />
-<hkern u1="'" u2="ò" k="123" />
-<hkern u1="'" u2="ë" k="123" />
-<hkern u1="'" u2="ê" k="123" />
-<hkern u1="'" u2="é" k="123" />
-<hkern u1="'" u2="è" k="123" />
-<hkern u1="'" u2="ç" k="123" />
-<hkern u1="'" u2="æ" k="82" />
-<hkern u1="'" u2="å" k="82" />
-<hkern u1="'" u2="ä" k="82" />
-<hkern u1="'" u2="ã" k="82" />
-<hkern u1="'" u2="â" k="82" />
-<hkern u1="'" u2="á" k="82" />
-<hkern u1="'" u2="à" k="123" />
-<hkern u1="'" u2="Ý" k="-20" />
-<hkern u1="'" u2="Å" k="143" />
-<hkern u1="'" u2="Ä" k="143" />
-<hkern u1="'" u2="Ã" k="143" />
-<hkern u1="'" u2="Â" k="143" />
-<hkern u1="'" u2="Á" k="143" />
-<hkern u1="'" u2="À" k="143" />
-<hkern u1="'" u2="u" k="61" />
-<hkern u1="'" u2="s" k="61" />
-<hkern u1="'" u2="r" k="61" />
-<hkern u1="'" u2="q" k="123" />
-<hkern u1="'" u2="p" k="61" />
-<hkern u1="'" u2="o" k="123" />
-<hkern u1="'" u2="n" k="61" />
-<hkern u1="'" u2="m" k="61" />
-<hkern u1="'" u2="g" k="61" />
-<hkern u1="'" u2="e" k="123" />
-<hkern u1="'" u2="d" k="123" />
-<hkern u1="'" u2="c" k="123" />
-<hkern u1="'" u2="a" k="82" />
-<hkern u1="'" u2="Y" k="-20" />
-<hkern u1="'" u2="W" k="-41" />
-<hkern u1="'" u2="V" k="-41" />
-<hkern u1="'" u2="T" k="-41" />
-<hkern u1="'" u2="A" k="143" />
-<hkern u1="(" u2="J" k="-184" />
-<hkern u1="," u2="Ÿ" k="123" />
-<hkern u1="," u2="Œ" k="102" />
-<hkern u1="," u2="Ý" k="123" />
-<hkern u1="," u2="Ü" k="41" />
-<hkern u1="," u2="Û" k="41" />
-<hkern u1="," u2="Ú" k="41" />
-<hkern u1="," u2="Ù" k="41" />
-<hkern u1="," u2="Ø" k="102" />
-<hkern u1="," u2="Ö" k="102" />
-<hkern u1="," u2="Õ" k="102" />
-<hkern u1="," u2="Ô" k="102" />
-<hkern u1="," u2="Ó" k="102" />
-<hkern u1="," u2="Ò" k="102" />
-<hkern u1="," u2="Ç" k="102" />
-<hkern u1="," u2="Y" k="123" />
-<hkern u1="," u2="W" k="123" />
-<hkern u1="," u2="V" k="123" />
-<hkern u1="," u2="U" k="41" />
-<hkern u1="," u2="T" k="143" />
-<hkern u1="," u2="Q" k="102" />
-<hkern u1="," u2="O" k="102" />
-<hkern u1="," u2="G" k="102" />
-<hkern u1="," u2="C" k="102" />
-<hkern u1="-" u2="T" k="82" />
-<hkern u1="." u2="Ÿ" k="123" />
-<hkern u1="." u2="Œ" k="102" />
-<hkern u1="." u2="Ý" k="123" />
-<hkern u1="." u2="Ü" k="41" />
-<hkern u1="." u2="Û" k="41" />
-<hkern u1="." u2="Ú" k="41" />
-<hkern u1="." u2="Ù" k="41" />
-<hkern u1="." u2="Ø" k="102" />
-<hkern u1="." u2="Ö" k="102" />
-<hkern u1="." u2="Õ" k="102" />
-<hkern u1="." u2="Ô" k="102" />
-<hkern u1="." u2="Ó" k="102" />
-<hkern u1="." u2="Ò" k="102" />
-<hkern u1="." u2="Ç" k="102" />
-<hkern u1="." u2="Y" k="123" />
-<hkern u1="." u2="W" k="123" />
-<hkern u1="." u2="V" k="123" />
-<hkern u1="." u2="U" k="41" />
-<hkern u1="." u2="T" k="143" />
-<hkern u1="." u2="Q" k="102" />
-<hkern u1="." u2="O" k="102" />
-<hkern u1="." u2="G" k="102" />
-<hkern u1="." u2="C" k="102" />
-<hkern u1="A" u2="”" k="143" />
-<hkern u1="A" u2="’" k="143" />
-<hkern u1="A" u2="Ÿ" k="123" />
-<hkern u1="A" u2="Œ" k="41" />
-<hkern u1="A" u2="Ý" k="123" />
-<hkern u1="A" u2="Ø" k="41" />
-<hkern u1="A" u2="Ö" k="41" />
-<hkern u1="A" u2="Õ" k="41" />
-<hkern u1="A" u2="Ô" k="41" />
-<hkern u1="A" u2="Ó" k="41" />
-<hkern u1="A" u2="Ò" k="41" />
-<hkern u1="A" u2="Ç" k="41" />
-<hkern u1="A" u2="Y" k="123" />
-<hkern u1="A" u2="W" k="82" />
-<hkern u1="A" u2="V" k="82" />
-<hkern u1="A" u2="T" k="143" />
-<hkern u1="A" u2="Q" k="41" />
-<hkern u1="A" u2="O" k="41" />
-<hkern u1="A" u2="J" k="-266" />
-<hkern u1="A" u2="G" k="41" />
-<hkern u1="A" u2="C" k="41" />
-<hkern u1="A" u2="'" k="143" />
-<hkern u1="A" u2=""" k="143" />
-<hkern u1="B" u2="„" k="82" />
-<hkern u1="B" u2="‚" k="82" />
-<hkern u1="B" u2="Ÿ" k="20" />
-<hkern u1="B" u2="Ý" k="20" />
-<hkern u1="B" u2="Å" k="41" />
-<hkern u1="B" u2="Ä" k="41" />
-<hkern u1="B" u2="Ã" k="41" />
-<hkern u1="B" u2="Â" k="41" />
-<hkern u1="B" u2="Á" k="41" />
-<hkern u1="B" u2="À" k="41" />
-<hkern u1="B" u2="Z" k="20" />
-<hkern u1="B" u2="Y" k="20" />
-<hkern u1="B" u2="X" k="41" />
-<hkern u1="B" u2="W" k="20" />
-<hkern u1="B" u2="V" k="20" />
-<hkern u1="B" u2="T" k="61" />
-<hkern u1="B" u2="A" k="41" />
-<hkern u1="B" u2="." k="82" />
-<hkern u1="B" u2="," k="82" />
-<hkern u1="C" u2="Œ" k="41" />
-<hkern u1="C" u2="Ø" k="41" />
-<hkern u1="C" u2="Ö" k="41" />
-<hkern u1="C" u2="Õ" k="41" />
-<hkern u1="C" u2="Ô" k="41" />
-<hkern u1="C" u2="Ó" k="41" />
-<hkern u1="C" u2="Ò" k="41" />
-<hkern u1="C" u2="Ç" k="41" />
-<hkern u1="C" u2="Q" k="41" />
-<hkern u1="C" u2="O" k="41" />
-<hkern u1="C" u2="G" k="41" />
-<hkern u1="C" u2="C" k="41" />
-<hkern u1="D" u2="„" k="82" />
-<hkern u1="D" u2="‚" k="82" />
-<hkern u1="D" u2="Ÿ" k="20" />
-<hkern u1="D" u2="Ý" k="20" />
-<hkern u1="D" u2="Å" k="41" />
-<hkern u1="D" u2="Ä" k="41" />
-<hkern u1="D" u2="Ã" k="41" />
-<hkern u1="D" u2="Â" k="41" />
-<hkern u1="D" u2="Á" k="41" />
-<hkern u1="D" u2="À" k="41" />
-<hkern u1="D" u2="Z" k="20" />
-<hkern u1="D" u2="Y" k="20" />
-<hkern u1="D" u2="X" k="41" />
-<hkern u1="D" u2="W" k="20" />
-<hkern u1="D" u2="V" k="20" />
-<hkern u1="D" u2="T" k="61" />
-<hkern u1="D" u2="A" k="41" />
-<hkern u1="D" u2="." k="82" />
-<hkern u1="D" u2="," k="82" />
-<hkern u1="E" u2="J" k="-123" />
-<hkern u1="F" u2="„" k="123" />
-<hkern u1="F" u2="‚" k="123" />
-<hkern u1="F" u2="Å" k="41" />
-<hkern u1="F" u2="Ä" k="41" />
-<hkern u1="F" u2="Ã" k="41" />
-<hkern u1="F" u2="Â" k="41" />
-<hkern u1="F" u2="Á" k="41" />
-<hkern u1="F" u2="À" k="41" />
-<hkern u1="F" u2="A" k="41" />
-<hkern u1="F" u2="?" k="-41" />
-<hkern u1="F" u2="." k="123" />
-<hkern u1="F" u2="," k="123" />
-<hkern u1="K" u2="Œ" k="41" />
-<hkern u1="K" u2="Ø" k="41" />
-<hkern u1="K" u2="Ö" k="41" />
-<hkern u1="K" u2="Õ" k="41" />
-<hkern u1="K" u2="Ô" k="41" />
-<hkern u1="K" u2="Ó" k="41" />
-<hkern u1="K" u2="Ò" k="41" />
-<hkern u1="K" u2="Ç" k="41" />
-<hkern u1="K" u2="Q" k="41" />
-<hkern u1="K" u2="O" k="41" />
-<hkern u1="K" u2="G" k="41" />
-<hkern u1="K" u2="C" k="41" />
-<hkern u1="L" u2="”" k="164" />
-<hkern u1="L" u2="’" k="164" />
-<hkern u1="L" u2="Ÿ" k="61" />
-<hkern u1="L" u2="Œ" k="41" />
-<hkern u1="L" u2="Ý" k="61" />
-<hkern u1="L" u2="Ü" k="20" />
-<hkern u1="L" u2="Û" k="20" />
-<hkern u1="L" u2="Ú" k="20" />
-<hkern u1="L" u2="Ù" k="20" />
-<hkern u1="L" u2="Ø" k="41" />
-<hkern u1="L" u2="Ö" k="41" />
-<hkern u1="L" u2="Õ" k="41" />
-<hkern u1="L" u2="Ô" k="41" />
-<hkern u1="L" u2="Ó" k="41" />
-<hkern u1="L" u2="Ò" k="41" />
-<hkern u1="L" u2="Ç" k="41" />
-<hkern u1="L" u2="Y" k="61" />
-<hkern u1="L" u2="W" k="41" />
-<hkern u1="L" u2="V" k="41" />
-<hkern u1="L" u2="U" k="20" />
-<hkern u1="L" u2="T" k="41" />
-<hkern u1="L" u2="Q" k="41" />
-<hkern u1="L" u2="O" k="41" />
-<hkern u1="L" u2="G" k="41" />
-<hkern u1="L" u2="C" k="41" />
-<hkern u1="L" u2="'" k="164" />
-<hkern u1="L" u2=""" k="164" />
-<hkern u1="O" u2="„" k="82" />
-<hkern u1="O" u2="‚" k="82" />
-<hkern u1="O" u2="Ÿ" k="20" />
-<hkern u1="O" u2="Ý" k="20" />
-<hkern u1="O" u2="Å" k="41" />
-<hkern u1="O" u2="Ä" k="41" />
-<hkern u1="O" u2="Ã" k="41" />
-<hkern u1="O" u2="Â" k="41" />
-<hkern u1="O" u2="Á" k="41" />
-<hkern u1="O" u2="À" k="41" />
-<hkern u1="O" u2="Z" k="20" />
-<hkern u1="O" u2="Y" k="20" />
-<hkern u1="O" u2="X" k="41" />
-<hkern u1="O" u2="W" k="20" />
-<hkern u1="O" u2="V" k="20" />
-<hkern u1="O" u2="T" k="61" />
-<hkern u1="O" u2="A" k="41" />
-<hkern u1="O" u2="." k="82" />
-<hkern u1="O" u2="," k="82" />
-<hkern u1="P" u2="„" k="266" />
-<hkern u1="P" u2="‚" k="266" />
-<hkern u1="P" u2="Å" k="102" />
-<hkern u1="P" u2="Ä" k="102" />
-<hkern u1="P" u2="Ã" k="102" />
-<hkern u1="P" u2="Â" k="102" />
-<hkern u1="P" u2="Á" k="102" />
-<hkern u1="P" u2="À" k="102" />
-<hkern u1="P" u2="Z" k="20" />
-<hkern u1="P" u2="X" k="41" />
-<hkern u1="P" u2="A" k="102" />
-<hkern u1="P" u2="." k="266" />
-<hkern u1="P" u2="," k="266" />
-<hkern u1="Q" u2="„" k="82" />
-<hkern u1="Q" u2="‚" k="82" />
-<hkern u1="Q" u2="Ÿ" k="20" />
-<hkern u1="Q" u2="Ý" k="20" />
-<hkern u1="Q" u2="Å" k="41" />
-<hkern u1="Q" u2="Ä" k="41" />
-<hkern u1="Q" u2="Ã" k="41" />
-<hkern u1="Q" u2="Â" k="41" />
-<hkern u1="Q" u2="Á" k="41" />
-<hkern u1="Q" u2="À" k="41" />
-<hkern u1="Q" u2="Z" k="20" />
-<hkern u1="Q" u2="Y" k="20" />
-<hkern u1="Q" u2="X" k="41" />
-<hkern u1="Q" u2="W" k="20" />
-<hkern u1="Q" u2="V" k="20" />
-<hkern u1="Q" u2="T" k="61" />
-<hkern u1="Q" u2="A" k="41" />
-<hkern u1="Q" u2="." k="82" />
-<hkern u1="Q" u2="," k="82" />
-<hkern u1="T" u2="„" k="123" />
-<hkern u1="T" u2="‚" k="123" />
-<hkern u1="T" u2="—" k="82" />
-<hkern u1="T" u2="–" k="82" />
-<hkern u1="T" u2="œ" k="143" />
-<hkern u1="T" u2="Œ" k="41" />
-<hkern u1="T" u2="ý" k="41" />
-<hkern u1="T" u2="ü" k="102" />
-<hkern u1="T" u2="û" k="102" />
-<hkern u1="T" u2="ú" k="102" />
-<hkern u1="T" u2="ù" k="102" />
-<hkern u1="T" u2="ø" k="143" />
-<hkern u1="T" u2="ö" k="143" />
-<hkern u1="T" u2="õ" k="143" />
-<hkern u1="T" u2="ô" k="143" />
-<hkern u1="T" u2="ó" k="143" />
-<hkern u1="T" u2="ò" k="143" />
-<hkern u1="T" u2="ë" k="143" />
-<hkern u1="T" u2="ê" k="143" />
-<hkern u1="T" u2="é" k="143" />
-<hkern u1="T" u2="è" k="143" />
-<hkern u1="T" u2="ç" k="143" />
-<hkern u1="T" u2="æ" k="164" />
-<hkern u1="T" u2="å" k="164" />
-<hkern u1="T" u2="ä" k="164" />
-<hkern u1="T" u2="ã" k="164" />
-<hkern u1="T" u2="â" k="164" />
-<hkern u1="T" u2="á" k="164" />
-<hkern u1="T" u2="à" k="143" />
-<hkern u1="T" u2="Ø" k="41" />
-<hkern u1="T" u2="Ö" k="41" />
-<hkern u1="T" u2="Õ" k="41" />
-<hkern u1="T" u2="Ô" k="41" />
-<hkern u1="T" u2="Ó" k="41" />
-<hkern u1="T" u2="Ò" k="41" />
-<hkern u1="T" u2="Ç" k="41" />
-<hkern u1="T" u2="Å" k="143" />
-<hkern u1="T" u2="Ä" k="143" />
-<hkern u1="T" u2="Ã" k="143" />
-<hkern u1="T" u2="Â" k="143" />
-<hkern u1="T" u2="Á" k="143" />
-<hkern u1="T" u2="À" k="143" />
-<hkern u1="T" u2="z" k="82" />
-<hkern u1="T" u2="y" k="41" />
-<hkern u1="T" u2="x" k="41" />
-<hkern u1="T" u2="w" k="41" />
-<hkern u1="T" u2="v" k="41" />
-<hkern u1="T" u2="u" k="102" />
-<hkern u1="T" u2="s" k="123" />
-<hkern u1="T" u2="r" k="102" />
-<hkern u1="T" u2="q" k="143" />
-<hkern u1="T" u2="p" k="102" />
-<hkern u1="T" u2="o" k="143" />
-<hkern u1="T" u2="n" k="102" />
-<hkern u1="T" u2="m" k="102" />
-<hkern u1="T" u2="g" k="143" />
-<hkern u1="T" u2="e" k="143" />
-<hkern u1="T" u2="d" k="143" />
-<hkern u1="T" u2="c" k="143" />
-<hkern u1="T" u2="a" k="164" />
-<hkern u1="T" u2="T" k="-41" />
-<hkern u1="T" u2="Q" k="41" />
-<hkern u1="T" u2="O" k="41" />
-<hkern u1="T" u2="G" k="41" />
-<hkern u1="T" u2="C" k="41" />
-<hkern u1="T" u2="A" k="143" />
-<hkern u1="T" u2="?" k="-41" />
-<hkern u1="T" u2="." k="123" />
-<hkern u1="T" u2="-" k="82" />
-<hkern u1="T" u2="," k="123" />
-<hkern u1="U" u2="„" k="41" />
-<hkern u1="U" u2="‚" k="41" />
-<hkern u1="U" u2="Å" k="20" />
-<hkern u1="U" u2="Ä" k="20" />
-<hkern u1="U" u2="Ã" k="20" />
-<hkern u1="U" u2="Â" k="20" />
-<hkern u1="U" u2="Á" k="20" />
-<hkern u1="U" u2="À" k="20" />
-<hkern u1="U" u2="A" k="20" />
-<hkern u1="U" u2="." k="41" />
-<hkern u1="U" u2="," k="41" />
-<hkern u1="V" u2="„" k="102" />
-<hkern u1="V" u2="‚" k="102" />
-<hkern u1="V" u2="œ" k="41" />
-<hkern u1="V" u2="Œ" k="20" />
-<hkern u1="V" u2="ü" k="20" />
-<hkern u1="V" u2="û" k="20" />
-<hkern u1="V" u2="ú" k="20" />
-<hkern u1="V" u2="ù" k="20" />
-<hkern u1="V" u2="ø" k="41" />
-<hkern u1="V" u2="ö" k="41" />
-<hkern u1="V" u2="õ" k="41" />
-<hkern u1="V" u2="ô" k="41" />
-<hkern u1="V" u2="ó" k="41" />
-<hkern u1="V" u2="ò" k="41" />
-<hkern u1="V" u2="ë" k="41" />
-<hkern u1="V" u2="ê" k="41" />
-<hkern u1="V" u2="é" k="41" />
-<hkern u1="V" u2="è" k="41" />
-<hkern u1="V" u2="ç" k="41" />
-<hkern u1="V" u2="æ" k="41" />
-<hkern u1="V" u2="å" k="41" />
-<hkern u1="V" u2="ä" k="41" />
-<hkern u1="V" u2="ã" k="41" />
-<hkern u1="V" u2="â" k="41" />
-<hkern u1="V" u2="á" k="41" />
-<hkern u1="V" u2="à" k="41" />
-<hkern u1="V" u2="Ø" k="20" />
-<hkern u1="V" u2="Ö" k="20" />
-<hkern u1="V" u2="Õ" k="20" />
-<hkern u1="V" u2="Ô" k="20" />
-<hkern u1="V" u2="Ó" k="20" />
-<hkern u1="V" u2="Ò" k="20" />
-<hkern u1="V" u2="Ç" k="20" />
-<hkern u1="V" u2="Å" k="82" />
-<hkern u1="V" u2="Ä" k="82" />
-<hkern u1="V" u2="Ã" k="82" />
-<hkern u1="V" u2="Â" k="82" />
-<hkern u1="V" u2="Á" k="82" />
-<hkern u1="V" u2="À" k="82" />
-<hkern u1="V" u2="u" k="20" />
-<hkern u1="V" u2="s" k="20" />
-<hkern u1="V" u2="r" k="20" />
-<hkern u1="V" u2="q" k="41" />
-<hkern u1="V" u2="p" k="20" />
-<hkern u1="V" u2="o" k="41" />
-<hkern u1="V" u2="n" k="20" />
-<hkern u1="V" u2="m" k="20" />
-<hkern u1="V" u2="g" k="20" />
-<hkern u1="V" u2="e" k="41" />
-<hkern u1="V" u2="d" k="41" />
-<hkern u1="V" u2="c" k="41" />
-<hkern u1="V" u2="a" k="41" />
-<hkern u1="V" u2="Q" k="20" />
-<hkern u1="V" u2="O" k="20" />
-<hkern u1="V" u2="G" k="20" />
-<hkern u1="V" u2="C" k="20" />
-<hkern u1="V" u2="A" k="82" />
-<hkern u1="V" u2="?" k="-41" />
-<hkern u1="V" u2="." k="102" />
-<hkern u1="V" u2="," k="102" />
-<hkern u1="W" u2="„" k="102" />
-<hkern u1="W" u2="‚" k="102" />
-<hkern u1="W" u2="œ" k="41" />
-<hkern u1="W" u2="Œ" k="20" />
-<hkern u1="W" u2="ü" k="20" />
-<hkern u1="W" u2="û" k="20" />
-<hkern u1="W" u2="ú" k="20" />
-<hkern u1="W" u2="ù" k="20" />
-<hkern u1="W" u2="ø" k="41" />
-<hkern u1="W" u2="ö" k="41" />
-<hkern u1="W" u2="õ" k="41" />
-<hkern u1="W" u2="ô" k="41" />
-<hkern u1="W" u2="ó" k="41" />
-<hkern u1="W" u2="ò" k="41" />
-<hkern u1="W" u2="ë" k="41" />
-<hkern u1="W" u2="ê" k="41" />
-<hkern u1="W" u2="é" k="41" />
-<hkern u1="W" u2="è" k="41" />
-<hkern u1="W" u2="ç" k="41" />
-<hkern u1="W" u2="æ" k="41" />
-<hkern u1="W" u2="å" k="41" />
-<hkern u1="W" u2="ä" k="41" />
-<hkern u1="W" u2="ã" k="41" />
-<hkern u1="W" u2="â" k="41" />
-<hkern u1="W" u2="á" k="41" />
-<hkern u1="W" u2="à" k="41" />
-<hkern u1="W" u2="Ø" k="20" />
-<hkern u1="W" u2="Ö" k="20" />
-<hkern u1="W" u2="Õ" k="20" />
-<hkern u1="W" u2="Ô" k="20" />
-<hkern u1="W" u2="Ó" k="20" />
-<hkern u1="W" u2="Ò" k="20" />
-<hkern u1="W" u2="Ç" k="20" />
-<hkern u1="W" u2="Å" k="82" />
-<hkern u1="W" u2="Ä" k="82" />
-<hkern u1="W" u2="Ã" k="82" />
-<hkern u1="W" u2="Â" k="82" />
-<hkern u1="W" u2="Á" k="82" />
-<hkern u1="W" u2="À" k="82" />
-<hkern u1="W" u2="u" k="20" />
-<hkern u1="W" u2="s" k="20" />
-<hkern u1="W" u2="r" k="20" />
-<hkern u1="W" u2="q" k="41" />
-<hkern u1="W" u2="p" k="20" />
-<hkern u1="W" u2="o" k="41" />
-<hkern u1="W" u2="n" k="20" />
-<hkern u1="W" u2="m" k="20" />
-<hkern u1="W" u2="g" k="20" />
-<hkern u1="W" u2="e" k="41" />
-<hkern u1="W" u2="d" k="41" />
-<hkern u1="W" u2="c" k="41" />
-<hkern u1="W" u2="a" k="41" />
-<hkern u1="W" u2="Q" k="20" />
-<hkern u1="W" u2="O" k="20" />
-<hkern u1="W" u2="G" k="20" />
-<hkern u1="W" u2="C" k="20" />
-<hkern u1="W" u2="A" k="82" />
-<hkern u1="W" u2="?" k="-41" />
-<hkern u1="W" u2="." k="102" />
-<hkern u1="W" u2="," k="102" />
-<hkern u1="X" u2="Œ" k="41" />
-<hkern u1="X" u2="Ø" k="41" />
-<hkern u1="X" u2="Ö" k="41" />
-<hkern u1="X" u2="Õ" k="41" />
-<hkern u1="X" u2="Ô" k="41" />
-<hkern u1="X" u2="Ó" k="41" />
-<hkern u1="X" u2="Ò" k="41" />
-<hkern u1="X" u2="Ç" k="41" />
-<hkern u1="X" u2="Q" k="41" />
-<hkern u1="X" u2="O" k="41" />
-<hkern u1="X" u2="G" k="41" />
-<hkern u1="X" u2="C" k="41" />
-<hkern u1="Y" u2="„" k="123" />
-<hkern u1="Y" u2="‚" k="123" />
-<hkern u1="Y" u2="œ" k="102" />
-<hkern u1="Y" u2="Œ" k="41" />
-<hkern u1="Y" u2="ü" k="61" />
-<hkern u1="Y" u2="û" k="61" />
-<hkern u1="Y" u2="ú" k="61" />
-<hkern u1="Y" u2="ù" k="61" />
-<hkern u1="Y" u2="ø" k="102" />
-<hkern u1="Y" u2="ö" k="102" />
-<hkern u1="Y" u2="õ" k="102" />
-<hkern u1="Y" u2="ô" k="102" />
-<hkern u1="Y" u2="ó" k="102" />
-<hkern u1="Y" u2="ò" k="102" />
-<hkern u1="Y" u2="ë" k="102" />
-<hkern u1="Y" u2="ê" k="102" />
-<hkern u1="Y" u2="é" k="102" />
-<hkern u1="Y" u2="è" k="102" />
-<hkern u1="Y" u2="ç" k="102" />
-<hkern u1="Y" u2="æ" k="102" />
-<hkern u1="Y" u2="å" k="102" />
-<hkern u1="Y" u2="ä" k="102" />
-<hkern u1="Y" u2="ã" k="102" />
-<hkern u1="Y" u2="â" k="102" />
-<hkern u1="Y" u2="á" k="102" />
-<hkern u1="Y" u2="à" k="102" />
-<hkern u1="Y" u2="Ø" k="41" />
-<hkern u1="Y" u2="Ö" k="41" />
-<hkern u1="Y" u2="Õ" k="41" />
-<hkern u1="Y" u2="Ô" k="41" />
-<hkern u1="Y" u2="Ó" k="41" />
-<hkern u1="Y" u2="Ò" k="41" />
-<hkern u1="Y" u2="Ç" k="41" />
-<hkern u1="Y" u2="Å" k="123" />
-<hkern u1="Y" u2="Ä" k="123" />
-<hkern u1="Y" u2="Ã" k="123" />
-<hkern u1="Y" u2="Â" k="123" />
-<hkern u1="Y" u2="Á" k="123" />
-<hkern u1="Y" u2="À" k="123" />
-<hkern u1="Y" u2="z" k="41" />
-<hkern u1="Y" u2="u" k="61" />
-<hkern u1="Y" u2="s" k="82" />
-<hkern u1="Y" u2="r" k="61" />
-<hkern u1="Y" u2="q" k="102" />
-<hkern u1="Y" u2="p" k="61" />
-<hkern u1="Y" u2="o" k="102" />
-<hkern u1="Y" u2="n" k="61" />
-<hkern u1="Y" u2="m" k="61" />
-<hkern u1="Y" u2="g" k="41" />
-<hkern u1="Y" u2="e" k="102" />
-<hkern u1="Y" u2="d" k="102" />
-<hkern u1="Y" u2="c" k="102" />
-<hkern u1="Y" u2="a" k="102" />
-<hkern u1="Y" u2="Q" k="41" />
-<hkern u1="Y" u2="O" k="41" />
-<hkern u1="Y" u2="G" k="41" />
-<hkern u1="Y" u2="C" k="41" />
-<hkern u1="Y" u2="A" k="123" />
-<hkern u1="Y" u2="?" k="-41" />
-<hkern u1="Y" u2="." k="123" />
-<hkern u1="Y" u2="," k="123" />
-<hkern u1="Z" u2="Œ" k="20" />
-<hkern u1="Z" u2="Ø" k="20" />
-<hkern u1="Z" u2="Ö" k="20" />
-<hkern u1="Z" u2="Õ" k="20" />
-<hkern u1="Z" u2="Ô" k="20" />
-<hkern u1="Z" u2="Ó" k="20" />
-<hkern u1="Z" u2="Ò" k="20" />
-<hkern u1="Z" u2="Ç" k="20" />
-<hkern u1="Z" u2="Q" k="20" />
-<hkern u1="Z" u2="O" k="20" />
-<hkern u1="Z" u2="G" k="20" />
-<hkern u1="Z" u2="C" k="20" />
-<hkern u1="[" u2="J" k="-184" />
-<hkern u1="a" u2="”" k="20" />
-<hkern u1="a" u2="’" k="20" />
-<hkern u1="a" u2="'" k="20" />
-<hkern u1="a" u2=""" k="20" />
-<hkern u1="b" u2="”" k="20" />
-<hkern u1="b" u2="’" k="20" />
-<hkern u1="b" u2="ý" k="41" />
-<hkern u1="b" u2="z" k="20" />
-<hkern u1="b" u2="y" k="41" />
-<hkern u1="b" u2="x" k="41" />
-<hkern u1="b" u2="w" k="41" />
-<hkern u1="b" u2="v" k="41" />
-<hkern u1="b" u2="'" k="20" />
-<hkern u1="b" u2=""" k="20" />
-<hkern u1="c" u2="”" k="-41" />
-<hkern u1="c" u2="’" k="-41" />
-<hkern u1="c" u2="'" k="-41" />
-<hkern u1="c" u2=""" k="-41" />
-<hkern u1="e" u2="”" k="20" />
-<hkern u1="e" u2="’" k="20" />
-<hkern u1="e" u2="ý" k="41" />
-<hkern u1="e" u2="z" k="20" />
-<hkern u1="e" u2="y" k="41" />
-<hkern u1="e" u2="x" k="41" />
-<hkern u1="e" u2="w" k="41" />
-<hkern u1="e" u2="v" k="41" />
-<hkern u1="e" u2="'" k="20" />
-<hkern u1="e" u2=""" k="20" />
-<hkern u1="f" u2="”" k="-123" />
-<hkern u1="f" u2="’" k="-123" />
-<hkern u1="f" u2="'" k="-123" />
-<hkern u1="f" u2=""" k="-123" />
-<hkern u1="h" u2="”" k="20" />
-<hkern u1="h" u2="’" k="20" />
-<hkern u1="h" u2="'" k="20" />
-<hkern u1="h" u2=""" k="20" />
-<hkern u1="k" u2="œ" k="41" />
-<hkern u1="k" u2="ø" k="41" />
-<hkern u1="k" u2="ö" k="41" />
-<hkern u1="k" u2="õ" k="41" />
-<hkern u1="k" u2="ô" k="41" />
-<hkern u1="k" u2="ó" k="41" />
-<hkern u1="k" u2="ò" k="41" />
-<hkern u1="k" u2="ë" k="41" />
-<hkern u1="k" u2="ê" k="41" />
-<hkern u1="k" u2="é" k="41" />
-<hkern u1="k" u2="è" k="41" />
-<hkern u1="k" u2="ç" k="41" />
-<hkern u1="k" u2="à" k="41" />
-<hkern u1="k" u2="q" k="41" />
-<hkern u1="k" u2="o" k="41" />
-<hkern u1="k" u2="e" k="41" />
-<hkern u1="k" u2="d" k="41" />
-<hkern u1="k" u2="c" k="41" />
-<hkern u1="m" u2="”" k="20" />
-<hkern u1="m" u2="’" k="20" />
-<hkern u1="m" u2="'" k="20" />
-<hkern u1="m" u2=""" k="20" />
-<hkern u1="n" u2="”" k="20" />
-<hkern u1="n" u2="’" k="20" />
-<hkern u1="n" u2="'" k="20" />
-<hkern u1="n" u2=""" k="20" />
-<hkern u1="o" u2="”" k="20" />
-<hkern u1="o" u2="’" k="20" />
-<hkern u1="o" u2="ý" k="41" />
-<hkern u1="o" u2="z" k="20" />
-<hkern u1="o" u2="y" k="41" />
-<hkern u1="o" u2="x" k="41" />
-<hkern u1="o" u2="w" k="41" />
-<hkern u1="o" u2="v" k="41" />
-<hkern u1="o" u2="'" k="20" />
-<hkern u1="o" u2=""" k="20" />
-<hkern u1="p" u2="”" k="20" />
-<hkern u1="p" u2="’" k="20" />
-<hkern u1="p" u2="ý" k="41" />
-<hkern u1="p" u2="z" k="20" />
-<hkern u1="p" u2="y" k="41" />
-<hkern u1="p" u2="x" k="41" />
-<hkern u1="p" u2="w" k="41" />
-<hkern u1="p" u2="v" k="41" />
-<hkern u1="p" u2="'" k="20" />
-<hkern u1="p" u2=""" k="20" />
-<hkern u1="r" u2="”" k="-82" />
-<hkern u1="r" u2="’" k="-82" />
-<hkern u1="r" u2="œ" k="41" />
-<hkern u1="r" u2="ø" k="41" />
-<hkern u1="r" u2="ö" k="41" />
-<hkern u1="r" u2="õ" k="41" />
-<hkern u1="r" u2="ô" k="41" />
-<hkern u1="r" u2="ó" k="41" />
-<hkern u1="r" u2="ò" k="41" />
-<hkern u1="r" u2="ë" k="41" />
-<hkern u1="r" u2="ê" k="41" />
-<hkern u1="r" u2="é" k="41" />
-<hkern u1="r" u2="è" k="41" />
-<hkern u1="r" u2="ç" k="41" />
-<hkern u1="r" u2="æ" k="41" />
-<hkern u1="r" u2="å" k="41" />
-<hkern u1="r" u2="ä" k="41" />
-<hkern u1="r" u2="ã" k="41" />
-<hkern u1="r" u2="â" k="41" />
-<hkern u1="r" u2="á" k="41" />
-<hkern u1="r" u2="à" k="41" />
-<hkern u1="r" u2="q" k="41" />
-<hkern u1="r" u2="o" k="41" />
-<hkern u1="r" u2="g" k="20" />
-<hkern u1="r" u2="e" k="41" />
-<hkern u1="r" u2="d" k="41" />
-<hkern u1="r" u2="c" k="41" />
-<hkern u1="r" u2="a" k="41" />
-<hkern u1="r" u2="'" k="-82" />
-<hkern u1="r" u2=""" k="-82" />
-<hkern u1="t" u2="”" k="-41" />
-<hkern u1="t" u2="’" k="-41" />
-<hkern u1="t" u2="'" k="-41" />
-<hkern u1="t" u2=""" k="-41" />
-<hkern u1="v" u2="„" k="82" />
-<hkern u1="v" u2="”" k="-82" />
-<hkern u1="v" u2="‚" k="82" />
-<hkern u1="v" u2="’" k="-82" />
-<hkern u1="v" u2="?" k="-41" />
-<hkern u1="v" u2="." k="82" />
-<hkern u1="v" u2="," k="82" />
-<hkern u1="v" u2="'" k="-82" />
-<hkern u1="v" u2=""" k="-82" />
-<hkern u1="w" u2="„" k="82" />
-<hkern u1="w" u2="”" k="-82" />
-<hkern u1="w" u2="‚" k="82" />
-<hkern u1="w" u2="’" k="-82" />
-<hkern u1="w" u2="?" k="-41" />
-<hkern u1="w" u2="." k="82" />
-<hkern u1="w" u2="," k="82" />
-<hkern u1="w" u2="'" k="-82" />
-<hkern u1="w" u2=""" k="-82" />
-<hkern u1="x" u2="œ" k="41" />
-<hkern u1="x" u2="ø" k="41" />
-<hkern u1="x" u2="ö" k="41" />
-<hkern u1="x" u2="õ" k="41" />
-<hkern u1="x" u2="ô" k="41" />
-<hkern u1="x" u2="ó" k="41" />
-<hkern u1="x" u2="ò" k="41" />
-<hkern u1="x" u2="ë" k="41" />
-<hkern u1="x" u2="ê" k="41" />
-<hkern u1="x" u2="é" k="41" />
-<hkern u1="x" u2="è" k="41" />
-<hkern u1="x" u2="ç" k="41" />
-<hkern u1="x" u2="à" k="41" />
-<hkern u1="x" u2="q" k="41" />
-<hkern u1="x" u2="o" k="41" />
-<hkern u1="x" u2="e" k="41" />
-<hkern u1="x" u2="d" k="41" />
-<hkern u1="x" u2="c" k="41" />
-<hkern u1="y" u2="„" k="82" />
-<hkern u1="y" u2="”" k="-82" />
-<hkern u1="y" u2="‚" k="82" />
-<hkern u1="y" u2="’" k="-82" />
-<hkern u1="y" u2="?" k="-41" />
-<hkern u1="y" u2="." k="82" />
-<hkern u1="y" u2="," k="82" />
-<hkern u1="y" u2="'" k="-82" />
-<hkern u1="y" u2=""" k="-82" />
-<hkern u1="{" u2="J" k="-184" />
-<hkern u1="À" u2="”" k="143" />
-<hkern u1="À" u2="’" k="143" />
-<hkern u1="À" u2="Ÿ" k="123" />
-<hkern u1="À" u2="Œ" k="41" />
-<hkern u1="À" u2="Ý" k="123" />
-<hkern u1="À" u2="Ø" k="41" />
-<hkern u1="À" u2="Ö" k="41" />
-<hkern u1="À" u2="Õ" k="41" />
-<hkern u1="À" u2="Ô" k="41" />
-<hkern u1="À" u2="Ó" k="41" />
-<hkern u1="À" u2="Ò" k="41" />
-<hkern u1="À" u2="Ç" k="41" />
-<hkern u1="À" u2="Y" k="123" />
-<hkern u1="À" u2="W" k="82" />
-<hkern u1="À" u2="V" k="82" />
-<hkern u1="À" u2="T" k="143" />
-<hkern u1="À" u2="Q" k="41" />
-<hkern u1="À" u2="O" k="41" />
-<hkern u1="À" u2="J" k="-266" />
-<hkern u1="À" u2="G" k="41" />
-<hkern u1="À" u2="C" k="41" />
-<hkern u1="À" u2="'" k="143" />
-<hkern u1="À" u2=""" k="143" />
-<hkern u1="Á" u2="”" k="143" />
-<hkern u1="Á" u2="’" k="143" />
-<hkern u1="Á" u2="Ÿ" k="123" />
-<hkern u1="Á" u2="Œ" k="41" />
-<hkern u1="Á" u2="Ý" k="123" />
-<hkern u1="Á" u2="Ø" k="41" />
-<hkern u1="Á" u2="Ö" k="41" />
-<hkern u1="Á" u2="Õ" k="41" />
-<hkern u1="Á" u2="Ô" k="41" />
-<hkern u1="Á" u2="Ó" k="41" />
-<hkern u1="Á" u2="Ò" k="41" />
-<hkern u1="Á" u2="Ç" k="41" />
-<hkern u1="Á" u2="Y" k="123" />
-<hkern u1="Á" u2="W" k="82" />
-<hkern u1="Á" u2="V" k="82" />
-<hkern u1="Á" u2="T" k="143" />
-<hkern u1="Á" u2="Q" k="41" />
-<hkern u1="Á" u2="O" k="41" />
-<hkern u1="Á" u2="J" k="-266" />
-<hkern u1="Á" u2="G" k="41" />
-<hkern u1="Á" u2="C" k="41" />
-<hkern u1="Á" u2="'" k="143" />
-<hkern u1="Á" u2=""" k="143" />
-<hkern u1="Â" u2="”" k="143" />
-<hkern u1="Â" u2="’" k="143" />
-<hkern u1="Â" u2="Ÿ" k="123" />
-<hkern u1="Â" u2="Œ" k="41" />
-<hkern u1="Â" u2="Ý" k="123" />
-<hkern u1="Â" u2="Ø" k="41" />
-<hkern u1="Â" u2="Ö" k="41" />
-<hkern u1="Â" u2="Õ" k="41" />
-<hkern u1="Â" u2="Ô" k="41" />
-<hkern u1="Â" u2="Ó" k="41" />
-<hkern u1="Â" u2="Ò" k="41" />
-<hkern u1="Â" u2="Ç" k="41" />
-<hkern u1="Â" u2="Y" k="123" />
-<hkern u1="Â" u2="W" k="82" />
-<hkern u1="Â" u2="V" k="82" />
-<hkern u1="Â" u2="T" k="143" />
-<hkern u1="Â" u2="Q" k="41" />
-<hkern u1="Â" u2="O" k="41" />
-<hkern u1="Â" u2="J" k="-266" />
-<hkern u1="Â" u2="G" k="41" />
-<hkern u1="Â" u2="C" k="41" />
-<hkern u1="Â" u2="'" k="143" />
-<hkern u1="Â" u2=""" k="143" />
-<hkern u1="Ã" u2="”" k="143" />
-<hkern u1="Ã" u2="’" k="143" />
-<hkern u1="Ã" u2="Ÿ" k="123" />
-<hkern u1="Ã" u2="Œ" k="41" />
-<hkern u1="Ã" u2="Ý" k="123" />
-<hkern u1="Ã" u2="Ø" k="41" />
-<hkern u1="Ã" u2="Ö" k="41" />
-<hkern u1="Ã" u2="Õ" k="41" />
-<hkern u1="Ã" u2="Ô" k="41" />
-<hkern u1="Ã" u2="Ó" k="41" />
-<hkern u1="Ã" u2="Ò" k="41" />
-<hkern u1="Ã" u2="Ç" k="41" />
-<hkern u1="Ã" u2="Y" k="123" />
-<hkern u1="Ã" u2="W" k="82" />
-<hkern u1="Ã" u2="V" k="82" />
-<hkern u1="Ã" u2="T" k="143" />
-<hkern u1="Ã" u2="Q" k="41" />
-<hkern u1="Ã" u2="O" k="41" />
-<hkern u1="Ã" u2="J" k="-266" />
-<hkern u1="Ã" u2="G" k="41" />
-<hkern u1="Ã" u2="C" k="41" />
-<hkern u1="Ã" u2="'" k="143" />
-<hkern u1="Ã" u2=""" k="143" />
-<hkern u1="Ä" u2="”" k="143" />
-<hkern u1="Ä" u2="’" k="143" />
-<hkern u1="Ä" u2="Ÿ" k="123" />
-<hkern u1="Ä" u2="Œ" k="41" />
-<hkern u1="Ä" u2="Ý" k="123" />
-<hkern u1="Ä" u2="Ø" k="41" />
-<hkern u1="Ä" u2="Ö" k="41" />
-<hkern u1="Ä" u2="Õ" k="41" />
-<hkern u1="Ä" u2="Ô" k="41" />
-<hkern u1="Ä" u2="Ó" k="41" />
-<hkern u1="Ä" u2="Ò" k="41" />
-<hkern u1="Ä" u2="Ç" k="41" />
-<hkern u1="Ä" u2="Y" k="123" />
-<hkern u1="Ä" u2="W" k="82" />
-<hkern u1="Ä" u2="V" k="82" />
-<hkern u1="Ä" u2="T" k="143" />
-<hkern u1="Ä" u2="Q" k="41" />
-<hkern u1="Ä" u2="O" k="41" />
-<hkern u1="Ä" u2="J" k="-266" />
-<hkern u1="Ä" u2="G" k="41" />
-<hkern u1="Ä" u2="C" k="41" />
-<hkern u1="Ä" u2="'" k="143" />
-<hkern u1="Ä" u2=""" k="143" />
-<hkern u1="Å" u2="”" k="143" />
-<hkern u1="Å" u2="’" k="143" />
-<hkern u1="Å" u2="Ÿ" k="123" />
-<hkern u1="Å" u2="Œ" k="41" />
-<hkern u1="Å" u2="Ý" k="123" />
-<hkern u1="Å" u2="Ø" k="41" />
-<hkern u1="Å" u2="Ö" k="41" />
-<hkern u1="Å" u2="Õ" k="41" />
-<hkern u1="Å" u2="Ô" k="41" />
-<hkern u1="Å" u2="Ó" k="41" />
-<hkern u1="Å" u2="Ò" k="41" />
-<hkern u1="Å" u2="Ç" k="41" />
-<hkern u1="Å" u2="Y" k="123" />
-<hkern u1="Å" u2="W" k="82" />
-<hkern u1="Å" u2="V" k="82" />
-<hkern u1="Å" u2="T" k="143" />
-<hkern u1="Å" u2="Q" k="41" />
-<hkern u1="Å" u2="O" k="41" />
-<hkern u1="Å" u2="J" k="-266" />
-<hkern u1="Å" u2="G" k="41" />
-<hkern u1="Å" u2="C" k="41" />
-<hkern u1="Å" u2="'" k="143" />
-<hkern u1="Å" u2=""" k="143" />
-<hkern u1="Æ" u2="J" k="-123" />
-<hkern u1="Ç" u2="Œ" k="41" />
-<hkern u1="Ç" u2="Ø" k="41" />
-<hkern u1="Ç" u2="Ö" k="41" />
-<hkern u1="Ç" u2="Õ" k="41" />
-<hkern u1="Ç" u2="Ô" k="41" />
-<hkern u1="Ç" u2="Ó" k="41" />
-<hkern u1="Ç" u2="Ò" k="41" />
-<hkern u1="Ç" u2="Ç" k="41" />
-<hkern u1="Ç" u2="Q" k="41" />
-<hkern u1="Ç" u2="O" k="41" />
-<hkern u1="Ç" u2="G" k="41" />
-<hkern u1="Ç" u2="C" k="41" />
-<hkern u1="È" u2="J" k="-123" />
-<hkern u1="É" u2="J" k="-123" />
-<hkern u1="Ê" u2="J" k="-123" />
-<hkern u1="Ë" u2="J" k="-123" />
-<hkern u1="Ð" u2="„" k="82" />
-<hkern u1="Ð" u2="‚" k="82" />
-<hkern u1="Ð" u2="Ÿ" k="20" />
-<hkern u1="Ð" u2="Ý" k="20" />
-<hkern u1="Ð" u2="Å" k="41" />
-<hkern u1="Ð" u2="Ä" k="41" />
-<hkern u1="Ð" u2="Ã" k="41" />
-<hkern u1="Ð" u2="Â" k="41" />
-<hkern u1="Ð" u2="Á" k="41" />
-<hkern u1="Ð" u2="À" k="41" />
-<hkern u1="Ð" u2="Z" k="20" />
-<hkern u1="Ð" u2="Y" k="20" />
-<hkern u1="Ð" u2="X" k="41" />
-<hkern u1="Ð" u2="W" k="20" />
-<hkern u1="Ð" u2="V" k="20" />
-<hkern u1="Ð" u2="T" k="61" />
-<hkern u1="Ð" u2="A" k="41" />
-<hkern u1="Ð" u2="." k="82" />
-<hkern u1="Ð" u2="," k="82" />
-<hkern u1="Ò" u2="„" k="82" />
-<hkern u1="Ò" u2="‚" k="82" />
-<hkern u1="Ò" u2="Ÿ" k="20" />
-<hkern u1="Ò" u2="Ý" k="20" />
-<hkern u1="Ò" u2="Å" k="41" />
-<hkern u1="Ò" u2="Ä" k="41" />
-<hkern u1="Ò" u2="Ã" k="41" />
-<hkern u1="Ò" u2="Â" k="41" />
-<hkern u1="Ò" u2="Á" k="41" />
-<hkern u1="Ò" u2="À" k="41" />
-<hkern u1="Ò" u2="Z" k="20" />
-<hkern u1="Ò" u2="Y" k="20" />
-<hkern u1="Ò" u2="X" k="41" />
-<hkern u1="Ò" u2="W" k="20" />
-<hkern u1="Ò" u2="V" k="20" />
-<hkern u1="Ò" u2="T" k="61" />
-<hkern u1="Ò" u2="A" k="41" />
-<hkern u1="Ò" u2="." k="82" />
-<hkern u1="Ò" u2="," k="82" />
-<hkern u1="Ó" u2="„" k="82" />
-<hkern u1="Ó" u2="‚" k="82" />
-<hkern u1="Ó" u2="Ÿ" k="20" />
-<hkern u1="Ó" u2="Ý" k="20" />
-<hkern u1="Ó" u2="Å" k="41" />
-<hkern u1="Ó" u2="Ä" k="41" />
-<hkern u1="Ó" u2="Ã" k="41" />
-<hkern u1="Ó" u2="Â" k="41" />
-<hkern u1="Ó" u2="Á" k="41" />
-<hkern u1="Ó" u2="À" k="41" />
-<hkern u1="Ó" u2="Z" k="20" />
-<hkern u1="Ó" u2="Y" k="20" />
-<hkern u1="Ó" u2="X" k="41" />
-<hkern u1="Ó" u2="W" k="20" />
-<hkern u1="Ó" u2="V" k="20" />
-<hkern u1="Ó" u2="T" k="61" />
-<hkern u1="Ó" u2="A" k="41" />
-<hkern u1="Ó" u2="." k="82" />
-<hkern u1="Ó" u2="," k="82" />
-<hkern u1="Ô" u2="„" k="82" />
-<hkern u1="Ô" u2="‚" k="82" />
-<hkern u1="Ô" u2="Ÿ" k="20" />
-<hkern u1="Ô" u2="Ý" k="20" />
-<hkern u1="Ô" u2="Å" k="41" />
-<hkern u1="Ô" u2="Ä" k="41" />
-<hkern u1="Ô" u2="Ã" k="41" />
-<hkern u1="Ô" u2="Â" k="41" />
-<hkern u1="Ô" u2="Á" k="41" />
-<hkern u1="Ô" u2="À" k="41" />
-<hkern u1="Ô" u2="Z" k="20" />
-<hkern u1="Ô" u2="Y" k="20" />
-<hkern u1="Ô" u2="X" k="41" />
-<hkern u1="Ô" u2="W" k="20" />
-<hkern u1="Ô" u2="V" k="20" />
-<hkern u1="Ô" u2="T" k="61" />
-<hkern u1="Ô" u2="A" k="41" />
-<hkern u1="Ô" u2="." k="82" />
-<hkern u1="Ô" u2="," k="82" />
-<hkern u1="Õ" u2="„" k="82" />
-<hkern u1="Õ" u2="‚" k="82" />
-<hkern u1="Õ" u2="Ÿ" k="20" />
-<hkern u1="Õ" u2="Ý" k="20" />
-<hkern u1="Õ" u2="Å" k="41" />
-<hkern u1="Õ" u2="Ä" k="41" />
-<hkern u1="Õ" u2="Ã" k="41" />
-<hkern u1="Õ" u2="Â" k="41" />
-<hkern u1="Õ" u2="Á" k="41" />
-<hkern u1="Õ" u2="À" k="41" />
-<hkern u1="Õ" u2="Z" k="20" />
-<hkern u1="Õ" u2="Y" k="20" />
-<hkern u1="Õ" u2="X" k="41" />
-<hkern u1="Õ" u2="W" k="20" />
-<hkern u1="Õ" u2="V" k="20" />
-<hkern u1="Õ" u2="T" k="61" />
-<hkern u1="Õ" u2="A" k="41" />
-<hkern u1="Õ" u2="." k="82" />
-<hkern u1="Õ" u2="," k="82" />
-<hkern u1="Ö" u2="„" k="82" />
-<hkern u1="Ö" u2="‚" k="82" />
-<hkern u1="Ö" u2="Ÿ" k="20" />
-<hkern u1="Ö" u2="Ý" k="20" />
-<hkern u1="Ö" u2="Å" k="41" />
-<hkern u1="Ö" u2="Ä" k="41" />
-<hkern u1="Ö" u2="Ã" k="41" />
-<hkern u1="Ö" u2="Â" k="41" />
-<hkern u1="Ö" u2="Á" k="41" />
-<hkern u1="Ö" u2="À" k="41" />
-<hkern u1="Ö" u2="Z" k="20" />
-<hkern u1="Ö" u2="Y" k="20" />
-<hkern u1="Ö" u2="X" k="41" />
-<hkern u1="Ö" u2="W" k="20" />
-<hkern u1="Ö" u2="V" k="20" />
-<hkern u1="Ö" u2="T" k="61" />
-<hkern u1="Ö" u2="A" k="41" />
-<hkern u1="Ö" u2="." k="82" />
-<hkern u1="Ö" u2="," k="82" />
-<hkern u1="Ø" u2="„" k="82" />
-<hkern u1="Ø" u2="‚" k="82" />
-<hkern u1="Ø" u2="Ÿ" k="20" />
-<hkern u1="Ø" u2="Ý" k="20" />
-<hkern u1="Ø" u2="Å" k="41" />
-<hkern u1="Ø" u2="Ä" k="41" />
-<hkern u1="Ø" u2="Ã" k="41" />
-<hkern u1="Ø" u2="Â" k="41" />
-<hkern u1="Ø" u2="Á" k="41" />
-<hkern u1="Ø" u2="À" k="41" />
-<hkern u1="Ø" u2="Z" k="20" />
-<hkern u1="Ø" u2="Y" k="20" />
-<hkern u1="Ø" u2="X" k="41" />
-<hkern u1="Ø" u2="W" k="20" />
-<hkern u1="Ø" u2="V" k="20" />
-<hkern u1="Ø" u2="T" k="61" />
-<hkern u1="Ø" u2="A" k="41" />
-<hkern u1="Ø" u2="." k="82" />
-<hkern u1="Ø" u2="," k="82" />
-<hkern u1="Ù" u2="„" k="41" />
-<hkern u1="Ù" u2="‚" k="41" />
-<hkern u1="Ù" u2="Å" k="20" />
-<hkern u1="Ù" u2="Ä" k="20" />
-<hkern u1="Ù" u2="Ã" k="20" />
-<hkern u1="Ù" u2="Â" k="20" />
-<hkern u1="Ù" u2="Á" k="20" />
-<hkern u1="Ù" u2="À" k="20" />
-<hkern u1="Ù" u2="A" k="20" />
-<hkern u1="Ù" u2="." k="41" />
-<hkern u1="Ù" u2="," k="41" />
-<hkern u1="Ú" u2="„" k="41" />
-<hkern u1="Ú" u2="‚" k="41" />
-<hkern u1="Ú" u2="Å" k="20" />
-<hkern u1="Ú" u2="Ä" k="20" />
-<hkern u1="Ú" u2="Ã" k="20" />
-<hkern u1="Ú" u2="Â" k="20" />
-<hkern u1="Ú" u2="Á" k="20" />
-<hkern u1="Ú" u2="À" k="20" />
-<hkern u1="Ú" u2="A" k="20" />
-<hkern u1="Ú" u2="." k="41" />
-<hkern u1="Ú" u2="," k="41" />
-<hkern u1="Û" u2="„" k="41" />
-<hkern u1="Û" u2="‚" k="41" />
-<hkern u1="Û" u2="Å" k="20" />
-<hkern u1="Û" u2="Ä" k="20" />
-<hkern u1="Û" u2="Ã" k="20" />
-<hkern u1="Û" u2="Â" k="20" />
-<hkern u1="Û" u2="Á" k="20" />
-<hkern u1="Û" u2="À" k="20" />
-<hkern u1="Û" u2="A" k="20" />
-<hkern u1="Û" u2="." k="41" />
-<hkern u1="Û" u2="," k="41" />
-<hkern u1="Ü" u2="„" k="41" />
-<hkern u1="Ü" u2="‚" k="41" />
-<hkern u1="Ü" u2="Å" k="20" />
-<hkern u1="Ü" u2="Ä" k="20" />
-<hkern u1="Ü" u2="Ã" k="20" />
-<hkern u1="Ü" u2="Â" k="20" />
-<hkern u1="Ü" u2="Á" k="20" />
-<hkern u1="Ü" u2="À" k="20" />
-<hkern u1="Ü" u2="A" k="20" />
-<hkern u1="Ü" u2="." k="41" />
-<hkern u1="Ü" u2="," k="41" />
-<hkern u1="Ý" u2="„" k="123" />
-<hkern u1="Ý" u2="‚" k="123" />
-<hkern u1="Ý" u2="œ" k="102" />
-<hkern u1="Ý" u2="Œ" k="41" />
-<hkern u1="Ý" u2="ü" k="61" />
-<hkern u1="Ý" u2="û" k="61" />
-<hkern u1="Ý" u2="ú" k="61" />
-<hkern u1="Ý" u2="ù" k="61" />
-<hkern u1="Ý" u2="ø" k="102" />
-<hkern u1="Ý" u2="ö" k="102" />
-<hkern u1="Ý" u2="õ" k="102" />
-<hkern u1="Ý" u2="ô" k="102" />
-<hkern u1="Ý" u2="ó" k="102" />
-<hkern u1="Ý" u2="ò" k="102" />
-<hkern u1="Ý" u2="ë" k="102" />
-<hkern u1="Ý" u2="ê" k="102" />
-<hkern u1="Ý" u2="é" k="102" />
-<hkern u1="Ý" u2="è" k="102" />
-<hkern u1="Ý" u2="ç" k="102" />
-<hkern u1="Ý" u2="æ" k="102" />
-<hkern u1="Ý" u2="å" k="102" />
-<hkern u1="Ý" u2="ä" k="102" />
-<hkern u1="Ý" u2="ã" k="102" />
-<hkern u1="Ý" u2="â" k="102" />
-<hkern u1="Ý" u2="á" k="102" />
-<hkern u1="Ý" u2="à" k="102" />
-<hkern u1="Ý" u2="Ø" k="41" />
-<hkern u1="Ý" u2="Ö" k="41" />
-<hkern u1="Ý" u2="Õ" k="41" />
-<hkern u1="Ý" u2="Ô" k="41" />
-<hkern u1="Ý" u2="Ó" k="41" />
-<hkern u1="Ý" u2="Ò" k="41" />
-<hkern u1="Ý" u2="Ç" k="41" />
-<hkern u1="Ý" u2="Å" k="123" />
-<hkern u1="Ý" u2="Ä" k="123" />
-<hkern u1="Ý" u2="Ã" k="123" />
-<hkern u1="Ý" u2="Â" k="123" />
-<hkern u1="Ý" u2="Á" k="123" />
-<hkern u1="Ý" u2="À" k="123" />
-<hkern u1="Ý" u2="z" k="41" />
-<hkern u1="Ý" u2="u" k="61" />
-<hkern u1="Ý" u2="s" k="82" />
-<hkern u1="Ý" u2="r" k="61" />
-<hkern u1="Ý" u2="q" k="102" />
-<hkern u1="Ý" u2="p" k="61" />
-<hkern u1="Ý" u2="o" k="102" />
-<hkern u1="Ý" u2="n" k="61" />
-<hkern u1="Ý" u2="m" k="61" />
-<hkern u1="Ý" u2="g" k="41" />
-<hkern u1="Ý" u2="e" k="102" />
-<hkern u1="Ý" u2="d" k="102" />
-<hkern u1="Ý" u2="c" k="102" />
-<hkern u1="Ý" u2="a" k="102" />
-<hkern u1="Ý" u2="Q" k="41" />
-<hkern u1="Ý" u2="O" k="41" />
-<hkern u1="Ý" u2="G" k="41" />
-<hkern u1="Ý" u2="C" k="41" />
-<hkern u1="Ý" u2="A" k="123" />
-<hkern u1="Ý" u2="?" k="-41" />
-<hkern u1="Ý" u2="." k="123" />
-<hkern u1="Ý" u2="," k="123" />
-<hkern u1="Þ" u2="„" k="266" />
-<hkern u1="Þ" u2="‚" k="266" />
-<hkern u1="Þ" u2="Å" k="102" />
-<hkern u1="Þ" u2="Ä" k="102" />
-<hkern u1="Þ" u2="Ã" k="102" />
-<hkern u1="Þ" u2="Â" k="102" />
-<hkern u1="Þ" u2="Á" k="102" />
-<hkern u1="Þ" u2="À" k="102" />
-<hkern u1="Þ" u2="Z" k="20" />
-<hkern u1="Þ" u2="X" k="41" />
-<hkern u1="Þ" u2="A" k="102" />
-<hkern u1="Þ" u2="." k="266" />
-<hkern u1="Þ" u2="," k="266" />
-<hkern u1="à" u2="”" k="20" />
-<hkern u1="à" u2="’" k="20" />
-<hkern u1="à" u2="'" k="20" />
-<hkern u1="à" u2=""" k="20" />
-<hkern u1="á" u2="”" k="20" />
-<hkern u1="á" u2="’" k="20" />
-<hkern u1="á" u2="'" k="20" />
-<hkern u1="á" u2=""" k="20" />
-<hkern u1="â" u2="”" k="20" />
-<hkern u1="â" u2="’" k="20" />
-<hkern u1="â" u2="'" k="20" />
-<hkern u1="â" u2=""" k="20" />
-<hkern u1="ã" u2="”" k="20" />
-<hkern u1="ã" u2="’" k="20" />
-<hkern u1="ã" u2="'" k="20" />
-<hkern u1="ã" u2=""" k="20" />
-<hkern u1="ä" u2="”" k="20" />
-<hkern u1="ä" u2="’" k="20" />
-<hkern u1="ä" u2="'" k="20" />
-<hkern u1="ä" u2=""" k="20" />
-<hkern u1="å" u2="”" k="20" />
-<hkern u1="å" u2="’" k="20" />
-<hkern u1="å" u2="'" k="20" />
-<hkern u1="å" u2=""" k="20" />
-<hkern u1="è" u2="”" k="20" />
-<hkern u1="è" u2="’" k="20" />
-<hkern u1="è" u2="ý" k="41" />
-<hkern u1="è" u2="z" k="20" />
-<hkern u1="è" u2="y" k="41" />
-<hkern u1="è" u2="x" k="41" />
-<hkern u1="è" u2="w" k="41" />
-<hkern u1="è" u2="v" k="41" />
-<hkern u1="è" u2="'" k="20" />
-<hkern u1="è" u2=""" k="20" />
-<hkern u1="é" u2="”" k="20" />
-<hkern u1="é" u2="’" k="20" />
-<hkern u1="é" u2="ý" k="41" />
-<hkern u1="é" u2="z" k="20" />
-<hkern u1="é" u2="y" k="41" />
-<hkern u1="é" u2="x" k="41" />
-<hkern u1="é" u2="w" k="41" />
-<hkern u1="é" u2="v" k="41" />
-<hkern u1="é" u2="'" k="20" />
-<hkern u1="é" u2=""" k="20" />
-<hkern u1="ê" u2="”" k="20" />
-<hkern u1="ê" u2="’" k="20" />
-<hkern u1="ê" u2="ý" k="41" />
-<hkern u1="ê" u2="z" k="20" />
-<hkern u1="ê" u2="y" k="41" />
-<hkern u1="ê" u2="x" k="41" />
-<hkern u1="ê" u2="w" k="41" />
-<hkern u1="ê" u2="v" k="41" />
-<hkern u1="ê" u2="'" k="20" />
-<hkern u1="ê" u2=""" k="20" />
-<hkern u1="ë" u2="”" k="20" />
-<hkern u1="ë" u2="’" k="20" />
-<hkern u1="ë" u2="ý" k="41" />
-<hkern u1="ë" u2="z" k="20" />
-<hkern u1="ë" u2="y" k="41" />
-<hkern u1="ë" u2="x" k="41" />
-<hkern u1="ë" u2="w" k="41" />
-<hkern u1="ë" u2="v" k="41" />
-<hkern u1="ë" u2="'" k="20" />
-<hkern u1="ë" u2=""" k="20" />
-<hkern u1="ð" u2="”" k="20" />
-<hkern u1="ð" u2="’" k="20" />
-<hkern u1="ð" u2="ý" k="41" />
-<hkern u1="ð" u2="z" k="20" />
-<hkern u1="ð" u2="y" k="41" />
-<hkern u1="ð" u2="x" k="41" />
-<hkern u1="ð" u2="w" k="41" />
-<hkern u1="ð" u2="v" k="41" />
-<hkern u1="ð" u2="'" k="20" />
-<hkern u1="ð" u2=""" k="20" />
-<hkern u1="ò" u2="”" k="20" />
-<hkern u1="ò" u2="’" k="20" />
-<hkern u1="ò" u2="ý" k="41" />
-<hkern u1="ò" u2="z" k="20" />
-<hkern u1="ò" u2="y" k="41" />
-<hkern u1="ò" u2="x" k="41" />
-<hkern u1="ò" u2="w" k="41" />
-<hkern u1="ò" u2="v" k="41" />
-<hkern u1="ò" u2="'" k="20" />
-<hkern u1="ò" u2=""" k="20" />
-<hkern u1="ó" u2="”" k="20" />
-<hkern u1="ó" u2="’" k="20" />
-<hkern u1="ó" u2="ý" k="41" />
-<hkern u1="ó" u2="z" k="20" />
-<hkern u1="ó" u2="y" k="41" />
-<hkern u1="ó" u2="x" k="41" />
-<hkern u1="ó" u2="w" k="41" />
-<hkern u1="ó" u2="v" k="41" />
-<hkern u1="ó" u2="'" k="20" />
-<hkern u1="ó" u2=""" k="20" />
-<hkern u1="ô" u2="”" k="20" />
-<hkern u1="ô" u2="’" k="20" />
-<hkern u1="ô" u2="ý" k="41" />
-<hkern u1="ô" u2="z" k="20" />
-<hkern u1="ô" u2="y" k="41" />
-<hkern u1="ô" u2="x" k="41" />
-<hkern u1="ô" u2="w" k="41" />
-<hkern u1="ô" u2="v" k="41" />
-<hkern u1="ô" u2="'" k="20" />
-<hkern u1="ô" u2=""" k="20" />
-<hkern u1="ö" u2="”" k="41" />
-<hkern u1="ö" u2="’" k="41" />
-<hkern u1="ö" u2="'" k="41" />
-<hkern u1="ö" u2=""" k="41" />
-<hkern u1="ø" u2="”" k="20" />
-<hkern u1="ø" u2="’" k="20" />
-<hkern u1="ø" u2="ý" k="41" />
-<hkern u1="ø" u2="z" k="20" />
-<hkern u1="ø" u2="y" k="41" />
-<hkern u1="ø" u2="x" k="41" />
-<hkern u1="ø" u2="w" k="41" />
-<hkern u1="ø" u2="v" k="41" />
-<hkern u1="ø" u2="'" k="20" />
-<hkern u1="ø" u2=""" k="20" />
-<hkern u1="ý" u2="„" k="82" />
-<hkern u1="ý" u2="”" k="-82" />
-<hkern u1="ý" u2="‚" k="82" />
-<hkern u1="ý" u2="’" k="-82" />
-<hkern u1="ý" u2="?" k="-41" />
-<hkern u1="ý" u2="." k="82" />
-<hkern u1="ý" u2="," k="82" />
-<hkern u1="ý" u2="'" k="-82" />
-<hkern u1="ý" u2=""" k="-82" />
-<hkern u1="þ" u2="”" k="20" />
-<hkern u1="þ" u2="’" k="20" />
-<hkern u1="þ" u2="ý" k="41" />
-<hkern u1="þ" u2="z" k="20" />
-<hkern u1="þ" u2="y" k="41" />
-<hkern u1="þ" u2="x" k="41" />
-<hkern u1="þ" u2="w" k="41" />
-<hkern u1="þ" u2="v" k="41" />
-<hkern u1="þ" u2="'" k="20" />
-<hkern u1="þ" u2=""" k="20" />
-<hkern u1="ÿ" u2="„" k="82" />
-<hkern u1="ÿ" u2="”" k="-82" />
-<hkern u1="ÿ" u2="‚" k="82" />
-<hkern u1="ÿ" u2="’" k="-82" />
-<hkern u1="ÿ" u2="?" k="-41" />
-<hkern u1="ÿ" u2="." k="82" />
-<hkern u1="ÿ" u2="," k="82" />
-<hkern u1="ÿ" u2="'" k="-82" />
-<hkern u1="ÿ" u2=""" k="-82" />
-<hkern u1="Œ" u2="J" k="-123" />
-<hkern u1="Ÿ" u2="„" k="123" />
-<hkern u1="Ÿ" u2="‚" k="123" />
-<hkern u1="Ÿ" u2="œ" k="102" />
-<hkern u1="Ÿ" u2="Œ" k="41" />
-<hkern u1="Ÿ" u2="ü" k="61" />
-<hkern u1="Ÿ" u2="û" k="61" />
-<hkern u1="Ÿ" u2="ú" k="61" />
-<hkern u1="Ÿ" u2="ù" k="61" />
-<hkern u1="Ÿ" u2="ø" k="102" />
-<hkern u1="Ÿ" u2="ö" k="102" />
-<hkern u1="Ÿ" u2="õ" k="102" />
-<hkern u1="Ÿ" u2="ô" k="102" />
-<hkern u1="Ÿ" u2="ó" k="102" />
-<hkern u1="Ÿ" u2="ò" k="102" />
-<hkern u1="Ÿ" u2="ë" k="102" />
-<hkern u1="Ÿ" u2="ê" k="102" />
-<hkern u1="Ÿ" u2="é" k="102" />
-<hkern u1="Ÿ" u2="è" k="102" />
-<hkern u1="Ÿ" u2="ç" k="102" />
-<hkern u1="Ÿ" u2="æ" k="102" />
-<hkern u1="Ÿ" u2="å" k="102" />
-<hkern u1="Ÿ" u2="ä" k="102" />
-<hkern u1="Ÿ" u2="ã" k="102" />
-<hkern u1="Ÿ" u2="â" k="102" />
-<hkern u1="Ÿ" u2="á" k="102" />
-<hkern u1="Ÿ" u2="à" k="102" />
-<hkern u1="Ÿ" u2="Ø" k="41" />
-<hkern u1="Ÿ" u2="Ö" k="41" />
-<hkern u1="Ÿ" u2="Õ" k="41" />
-<hkern u1="Ÿ" u2="Ô" k="41" />
-<hkern u1="Ÿ" u2="Ó" k="41" />
-<hkern u1="Ÿ" u2="Ò" k="41" />
-<hkern u1="Ÿ" u2="Ç" k="41" />
-<hkern u1="Ÿ" u2="Å" k="123" />
-<hkern u1="Ÿ" u2="Ä" k="123" />
-<hkern u1="Ÿ" u2="Ã" k="123" />
-<hkern u1="Ÿ" u2="Â" k="123" />
-<hkern u1="Ÿ" u2="Á" k="123" />
-<hkern u1="Ÿ" u2="À" k="123" />
-<hkern u1="Ÿ" u2="z" k="41" />
-<hkern u1="Ÿ" u2="u" k="61" />
-<hkern u1="Ÿ" u2="s" k="82" />
-<hkern u1="Ÿ" u2="r" k="61" />
-<hkern u1="Ÿ" u2="q" k="102" />
-<hkern u1="Ÿ" u2="p" k="61" />
-<hkern u1="Ÿ" u2="o" k="102" />
-<hkern u1="Ÿ" u2="n" k="61" />
-<hkern u1="Ÿ" u2="m" k="61" />
-<hkern u1="Ÿ" u2="g" k="41" />
-<hkern u1="Ÿ" u2="e" k="102" />
-<hkern u1="Ÿ" u2="d" k="102" />
-<hkern u1="Ÿ" u2="c" k="102" />
-<hkern u1="Ÿ" u2="a" k="102" />
-<hkern u1="Ÿ" u2="Q" k="41" />
-<hkern u1="Ÿ" u2="O" k="41" />
-<hkern u1="Ÿ" u2="G" k="41" />
-<hkern u1="Ÿ" u2="C" k="41" />
-<hkern u1="Ÿ" u2="A" k="123" />
-<hkern u1="Ÿ" u2="?" k="-41" />
-<hkern u1="Ÿ" u2="." k="123" />
-<hkern u1="Ÿ" u2="," k="123" />
-<hkern u1="–" u2="T" k="82" />
-<hkern u1="—" u2="T" k="82" />
-<hkern u1="‘" u2="Ÿ" k="-20" />
-<hkern u1="‘" u2="œ" k="123" />
-<hkern u1="‘" u2="ü" k="61" />
-<hkern u1="‘" u2="û" k="61" />
-<hkern u1="‘" u2="ú" k="61" />
-<hkern u1="‘" u2="ù" k="61" />
-<hkern u1="‘" u2="ø" k="123" />
-<hkern u1="‘" u2="ö" k="123" />
-<hkern u1="‘" u2="õ" k="123" />
-<hkern u1="‘" u2="ô" k="123" />
-<hkern u1="‘" u2="ó" k="123" />
-<hkern u1="‘" u2="ò" k="123" />
-<hkern u1="‘" u2="ë" k="123" />
-<hkern u1="‘" u2="ê" k="123" />
-<hkern u1="‘" u2="é" k="123" />
-<hkern u1="‘" u2="è" k="123" />
-<hkern u1="‘" u2="ç" k="123" />
-<hkern u1="‘" u2="æ" k="82" />
-<hkern u1="‘" u2="å" k="82" />
-<hkern u1="‘" u2="ä" k="82" />
-<hkern u1="‘" u2="ã" k="82" />
-<hkern u1="‘" u2="â" k="82" />
-<hkern u1="‘" u2="á" k="82" />
-<hkern u1="‘" u2="à" k="123" />
-<hkern u1="‘" u2="Ý" k="-20" />
-<hkern u1="‘" u2="Å" k="143" />
-<hkern u1="‘" u2="Ä" k="143" />
-<hkern u1="‘" u2="Ã" k="143" />
-<hkern u1="‘" u2="Â" k="143" />
-<hkern u1="‘" u2="Á" k="143" />
-<hkern u1="‘" u2="À" k="143" />
-<hkern u1="‘" u2="u" k="61" />
-<hkern u1="‘" u2="s" k="61" />
-<hkern u1="‘" u2="r" k="61" />
-<hkern u1="‘" u2="q" k="123" />
-<hkern u1="‘" u2="p" k="61" />
-<hkern u1="‘" u2="o" k="123" />
-<hkern u1="‘" u2="n" k="61" />
-<hkern u1="‘" u2="m" k="61" />
-<hkern u1="‘" u2="g" k="61" />
-<hkern u1="‘" u2="e" k="123" />
-<hkern u1="‘" u2="d" k="123" />
-<hkern u1="‘" u2="c" k="123" />
-<hkern u1="‘" u2="a" k="82" />
-<hkern u1="‘" u2="Y" k="-20" />
-<hkern u1="‘" u2="W" k="-41" />
-<hkern u1="‘" u2="V" k="-41" />
-<hkern u1="‘" u2="T" k="-41" />
-<hkern u1="‘" u2="A" k="143" />
-<hkern u1="’" u2="Ÿ" k="-20" />
-<hkern u1="’" u2="œ" k="123" />
-<hkern u1="’" u2="ü" k="61" />
-<hkern u1="’" u2="û" k="61" />
-<hkern u1="’" u2="ú" k="61" />
-<hkern u1="’" u2="ù" k="61" />
-<hkern u1="’" u2="ø" k="123" />
-<hkern u1="’" u2="ö" k="123" />
-<hkern u1="’" u2="õ" k="123" />
-<hkern u1="’" u2="ô" k="123" />
-<hkern u1="’" u2="ó" k="123" />
-<hkern u1="’" u2="ò" k="123" />
-<hkern u1="’" u2="ë" k="123" />
-<hkern u1="’" u2="ê" k="123" />
-<hkern u1="’" u2="é" k="123" />
-<hkern u1="’" u2="è" k="123" />
-<hkern u1="’" u2="ç" k="123" />
-<hkern u1="’" u2="æ" k="82" />
-<hkern u1="’" u2="å" k="82" />
-<hkern u1="’" u2="ä" k="82" />
-<hkern u1="’" u2="ã" k="82" />
-<hkern u1="’" u2="â" k="82" />
-<hkern u1="’" u2="á" k="82" />
-<hkern u1="’" u2="à" k="123" />
-<hkern u1="’" u2="Ý" k="-20" />
-<hkern u1="’" u2="Å" k="143" />
-<hkern u1="’" u2="Ä" k="143" />
-<hkern u1="’" u2="Ã" k="143" />
-<hkern u1="’" u2="Â" k="143" />
-<hkern u1="’" u2="Á" k="143" />
-<hkern u1="’" u2="À" k="143" />
-<hkern u1="’" u2="u" k="61" />
-<hkern u1="’" u2="s" k="61" />
-<hkern u1="’" u2="r" k="61" />
-<hkern u1="’" u2="q" k="123" />
-<hkern u1="’" u2="p" k="61" />
-<hkern u1="’" u2="o" k="123" />
-<hkern u1="’" u2="n" k="61" />
-<hkern u1="’" u2="m" k="61" />
-<hkern u1="’" u2="g" k="61" />
-<hkern u1="’" u2="e" k="123" />
-<hkern u1="’" u2="d" k="123" />
-<hkern u1="’" u2="c" k="123" />
-<hkern u1="’" u2="a" k="82" />
-<hkern u1="’" u2="Y" k="-20" />
-<hkern u1="’" u2="W" k="-41" />
-<hkern u1="’" u2="V" k="-41" />
-<hkern u1="’" u2="T" k="-41" />
-<hkern u1="’" u2="A" k="143" />
-<hkern u1="‚" u2="Ÿ" k="123" />
-<hkern u1="‚" u2="Œ" k="102" />
-<hkern u1="‚" u2="Ý" k="123" />
-<hkern u1="‚" u2="Ü" k="41" />
-<hkern u1="‚" u2="Û" k="41" />
-<hkern u1="‚" u2="Ú" k="41" />
-<hkern u1="‚" u2="Ù" k="41" />
-<hkern u1="‚" u2="Ø" k="102" />
-<hkern u1="‚" u2="Ö" k="102" />
-<hkern u1="‚" u2="Õ" k="102" />
-<hkern u1="‚" u2="Ô" k="102" />
-<hkern u1="‚" u2="Ó" k="102" />
-<hkern u1="‚" u2="Ò" k="102" />
-<hkern u1="‚" u2="Ç" k="102" />
-<hkern u1="‚" u2="Y" k="123" />
-<hkern u1="‚" u2="W" k="123" />
-<hkern u1="‚" u2="V" k="123" />
-<hkern u1="‚" u2="U" k="41" />
-<hkern u1="‚" u2="T" k="143" />
-<hkern u1="‚" u2="Q" k="102" />
-<hkern u1="‚" u2="O" k="102" />
-<hkern u1="‚" u2="G" k="102" />
-<hkern u1="‚" u2="C" k="102" />
-<hkern u1="“" u2="Ÿ" k="-20" />
-<hkern u1="“" u2="œ" k="123" />
-<hkern u1="“" u2="ü" k="61" />
-<hkern u1="“" u2="û" k="61" />
-<hkern u1="“" u2="ú" k="61" />
-<hkern u1="“" u2="ù" k="61" />
-<hkern u1="“" u2="ø" k="123" />
-<hkern u1="“" u2="ö" k="123" />
-<hkern u1="“" u2="õ" k="123" />
-<hkern u1="“" u2="ô" k="123" />
-<hkern u1="“" u2="ó" k="123" />
-<hkern u1="“" u2="ò" k="123" />
-<hkern u1="“" u2="ë" k="123" />
-<hkern u1="“" u2="ê" k="123" />
-<hkern u1="“" u2="é" k="123" />
-<hkern u1="“" u2="è" k="123" />
-<hkern u1="“" u2="ç" k="123" />
-<hkern u1="“" u2="æ" k="82" />
-<hkern u1="“" u2="å" k="82" />
-<hkern u1="“" u2="ä" k="82" />
-<hkern u1="“" u2="ã" k="82" />
-<hkern u1="“" u2="â" k="82" />
-<hkern u1="“" u2="á" k="82" />
-<hkern u1="“" u2="à" k="123" />
-<hkern u1="“" u2="Ý" k="-20" />
-<hkern u1="“" u2="Å" k="143" />
-<hkern u1="“" u2="Ä" k="143" />
-<hkern u1="“" u2="Ã" k="143" />
-<hkern u1="“" u2="Â" k="143" />
-<hkern u1="“" u2="Á" k="143" />
-<hkern u1="“" u2="À" k="143" />
-<hkern u1="“" u2="u" k="61" />
-<hkern u1="“" u2="s" k="61" />
-<hkern u1="“" u2="r" k="61" />
-<hkern u1="“" u2="q" k="123" />
-<hkern u1="“" u2="p" k="61" />
-<hkern u1="“" u2="o" k="123" />
-<hkern u1="“" u2="n" k="61" />
-<hkern u1="“" u2="m" k="61" />
-<hkern u1="“" u2="g" k="61" />
-<hkern u1="“" u2="e" k="123" />
-<hkern u1="“" u2="d" k="123" />
-<hkern u1="“" u2="c" k="123" />
-<hkern u1="“" u2="a" k="82" />
-<hkern u1="“" u2="Y" k="-20" />
-<hkern u1="“" u2="W" k="-41" />
-<hkern u1="“" u2="V" k="-41" />
-<hkern u1="“" u2="T" k="-41" />
-<hkern u1="“" u2="A" k="143" />
-<hkern u1="„" u2="Ÿ" k="123" />
-<hkern u1="„" u2="Œ" k="102" />
-<hkern u1="„" u2="Ý" k="123" />
-<hkern u1="„" u2="Ü" k="41" />
-<hkern u1="„" u2="Û" k="41" />
-<hkern u1="„" u2="Ú" k="41" />
-<hkern u1="„" u2="Ù" k="41" />
-<hkern u1="„" u2="Ø" k="102" />
-<hkern u1="„" u2="Ö" k="102" />
-<hkern u1="„" u2="Õ" k="102" />
-<hkern u1="„" u2="Ô" k="102" />
-<hkern u1="„" u2="Ó" k="102" />
-<hkern u1="„" u2="Ò" k="102" />
-<hkern u1="„" u2="Ç" k="102" />
-<hkern u1="„" u2="Y" k="123" />
-<hkern u1="„" u2="W" k="123" />
-<hkern u1="„" u2="V" k="123" />
-<hkern u1="„" u2="U" k="41" />
-<hkern u1="„" u2="T" k="143" />
-<hkern u1="„" u2="Q" k="102" />
-<hkern u1="„" u2="O" k="102" />
-<hkern u1="„" u2="G" k="102" />
-<hkern u1="„" u2="C" k="102" />
-</font>
-</defs></svg>
\ No newline at end of file
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-italic.ttf b/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-italic.ttf
deleted file mode 100755
index 8866de2..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-italic.ttf and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-italic.woff b/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-italic.woff
deleted file mode 100755
index 24e1315..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-italic.woff and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-semibold.eot b/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-semibold.eot
deleted file mode 100755
index 0e97ec3..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-semibold.eot and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-semibold.svg b/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-semibold.svg
deleted file mode 100755
index b09279b..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-semibold.svg
+++ /dev/null
@@ -1,1825 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="open_sanssemibold" horiz-adv-x="1169" >
-<font-face units-per-em="2048" ascent="1638" descent="-410" />
-<missing-glyph horiz-adv-x="532" />
-<glyph unicode="fi" horiz-adv-x="1315" d="M35 928v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244 -41l-62 -178q-87 28 -166 28q-80 0 -116.5 -49.5t-36.5 -148.5v-72h270v-178h-270v-928h-236v928h-182zM897 1399q0 63 34.5 97t98.5 34q62 0 96.5 -34t34.5 -97q0 -60 -34.5 -94.5t-96.5 -34.5 q-64 0 -98.5 34.5t-34.5 94.5zM911 0v1106h235v-1106h-235z" />
-<glyph unicode="fl" horiz-adv-x="1315" d="M35 928v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244 -41l-62 -178q-87 28 -166 28q-80 0 -116.5 -49.5t-36.5 -148.5v-72h270v-178h-270v-928h-236v928h-182zM911 0v1556h235v-1556h-235z" />
-<glyph unicode="ffi" horiz-adv-x="2058" d="M35 928v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244 -41l-62 -178q-87 28 -166 28q-80 0 -116.5 -49.5t-36.5 -148.5v-72h270v-178h-270v-928h-236v928h-182zM778 928v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244 -41l-62 -178q-87 28 -166 28 q-80 0 -116.5 -49.5t-36.5 -148.5v-72h270v-178h-270v-928h-236v928h-182zM1641 1399q0 63 34.5 97t98.5 34q62 0 96.5 -34t34.5 -97q0 -60 -34.5 -94.5t-96.5 -34.5q-64 0 -98.5 34.5t-34.5 94.5zM1655 0v1106h235v-1106h-235z" />
-<glyph unicode="ffl" horiz-adv-x="2058" d="M35 928v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244 -41l-62 -178q-87 28 -166 28q-80 0 -116.5 -49.5t-36.5 -148.5v-72h270v-178h-270v-928h-236v928h-182zM778 928v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244 -41l-62 -178q-87 28 -166 28 q-80 0 -116.5 -49.5t-36.5 -148.5v-72h270v-178h-270v-928h-236v928h-182zM1655 0v1556h235v-1556h-235z" />
-<glyph horiz-adv-x="2048" />
-<glyph horiz-adv-x="2048" />
-<glyph unicode="
" horiz-adv-x="1044" />
-<glyph unicode=" " horiz-adv-x="532" />
-<glyph unicode="	" horiz-adv-x="532" />
-<glyph unicode=" " horiz-adv-x="532" />
-<glyph unicode="!" horiz-adv-x="565" d="M133 125q0 74 39 112.5t111 38.5q71 0 109 -40t38 -111t-38.5 -112.5t-108.5 -41.5q-71 0 -110.5 40t-39.5 114zM145 1462h277l-51 -1018h-174z" />
-<glyph unicode=""" horiz-adv-x="893" d="M133 1462h232l-41 -528h-150zM528 1462h232l-41 -528h-150z" />
-<glyph unicode="#" horiz-adv-x="1323" d="M47 418v168h283l57 284h-264v168h293l80 422h180l-80 -422h252l80 422h174l-80 -422h252v-168h-285l-55 -284h270v-168h-303l-80 -418h-178l80 418h-248l-80 -418h-174l76 418h-250zM506 586h250l57 284h-250z" />
-<glyph unicode="$" d="M111 168v211q86 -42 201 -70.5t206 -29.5v374l-84 31q-164 63 -239.5 150.5t-75.5 216.5q0 138 107.5 227t291.5 108v168h133v-165q203 -7 385 -82l-73 -183q-157 62 -312 74v-364l76 -29q190 -73 263 -154t73 -198q0 -145 -106 -239t-306 -116v-217h-133v211 q-248 4 -407 76zM354 1053q0 -57 35.5 -95t128.5 -75v311q-80 -12 -122 -49t-42 -92zM651 287q176 27 176 151q0 58 -40.5 95.5t-135.5 72.5v-319z" />
-<glyph unicode="%" horiz-adv-x="1765" d="M84 1026q0 457 319 457q157 0 241.5 -118.5t84.5 -338.5q0 -230 -82.5 -345.5t-243.5 -115.5q-152 0 -235.5 119.5t-83.5 341.5zM279 1024q0 -149 29 -222t95 -73q132 0 132 295t-132 295q-66 0 -95 -73t-29 -222zM379 0l811 1462h194l-811 -1462h-194zM1036 440 q0 457 320 457q154 0 239.5 -118t85.5 -339q0 -230 -83 -345t-242 -115q-152 0 -236 118.5t-84 341.5zM1231 440q0 -149 29.5 -223t95.5 -74q131 0 131 297q0 293 -131 293q-66 0 -95.5 -72t-29.5 -221z" />
-<glyph unicode="&" horiz-adv-x="1516" d="M96 387q0 131 64 228.5t231 193.5q-95 111 -129.5 187.5t-34.5 158.5q0 152 108.5 240t291.5 88q177 0 278 -85.5t101 -230.5q0 -114 -67.5 -207t-225.5 -186l346 -334q81 107 135 314h242q-70 -284 -224 -463l301 -291h-303l-149 145q-102 -82 -217.5 -123.5 t-255.5 -41.5q-230 0 -361 109t-131 298zM344 403q0 -98 69.5 -159.5t186.5 -61.5q183 0 313 107l-383 377q-106 -68 -146 -127.5t-40 -135.5zM451 1147q0 -63 33.5 -119t93.5 -119q113 64 158.5 119.5t45.5 124.5q0 65 -43.5 104t-115.5 39q-79 0 -125.5 -40.5 t-46.5 -108.5z" />
-<glyph unicode="'" horiz-adv-x="498" d="M133 1462h232l-41 -528h-150z" />
-<glyph unicode="(" horiz-adv-x="649" d="M82 561q0 265 77.5 496t223.5 405h205q-139 -188 -213 -421.5t-74 -477.5t74 -473t211 -414h-203q-147 170 -224 397t-77 488z" />
-<glyph unicode=")" horiz-adv-x="649" d="M61 1462h205q147 -175 224 -406.5t77 -494.5t-77.5 -490t-223.5 -395h-203q138 187 211.5 415t73.5 472q0 245 -74 477.5t-213 421.5z" />
-<glyph unicode="*" horiz-adv-x="1122" d="M74 1065l35 217l376 -108l-41 382h228l-41 -382l385 108l28 -217l-360 -29l236 -311l-199 -107l-166 338l-149 -338l-205 107l231 311z" />
-<glyph unicode="+" d="M96 633v178h398v408h180v-408h399v-178h-399v-406h-180v406h-398z" />
-<glyph unicode="," horiz-adv-x="547" d="M63 -264q69 270 103 502h231l15 -23q-48 -186 -176 -479h-173z" />
-<glyph unicode="-" horiz-adv-x="659" d="M72 449v200h514v-200h-514z" />
-<glyph unicode="." horiz-adv-x="563" d="M133 125q0 73 38 112t110 39q73 0 111 -40.5t38 -110.5q0 -71 -38.5 -112.5t-110.5 -41.5t-110 41t-38 113z" />
-<glyph unicode="/" horiz-adv-x="799" d="M16 0l545 1462h221l-544 -1462h-222z" />
-<glyph unicode="0" d="M88 731q0 387 122.5 570.5t373.5 183.5q245 0 371 -192t126 -562q0 -381 -122.5 -566t-374.5 -185q-244 0 -370 191t-126 560zM326 731q0 -299 61.5 -427t196.5 -128t197.5 130t62.5 425q0 294 -62.5 425.5t-197.5 131.5t-196.5 -129t-61.5 -428z" />
-<glyph unicode="1" d="M154 1124l430 338h196v-1462h-235v944q0 169 8 268q-23 -24 -56.5 -53t-224.5 -184z" />
-<glyph unicode="2" d="M90 0v178l377 379q167 171 221.5 242.5t79.5 134.5t25 135q0 99 -59.5 156t-164.5 57q-84 0 -162.5 -31t-181.5 -112l-127 155q122 103 237 146t245 43q204 0 327 -106.5t123 -286.5q0 -99 -35.5 -188t-109 -183.5t-244.5 -255.5l-254 -246v-10h694v-207h-991z" />
-<glyph unicode="3" d="M86 59v209q93 -46 197 -71t200 -25q170 0 254 63t84 195q0 117 -93 172t-292 55h-127v191h129q350 0 350 242q0 94 -61 145t-180 51q-83 0 -160 -23.5t-182 -91.5l-115 164q201 148 467 148q221 0 345 -95t124 -262q0 -139 -81 -231.5t-228 -124.5v-8q176 -22 264 -109.5 t88 -232.5q0 -211 -149 -325.5t-424 -114.5q-243 0 -410 79z" />
-<glyph unicode="4" d="M39 319v181l668 966h229v-952h197v-195h-197v-319h-229v319h-668zM258 514h449v367q0 196 10 321h-8q-28 -66 -88 -160z" />
-<glyph unicode="5" d="M117 59v213q81 -46 186 -71t195 -25q159 0 242 71t83 208q0 262 -334 262q-47 0 -116 -9.5t-121 -21.5l-105 62l56 714h760v-209h-553l-33 -362q35 6 85.5 14t123.5 8q221 0 350 -117t129 -319q0 -234 -146.5 -365.5t-416.5 -131.5q-245 0 -385 79z" />
-<glyph unicode="6" d="M94 623q0 858 699 858q110 0 186 -17v-196q-76 22 -176 22q-235 0 -353 -126t-128 -404h12q47 81 132 125.5t200 44.5q199 0 310 -122t111 -331q0 -230 -128.5 -363.5t-350.5 -133.5q-157 0 -273 75.5t-178.5 220t-62.5 347.5zM332 508q0 -141 76.5 -237.5t195.5 -96.5 q121 0 186.5 78t65.5 223q0 126 -61.5 198t-184.5 72q-76 0 -140 -32.5t-101 -89t-37 -115.5z" />
-<glyph unicode="7" d="M74 1253v207h1011v-164l-575 -1296h-254l578 1253h-760z" />
-<glyph unicode="8" d="M88 371q0 122 68.5 219.5t224.5 173.5q-134 80 -191 169t-57 200q0 159 125 253.5t326 94.5q208 0 329 -95.5t121 -255.5q0 -225 -270 -358q172 -86 244.5 -181t72.5 -212q0 -181 -133 -290t-360 -109q-238 0 -369 102t-131 289zM313 379q0 -104 73 -161.5t198 -57.5 q129 0 200.5 59.5t71.5 161.5q0 81 -66 148t-200 124l-29 13q-132 -58 -190 -127.5t-58 -159.5zM360 1116q0 -52 22 -93t64 -74.5t142 -80.5q120 53 169.5 111.5t49.5 136.5q0 85 -61.5 134.5t-163.5 49.5q-100 0 -161 -49.5t-61 -134.5z" />
-<glyph unicode="9" d="M86 981q0 229 128.5 364.5t350.5 135.5q156 0 272 -76t179 -220.5t63 -346.5q0 -432 -174 -645t-524 -213q-133 0 -191 16v197q89 -25 179 -25q238 0 355 128t128 402h-12q-59 -90 -142.5 -130t-195.5 -40q-194 0 -305 121t-111 332zM317 983q0 -125 60.5 -196.5 t183.5 -71.5q119 0 200 71t81 166q0 89 -34.5 166.5t-96.5 122.5t-142 45q-122 0 -187 -79.5t-65 -223.5z" />
-<glyph unicode=":" horiz-adv-x="563" d="M133 125q0 73 38 112t110 39q73 0 111 -40.5t38 -110.5q0 -71 -38.5 -112.5t-110.5 -41.5t-110 41t-38 113zM133 979q0 151 148 151q75 0 112 -40t37 -111t-38.5 -112.5t-110.5 -41.5t-110 41t-38 113z" />
-<glyph unicode=";" horiz-adv-x="569" d="M63 -264q69 270 103 502h231l15 -23q-48 -186 -176 -479h-173zM131 979q0 151 148 151q75 0 112 -40t37 -111t-38.5 -112.5t-110.5 -41.5t-110 41t-38 113z" />
-<glyph unicode="<" d="M96 651v121l977 488v-195l-733 -344l733 -303v-197z" />
-<glyph unicode="=" d="M102 432v178h963v-178h-963zM102 831v179h963v-179h-963z" />
-<glyph unicode=">" d="M96 221v197l733 303l-733 344v195l977 -488v-121z" />
-<glyph unicode="?" horiz-adv-x="928" d="M16 1370q203 113 435 113q196 0 311 -96t115 -265q0 -75 -22 -133.5t-66.5 -111.5t-153.5 -138q-93 -73 -124.5 -121t-31.5 -129v-45h-196v64q0 110 40 183t140 151q119 94 153.5 146t34.5 124q0 84 -56 129t-161 45q-95 0 -176 -27t-158 -65zM242 125q0 151 147 151 q72 0 110 -39.5t38 -111.5q0 -71 -38.5 -112.5t-109.5 -41.5t-109 40.5t-38 113.5z" />
-<glyph unicode="@" horiz-adv-x="1839" d="M111 586q0 261 112 464.5t310.5 311.5t449.5 108q217 0 386.5 -90t263 -256.5t93.5 -384.5q0 -143 -45 -261.5t-126.5 -184.5t-188.5 -66q-79 0 -137 42t-78 114h-12q-49 -78 -121 -117t-162 -39q-163 0 -256.5 105t-93.5 284q0 206 124 334.5t333 128.5 q76 0 168.5 -13.5t164.5 -37.5l-22 -465v-24q0 -160 104 -160q79 0 125.5 102t46.5 260q0 171 -70 300.5t-199 199.5t-296 70q-213 0 -370.5 -88t-240.5 -251.5t-83 -379.5q0 -290 155 -446t445 -156q221 0 461 90v-164q-210 -86 -457 -86q-370 0 -577 199.5t-207 556.5z M698 612q0 -233 183 -233q193 0 211 293l12 239q-63 17 -135 17q-128 0 -199.5 -85t-71.5 -231z" />
-<glyph unicode="A" horiz-adv-x="1354" d="M0 0l547 1468h260l547 -1468h-254l-146 406h-559l-143 -406h-252zM465 612h426l-137 398q-15 40 -41.5 126t-36.5 126q-27 -123 -79 -269z" />
-<glyph unicode="B" horiz-adv-x="1352" d="M193 0v1462h434q302 0 436.5 -88t134.5 -278q0 -128 -66 -213t-190 -107v-10q154 -29 226.5 -114.5t72.5 -231.5q0 -197 -137.5 -308.5t-382.5 -111.5h-528zM432 201h254q150 0 226.5 57.5t76.5 181.5q0 114 -78 169t-237 55h-242v-463zM432 858h230q150 0 219 47.5 t69 161.5q0 103 -74.5 149t-236.5 46h-207v-404z" />
-<glyph unicode="C" horiz-adv-x="1298" d="M121 731q0 228 83.5 399t241.5 262t371 91q224 0 414 -94l-86 -199q-74 35 -156.5 61.5t-173.5 26.5q-206 0 -324 -146t-118 -403q0 -269 113.5 -407t328.5 -138q93 0 180 18.5t181 47.5v-205q-172 -65 -390 -65q-321 0 -493 194.5t-172 556.5z" />
-<glyph unicode="D" horiz-adv-x="1503" d="M193 0v1462h452q349 0 543 -188t194 -529q0 -362 -201 -553.5t-579 -191.5h-409zM432 201h170q528 0 528 536q0 525 -491 525h-207v-1061z" />
-<glyph unicode="E" horiz-adv-x="1143" d="M193 0v1462h827v-202h-588v-398h551v-200h-551v-459h588v-203h-827z" />
-<glyph unicode="F" horiz-adv-x="1090" d="M193 0v1462h825v-202h-588v-457h551v-203h-551v-600h-237z" />
-<glyph unicode="G" horiz-adv-x="1487" d="M121 731q0 353 203 552.5t559 199.5q229 0 434 -88l-84 -199q-178 82 -356 82q-234 0 -370 -147t-136 -402q0 -268 122.5 -407.5t352.5 -139.5q116 0 248 29v377h-303v205h538v-734q-132 -43 -253.5 -61t-262.5 -18q-332 0 -512 196.5t-180 554.5z" />
-<glyph unicode="H" horiz-adv-x="1538" d="M193 0v1462h239v-598h674v598h240v-1462h-240v659h-674v-659h-239z" />
-<glyph unicode="I" horiz-adv-x="625" d="M193 0v1462h239v-1462h-239z" />
-<glyph unicode="J" horiz-adv-x="612" d="M-156 -182q84 -21 146 -21q196 0 196 248v1417h240v-1409q0 -224 -106.5 -342.5t-311.5 -118.5q-98 0 -164 25v201z" />
-<glyph unicode="K" horiz-adv-x="1309" d="M193 0v1462h239v-698q98 120 195 231l395 467h272q-383 -450 -549 -641l564 -821h-277l-459 662l-141 -115v-547h-239z" />
-<glyph unicode="L" horiz-adv-x="1110" d="M193 0v1462h239v-1257h619v-205h-858z" />
-<glyph unicode="M" horiz-adv-x="1890" d="M193 0v1462h337l406 -1163h6l418 1163h338v-1462h-230v723q0 109 5.5 284t9.5 212h-8l-439 -1219h-211l-424 1221h-8q17 -272 17 -510v-711h-217z" />
-<glyph unicode="N" horiz-adv-x="1604" d="M193 0v1462h290l717 -1159h6q-2 23 -8 167.5t-6 225.5v766h219v-1462h-293l-719 1165h-8l5 -65q14 -186 14 -340v-760h-217z" />
-<glyph unicode="O" horiz-adv-x="1612" d="M121 735q0 362 178.5 556t509.5 194q326 0 504 -197t178 -555q0 -357 -178.5 -555t-505.5 -198q-331 0 -508.5 196.5t-177.5 558.5zM375 733q0 -270 109 -409.5t323 -139.5q213 0 321.5 138t108.5 411q0 269 -107.5 408t-320.5 139q-215 0 -324.5 -139t-109.5 -408z" />
-<glyph unicode="P" horiz-adv-x="1260" d="M193 0v1462h421q274 0 410.5 -112t136.5 -330q0 -229 -150 -351t-427 -122h-152v-547h-239zM432 748h127q184 0 270 64t86 200q0 126 -77 188t-240 62h-166v-514z" />
-<glyph unicode="Q" horiz-adv-x="1612" d="M121 735q0 362 178.5 556t509.5 194q326 0 504 -197t178 -555q0 -266 -101.5 -448t-295.5 -256l350 -377h-322l-276 328h-39q-331 0 -508.5 196.5t-177.5 558.5zM375 733q0 -270 109 -409.5t323 -139.5q213 0 321.5 138t108.5 411q0 269 -107.5 408t-320.5 139 q-215 0 -324.5 -139t-109.5 -408z" />
-<glyph unicode="R" horiz-adv-x="1309" d="M193 0v1462h413q283 0 419 -106t136 -320q0 -273 -284 -389l413 -647h-272l-350 584h-236v-584h-239zM432 782h166q167 0 242 62t75 184q0 124 -81 178t-244 54h-158v-478z" />
-<glyph unicode="S" horiz-adv-x="1126" d="M100 57v226q100 -47 212.5 -74t209.5 -27q142 0 209.5 54t67.5 145q0 82 -62 139t-256 135q-200 81 -282 185t-82 250q0 183 130 288t349 105q210 0 418 -92l-76 -195q-195 82 -348 82q-116 0 -176 -50.5t-60 -133.5q0 -57 24 -97.5t79 -76.5t198 -95q161 -67 236 -125 t110 -131t35 -172q0 -195 -141 -306t-389 -111t-406 77z" />
-<glyph unicode="T" horiz-adv-x="1159" d="M29 1257v205h1099v-205h-430v-1257h-239v1257h-430z" />
-<glyph unicode="U" horiz-adv-x="1520" d="M180 520v942h240v-925q0 -181 84 -267t258 -86q338 0 338 355v923h239v-946q0 -162 -69.5 -283.5t-201 -187t-314.5 -65.5q-272 0 -423 144t-151 396z" />
-<glyph unicode="V" horiz-adv-x="1274" d="M0 1462h246l305 -909q24 -65 51 -167.5t35 -152.5q13 76 40 176t44 148l305 905h248l-512 -1462h-252z" />
-<glyph unicode="W" horiz-adv-x="1937" d="M12 1462h244l209 -852q49 -205 70 -362q11 85 33 190t40 170l238 854h237l244 -858q35 -119 74 -356q15 143 72 364l208 850h242l-381 -1462h-260l-248 872q-16 57 -40 164.5t-29 149.5q-10 -64 -32.5 -166t-37.5 -152l-242 -868h-260l-189 732z" />
-<glyph unicode="X" horiz-adv-x="1274" d="M4 0l485 758l-454 704h266l338 -553l338 553h258l-457 -708l492 -754h-275l-366 598l-369 -598h-256z" />
-<glyph unicode="Y" horiz-adv-x="1212" d="M0 1462h260l346 -667l346 667h260l-487 -895v-567h-240v559z" />
-<glyph unicode="Z" horiz-adv-x="1178" d="M66 0v166l737 1091h-717v205h1006v-168l-740 -1089h760v-205h-1046z" />
-<glyph unicode="[" horiz-adv-x="676" d="M154 -324v1786h471v-176h-256v-1433h256v-177h-471z" />
-<glyph unicode="\" horiz-adv-x="799" d="M16 1462h222l544 -1462h-221z" />
-<glyph unicode="]" horiz-adv-x="676" d="M51 -147h256v1433h-256v176h469v-1786h-469v177z" />
-<glyph unicode="^" horiz-adv-x="1100" d="M29 535l436 935h121l485 -935h-194l-349 694l-307 -694h-192z" />
-<glyph unicode="_" horiz-adv-x="879" d="M-4 -184h887v-135h-887v135z" />
-<glyph unicode="`" horiz-adv-x="1212" d="M362 1548v21h273q38 -70 103.5 -161t109.5 -142v-25h-158q-69 52 -174.5 150.5t-153.5 156.5z" />
-<glyph unicode="a" horiz-adv-x="1188" d="M90 317q0 171 127 258t387 95l191 6v59q0 106 -49.5 158.5t-153.5 52.5q-85 0 -163 -25t-150 -59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5 -92t107.5 -289v-745h-168l-47 154h-8q-80 -101 -161 -137.5t-208 -36.5q-163 0 -254.5 88t-91.5 249zM334 315 q0 -74 44 -114.5t132 -40.5q128 0 205.5 71.5t77.5 200.5v96l-142 -6q-166 -6 -241.5 -55.5t-75.5 -151.5z" />
-<glyph unicode="b" horiz-adv-x="1276" d="M168 0v1556h235v-370q0 -41 -4 -122t-6 -103h10q112 165 330 165q207 0 322.5 -150t115.5 -421q0 -272 -117 -423.5t-325 -151.5q-210 0 -326 151h-16l-43 -131h-176zM403 555q0 -202 64 -292.5t209 -90.5q125 0 189.5 99t64.5 286q0 377 -258 377q-142 0 -204.5 -83.5 t-64.5 -279.5v-16z" />
-<glyph unicode="c" horiz-adv-x="1014" d="M102 547q0 279 136.5 429t394.5 150q175 0 315 -65l-71 -189q-149 58 -246 58q-287 0 -287 -381q0 -186 71.5 -279.5t209.5 -93.5q157 0 297 78v-205q-63 -37 -134.5 -53t-173.5 -16q-251 0 -381.5 146.5t-130.5 420.5z" />
-<glyph unicode="d" horiz-adv-x="1276" d="M102 551q0 272 117.5 423.5t325.5 151.5q218 0 332 -161h12q-17 119 -17 188v403h236v-1556h-184l-41 145h-11q-113 -165 -331 -165q-207 0 -323 150t-116 421zM344 547q0 -184 65 -280.5t195 -96.5q145 0 211 81.5t68 264.5v33q0 209 -68 297t-213 88 q-124 0 -191 -100.5t-67 -286.5z" />
-<glyph unicode="e" horiz-adv-x="1180" d="M102 545q0 271 135 426t371 155q219 0 346 -133t127 -366v-127h-737q5 -161 87 -247.5t231 -86.5q98 0 182.5 18.5t181.5 61.5v-191q-86 -41 -174 -58t-201 -17q-258 0 -403.5 150.5t-145.5 414.5zM348 670h502q-2 137 -66 207.5t-176 70.5t-179.5 -71t-80.5 -207z" />
-<glyph unicode="f" horiz-adv-x="743" d="M35 928v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244 -41l-62 -178q-87 28 -166 28q-80 0 -116.5 -49.5t-36.5 -148.5v-72h270v-178h-270v-928h-236v928h-182z" />
-<glyph unicode="g" horiz-adv-x="1139" d="M23 -184q0 102 64.5 171.5t180.5 96.5q-47 20 -77.5 64.5t-30.5 93.5q0 62 35 105t104 85q-86 37 -139.5 120.5t-53.5 195.5q0 180 113.5 279t323.5 99q47 0 98.5 -6.5t77.5 -13.5h383v-129l-189 -35q26 -35 43 -86t17 -108q0 -171 -118 -269t-325 -98q-53 0 -96 8 q-76 -47 -76 -110q0 -38 35.5 -57t130.5 -19h193q183 0 278 -78t95 -225q0 -188 -155 -290t-448 -102q-226 0 -345 80t-119 228zM233 -172q0 -76 68.5 -117t192.5 -41q192 0 286 55t94 146q0 72 -51.5 102.5t-191.5 30.5h-178q-101 0 -160.5 -47.5t-59.5 -128.5zM334 748 q0 -104 53.5 -160t153.5 -56q204 0 204 218q0 108 -50.5 166.5t-153.5 58.5q-102 0 -154.5 -58t-52.5 -169z" />
-<glyph unicode="h" horiz-adv-x="1300" d="M168 0v1556h235v-395q0 -95 -12 -203h15q48 80 133.5 124t199.5 44q402 0 402 -405v-721h-236v680q0 128 -51.5 191t-163.5 63q-148 0 -217.5 -88.5t-69.5 -296.5v-549h-235z" />
-<glyph unicode="i" horiz-adv-x="571" d="M154 1399q0 63 34.5 97t98.5 34q62 0 96.5 -34t34.5 -97q0 -60 -34.5 -94.5t-96.5 -34.5q-64 0 -98.5 34.5t-34.5 94.5zM168 0v1106h235v-1106h-235z" />
-<glyph unicode="j" horiz-adv-x="571" d="M-121 -281q68 -18 139 -18q150 0 150 170v1235h235v-1251q0 -171 -89.5 -259t-258.5 -88q-106 0 -176 25v186zM154 1399q0 63 34.5 97t98.5 34q62 0 96.5 -34t34.5 -97q0 -60 -34.5 -94.5t-96.5 -34.5q-64 0 -98.5 34.5t-34.5 94.5z" />
-<glyph unicode="k" horiz-adv-x="1171" d="M168 0v1556h233v-759l-12 -213h6l133 166l334 356h271l-445 -475l473 -631h-276l-355 485l-129 -106v-379h-233z" />
-<glyph unicode="l" horiz-adv-x="571" d="M168 0v1556h235v-1556h-235z" />
-<glyph unicode="m" horiz-adv-x="1958" d="M168 0v1106h184l33 -145h12q46 79 133.5 122t192.5 43q255 0 338 -174h16q49 82 138 128t204 46q198 0 288.5 -100t90.5 -305v-721h-235v682q0 127 -48.5 189.5t-150.5 62.5q-137 0 -200.5 -85.5t-63.5 -262.5v-586h-236v682q0 127 -48 189.5t-150 62.5 q-136 0 -199.5 -88.5t-63.5 -294.5v-551h-235z" />
-<glyph unicode="n" horiz-adv-x="1300" d="M168 0v1106h184l33 -145h12q50 79 142 122t204 43q398 0 398 -405v-721h-236v680q0 128 -51.5 191t-163.5 63q-149 0 -218 -88t-69 -295v-551h-235z" />
-<glyph unicode="o" horiz-adv-x="1251" d="M102 555q0 269 138 420t389 151q240 0 380 -154.5t140 -416.5q0 -271 -139 -423t-387 -152q-155 0 -274 70t-183 201t-64 304zM344 555q0 -383 283 -383q280 0 280 383q0 379 -282 379q-148 0 -214.5 -98t-66.5 -281z" />
-<glyph unicode="p" horiz-adv-x="1276" d="M168 -492v1598h190q8 -31 33 -148h12q110 168 330 168q207 0 322.5 -150t115.5 -421t-117.5 -423t-324.5 -152q-210 0 -326 151h-14q14 -140 14 -170v-453h-235zM403 555q0 -202 64 -292.5t209 -90.5q122 0 188 100t66 285q0 186 -65.5 281.5t-192.5 95.5 q-140 0 -204.5 -82t-64.5 -262v-35z" />
-<glyph unicode="q" horiz-adv-x="1276" d="M102 551q0 270 118 422.5t325 152.5q104 0 186.5 -38.5t147.5 -126.5h8l26 145h195v-1598h-236v469q0 44 4 93t7 75h-13q-104 -165 -331 -165q-205 0 -321 150.5t-116 420.5zM344 547q0 -379 262 -379q148 0 212.5 85.5t64.5 258.5v37q0 205 -66.5 295t-214.5 90 q-126 0 -192 -100t-66 -287z" />
-<glyph unicode="r" horiz-adv-x="883" d="M168 0v1106h184l31 -195h12q55 99 143.5 157t190.5 58q71 0 117 -10l-23 -219q-50 12 -104 12q-141 0 -228.5 -92t-87.5 -239v-578h-235z" />
-<glyph unicode="s" horiz-adv-x="997" d="M98 827q0 142 114.5 220.5t311.5 78.5q195 0 369 -79l-76 -177q-179 74 -301 74q-186 0 -186 -106q0 -52 48.5 -88t211.5 -99q137 -53 199 -97t92 -101.5t30 -137.5q0 -162 -118 -248.5t-338 -86.5q-221 0 -355 67v203q195 -90 363 -90q217 0 217 131q0 42 -24 70t-79 58 t-153 68q-191 74 -258.5 148t-67.5 192z" />
-<glyph unicode="t" horiz-adv-x="805" d="M39 928v104l162 86l80 234h145v-246h315v-178h-315v-592q0 -85 42.5 -125.5t111.5 -40.5q86 0 172 27v-177q-39 -17 -100.5 -28.5t-127.5 -11.5q-334 0 -334 352v596h-151z" />
-<glyph unicode="u" horiz-adv-x="1300" d="M158 383v723h237v-682q0 -127 52 -190.5t163 -63.5q148 0 217.5 88.5t69.5 296.5v551h236v-1106h-185l-33 145h-12q-49 -77 -139.5 -121t-206.5 -44q-201 0 -300 100t-99 303z" />
-<glyph unicode="v" horiz-adv-x="1096" d="M0 1106h248l225 -643q58 -162 70 -262h8q9 72 70 262l225 643h250l-422 -1106h-254z" />
-<glyph unicode="w" horiz-adv-x="1673" d="M20 1106h240l141 -545q48 -202 68 -346h6q10 73 30.5 167.5t35.5 141.5l168 582h258l163 -582q15 -49 37.5 -150t26.5 -157h8q15 123 70 344l143 545h236l-312 -1106h-264l-143 516q-26 82 -94 381h-9q-58 -270 -92 -383l-147 -514h-260z" />
-<glyph unicode="x" horiz-adv-x="1128" d="M25 0l389 565l-371 541h268l252 -387l254 387h266l-372 -541l391 -565h-266l-273 414l-272 -414h-266z" />
-<glyph unicode="y" horiz-adv-x="1098" d="M0 1106h256l225 -627q51 -134 68 -252h8q9 55 33 133.5t254 745.5h254l-473 -1253q-129 -345 -430 -345q-78 0 -152 17v186q53 -12 121 -12q170 0 239 197l41 104z" />
-<glyph unicode="z" horiz-adv-x="979" d="M68 0v145l559 781h-525v180h789v-164l-547 -762h563v-180h-839z" />
-<glyph unicode="{" horiz-adv-x="791" d="M45 473v191q135 0 200.5 45.5t65.5 138.5v311q0 156 108.5 229.5t325.5 73.5v-182q-114 -5 -165.5 -46.5t-51.5 -123.5v-297q0 -199 -229 -238v-12q229 -36 229 -237v-299q0 -82 51 -124t166 -44v-183q-231 2 -332.5 78.5t-101.5 247.5v285q0 186 -266 186z" />
-<glyph unicode="|" horiz-adv-x="1128" d="M473 -481v2033h180v-2033h-180z" />
-<glyph unicode="}" horiz-adv-x="760" d="M45 -141q95 1 148 38.5t53 129.5v262q0 121 53 187t176 87v12q-229 39 -229 238v297q0 82 -45.5 123.5t-155.5 46.5v182q223 0 320.5 -76.5t97.5 -250.5v-287q0 -100 63.5 -142t188.5 -42v-191q-123 0 -187.5 -42.5t-64.5 -143.5v-307q0 -156 -99.5 -229t-318.5 -75v183z " />
-<glyph unicode="~" d="M96 571v191q99 108 250 108q66 0 125 -13t147 -50q131 -55 220 -55q52 0 114.5 31t120.5 89v-190q-105 -111 -250 -111q-65 0 -127.5 15.5t-146.5 50.5q-127 55 -219 55q-50 0 -111.5 -30t-122.5 -91z" />
-<glyph unicode="¡" horiz-adv-x="565" d="M133 965q0 69 38 111t110 42t110.5 -40.5t38.5 -112.5q0 -74 -37.5 -113t-111.5 -39q-72 0 -110 39.5t-38 112.5zM141 -371l52 1016h174l51 -1016h-277z" />
-<glyph unicode="¢" d="M166 741q0 254 100.5 397t306.5 175v170h158v-162q152 -5 283 -66l-70 -188q-146 59 -250 59q-146 0 -216 -95t-70 -288q0 -194 72 -283t210 -89q75 0 142.5 15t154.5 52v-200q-119 -59 -258 -64v-194h-156v200q-207 31 -307 171t-100 390z" />
-<glyph unicode="£" d="M72 0v195q98 30 145 96t47 178v184h-188v172h188v256q0 188 113.5 294t312.5 106q194 0 375 -82l-76 -182q-162 71 -284 71q-205 0 -205 -219v-244h397v-172h-397v-182q0 -91 -33 -155t-113 -109h756v-207h-1038z" />
-<glyph unicode="¤" d="M117 1069l121 119l131 -129q100 63 215 63t213 -65l133 131l121 -117l-131 -133q63 -100 63 -215q0 -119 -63 -217l129 -129l-119 -119l-133 129q-99 -61 -213 -61q-126 0 -215 61l-131 -127l-119 119l131 129q-64 99 -64 215q0 109 64 213zM354 723q0 -98 68 -164.5 t162 -66.5q97 0 165 66.5t68 164.5q0 97 -68 165t-165 68q-93 0 -161.5 -68t-68.5 -165z" />
-<glyph unicode="¥" d="M18 1462h246l320 -665l321 665h244l-399 -760h227v-151h-281v-154h281v-153h-281v-244h-225v244h-283v153h283v154h-283v151h224z" />
-<glyph unicode="¦" horiz-adv-x="1128" d="M473 315h180v-796h-180v796zM473 758v794h180v-794h-180z" />
-<glyph unicode="§" horiz-adv-x="1026" d="M115 57v179q77 -40 173 -65.5t177 -25.5q235 0 235 131q0 43 -21 70t-71 54t-147 65q-141 55 -206 101.5t-95.5 105t-30.5 135.5q0 80 38.5 145.5t111.5 108.5q-146 83 -146 235q0 129 109.5 202t294.5 73q91 0 174 -17t182 -59l-68 -162q-116 50 -176 63t-121 13 q-194 0 -194 -109q0 -54 55 -93.5t191 -90.5q175 -68 250 -146.5t75 -187.5q0 -177 -139 -266q139 -80 139 -223q0 -142 -118 -224.5t-326 -82.5q-212 0 -346 71zM313 827q0 -45 24 -80t78.5 -69t194.5 -90q109 65 109 168q0 75 -62 126.5t-221 104.5q-54 -16 -88.5 -61.5 t-34.5 -98.5z" />
-<glyph unicode="¨" horiz-adv-x="1212" d="M293 1399q0 62 33.5 89.5t81.5 27.5q53 0 84.5 -31t31.5 -86q0 -53 -32 -85t-84 -32q-48 0 -81.5 29t-33.5 88zM686 1399q0 62 33.5 89.5t81.5 27.5q53 0 85 -31t32 -86q0 -54 -33 -85.5t-84 -31.5q-48 0 -81.5 29t-33.5 88z" />
-<glyph unicode="©" horiz-adv-x="1704" d="M100 731q0 200 100 375t275 276t377 101q200 0 375 -100t276 -275t101 -377q0 -197 -97 -370t-272 -277t-383 -104q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM223 731q0 -170 84.5 -315.5t230.5 -229.5t314 -84q170 0 316 85.5t229.5 230t83.5 313.5q0 168 -84.5 314.5 t-231 230.5t-313.5 84q-168 0 -312.5 -83t-230.5 -229t-86 -317zM471 731q0 214 110 337.5t306 123.5q138 0 274 -70l-65 -143q-106 55 -203 55q-111 0 -171 -80.5t-60 -222.5q0 -147 54 -226t177 -79q55 0 118 15t109 36v-158q-115 -51 -235 -51q-197 0 -305.5 120.5 t-108.5 342.5z" />
-<glyph unicode="ª" horiz-adv-x="754" d="M57 981q0 104 84 159.5t252 61.5l107 4q0 72 -34.5 108t-103.5 36q-90 0 -210 -56l-54 115q144 70 285 70q138 0 207 -62.5t69 -187.5v-447h-112l-29 97q-46 -55 -105 -82t-130 -27q-113 0 -169.5 52.5t-56.5 158.5zM221 983q0 -88 96 -88q91 0 137 41t46 123v43l-99 -4 q-71 -2 -125.5 -34t-54.5 -81z" />
-<glyph unicode="«" horiz-adv-x="1139" d="M82 535v26l356 432l168 -94l-282 -350l282 -348l-168 -97zM532 535v26l357 432l168 -94l-283 -350l283 -348l-168 -97z" />
-<glyph unicode="¬" d="M96 633v178h977v-555h-178v377h-799z" />
-<glyph unicode="­" horiz-adv-x="659" d="M72 449v200h514v-200h-514z" />
-<glyph unicode="®" horiz-adv-x="1704" d="M100 731q0 200 100 375t275 276t377 101q200 0 375 -100t276 -275t101 -377q0 -197 -97 -370t-272 -277t-383 -104q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM223 731q0 -170 84.5 -315.5t230.5 -229.5t314 -84q170 0 316 85.5t229.5 230t83.5 313.5q0 168 -84.5 314.5 t-231 230.5t-313.5 84q-168 0 -312.5 -83t-230.5 -229t-86 -317zM559 279v903h262q174 0 255 -68t81 -205q0 -171 -153 -233l237 -397h-211l-192 346h-90v-346h-189zM748 770h69q74 0 112 35t38 100q0 72 -36.5 100.5t-115.5 28.5h-67v-264z" />
-<glyph unicode="¯" horiz-adv-x="1024" d="M-6 1556v164h1036v-164h-1036z" />
-<glyph unicode="°" horiz-adv-x="877" d="M109 1153q0 135 95 232.5t234 97.5q138 0 233 -96t95 -234q0 -139 -96 -233.5t-232 -94.5q-88 0 -164.5 43.5t-120.5 119.5t-44 165zM262 1153q0 -70 51 -122t125 -52t125 51.5t51 122.5q0 76 -52 127t-124 51t-124 -52t-52 -126z" />
-<glyph unicode="±" d="M96 0v178h977v-178h-977zM96 664v178h398v407h180v-407h399v-178h-399v-406h-180v406h-398z" />
-<glyph unicode="²" horiz-adv-x="743" d="M51 586v135l230 225q117 112 149.5 165t32.5 112q0 52 -32 79t-83 27q-93 0 -201 -88l-94 121q139 119 309 119q136 0 211.5 -66t75.5 -180q0 -83 -46 -158.5t-183 -202.5l-139 -129h397v-159h-627z" />
-<glyph unicode="³" horiz-adv-x="743" d="M45 631v157q145 -79 270 -79q179 0 179 135q0 125 -199 125h-115v133h105q184 0 184 129q0 52 -34.5 80t-90.5 28q-57 0 -105.5 -20t-105.5 -57l-84 114q61 46 134 75.5t171 29.5q134 0 212.5 -61.5t78.5 -168.5q0 -75 -40.5 -122.5t-119.5 -86.5q94 -21 141.5 -76 t47.5 -132q0 -127 -93 -196t-266 -69q-148 0 -270 62z" />
-<glyph unicode="´" horiz-adv-x="1212" d="M362 1241v25q57 70 117.5 156t95.5 147h273v-21q-52 -61 -155.5 -157.5t-174.5 -149.5h-156z" />
-<glyph unicode="µ" horiz-adv-x="1309" d="M168 -492v1598h235v-684q0 -252 218 -252q146 0 215 88.5t69 296.5v551h236v-1106h-183l-34 147h-13q-48 -83 -119.5 -125t-175.5 -42q-140 0 -219 90h-4q3 -28 6.5 -117t3.5 -125v-320h-235z" />
-<glyph unicode="¶" horiz-adv-x="1341" d="M113 1042q0 260 109 387t341 127h580v-1816h-137v1663h-191v-1663h-137v819q-62 -18 -146 -18q-216 0 -317.5 125t-101.5 376z" />
-<glyph unicode="·" horiz-adv-x="563" d="M133 723q0 73 38 112t110 39q73 0 111 -40.5t38 -110.5q0 -71 -38.5 -112.5t-110.5 -41.5t-110 41t-38 113z" />
-<glyph unicode="¸" horiz-adv-x="442" d="M0 -340q54 -14 123 -14q54 0 85.5 16.5t31.5 61.5q0 85 -179 110l84 166h152l-41 -88q80 -21 125 -68.5t45 -113.5q0 -222 -305 -222q-66 0 -121 15v137z" />
-<glyph unicode="¹" horiz-adv-x="743" d="M84 1253l281 209h167v-876h-186v512l3 103l5 91q-17 -18 -40.5 -40t-141.5 -111z" />
-<glyph unicode="º" horiz-adv-x="780" d="M61 1124q0 169 88.5 262t241.5 93q152 0 240 -94.5t88 -260.5q0 -164 -87.5 -259t-244.5 -95q-150 0 -238 95.5t-88 258.5zM223 1124q0 -111 39 -166t127 -55t127 55t39 166q0 113 -39 167.5t-127 54.5t-127 -54.5t-39 -167.5z" />
-<glyph unicode="»" horiz-adv-x="1139" d="M80 201l282 348l-282 350l168 94l358 -432v-26l-358 -431zM530 201l283 348l-283 350l168 94l359 -432v-26l-359 -431z" />
-<glyph unicode="¼" horiz-adv-x="1700" d="M60 1253l281 209h167v-876h-186v512l3 103l5 91q-17 -18 -40.5 -40t-141.5 -111zM285 0l858 1462h190l-856 -1462h-192zM876 177v127l396 579h188v-563h125v-143h-125v-176h-192v176h-392zM1038 320h230v178q0 97 6 197q-52 -104 -88 -158z" />
-<glyph unicode="½" horiz-adv-x="1700" d="M46 1253l281 209h167v-876h-186v512l3 103l5 91q-17 -18 -40.5 -40t-141.5 -111zM250 0l858 1462h190l-856 -1462h-192zM981 1v135l230 225q117 112 149.5 165t32.5 112q0 52 -32 79t-83 27q-93 0 -201 -88l-94 121q139 119 309 119q136 0 211.5 -66t75.5 -180 q0 -83 -46 -158.5t-183 -202.5l-139 -129h397v-159h-627z" />
-<glyph unicode="¾" horiz-adv-x="1700" d="M55 631v157q145 -79 270 -79q179 0 179 135q0 125 -199 125h-115v133h105q184 0 184 129q0 52 -34.5 80t-90.5 28q-57 0 -105.5 -20t-105.5 -57l-84 114q61 46 134 75.5t171 29.5q134 0 212.5 -61.5t78.5 -168.5q0 -75 -40.5 -122.5t-119.5 -86.5q94 -21 141.5 -76 t47.5 -132q0 -127 -93 -196t-266 -69q-148 0 -270 62zM367 0l858 1462h190l-856 -1462h-192zM931 177v127l396 579h188v-563h125v-143h-125v-176h-192v176h-392zM1093 320h230v178q0 97 6 197q-52 -104 -88 -158z" />
-<glyph unicode="¿" horiz-adv-x="928" d="M55 -33q0 73 21 130t64 109t157 142q94 76 125 124.5t31 127.5v45h198v-63q0 -106 -41 -181t-143 -155q-124 -98 -155 -147t-31 -124q0 -78 54 -125t161 -47q90 0 174 27.5t166 65.5l82 -179q-220 -110 -424 -110q-207 0 -323 95.5t-116 264.5zM395 965q0 69 38 111 t110 42t110.5 -40.5t38.5 -112.5q0 -74 -37.5 -113t-111.5 -39q-72 0 -110 39.5t-38 112.5z" />
-<glyph unicode="À" horiz-adv-x="1354" d="M0 0l547 1468h260l547 -1468h-254l-146 406h-559l-143 -406h-252zM334 1886v21h273q38 -70 103.5 -161t109.5 -142v-25h-158q-69 52 -174.5 150.5t-153.5 156.5zM465 612h426l-137 398q-15 40 -41.5 126t-36.5 126q-27 -123 -79 -269z" />
-<glyph unicode="Á" horiz-adv-x="1354" d="M0 0l547 1468h260l547 -1468h-254l-146 406h-559l-143 -406h-252zM465 612h426l-137 398q-15 40 -41.5 126t-36.5 126q-27 -123 -79 -269zM532 1579v25q57 70 117.5 156t95.5 147h273v-21q-52 -61 -155.5 -157.5t-174.5 -149.5h-156z" />
-<glyph unicode="Â" horiz-adv-x="1354" d="M0 0l547 1468h260l547 -1468h-254l-146 406h-559l-143 -406h-252zM286 1579v25q191 198 254 303h260q63 -110 256 -303v-25h-159q-123 73 -228 180q-103 -103 -225 -180h-158zM465 612h426l-137 398q-15 40 -41.5 126t-36.5 126q-27 -123 -79 -269z" />
-<glyph unicode="Ã" horiz-adv-x="1354" d="M0 0l547 1468h260l547 -1468h-254l-146 406h-559l-143 -406h-252zM281 1577q12 139 77.5 212t167.5 73q43 0 84 -17.5t80 -39t75.5 -39t70.5 -17.5q79 0 106 115h125q-12 -134 -77 -209.5t-169 -75.5q-42 0 -82.5 17.5t-79.5 39t-76 39t-71 17.5q-81 0 -109 -115h-122z M465 612h426l-137 398q-15 40 -41.5 126t-36.5 126q-27 -123 -79 -269z" />
-<glyph unicode="Ä" horiz-adv-x="1354" d="M0 0l547 1468h260l547 -1468h-254l-146 406h-559l-143 -406h-252zM363 1737q0 62 33.5 89.5t81.5 27.5q53 0 84.5 -31t31.5 -86q0 -53 -32 -85t-84 -32q-48 0 -81.5 29t-33.5 88zM465 612h426l-137 398q-15 40 -41.5 126t-36.5 126q-27 -123 -79 -269zM756 1737 q0 62 33.5 89.5t81.5 27.5q53 0 85 -31t32 -86q0 -54 -33 -85.5t-84 -31.5q-48 0 -81.5 29t-33.5 88z" />
-<glyph unicode="Å" horiz-adv-x="1354" d="M0 0l547 1468h260l547 -1468h-254l-146 406h-559l-143 -406h-252zM438 1575q0 101 63.5 163.5t172.5 62.5q104 0 171.5 -62t67.5 -162q0 -102 -65.5 -165.5t-173.5 -63.5t-172 62.5t-64 164.5zM465 612h426l-137 398q-15 40 -41.5 126t-36.5 126q-27 -123 -79 -269z M567 1575q0 -106 107 -106q46 0 76 27.5t30 78.5q0 50 -30 78.5t-76 28.5q-47 0 -77 -28.5t-30 -78.5z" />
-<glyph unicode="Æ" horiz-adv-x="1868" d="M-2 0l678 1462h1071v-202h-571v-398h532v-200h-532v-459h571v-203h-811v406h-504l-188 -406h-246zM522 612h414v641h-123z" />
-<glyph unicode="Ç" horiz-adv-x="1298" d="M121 731q0 228 83.5 399t241.5 262t371 91q224 0 414 -94l-86 -199q-74 35 -156.5 61.5t-173.5 26.5q-206 0 -324 -146t-118 -403q0 -269 113.5 -407t328.5 -138q93 0 180 18.5t181 47.5v-205q-172 -65 -390 -65q-321 0 -493 194.5t-172 556.5zM526 -340q54 -14 123 -14 q54 0 85.5 16.5t31.5 61.5q0 85 -179 110l84 166h152l-41 -88q80 -21 125 -68.5t45 -113.5q0 -222 -305 -222q-66 0 -121 15v137z" />
-<glyph unicode="È" horiz-adv-x="1143" d="M193 0v1462h827v-202h-588v-398h551v-200h-551v-459h588v-203h-827zM289 1886v21h273q38 -70 103.5 -161t109.5 -142v-25h-158q-69 52 -174.5 150.5t-153.5 156.5z" />
-<glyph unicode="É" horiz-adv-x="1143" d="M193 0v1462h827v-202h-588v-398h551v-200h-551v-459h588v-203h-827zM440 1579v25q57 70 117.5 156t95.5 147h273v-21q-52 -61 -155.5 -157.5t-174.5 -149.5h-156z" />
-<glyph unicode="Ê" horiz-adv-x="1143" d="M193 0v1462h827v-202h-588v-398h551v-200h-551v-459h588v-203h-827zM220 1579v25q191 198 254 303h260q63 -110 256 -303v-25h-159q-123 73 -228 180q-103 -103 -225 -180h-158z" />
-<glyph unicode="Ë" horiz-adv-x="1143" d="M193 0v1462h827v-202h-588v-398h551v-200h-551v-459h588v-203h-827zM297 1737q0 62 33.5 89.5t81.5 27.5q53 0 84.5 -31t31.5 -86q0 -53 -32 -85t-84 -32q-48 0 -81.5 29t-33.5 88zM690 1737q0 62 33.5 89.5t81.5 27.5q53 0 85 -31t32 -86q0 -54 -33 -85.5t-84 -31.5 q-48 0 -81.5 29t-33.5 88z" />
-<glyph unicode="Ì" horiz-adv-x="625" d="M-6 1886v21h273q38 -70 103.5 -161t109.5 -142v-25h-158q-69 52 -174.5 150.5t-153.5 156.5zM193 0v1462h239v-1462h-239z" />
-<glyph unicode="Í" horiz-adv-x="625" d="M179 1579v25q57 70 117.5 156t95.5 147h273v-21q-52 -61 -155.5 -157.5t-174.5 -149.5h-156zM193 0v1462h239v-1462h-239z" />
-<glyph unicode="Î" horiz-adv-x="625" d="M-75 1579v25q191 198 254 303h260q63 -110 256 -303v-25h-159q-123 73 -228 180q-103 -103 -225 -180h-158zM193 0v1462h239v-1462h-239z" />
-<glyph unicode="Ï" horiz-adv-x="625" d="M1 1737q0 62 33.5 89.5t81.5 27.5q53 0 84.5 -31t31.5 -86q0 -53 -32 -85t-84 -32q-48 0 -81.5 29t-33.5 88zM193 0v1462h239v-1462h-239zM394 1737q0 62 33.5 89.5t81.5 27.5q53 0 85 -31t32 -86q0 -54 -33 -85.5t-84 -31.5q-48 0 -81.5 29t-33.5 88z" />
-<glyph unicode="Ð" horiz-adv-x="1497" d="M47 623v200h146v639h446q347 0 541 -188.5t194 -528.5q0 -360 -201 -552.5t-579 -192.5h-401v623h-146zM432 201h160q530 0 530 536q0 260 -124.5 392.5t-368.5 132.5h-197v-439h307v-200h-307v-422z" />
-<glyph unicode="Ñ" horiz-adv-x="1604" d="M193 0v1462h290l717 -1159h6q-2 23 -8 167.5t-6 225.5v766h219v-1462h-293l-719 1165h-8l5 -65q14 -186 14 -340v-760h-217zM414 1577q12 139 77.5 212t167.5 73q43 0 84 -17.5t80 -39t75.5 -39t70.5 -17.5q79 0 106 115h125q-12 -134 -77 -209.5t-169 -75.5 q-42 0 -82.5 17.5t-79.5 39t-76 39t-71 17.5q-81 0 -109 -115h-122z" />
-<glyph unicode="Ò" horiz-adv-x="1612" d="M121 735q0 362 178.5 556t509.5 194q326 0 504 -197t178 -555q0 -357 -178.5 -555t-505.5 -198q-331 0 -508.5 196.5t-177.5 558.5zM375 733q0 -270 109 -409.5t323 -139.5q213 0 321.5 138t108.5 411q0 269 -107.5 408t-320.5 139q-215 0 -324.5 -139t-109.5 -408z M481 1886v21h273q38 -70 103.5 -161t109.5 -142v-25h-158q-69 52 -174.5 150.5t-153.5 156.5z" />
-<glyph unicode="Ó" horiz-adv-x="1612" d="M121 735q0 362 178.5 556t509.5 194q326 0 504 -197t178 -555q0 -357 -178.5 -555t-505.5 -198q-331 0 -508.5 196.5t-177.5 558.5zM375 733q0 -270 109 -409.5t323 -139.5q213 0 321.5 138t108.5 411q0 269 -107.5 408t-320.5 139q-215 0 -324.5 -139t-109.5 -408z M657 1579v25q57 70 117.5 156t95.5 147h273v-21q-52 -61 -155.5 -157.5t-174.5 -149.5h-156z" />
-<glyph unicode="Ô" horiz-adv-x="1612" d="M121 735q0 362 178.5 556t509.5 194q326 0 504 -197t178 -555q0 -357 -178.5 -555t-505.5 -198q-331 0 -508.5 196.5t-177.5 558.5zM375 733q0 -270 109 -409.5t323 -139.5q213 0 321.5 138t108.5 411q0 269 -107.5 408t-320.5 139q-215 0 -324.5 -139t-109.5 -408z M413 1579v25q191 198 254 303h260q63 -110 256 -303v-25h-159q-123 73 -228 180q-103 -103 -225 -180h-158z" />
-<glyph unicode="Õ" horiz-adv-x="1612" d="M121 735q0 362 178.5 556t509.5 194q326 0 504 -197t178 -555q0 -357 -178.5 -555t-505.5 -198q-331 0 -508.5 196.5t-177.5 558.5zM375 733q0 -270 109 -409.5t323 -139.5q213 0 321.5 138t108.5 411q0 269 -107.5 408t-320.5 139q-215 0 -324.5 -139t-109.5 -408z M410 1577q12 139 77.5 212t167.5 73q43 0 84 -17.5t80 -39t75.5 -39t70.5 -17.5q79 0 106 115h125q-12 -134 -77 -209.5t-169 -75.5q-42 0 -82.5 17.5t-79.5 39t-76 39t-71 17.5q-81 0 -109 -115h-122z" />
-<glyph unicode="Ö" horiz-adv-x="1612" d="M121 735q0 362 178.5 556t509.5 194q326 0 504 -197t178 -555q0 -357 -178.5 -555t-505.5 -198q-331 0 -508.5 196.5t-177.5 558.5zM375 733q0 -270 109 -409.5t323 -139.5q213 0 321.5 138t108.5 411q0 269 -107.5 408t-320.5 139q-215 0 -324.5 -139t-109.5 -408z M496 1737q0 62 33.5 89.5t81.5 27.5q53 0 84.5 -31t31.5 -86q0 -53 -32 -85t-84 -32q-48 0 -81.5 29t-33.5 88zM889 1737q0 62 33.5 89.5t81.5 27.5q53 0 85 -31t32 -86q0 -54 -33 -85.5t-84 -31.5q-48 0 -81.5 29t-33.5 88z" />
-<glyph unicode="×" d="M131 1049l125 127l328 -326l329 326l125 -123l-329 -330l325 -328l-123 -125l-329 326l-324 -326l-125 125l324 328z" />
-<glyph unicode="Ø" horiz-adv-x="1612" d="M121 735q0 362 178.5 556t509.5 194q199 0 354 -82l90 129l142 -92l-99 -140q195 -199 195 -567q0 -357 -178.5 -555t-505.5 -198q-213 0 -361 81l-94 -137l-141 94l98 144q-188 196 -188 573zM375 733q0 -231 78 -362l587 850q-92 59 -231 59q-215 0 -324.5 -139 t-109.5 -408zM571 244q97 -60 236 -60q213 0 321.5 138t108.5 411q0 225 -80 361z" />
-<glyph unicode="Ù" horiz-adv-x="1520" d="M180 520v942h240v-925q0 -181 84 -267t258 -86q338 0 338 355v923h239v-946q0 -162 -69.5 -283.5t-201 -187t-314.5 -65.5q-272 0 -423 144t-151 396zM417 1886v21h273q38 -70 103.5 -161t109.5 -142v-25h-158q-69 52 -174.5 150.5t-153.5 156.5z" />
-<glyph unicode="Ú" horiz-adv-x="1520" d="M180 520v942h240v-925q0 -181 84 -267t258 -86q338 0 338 355v923h239v-946q0 -162 -69.5 -283.5t-201 -187t-314.5 -65.5q-272 0 -423 144t-151 396zM600 1579v25q57 70 117.5 156t95.5 147h273v-21q-52 -61 -155.5 -157.5t-174.5 -149.5h-156z" />
-<glyph unicode="Û" horiz-adv-x="1520" d="M180 520v942h240v-925q0 -181 84 -267t258 -86q338 0 338 355v923h239v-946q0 -162 -69.5 -283.5t-201 -187t-314.5 -65.5q-272 0 -423 144t-151 396zM366 1579v25q191 198 254 303h260q63 -110 256 -303v-25h-159q-123 73 -228 180q-103 -103 -225 -180h-158z" />
-<glyph unicode="Ü" horiz-adv-x="1520" d="M180 520v942h240v-925q0 -181 84 -267t258 -86q338 0 338 355v923h239v-946q0 -162 -69.5 -283.5t-201 -187t-314.5 -65.5q-272 0 -423 144t-151 396zM445 1737q0 62 33.5 89.5t81.5 27.5q53 0 84.5 -31t31.5 -86q0 -53 -32 -85t-84 -32q-48 0 -81.5 29t-33.5 88z M838 1737q0 62 33.5 89.5t81.5 27.5q53 0 85 -31t32 -86q0 -54 -33 -85.5t-84 -31.5q-48 0 -81.5 29t-33.5 88z" />
-<glyph unicode="Ý" horiz-adv-x="1212" d="M0 1462h260l346 -667l346 667h260l-487 -895v-567h-240v559zM450 1579v25q57 70 117.5 156t95.5 147h273v-21q-52 -61 -155.5 -157.5t-174.5 -149.5h-156z" />
-<glyph unicode="Þ" horiz-adv-x="1268" d="M193 0v1462h239v-243h197q268 0 404 -112t136 -331q0 -227 -146 -349t-423 -122h-168v-305h-239zM432 504h133q187 0 273 63t86 203q0 127 -78 188.5t-250 61.5h-164v-516z" />
-<glyph unicode="ß" horiz-adv-x="1364" d="M168 0v1169q0 193 128.5 295.5t367.5 102.5q225 0 355 -84t130 -230q0 -74 -38.5 -140.5t-104.5 -117.5q-90 -69 -117 -98t-27 -57q0 -30 22.5 -55.5t79.5 -63.5l95 -64q92 -62 135.5 -109.5t65.5 -103.5t22 -127q0 -165 -107 -251t-311 -86q-190 0 -299 65v199 q58 -37 139 -61.5t148 -24.5q192 0 192 151q0 61 -34.5 105t-155.5 118q-119 73 -171 135t-52 146q0 63 34 115.5t105 105.5q75 55 107 97.5t32 93.5q0 72 -67 112.5t-178 40.5q-127 0 -194 -54t-67 -159v-1165h-235z" />
-<glyph unicode="à" horiz-adv-x="1188" d="M90 317q0 171 127 258t387 95l191 6v59q0 106 -49.5 158.5t-153.5 52.5q-85 0 -163 -25t-150 -59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5 -92t107.5 -289v-745h-168l-47 154h-8q-80 -101 -161 -137.5t-208 -36.5q-163 0 -254.5 88t-91.5 249zM259 1548v21h273 q38 -70 103.5 -161t109.5 -142v-25h-158q-69 52 -174.5 150.5t-153.5 156.5zM334 315q0 -74 44 -114.5t132 -40.5q128 0 205.5 71.5t77.5 200.5v96l-142 -6q-166 -6 -241.5 -55.5t-75.5 -151.5z" />
-<glyph unicode="á" horiz-adv-x="1188" d="M90 317q0 171 127 258t387 95l191 6v59q0 106 -49.5 158.5t-153.5 52.5q-85 0 -163 -25t-150 -59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5 -92t107.5 -289v-745h-168l-47 154h-8q-80 -101 -161 -137.5t-208 -36.5q-163 0 -254.5 88t-91.5 249zM334 315 q0 -74 44 -114.5t132 -40.5q128 0 205.5 71.5t77.5 200.5v96l-142 -6q-166 -6 -241.5 -55.5t-75.5 -151.5zM438 1241v25q57 70 117.5 156t95.5 147h273v-21q-52 -61 -155.5 -157.5t-174.5 -149.5h-156z" />
-<glyph unicode="â" horiz-adv-x="1188" d="M90 317q0 171 127 258t387 95l191 6v59q0 106 -49.5 158.5t-153.5 52.5q-85 0 -163 -25t-150 -59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5 -92t107.5 -289v-745h-168l-47 154h-8q-80 -101 -161 -137.5t-208 -36.5q-163 0 -254.5 88t-91.5 249zM203 1241v25 q191 198 254 303h260q63 -110 256 -303v-25h-159q-123 73 -228 180q-103 -103 -225 -180h-158zM334 315q0 -74 44 -114.5t132 -40.5q128 0 205.5 71.5t77.5 200.5v96l-142 -6q-166 -6 -241.5 -55.5t-75.5 -151.5z" />
-<glyph unicode="ã" horiz-adv-x="1188" d="M90 317q0 171 127 258t387 95l191 6v59q0 106 -49.5 158.5t-153.5 52.5q-85 0 -163 -25t-150 -59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5 -92t107.5 -289v-745h-168l-47 154h-8q-80 -101 -161 -137.5t-208 -36.5q-163 0 -254.5 88t-91.5 249zM208 1239 q12 139 77.5 212t167.5 73q43 0 84 -17.5t80 -39t75.5 -39t70.5 -17.5q79 0 106 115h125q-12 -134 -77 -209.5t-169 -75.5q-42 0 -82.5 17.5t-79.5 39t-76 39t-71 17.5q-81 0 -109 -115h-122zM334 315q0 -74 44 -114.5t132 -40.5q128 0 205.5 71.5t77.5 200.5v96l-142 -6 q-166 -6 -241.5 -55.5t-75.5 -151.5z" />
-<glyph unicode="ä" horiz-adv-x="1188" d="M90 317q0 171 127 258t387 95l191 6v59q0 106 -49.5 158.5t-153.5 52.5q-85 0 -163 -25t-150 -59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5 -92t107.5 -289v-745h-168l-47 154h-8q-80 -101 -161 -137.5t-208 -36.5q-163 0 -254.5 88t-91.5 249zM282 1399 q0 62 33.5 89.5t81.5 27.5q53 0 84.5 -31t31.5 -86q0 -53 -32 -85t-84 -32q-48 0 -81.5 29t-33.5 88zM334 315q0 -74 44 -114.5t132 -40.5q128 0 205.5 71.5t77.5 200.5v96l-142 -6q-166 -6 -241.5 -55.5t-75.5 -151.5zM675 1399q0 62 33.5 89.5t81.5 27.5q53 0 85 -31 t32 -86q0 -54 -33 -85.5t-84 -31.5q-48 0 -81.5 29t-33.5 88z" />
-<glyph unicode="å" horiz-adv-x="1188" d="M90 317q0 171 127 258t387 95l191 6v59q0 106 -49.5 158.5t-153.5 52.5q-85 0 -163 -25t-150 -59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5 -92t107.5 -289v-745h-168l-47 154h-8q-80 -101 -161 -137.5t-208 -36.5q-163 0 -254.5 88t-91.5 249zM334 315 q0 -74 44 -114.5t132 -40.5q128 0 205.5 71.5t77.5 200.5v96l-142 -6q-166 -6 -241.5 -55.5t-75.5 -151.5zM366 1466q0 101 63.5 163.5t172.5 62.5q104 0 171.5 -62t67.5 -162q0 -102 -65.5 -165.5t-173.5 -63.5t-172 62.5t-64 164.5zM495 1466q0 -106 107 -106 q46 0 76 27.5t30 78.5q0 50 -30 78.5t-76 28.5q-47 0 -77 -28.5t-30 -78.5z" />
-<glyph unicode="æ" horiz-adv-x="1817" d="M90 317q0 172 121.5 258.5t370.5 94.5l188 6v76q0 194 -201 194q-141 0 -307 -82l-74 166q88 47 192.5 71.5t203.5 24.5q241 0 340 -155q120 155 346 155q206 0 328 -134.5t122 -362.5v-127h-712q10 -336 301 -336q184 0 356 80v-191q-86 -41 -171.5 -58t-195.5 -17 q-140 0 -248.5 54.5t-175.5 164.5q-94 -125 -190.5 -172t-241.5 -47q-165 0 -258.5 90t-93.5 247zM334 315q0 -155 166 -155q124 0 196 72.5t72 199.5v96l-135 -6q-155 -6 -227 -54.5t-72 -152.5zM1014 670h473q0 130 -58.5 204t-162.5 74q-112 0 -177.5 -69.5t-74.5 -208.5 z" />
-<glyph unicode="ç" horiz-adv-x="1014" d="M102 547q0 279 136.5 429t394.5 150q175 0 315 -65l-71 -189q-149 58 -246 58q-287 0 -287 -381q0 -186 71.5 -279.5t209.5 -93.5q157 0 297 78v-205q-63 -37 -134.5 -53t-173.5 -16q-251 0 -381.5 146.5t-130.5 420.5zM356 -340q54 -14 123 -14q54 0 85.5 16.5 t31.5 61.5q0 85 -179 110l84 166h152l-41 -88q80 -21 125 -68.5t45 -113.5q0 -222 -305 -222q-66 0 -121 15v137z" />
-<glyph unicode="è" horiz-adv-x="1180" d="M102 545q0 271 135 426t371 155q219 0 346 -133t127 -366v-127h-737q5 -161 87 -247.5t231 -86.5q98 0 182.5 18.5t181.5 61.5v-191q-86 -41 -174 -58t-201 -17q-258 0 -403.5 150.5t-145.5 414.5zM281 1548v21h273q38 -70 103.5 -161t109.5 -142v-25h-158 q-69 52 -174.5 150.5t-153.5 156.5zM348 670h502q-2 137 -66 207.5t-176 70.5t-179.5 -71t-80.5 -207z" />
-<glyph unicode="é" horiz-adv-x="1180" d="M102 545q0 271 135 426t371 155q219 0 346 -133t127 -366v-127h-737q5 -161 87 -247.5t231 -86.5q98 0 182.5 18.5t181.5 61.5v-191q-86 -41 -174 -58t-201 -17q-258 0 -403.5 150.5t-145.5 414.5zM348 670h502q-2 137 -66 207.5t-176 70.5t-179.5 -71t-80.5 -207z M458 1241v25q57 70 117.5 156t95.5 147h273v-21q-52 -61 -155.5 -157.5t-174.5 -149.5h-156z" />
-<glyph unicode="ê" horiz-adv-x="1180" d="M102 545q0 271 135 426t371 155q219 0 346 -133t127 -366v-127h-737q5 -161 87 -247.5t231 -86.5q98 0 182.5 18.5t181.5 61.5v-191q-86 -41 -174 -58t-201 -17q-258 0 -403.5 150.5t-145.5 414.5zM227 1241v25q191 198 254 303h260q63 -110 256 -303v-25h-159 q-123 73 -228 180q-103 -103 -225 -180h-158zM348 670h502q-2 137 -66 207.5t-176 70.5t-179.5 -71t-80.5 -207z" />
-<glyph unicode="ë" horiz-adv-x="1180" d="M102 545q0 271 135 426t371 155q219 0 346 -133t127 -366v-127h-737q5 -161 87 -247.5t231 -86.5q98 0 182.5 18.5t181.5 61.5v-191q-86 -41 -174 -58t-201 -17q-258 0 -403.5 150.5t-145.5 414.5zM307 1399q0 62 33.5 89.5t81.5 27.5q53 0 84.5 -31t31.5 -86 q0 -53 -32 -85t-84 -32q-48 0 -81.5 29t-33.5 88zM348 670h502q-2 137 -66 207.5t-176 70.5t-179.5 -71t-80.5 -207zM700 1399q0 62 33.5 89.5t81.5 27.5q53 0 85 -31t32 -86q0 -54 -33 -85.5t-84 -31.5q-48 0 -81.5 29t-33.5 88z" />
-<glyph unicode="ì" horiz-adv-x="571" d="M-69 1548v21h273q38 -70 103.5 -161t109.5 -142v-25h-158q-69 52 -174.5 150.5t-153.5 156.5zM168 0v1106h235v-1106h-235z" />
-<glyph unicode="í" horiz-adv-x="571" d="M156 1241v25q57 70 117.5 156t95.5 147h273v-21q-52 -61 -155.5 -157.5t-174.5 -149.5h-156zM168 0v1106h235v-1106h-235z" />
-<glyph unicode="î" horiz-adv-x="571" d="M-100 1241v25q191 198 254 303h260q63 -110 256 -303v-25h-159q-123 73 -228 180q-103 -103 -225 -180h-158zM168 0v1106h235v-1106h-235z" />
-<glyph unicode="ï" horiz-adv-x="571" d="M-25 1399q0 62 33.5 89.5t81.5 27.5q53 0 84.5 -31t31.5 -86q0 -53 -32 -85t-84 -32q-48 0 -81.5 29t-33.5 88zM168 0v1106h235v-1106h-235zM368 1399q0 62 33.5 89.5t81.5 27.5q53 0 85 -31t32 -86q0 -54 -33 -85.5t-84 -31.5q-48 0 -81.5 29t-33.5 88z" />
-<glyph unicode="ð" horiz-adv-x="1243" d="M102 481q0 231 131 365.5t351 134.5q214 0 301 -111l8 4q-62 189 -227 345l-250 -150l-88 133l204 119q-86 59 -167 102l84 146q140 -63 258 -144l231 138l88 -129l-188 -113q152 -140 231.5 -330t79.5 -424q0 -279 -137.5 -433t-388.5 -154q-235 0 -378 136t-143 365z M342 477q0 -153 74 -234t211 -81q148 0 215 91t67 269q0 127 -75.5 202t-206.5 75q-151 0 -218 -82t-67 -240z" />
-<glyph unicode="ñ" horiz-adv-x="1300" d="M168 0v1106h184l33 -145h12q50 79 142 122t204 43q398 0 398 -405v-721h-236v680q0 128 -51.5 191t-163.5 63q-149 0 -218 -88t-69 -295v-551h-235zM269 1239q12 139 77.5 212t167.5 73q43 0 84 -17.5t80 -39t75.5 -39t70.5 -17.5q79 0 106 115h125q-12 -134 -77 -209.5 t-169 -75.5q-42 0 -82.5 17.5t-79.5 39t-76 39t-71 17.5q-81 0 -109 -115h-122z" />
-<glyph unicode="ò" horiz-adv-x="1251" d="M102 555q0 269 138 420t389 151q240 0 380 -154.5t140 -416.5q0 -271 -139 -423t-387 -152q-155 0 -274 70t-183 201t-64 304zM293 1548v21h273q38 -70 103.5 -161t109.5 -142v-25h-158q-69 52 -174.5 150.5t-153.5 156.5zM344 555q0 -383 283 -383q280 0 280 383 q0 379 -282 379q-148 0 -214.5 -98t-66.5 -281z" />
-<glyph unicode="ó" horiz-adv-x="1251" d="M102 555q0 269 138 420t389 151q240 0 380 -154.5t140 -416.5q0 -271 -139 -423t-387 -152q-155 0 -274 70t-183 201t-64 304zM344 555q0 -383 283 -383q280 0 280 383q0 379 -282 379q-148 0 -214.5 -98t-66.5 -281zM473 1241v25q57 70 117.5 156t95.5 147h273v-21 q-52 -61 -155.5 -157.5t-174.5 -149.5h-156z" />
-<glyph unicode="ô" horiz-adv-x="1251" d="M102 555q0 269 138 420t389 151q240 0 380 -154.5t140 -416.5q0 -271 -139 -423t-387 -152q-155 0 -274 70t-183 201t-64 304zM239 1241v25q191 198 254 303h260q63 -110 256 -303v-25h-159q-123 73 -228 180q-103 -103 -225 -180h-158zM344 555q0 -383 283 -383 q280 0 280 383q0 379 -282 379q-148 0 -214.5 -98t-66.5 -281z" />
-<glyph unicode="õ" horiz-adv-x="1251" d="M102 555q0 269 138 420t389 151q240 0 380 -154.5t140 -416.5q0 -271 -139 -423t-387 -152q-155 0 -274 70t-183 201t-64 304zM235 1239q12 139 77.5 212t167.5 73q43 0 84 -17.5t80 -39t75.5 -39t70.5 -17.5q79 0 106 115h125q-12 -134 -77 -209.5t-169 -75.5 q-42 0 -82.5 17.5t-79.5 39t-76 39t-71 17.5q-81 0 -109 -115h-122zM344 555q0 -383 283 -383q280 0 280 383q0 379 -282 379q-148 0 -214.5 -98t-66.5 -281z" />
-<glyph unicode="ö" horiz-adv-x="1251" d="M102 555q0 269 138 420t389 151q240 0 380 -154.5t140 -416.5q0 -271 -139 -423t-387 -152q-155 0 -274 70t-183 201t-64 304zM311 1399q0 62 33.5 89.5t81.5 27.5q53 0 84.5 -31t31.5 -86q0 -53 -32 -85t-84 -32q-48 0 -81.5 29t-33.5 88zM344 555q0 -383 283 -383 q280 0 280 383q0 379 -282 379q-148 0 -214.5 -98t-66.5 -281zM704 1399q0 62 33.5 89.5t81.5 27.5q53 0 85 -31t32 -86q0 -54 -33 -85.5t-84 -31.5q-48 0 -81.5 29t-33.5 88z" />
-<glyph unicode="÷" d="M96 633v178h977v-178h-977zM457 373q0 64 31.5 99.5t95.5 35.5q61 0 93 -36t32 -99t-34 -100t-91 -37q-60 0 -93.5 35.5t-33.5 101.5zM457 1071q0 64 31.5 99.5t95.5 35.5q61 0 93 -36t32 -99t-34 -100t-91 -37q-60 0 -93.5 35.5t-33.5 101.5z" />
-<glyph unicode="ø" horiz-adv-x="1251" d="M102 555q0 269 138 420t389 151q144 0 258 -63l69 100l136 -92l-78 -108q135 -152 135 -408q0 -271 -139 -423t-387 -152q-144 0 -250 57l-76 -109l-135 90l82 117q-142 155 -142 420zM344 555q0 -135 37 -219l391 559q-60 39 -147 39q-148 0 -214.5 -98t-66.5 -281z M487 205q54 -33 140 -33q280 0 280 383q0 121 -33 203z" />
-<glyph unicode="ù" horiz-adv-x="1300" d="M158 383v723h237v-682q0 -127 52 -190.5t163 -63.5q148 0 217.5 88.5t69.5 296.5v551h236v-1106h-185l-33 145h-12q-49 -77 -139.5 -121t-206.5 -44q-201 0 -300 100t-99 303zM289 1548v21h273q38 -70 103.5 -161t109.5 -142v-25h-158q-69 52 -174.5 150.5t-153.5 156.5z " />
-<glyph unicode="ú" horiz-adv-x="1300" d="M158 383v723h237v-682q0 -127 52 -190.5t163 -63.5q148 0 217.5 88.5t69.5 296.5v551h236v-1106h-185l-33 145h-12q-49 -77 -139.5 -121t-206.5 -44q-201 0 -300 100t-99 303zM501 1241v25q57 70 117.5 156t95.5 147h273v-21q-52 -61 -155.5 -157.5t-174.5 -149.5h-156z " />
-<glyph unicode="û" horiz-adv-x="1300" d="M158 383v723h237v-682q0 -127 52 -190.5t163 -63.5q148 0 217.5 88.5t69.5 296.5v551h236v-1106h-185l-33 145h-12q-49 -77 -139.5 -121t-206.5 -44q-201 0 -300 100t-99 303zM260 1241v25q191 198 254 303h260q63 -110 256 -303v-25h-159q-123 73 -228 180 q-103 -103 -225 -180h-158z" />
-<glyph unicode="ü" horiz-adv-x="1300" d="M158 383v723h237v-682q0 -127 52 -190.5t163 -63.5q148 0 217.5 88.5t69.5 296.5v551h236v-1106h-185l-33 145h-12q-49 -77 -139.5 -121t-206.5 -44q-201 0 -300 100t-99 303zM332 1399q0 62 33.5 89.5t81.5 27.5q53 0 84.5 -31t31.5 -86q0 -53 -32 -85t-84 -32 q-48 0 -81.5 29t-33.5 88zM725 1399q0 62 33.5 89.5t81.5 27.5q53 0 85 -31t32 -86q0 -54 -33 -85.5t-84 -31.5q-48 0 -81.5 29t-33.5 88z" />
-<glyph unicode="ý" horiz-adv-x="1098" d="M0 1106h256l225 -627q51 -134 68 -252h8q9 55 33 133.5t254 745.5h254l-473 -1253q-129 -345 -430 -345q-78 0 -152 17v186q53 -12 121 -12q170 0 239 197l41 104zM401 1241v25q57 70 117.5 156t95.5 147h273v-21q-52 -61 -155.5 -157.5t-174.5 -149.5h-156z" />
-<glyph unicode="þ" horiz-adv-x="1276" d="M168 -492v2048h235v-430l-7 -138l-3 -27h10q61 86 142.5 125.5t187.5 39.5q206 0 322 -151t116 -420q0 -272 -116.5 -423.5t-321.5 -151.5q-219 0 -330 149h-14l8 -72l6 -92v-457h-235zM403 555q0 -202 64 -292.5t209 -90.5q254 0 254 385q0 190 -61.5 283.5t-194.5 93.5 q-142 0 -206.5 -82t-64.5 -260v-37z" />
-<glyph unicode="ÿ" horiz-adv-x="1098" d="M0 1106h256l225 -627q51 -134 68 -252h8q9 55 33 133.5t254 745.5h254l-473 -1253q-129 -345 -430 -345q-78 0 -152 17v186q53 -12 121 -12q170 0 239 197l41 104zM239 1399q0 62 33.5 89.5t81.5 27.5q53 0 84.5 -31t31.5 -86q0 -53 -32 -85t-84 -32q-48 0 -81.5 29 t-33.5 88zM632 1399q0 62 33.5 89.5t81.5 27.5q53 0 85 -31t32 -86q0 -54 -33 -85.5t-84 -31.5q-48 0 -81.5 29t-33.5 88z" />
-<glyph unicode="Œ" horiz-adv-x="1942" d="M121 735q0 360 172 555t491 195q115 0 209 -23h826v-202h-576v-398h539v-200h-539v-459h576v-203h-820q-102 -20 -211 -20q-320 0 -493.5 196.5t-173.5 558.5zM371 733q0 -269 106 -409t314 -140q129 0 213 35v1024q-80 37 -211 37q-208 0 -315 -139t-107 -408z" />
-<glyph unicode="œ" horiz-adv-x="1966" d="M102 555q0 272 137 421.5t382 149.5q121 0 223 -49t168 -145q131 194 379 194q221 0 349 -133.5t128 -365.5v-127h-738q11 -164 85.5 -249t228.5 -85q102 0 187 18.5t181 61.5v-191q-84 -40 -171.5 -57.5t-202.5 -17.5q-281 0 -420 194q-132 -194 -400 -194 q-236 0 -376 155t-140 420zM344 555q0 -189 65.5 -286t211.5 -97q141 0 206.5 95.5t65.5 283.5q0 192 -66 287.5t-211 95.5q-143 0 -207.5 -95t-64.5 -284zM1137 670h497q0 134 -63 206t-178 72q-110 0 -177.5 -69.5t-78.5 -208.5z" />
-<glyph unicode="Ÿ" horiz-adv-x="1212" d="M0 1462h260l346 -667l346 667h260l-487 -895v-567h-240v559zM293 1737q0 62 33.5 89.5t81.5 27.5q53 0 84.5 -31t31.5 -86q0 -53 -32 -85t-84 -32q-48 0 -81.5 29t-33.5 88zM686 1737q0 62 33.5 89.5t81.5 27.5q53 0 85 -31t32 -86q0 -54 -33 -85.5t-84 -31.5 q-48 0 -81.5 29t-33.5 88z" />
-<glyph unicode="ˆ" horiz-adv-x="1227" d="M227 1241v25q191 198 254 303h260q63 -110 256 -303v-25h-159q-123 73 -228 180q-103 -103 -225 -180h-158z" />
-<glyph unicode="˜" horiz-adv-x="1227" d="M236 1239q12 139 77.5 212t167.5 73q43 0 84 -17.5t80 -39t75.5 -39t70.5 -17.5q79 0 106 115h125q-12 -134 -77 -209.5t-169 -75.5q-42 0 -82.5 17.5t-79.5 39t-76 39t-71 17.5q-81 0 -109 -115h-122z" />
-<glyph unicode=" " horiz-adv-x="953" />
-<glyph unicode=" " horiz-adv-x="1907" />
-<glyph unicode=" " horiz-adv-x="953" />
-<glyph unicode=" " horiz-adv-x="1907" />
-<glyph unicode=" " horiz-adv-x="635" />
-<glyph unicode=" " horiz-adv-x="476" />
-<glyph unicode=" " horiz-adv-x="317" />
-<glyph unicode=" " horiz-adv-x="317" />
-<glyph unicode=" " horiz-adv-x="238" />
-<glyph unicode=" " horiz-adv-x="381" />
-<glyph unicode=" " horiz-adv-x="105" />
-<glyph unicode="‐" horiz-adv-x="659" d="M72 449v200h514v-200h-514z" />
-<glyph unicode="‑" horiz-adv-x="659" d="M72 449v200h514v-200h-514z" />
-<glyph unicode="‒" horiz-adv-x="659" d="M72 449v200h514v-200h-514z" />
-<glyph unicode="–" horiz-adv-x="1024" d="M82 455v190h860v-190h-860z" />
-<glyph unicode="—" horiz-adv-x="2048" d="M82 455v190h1884v-190h-1884z" />
-<glyph unicode="‘" horiz-adv-x="395" d="M25 983q20 83 71 224t105 255h170q-64 -256 -101 -501h-233z" />
-<glyph unicode="’" horiz-adv-x="395" d="M25 961q69 289 100 501h231l15 -22q-53 -209 -176 -479h-170z" />
-<glyph unicode="‚" horiz-adv-x="549" d="M63 -264q69 270 103 502h231l15 -23q-48 -186 -176 -479h-173z" />
-<glyph unicode="“" horiz-adv-x="813" d="M25 983q20 83 71 224t105 255h170q-64 -256 -101 -501h-233zM440 983q53 203 178 479h170q-69 -296 -100 -501h-233z" />
-<glyph unicode="”" horiz-adv-x="813" d="M25 961q69 289 100 501h231l15 -22q-53 -209 -176 -479h-170zM440 961q69 271 103 501h231l14 -22q-53 -209 -176 -479h-172z" />
-<glyph unicode="„" horiz-adv-x="944" d="M43 -264q66 260 102 502h232l14 -23q-55 -214 -176 -479h-172zM461 -264q66 260 102 502h232l14 -23q-48 -186 -176 -479h-172z" />
-<glyph unicode="•" horiz-adv-x="770" d="M131 748q0 138 66 210t188 72q121 0 187.5 -72.5t66.5 -209.5q0 -135 -67 -209t-187 -74t-187 72.5t-67 210.5z" />
-<glyph unicode="…" horiz-adv-x="1677" d="M133 125q0 73 38 112t110 39q73 0 111 -40.5t38 -110.5q0 -71 -38.5 -112.5t-110.5 -41.5t-110 41t-38 113zM690 125q0 73 38 112t110 39q73 0 111 -40.5t38 -110.5q0 -71 -38.5 -112.5t-110.5 -41.5t-110 41t-38 113zM1247 125q0 73 38 112t110 39q73 0 111 -40.5 t38 -110.5q0 -71 -38.5 -112.5t-110.5 -41.5t-110 41t-38 113z" />
-<glyph unicode=" " horiz-adv-x="381" />
-<glyph unicode="‹" horiz-adv-x="688" d="M82 535v26l356 432l168 -94l-282 -350l282 -348l-168 -97z" />
-<glyph unicode="›" horiz-adv-x="688" d="M80 201l282 348l-282 350l168 94l358 -432v-26l-358 -431z" />
-<glyph unicode=" " horiz-adv-x="476" />
-<glyph unicode="€" horiz-adv-x="1188" d="M63 494v153h136l-2 37v37l2 65h-136v154h150q38 251 191 394t395 143q200 0 358 -88l-84 -187q-154 76 -274 76q-141 0 -230.5 -84t-119.5 -254h456v-154h-471l-2 -45v-55l2 -39h408v-153h-391q64 -312 364 -312q143 0 293 62v-203q-131 -61 -305 -61q-241 0 -391.5 132 t-196.5 382h-152z" />
-<glyph unicode="™" horiz-adv-x="1561" d="M27 1333v129h553v-129h-205v-592h-146v592h-202zM635 741v721h217l178 -534l187 534h210v-721h-147v414l4 129h-6l-193 -543h-122l-185 543h-6l4 -119v-424h-141z" />
-<glyph unicode="◼" horiz-adv-x="1105" d="M0 0v1105h1105v-1105h-1105z" />
-<hkern u1=""" u2="Ÿ" k="-20" />
-<hkern u1=""" u2="œ" k="123" />
-<hkern u1=""" u2="ü" k="61" />
-<hkern u1=""" u2="û" k="61" />
-<hkern u1=""" u2="ú" k="61" />
-<hkern u1=""" u2="ù" k="61" />
-<hkern u1=""" u2="ø" k="123" />
-<hkern u1=""" u2="ö" k="123" />
-<hkern u1=""" u2="õ" k="123" />
-<hkern u1=""" u2="ô" k="123" />
-<hkern u1=""" u2="ó" k="123" />
-<hkern u1=""" u2="ò" k="123" />
-<hkern u1=""" u2="ë" k="123" />
-<hkern u1=""" u2="ê" k="123" />
-<hkern u1=""" u2="é" k="123" />
-<hkern u1=""" u2="è" k="123" />
-<hkern u1=""" u2="ç" k="123" />
-<hkern u1=""" u2="æ" k="82" />
-<hkern u1=""" u2="å" k="82" />
-<hkern u1=""" u2="ä" k="82" />
-<hkern u1=""" u2="ã" k="82" />
-<hkern u1=""" u2="â" k="82" />
-<hkern u1=""" u2="á" k="82" />
-<hkern u1=""" u2="à" k="123" />
-<hkern u1=""" u2="Ý" k="-20" />
-<hkern u1=""" u2="Å" k="143" />
-<hkern u1=""" u2="Ä" k="143" />
-<hkern u1=""" u2="Ã" k="143" />
-<hkern u1=""" u2="Â" k="143" />
-<hkern u1=""" u2="Á" k="143" />
-<hkern u1=""" u2="À" k="143" />
-<hkern u1=""" u2="u" k="61" />
-<hkern u1=""" u2="s" k="61" />
-<hkern u1=""" u2="r" k="61" />
-<hkern u1=""" u2="q" k="123" />
-<hkern u1=""" u2="p" k="61" />
-<hkern u1=""" u2="o" k="123" />
-<hkern u1=""" u2="n" k="61" />
-<hkern u1=""" u2="m" k="61" />
-<hkern u1=""" u2="g" k="61" />
-<hkern u1=""" u2="e" k="123" />
-<hkern u1=""" u2="d" k="123" />
-<hkern u1=""" u2="c" k="123" />
-<hkern u1=""" u2="a" k="82" />
-<hkern u1=""" u2="Y" k="-20" />
-<hkern u1=""" u2="W" k="-41" />
-<hkern u1=""" u2="V" k="-41" />
-<hkern u1=""" u2="T" k="-41" />
-<hkern u1=""" u2="A" k="143" />
-<hkern u1="'" u2="Ÿ" k="-20" />
-<hkern u1="'" u2="œ" k="123" />
-<hkern u1="'" u2="ü" k="61" />
-<hkern u1="'" u2="û" k="61" />
-<hkern u1="'" u2="ú" k="61" />
-<hkern u1="'" u2="ù" k="61" />
-<hkern u1="'" u2="ø" k="123" />
-<hkern u1="'" u2="ö" k="123" />
-<hkern u1="'" u2="õ" k="123" />
-<hkern u1="'" u2="ô" k="123" />
-<hkern u1="'" u2="ó" k="123" />
-<hkern u1="'" u2="ò" k="123" />
-<hkern u1="'" u2="ë" k="123" />
-<hkern u1="'" u2="ê" k="123" />
-<hkern u1="'" u2="é" k="123" />
-<hkern u1="'" u2="è" k="123" />
-<hkern u1="'" u2="ç" k="123" />
-<hkern u1="'" u2="æ" k="82" />
-<hkern u1="'" u2="å" k="82" />
-<hkern u1="'" u2="ä" k="82" />
-<hkern u1="'" u2="ã" k="82" />
-<hkern u1="'" u2="â" k="82" />
-<hkern u1="'" u2="á" k="82" />
-<hkern u1="'" u2="à" k="123" />
-<hkern u1="'" u2="Ý" k="-20" />
-<hkern u1="'" u2="Å" k="143" />
-<hkern u1="'" u2="Ä" k="143" />
-<hkern u1="'" u2="Ã" k="143" />
-<hkern u1="'" u2="Â" k="143" />
-<hkern u1="'" u2="Á" k="143" />
-<hkern u1="'" u2="À" k="143" />
-<hkern u1="'" u2="u" k="61" />
-<hkern u1="'" u2="s" k="61" />
-<hkern u1="'" u2="r" k="61" />
-<hkern u1="'" u2="q" k="123" />
-<hkern u1="'" u2="p" k="61" />
-<hkern u1="'" u2="o" k="123" />
-<hkern u1="'" u2="n" k="61" />
-<hkern u1="'" u2="m" k="61" />
-<hkern u1="'" u2="g" k="61" />
-<hkern u1="'" u2="e" k="123" />
-<hkern u1="'" u2="d" k="123" />
-<hkern u1="'" u2="c" k="123" />
-<hkern u1="'" u2="a" k="82" />
-<hkern u1="'" u2="Y" k="-20" />
-<hkern u1="'" u2="W" k="-41" />
-<hkern u1="'" u2="V" k="-41" />
-<hkern u1="'" u2="T" k="-41" />
-<hkern u1="'" u2="A" k="143" />
-<hkern u1="(" u2="J" k="-184" />
-<hkern u1="," u2="Ÿ" k="123" />
-<hkern u1="," u2="Œ" k="102" />
-<hkern u1="," u2="Ý" k="123" />
-<hkern u1="," u2="Ü" k="41" />
-<hkern u1="," u2="Û" k="41" />
-<hkern u1="," u2="Ú" k="41" />
-<hkern u1="," u2="Ù" k="41" />
-<hkern u1="," u2="Ø" k="102" />
-<hkern u1="," u2="Ö" k="102" />
-<hkern u1="," u2="Õ" k="102" />
-<hkern u1="," u2="Ô" k="102" />
-<hkern u1="," u2="Ó" k="102" />
-<hkern u1="," u2="Ò" k="102" />
-<hkern u1="," u2="Ç" k="102" />
-<hkern u1="," u2="Y" k="123" />
-<hkern u1="," u2="W" k="123" />
-<hkern u1="," u2="V" k="123" />
-<hkern u1="," u2="U" k="41" />
-<hkern u1="," u2="T" k="143" />
-<hkern u1="," u2="Q" k="102" />
-<hkern u1="," u2="O" k="102" />
-<hkern u1="," u2="G" k="102" />
-<hkern u1="," u2="C" k="102" />
-<hkern u1="-" u2="T" k="82" />
-<hkern u1="." u2="Ÿ" k="123" />
-<hkern u1="." u2="Œ" k="102" />
-<hkern u1="." u2="Ý" k="123" />
-<hkern u1="." u2="Ü" k="41" />
-<hkern u1="." u2="Û" k="41" />
-<hkern u1="." u2="Ú" k="41" />
-<hkern u1="." u2="Ù" k="41" />
-<hkern u1="." u2="Ø" k="102" />
-<hkern u1="." u2="Ö" k="102" />
-<hkern u1="." u2="Õ" k="102" />
-<hkern u1="." u2="Ô" k="102" />
-<hkern u1="." u2="Ó" k="102" />
-<hkern u1="." u2="Ò" k="102" />
-<hkern u1="." u2="Ç" k="102" />
-<hkern u1="." u2="Y" k="123" />
-<hkern u1="." u2="W" k="123" />
-<hkern u1="." u2="V" k="123" />
-<hkern u1="." u2="U" k="41" />
-<hkern u1="." u2="T" k="143" />
-<hkern u1="." u2="Q" k="102" />
-<hkern u1="." u2="O" k="102" />
-<hkern u1="." u2="G" k="102" />
-<hkern u1="." u2="C" k="102" />
-<hkern u1="A" u2="”" k="143" />
-<hkern u1="A" u2="’" k="143" />
-<hkern u1="A" u2="Ÿ" k="123" />
-<hkern u1="A" u2="Œ" k="41" />
-<hkern u1="A" u2="Ý" k="123" />
-<hkern u1="A" u2="Ø" k="41" />
-<hkern u1="A" u2="Ö" k="41" />
-<hkern u1="A" u2="Õ" k="41" />
-<hkern u1="A" u2="Ô" k="41" />
-<hkern u1="A" u2="Ó" k="41" />
-<hkern u1="A" u2="Ò" k="41" />
-<hkern u1="A" u2="Ç" k="41" />
-<hkern u1="A" u2="Y" k="123" />
-<hkern u1="A" u2="W" k="82" />
-<hkern u1="A" u2="V" k="82" />
-<hkern u1="A" u2="T" k="143" />
-<hkern u1="A" u2="Q" k="41" />
-<hkern u1="A" u2="O" k="41" />
-<hkern u1="A" u2="J" k="-266" />
-<hkern u1="A" u2="G" k="41" />
-<hkern u1="A" u2="C" k="41" />
-<hkern u1="A" u2="'" k="143" />
-<hkern u1="A" u2=""" k="143" />
-<hkern u1="B" u2="„" k="82" />
-<hkern u1="B" u2="‚" k="82" />
-<hkern u1="B" u2="Ÿ" k="20" />
-<hkern u1="B" u2="Ý" k="20" />
-<hkern u1="B" u2="Å" k="41" />
-<hkern u1="B" u2="Ä" k="41" />
-<hkern u1="B" u2="Ã" k="41" />
-<hkern u1="B" u2="Â" k="41" />
-<hkern u1="B" u2="Á" k="41" />
-<hkern u1="B" u2="À" k="41" />
-<hkern u1="B" u2="Z" k="20" />
-<hkern u1="B" u2="Y" k="20" />
-<hkern u1="B" u2="X" k="41" />
-<hkern u1="B" u2="W" k="20" />
-<hkern u1="B" u2="V" k="20" />
-<hkern u1="B" u2="T" k="61" />
-<hkern u1="B" u2="A" k="41" />
-<hkern u1="B" u2="." k="82" />
-<hkern u1="B" u2="," k="82" />
-<hkern u1="C" u2="Œ" k="41" />
-<hkern u1="C" u2="Ø" k="41" />
-<hkern u1="C" u2="Ö" k="41" />
-<hkern u1="C" u2="Õ" k="41" />
-<hkern u1="C" u2="Ô" k="41" />
-<hkern u1="C" u2="Ó" k="41" />
-<hkern u1="C" u2="Ò" k="41" />
-<hkern u1="C" u2="Ç" k="41" />
-<hkern u1="C" u2="Q" k="41" />
-<hkern u1="C" u2="O" k="41" />
-<hkern u1="C" u2="G" k="41" />
-<hkern u1="C" u2="C" k="41" />
-<hkern u1="D" u2="„" k="82" />
-<hkern u1="D" u2="‚" k="82" />
-<hkern u1="D" u2="Ÿ" k="20" />
-<hkern u1="D" u2="Ý" k="20" />
-<hkern u1="D" u2="Å" k="41" />
-<hkern u1="D" u2="Ä" k="41" />
-<hkern u1="D" u2="Ã" k="41" />
-<hkern u1="D" u2="Â" k="41" />
-<hkern u1="D" u2="Á" k="41" />
-<hkern u1="D" u2="À" k="41" />
-<hkern u1="D" u2="Z" k="20" />
-<hkern u1="D" u2="Y" k="20" />
-<hkern u1="D" u2="X" k="41" />
-<hkern u1="D" u2="W" k="20" />
-<hkern u1="D" u2="V" k="20" />
-<hkern u1="D" u2="T" k="61" />
-<hkern u1="D" u2="A" k="41" />
-<hkern u1="D" u2="." k="82" />
-<hkern u1="D" u2="," k="82" />
-<hkern u1="E" u2="J" k="-123" />
-<hkern u1="F" u2="„" k="123" />
-<hkern u1="F" u2="‚" k="123" />
-<hkern u1="F" u2="Å" k="41" />
-<hkern u1="F" u2="Ä" k="41" />
-<hkern u1="F" u2="Ã" k="41" />
-<hkern u1="F" u2="Â" k="41" />
-<hkern u1="F" u2="Á" k="41" />
-<hkern u1="F" u2="À" k="41" />
-<hkern u1="F" u2="A" k="41" />
-<hkern u1="F" u2="?" k="-41" />
-<hkern u1="F" u2="." k="123" />
-<hkern u1="F" u2="," k="123" />
-<hkern u1="K" u2="Œ" k="41" />
-<hkern u1="K" u2="Ø" k="41" />
-<hkern u1="K" u2="Ö" k="41" />
-<hkern u1="K" u2="Õ" k="41" />
-<hkern u1="K" u2="Ô" k="41" />
-<hkern u1="K" u2="Ó" k="41" />
-<hkern u1="K" u2="Ò" k="41" />
-<hkern u1="K" u2="Ç" k="41" />
-<hkern u1="K" u2="Q" k="41" />
-<hkern u1="K" u2="O" k="41" />
-<hkern u1="K" u2="G" k="41" />
-<hkern u1="K" u2="C" k="41" />
-<hkern u1="L" u2="”" k="164" />
-<hkern u1="L" u2="’" k="164" />
-<hkern u1="L" u2="Ÿ" k="61" />
-<hkern u1="L" u2="Œ" k="41" />
-<hkern u1="L" u2="Ý" k="61" />
-<hkern u1="L" u2="Ü" k="20" />
-<hkern u1="L" u2="Û" k="20" />
-<hkern u1="L" u2="Ú" k="20" />
-<hkern u1="L" u2="Ù" k="20" />
-<hkern u1="L" u2="Ø" k="41" />
-<hkern u1="L" u2="Ö" k="41" />
-<hkern u1="L" u2="Õ" k="41" />
-<hkern u1="L" u2="Ô" k="41" />
-<hkern u1="L" u2="Ó" k="41" />
-<hkern u1="L" u2="Ò" k="41" />
-<hkern u1="L" u2="Ç" k="41" />
-<hkern u1="L" u2="Y" k="61" />
-<hkern u1="L" u2="W" k="41" />
-<hkern u1="L" u2="V" k="41" />
-<hkern u1="L" u2="U" k="20" />
-<hkern u1="L" u2="T" k="41" />
-<hkern u1="L" u2="Q" k="41" />
-<hkern u1="L" u2="O" k="41" />
-<hkern u1="L" u2="G" k="41" />
-<hkern u1="L" u2="C" k="41" />
-<hkern u1="L" u2="'" k="164" />
-<hkern u1="L" u2=""" k="164" />
-<hkern u1="O" u2="„" k="82" />
-<hkern u1="O" u2="‚" k="82" />
-<hkern u1="O" u2="Ÿ" k="20" />
-<hkern u1="O" u2="Ý" k="20" />
-<hkern u1="O" u2="Å" k="41" />
-<hkern u1="O" u2="Ä" k="41" />
-<hkern u1="O" u2="Ã" k="41" />
-<hkern u1="O" u2="Â" k="41" />
-<hkern u1="O" u2="Á" k="41" />
-<hkern u1="O" u2="À" k="41" />
-<hkern u1="O" u2="Z" k="20" />
-<hkern u1="O" u2="Y" k="20" />
-<hkern u1="O" u2="X" k="41" />
-<hkern u1="O" u2="W" k="20" />
-<hkern u1="O" u2="V" k="20" />
-<hkern u1="O" u2="T" k="61" />
-<hkern u1="O" u2="A" k="41" />
-<hkern u1="O" u2="." k="82" />
-<hkern u1="O" u2="," k="82" />
-<hkern u1="P" u2="„" k="266" />
-<hkern u1="P" u2="‚" k="266" />
-<hkern u1="P" u2="Å" k="102" />
-<hkern u1="P" u2="Ä" k="102" />
-<hkern u1="P" u2="Ã" k="102" />
-<hkern u1="P" u2="Â" k="102" />
-<hkern u1="P" u2="Á" k="102" />
-<hkern u1="P" u2="À" k="102" />
-<hkern u1="P" u2="Z" k="20" />
-<hkern u1="P" u2="X" k="41" />
-<hkern u1="P" u2="A" k="102" />
-<hkern u1="P" u2="." k="266" />
-<hkern u1="P" u2="," k="266" />
-<hkern u1="Q" u2="„" k="82" />
-<hkern u1="Q" u2="‚" k="82" />
-<hkern u1="Q" u2="Ÿ" k="20" />
-<hkern u1="Q" u2="Ý" k="20" />
-<hkern u1="Q" u2="Å" k="41" />
-<hkern u1="Q" u2="Ä" k="41" />
-<hkern u1="Q" u2="Ã" k="41" />
-<hkern u1="Q" u2="Â" k="41" />
-<hkern u1="Q" u2="Á" k="41" />
-<hkern u1="Q" u2="À" k="41" />
-<hkern u1="Q" u2="Z" k="20" />
-<hkern u1="Q" u2="Y" k="20" />
-<hkern u1="Q" u2="X" k="41" />
-<hkern u1="Q" u2="W" k="20" />
-<hkern u1="Q" u2="V" k="20" />
-<hkern u1="Q" u2="T" k="61" />
-<hkern u1="Q" u2="A" k="41" />
-<hkern u1="Q" u2="." k="82" />
-<hkern u1="Q" u2="," k="82" />
-<hkern u1="T" u2="„" k="123" />
-<hkern u1="T" u2="‚" k="123" />
-<hkern u1="T" u2="—" k="82" />
-<hkern u1="T" u2="–" k="82" />
-<hkern u1="T" u2="œ" k="143" />
-<hkern u1="T" u2="Œ" k="41" />
-<hkern u1="T" u2="ý" k="41" />
-<hkern u1="T" u2="ü" k="102" />
-<hkern u1="T" u2="û" k="102" />
-<hkern u1="T" u2="ú" k="102" />
-<hkern u1="T" u2="ù" k="102" />
-<hkern u1="T" u2="ø" k="143" />
-<hkern u1="T" u2="ö" k="143" />
-<hkern u1="T" u2="õ" k="143" />
-<hkern u1="T" u2="ô" k="143" />
-<hkern u1="T" u2="ó" k="143" />
-<hkern u1="T" u2="ò" k="143" />
-<hkern u1="T" u2="ë" k="143" />
-<hkern u1="T" u2="ê" k="143" />
-<hkern u1="T" u2="é" k="143" />
-<hkern u1="T" u2="è" k="143" />
-<hkern u1="T" u2="ç" k="143" />
-<hkern u1="T" u2="æ" k="164" />
-<hkern u1="T" u2="å" k="164" />
-<hkern u1="T" u2="ä" k="164" />
-<hkern u1="T" u2="ã" k="164" />
-<hkern u1="T" u2="â" k="164" />
-<hkern u1="T" u2="á" k="164" />
-<hkern u1="T" u2="à" k="143" />
-<hkern u1="T" u2="Ø" k="41" />
-<hkern u1="T" u2="Ö" k="41" />
-<hkern u1="T" u2="Õ" k="41" />
-<hkern u1="T" u2="Ô" k="41" />
-<hkern u1="T" u2="Ó" k="41" />
-<hkern u1="T" u2="Ò" k="41" />
-<hkern u1="T" u2="Ç" k="41" />
-<hkern u1="T" u2="Å" k="143" />
-<hkern u1="T" u2="Ä" k="143" />
-<hkern u1="T" u2="Ã" k="143" />
-<hkern u1="T" u2="Â" k="143" />
-<hkern u1="T" u2="Á" k="143" />
-<hkern u1="T" u2="À" k="143" />
-<hkern u1="T" u2="z" k="82" />
-<hkern u1="T" u2="y" k="41" />
-<hkern u1="T" u2="x" k="41" />
-<hkern u1="T" u2="w" k="41" />
-<hkern u1="T" u2="v" k="41" />
-<hkern u1="T" u2="u" k="102" />
-<hkern u1="T" u2="s" k="123" />
-<hkern u1="T" u2="r" k="102" />
-<hkern u1="T" u2="q" k="143" />
-<hkern u1="T" u2="p" k="102" />
-<hkern u1="T" u2="o" k="143" />
-<hkern u1="T" u2="n" k="102" />
-<hkern u1="T" u2="m" k="102" />
-<hkern u1="T" u2="g" k="143" />
-<hkern u1="T" u2="e" k="143" />
-<hkern u1="T" u2="d" k="143" />
-<hkern u1="T" u2="c" k="143" />
-<hkern u1="T" u2="a" k="164" />
-<hkern u1="T" u2="T" k="-41" />
-<hkern u1="T" u2="Q" k="41" />
-<hkern u1="T" u2="O" k="41" />
-<hkern u1="T" u2="G" k="41" />
-<hkern u1="T" u2="C" k="41" />
-<hkern u1="T" u2="A" k="143" />
-<hkern u1="T" u2="?" k="-41" />
-<hkern u1="T" u2="." k="123" />
-<hkern u1="T" u2="-" k="82" />
-<hkern u1="T" u2="," k="123" />
-<hkern u1="U" u2="„" k="41" />
-<hkern u1="U" u2="‚" k="41" />
-<hkern u1="U" u2="Å" k="20" />
-<hkern u1="U" u2="Ä" k="20" />
-<hkern u1="U" u2="Ã" k="20" />
-<hkern u1="U" u2="Â" k="20" />
-<hkern u1="U" u2="Á" k="20" />
-<hkern u1="U" u2="À" k="20" />
-<hkern u1="U" u2="A" k="20" />
-<hkern u1="U" u2="." k="41" />
-<hkern u1="U" u2="," k="41" />
-<hkern u1="V" u2="„" k="102" />
-<hkern u1="V" u2="‚" k="102" />
-<hkern u1="V" u2="œ" k="41" />
-<hkern u1="V" u2="Œ" k="20" />
-<hkern u1="V" u2="ü" k="20" />
-<hkern u1="V" u2="û" k="20" />
-<hkern u1="V" u2="ú" k="20" />
-<hkern u1="V" u2="ù" k="20" />
-<hkern u1="V" u2="ø" k="41" />
-<hkern u1="V" u2="ö" k="41" />
-<hkern u1="V" u2="õ" k="41" />
-<hkern u1="V" u2="ô" k="41" />
-<hkern u1="V" u2="ó" k="41" />
-<hkern u1="V" u2="ò" k="41" />
-<hkern u1="V" u2="ë" k="41" />
-<hkern u1="V" u2="ê" k="41" />
-<hkern u1="V" u2="é" k="41" />
-<hkern u1="V" u2="è" k="41" />
-<hkern u1="V" u2="ç" k="41" />
-<hkern u1="V" u2="æ" k="41" />
-<hkern u1="V" u2="å" k="41" />
-<hkern u1="V" u2="ä" k="41" />
-<hkern u1="V" u2="ã" k="41" />
-<hkern u1="V" u2="â" k="41" />
-<hkern u1="V" u2="á" k="41" />
-<hkern u1="V" u2="à" k="41" />
-<hkern u1="V" u2="Ø" k="20" />
-<hkern u1="V" u2="Ö" k="20" />
-<hkern u1="V" u2="Õ" k="20" />
-<hkern u1="V" u2="Ô" k="20" />
-<hkern u1="V" u2="Ó" k="20" />
-<hkern u1="V" u2="Ò" k="20" />
-<hkern u1="V" u2="Ç" k="20" />
-<hkern u1="V" u2="Å" k="82" />
-<hkern u1="V" u2="Ä" k="82" />
-<hkern u1="V" u2="Ã" k="82" />
-<hkern u1="V" u2="Â" k="82" />
-<hkern u1="V" u2="Á" k="82" />
-<hkern u1="V" u2="À" k="82" />
-<hkern u1="V" u2="u" k="20" />
-<hkern u1="V" u2="s" k="20" />
-<hkern u1="V" u2="r" k="20" />
-<hkern u1="V" u2="q" k="41" />
-<hkern u1="V" u2="p" k="20" />
-<hkern u1="V" u2="o" k="41" />
-<hkern u1="V" u2="n" k="20" />
-<hkern u1="V" u2="m" k="20" />
-<hkern u1="V" u2="g" k="20" />
-<hkern u1="V" u2="e" k="41" />
-<hkern u1="V" u2="d" k="41" />
-<hkern u1="V" u2="c" k="41" />
-<hkern u1="V" u2="a" k="41" />
-<hkern u1="V" u2="Q" k="20" />
-<hkern u1="V" u2="O" k="20" />
-<hkern u1="V" u2="G" k="20" />
-<hkern u1="V" u2="C" k="20" />
-<hkern u1="V" u2="A" k="82" />
-<hkern u1="V" u2="?" k="-41" />
-<hkern u1="V" u2="." k="102" />
-<hkern u1="V" u2="," k="102" />
-<hkern u1="W" u2="„" k="102" />
-<hkern u1="W" u2="‚" k="102" />
-<hkern u1="W" u2="œ" k="41" />
-<hkern u1="W" u2="Œ" k="20" />
-<hkern u1="W" u2="ü" k="20" />
-<hkern u1="W" u2="û" k="20" />
-<hkern u1="W" u2="ú" k="20" />
-<hkern u1="W" u2="ù" k="20" />
-<hkern u1="W" u2="ø" k="41" />
-<hkern u1="W" u2="ö" k="41" />
-<hkern u1="W" u2="õ" k="41" />
-<hkern u1="W" u2="ô" k="41" />
-<hkern u1="W" u2="ó" k="41" />
-<hkern u1="W" u2="ò" k="41" />
-<hkern u1="W" u2="ë" k="41" />
-<hkern u1="W" u2="ê" k="41" />
-<hkern u1="W" u2="é" k="41" />
-<hkern u1="W" u2="è" k="41" />
-<hkern u1="W" u2="ç" k="41" />
-<hkern u1="W" u2="æ" k="41" />
-<hkern u1="W" u2="å" k="41" />
-<hkern u1="W" u2="ä" k="41" />
-<hkern u1="W" u2="ã" k="41" />
-<hkern u1="W" u2="â" k="41" />
-<hkern u1="W" u2="á" k="41" />
-<hkern u1="W" u2="à" k="41" />
-<hkern u1="W" u2="Ø" k="20" />
-<hkern u1="W" u2="Ö" k="20" />
-<hkern u1="W" u2="Õ" k="20" />
-<hkern u1="W" u2="Ô" k="20" />
-<hkern u1="W" u2="Ó" k="20" />
-<hkern u1="W" u2="Ò" k="20" />
-<hkern u1="W" u2="Ç" k="20" />
-<hkern u1="W" u2="Å" k="82" />
-<hkern u1="W" u2="Ä" k="82" />
-<hkern u1="W" u2="Ã" k="82" />
-<hkern u1="W" u2="Â" k="82" />
-<hkern u1="W" u2="Á" k="82" />
-<hkern u1="W" u2="À" k="82" />
-<hkern u1="W" u2="u" k="20" />
-<hkern u1="W" u2="s" k="20" />
-<hkern u1="W" u2="r" k="20" />
-<hkern u1="W" u2="q" k="41" />
-<hkern u1="W" u2="p" k="20" />
-<hkern u1="W" u2="o" k="41" />
-<hkern u1="W" u2="n" k="20" />
-<hkern u1="W" u2="m" k="20" />
-<hkern u1="W" u2="g" k="20" />
-<hkern u1="W" u2="e" k="41" />
-<hkern u1="W" u2="d" k="41" />
-<hkern u1="W" u2="c" k="41" />
-<hkern u1="W" u2="a" k="41" />
-<hkern u1="W" u2="Q" k="20" />
-<hkern u1="W" u2="O" k="20" />
-<hkern u1="W" u2="G" k="20" />
-<hkern u1="W" u2="C" k="20" />
-<hkern u1="W" u2="A" k="82" />
-<hkern u1="W" u2="?" k="-41" />
-<hkern u1="W" u2="." k="102" />
-<hkern u1="W" u2="," k="102" />
-<hkern u1="X" u2="Œ" k="41" />
-<hkern u1="X" u2="Ø" k="41" />
-<hkern u1="X" u2="Ö" k="41" />
-<hkern u1="X" u2="Õ" k="41" />
-<hkern u1="X" u2="Ô" k="41" />
-<hkern u1="X" u2="Ó" k="41" />
-<hkern u1="X" u2="Ò" k="41" />
-<hkern u1="X" u2="Ç" k="41" />
-<hkern u1="X" u2="Q" k="41" />
-<hkern u1="X" u2="O" k="41" />
-<hkern u1="X" u2="G" k="41" />
-<hkern u1="X" u2="C" k="41" />
-<hkern u1="Y" u2="„" k="123" />
-<hkern u1="Y" u2="‚" k="123" />
-<hkern u1="Y" u2="œ" k="102" />
-<hkern u1="Y" u2="Œ" k="41" />
-<hkern u1="Y" u2="ü" k="61" />
-<hkern u1="Y" u2="û" k="61" />
-<hkern u1="Y" u2="ú" k="61" />
-<hkern u1="Y" u2="ù" k="61" />
-<hkern u1="Y" u2="ø" k="102" />
-<hkern u1="Y" u2="ö" k="102" />
-<hkern u1="Y" u2="õ" k="102" />
-<hkern u1="Y" u2="ô" k="102" />
-<hkern u1="Y" u2="ó" k="102" />
-<hkern u1="Y" u2="ò" k="102" />
-<hkern u1="Y" u2="ë" k="102" />
-<hkern u1="Y" u2="ê" k="102" />
-<hkern u1="Y" u2="é" k="102" />
-<hkern u1="Y" u2="è" k="102" />
-<hkern u1="Y" u2="ç" k="102" />
-<hkern u1="Y" u2="æ" k="102" />
-<hkern u1="Y" u2="å" k="102" />
-<hkern u1="Y" u2="ä" k="102" />
-<hkern u1="Y" u2="ã" k="102" />
-<hkern u1="Y" u2="â" k="102" />
-<hkern u1="Y" u2="á" k="102" />
-<hkern u1="Y" u2="à" k="102" />
-<hkern u1="Y" u2="Ø" k="41" />
-<hkern u1="Y" u2="Ö" k="41" />
-<hkern u1="Y" u2="Õ" k="41" />
-<hkern u1="Y" u2="Ô" k="41" />
-<hkern u1="Y" u2="Ó" k="41" />
-<hkern u1="Y" u2="Ò" k="41" />
-<hkern u1="Y" u2="Ç" k="41" />
-<hkern u1="Y" u2="Å" k="123" />
-<hkern u1="Y" u2="Ä" k="123" />
-<hkern u1="Y" u2="Ã" k="123" />
-<hkern u1="Y" u2="Â" k="123" />
-<hkern u1="Y" u2="Á" k="123" />
-<hkern u1="Y" u2="À" k="123" />
-<hkern u1="Y" u2="z" k="41" />
-<hkern u1="Y" u2="u" k="61" />
-<hkern u1="Y" u2="s" k="82" />
-<hkern u1="Y" u2="r" k="61" />
-<hkern u1="Y" u2="q" k="102" />
-<hkern u1="Y" u2="p" k="61" />
-<hkern u1="Y" u2="o" k="102" />
-<hkern u1="Y" u2="n" k="61" />
-<hkern u1="Y" u2="m" k="61" />
-<hkern u1="Y" u2="g" k="41" />
-<hkern u1="Y" u2="e" k="102" />
-<hkern u1="Y" u2="d" k="102" />
-<hkern u1="Y" u2="c" k="102" />
-<hkern u1="Y" u2="a" k="102" />
-<hkern u1="Y" u2="Q" k="41" />
-<hkern u1="Y" u2="O" k="41" />
-<hkern u1="Y" u2="G" k="41" />
-<hkern u1="Y" u2="C" k="41" />
-<hkern u1="Y" u2="A" k="123" />
-<hkern u1="Y" u2="?" k="-41" />
-<hkern u1="Y" u2="." k="123" />
-<hkern u1="Y" u2="," k="123" />
-<hkern u1="Z" u2="Œ" k="20" />
-<hkern u1="Z" u2="Ø" k="20" />
-<hkern u1="Z" u2="Ö" k="20" />
-<hkern u1="Z" u2="Õ" k="20" />
-<hkern u1="Z" u2="Ô" k="20" />
-<hkern u1="Z" u2="Ó" k="20" />
-<hkern u1="Z" u2="Ò" k="20" />
-<hkern u1="Z" u2="Ç" k="20" />
-<hkern u1="Z" u2="Q" k="20" />
-<hkern u1="Z" u2="O" k="20" />
-<hkern u1="Z" u2="G" k="20" />
-<hkern u1="Z" u2="C" k="20" />
-<hkern u1="[" u2="J" k="-184" />
-<hkern u1="a" u2="”" k="20" />
-<hkern u1="a" u2="’" k="20" />
-<hkern u1="a" u2="'" k="20" />
-<hkern u1="a" u2=""" k="20" />
-<hkern u1="b" u2="”" k="20" />
-<hkern u1="b" u2="’" k="20" />
-<hkern u1="b" u2="ý" k="41" />
-<hkern u1="b" u2="z" k="20" />
-<hkern u1="b" u2="y" k="41" />
-<hkern u1="b" u2="x" k="41" />
-<hkern u1="b" u2="w" k="41" />
-<hkern u1="b" u2="v" k="41" />
-<hkern u1="b" u2="'" k="20" />
-<hkern u1="b" u2=""" k="20" />
-<hkern u1="c" u2="”" k="-41" />
-<hkern u1="c" u2="’" k="-41" />
-<hkern u1="c" u2="'" k="-41" />
-<hkern u1="c" u2=""" k="-41" />
-<hkern u1="e" u2="”" k="20" />
-<hkern u1="e" u2="’" k="20" />
-<hkern u1="e" u2="ý" k="41" />
-<hkern u1="e" u2="z" k="20" />
-<hkern u1="e" u2="y" k="41" />
-<hkern u1="e" u2="x" k="41" />
-<hkern u1="e" u2="w" k="41" />
-<hkern u1="e" u2="v" k="41" />
-<hkern u1="e" u2="'" k="20" />
-<hkern u1="e" u2=""" k="20" />
-<hkern u1="f" u2="”" k="-123" />
-<hkern u1="f" u2="’" k="-123" />
-<hkern u1="f" u2="'" k="-123" />
-<hkern u1="f" u2=""" k="-123" />
-<hkern u1="h" u2="”" k="20" />
-<hkern u1="h" u2="’" k="20" />
-<hkern u1="h" u2="'" k="20" />
-<hkern u1="h" u2=""" k="20" />
-<hkern u1="k" u2="œ" k="41" />
-<hkern u1="k" u2="ø" k="41" />
-<hkern u1="k" u2="ö" k="41" />
-<hkern u1="k" u2="õ" k="41" />
-<hkern u1="k" u2="ô" k="41" />
-<hkern u1="k" u2="ó" k="41" />
-<hkern u1="k" u2="ò" k="41" />
-<hkern u1="k" u2="ë" k="41" />
-<hkern u1="k" u2="ê" k="41" />
-<hkern u1="k" u2="é" k="41" />
-<hkern u1="k" u2="è" k="41" />
-<hkern u1="k" u2="ç" k="41" />
-<hkern u1="k" u2="à" k="41" />
-<hkern u1="k" u2="q" k="41" />
-<hkern u1="k" u2="o" k="41" />
-<hkern u1="k" u2="e" k="41" />
-<hkern u1="k" u2="d" k="41" />
-<hkern u1="k" u2="c" k="41" />
-<hkern u1="m" u2="”" k="20" />
-<hkern u1="m" u2="’" k="20" />
-<hkern u1="m" u2="'" k="20" />
-<hkern u1="m" u2=""" k="20" />
-<hkern u1="n" u2="”" k="20" />
-<hkern u1="n" u2="’" k="20" />
-<hkern u1="n" u2="'" k="20" />
-<hkern u1="n" u2=""" k="20" />
-<hkern u1="o" u2="”" k="20" />
-<hkern u1="o" u2="’" k="20" />
-<hkern u1="o" u2="ý" k="41" />
-<hkern u1="o" u2="z" k="20" />
-<hkern u1="o" u2="y" k="41" />
-<hkern u1="o" u2="x" k="41" />
-<hkern u1="o" u2="w" k="41" />
-<hkern u1="o" u2="v" k="41" />
-<hkern u1="o" u2="'" k="20" />
-<hkern u1="o" u2=""" k="20" />
-<hkern u1="p" u2="”" k="20" />
-<hkern u1="p" u2="’" k="20" />
-<hkern u1="p" u2="ý" k="41" />
-<hkern u1="p" u2="z" k="20" />
-<hkern u1="p" u2="y" k="41" />
-<hkern u1="p" u2="x" k="41" />
-<hkern u1="p" u2="w" k="41" />
-<hkern u1="p" u2="v" k="41" />
-<hkern u1="p" u2="'" k="20" />
-<hkern u1="p" u2=""" k="20" />
-<hkern u1="r" u2="”" k="-82" />
-<hkern u1="r" u2="’" k="-82" />
-<hkern u1="r" u2="œ" k="41" />
-<hkern u1="r" u2="ø" k="41" />
-<hkern u1="r" u2="ö" k="41" />
-<hkern u1="r" u2="õ" k="41" />
-<hkern u1="r" u2="ô" k="41" />
-<hkern u1="r" u2="ó" k="41" />
-<hkern u1="r" u2="ò" k="41" />
-<hkern u1="r" u2="ë" k="41" />
-<hkern u1="r" u2="ê" k="41" />
-<hkern u1="r" u2="é" k="41" />
-<hkern u1="r" u2="è" k="41" />
-<hkern u1="r" u2="ç" k="41" />
-<hkern u1="r" u2="æ" k="41" />
-<hkern u1="r" u2="å" k="41" />
-<hkern u1="r" u2="ä" k="41" />
-<hkern u1="r" u2="ã" k="41" />
-<hkern u1="r" u2="â" k="41" />
-<hkern u1="r" u2="á" k="41" />
-<hkern u1="r" u2="à" k="41" />
-<hkern u1="r" u2="q" k="41" />
-<hkern u1="r" u2="o" k="41" />
-<hkern u1="r" u2="g" k="20" />
-<hkern u1="r" u2="e" k="41" />
-<hkern u1="r" u2="d" k="41" />
-<hkern u1="r" u2="c" k="41" />
-<hkern u1="r" u2="a" k="41" />
-<hkern u1="r" u2="'" k="-82" />
-<hkern u1="r" u2=""" k="-82" />
-<hkern u1="t" u2="”" k="-41" />
-<hkern u1="t" u2="’" k="-41" />
-<hkern u1="t" u2="'" k="-41" />
-<hkern u1="t" u2=""" k="-41" />
-<hkern u1="v" u2="„" k="82" />
-<hkern u1="v" u2="”" k="-82" />
-<hkern u1="v" u2="‚" k="82" />
-<hkern u1="v" u2="’" k="-82" />
-<hkern u1="v" u2="?" k="-41" />
-<hkern u1="v" u2="." k="82" />
-<hkern u1="v" u2="," k="82" />
-<hkern u1="v" u2="'" k="-82" />
-<hkern u1="v" u2=""" k="-82" />
-<hkern u1="w" u2="„" k="82" />
-<hkern u1="w" u2="”" k="-82" />
-<hkern u1="w" u2="‚" k="82" />
-<hkern u1="w" u2="’" k="-82" />
-<hkern u1="w" u2="?" k="-41" />
-<hkern u1="w" u2="." k="82" />
-<hkern u1="w" u2="," k="82" />
-<hkern u1="w" u2="'" k="-82" />
-<hkern u1="w" u2=""" k="-82" />
-<hkern u1="x" u2="œ" k="41" />
-<hkern u1="x" u2="ø" k="41" />
-<hkern u1="x" u2="ö" k="41" />
-<hkern u1="x" u2="õ" k="41" />
-<hkern u1="x" u2="ô" k="41" />
-<hkern u1="x" u2="ó" k="41" />
-<hkern u1="x" u2="ò" k="41" />
-<hkern u1="x" u2="ë" k="41" />
-<hkern u1="x" u2="ê" k="41" />
-<hkern u1="x" u2="é" k="41" />
-<hkern u1="x" u2="è" k="41" />
-<hkern u1="x" u2="ç" k="41" />
-<hkern u1="x" u2="à" k="41" />
-<hkern u1="x" u2="q" k="41" />
-<hkern u1="x" u2="o" k="41" />
-<hkern u1="x" u2="e" k="41" />
-<hkern u1="x" u2="d" k="41" />
-<hkern u1="x" u2="c" k="41" />
-<hkern u1="y" u2="„" k="82" />
-<hkern u1="y" u2="”" k="-82" />
-<hkern u1="y" u2="‚" k="82" />
-<hkern u1="y" u2="’" k="-82" />
-<hkern u1="y" u2="?" k="-41" />
-<hkern u1="y" u2="." k="82" />
-<hkern u1="y" u2="," k="82" />
-<hkern u1="y" u2="'" k="-82" />
-<hkern u1="y" u2=""" k="-82" />
-<hkern u1="{" u2="J" k="-184" />
-<hkern u1="À" u2="”" k="143" />
-<hkern u1="À" u2="’" k="143" />
-<hkern u1="À" u2="Ÿ" k="123" />
-<hkern u1="À" u2="Œ" k="41" />
-<hkern u1="À" u2="Ý" k="123" />
-<hkern u1="À" u2="Ø" k="41" />
-<hkern u1="À" u2="Ö" k="41" />
-<hkern u1="À" u2="Õ" k="41" />
-<hkern u1="À" u2="Ô" k="41" />
-<hkern u1="À" u2="Ó" k="41" />
-<hkern u1="À" u2="Ò" k="41" />
-<hkern u1="À" u2="Ç" k="41" />
-<hkern u1="À" u2="Y" k="123" />
-<hkern u1="À" u2="W" k="82" />
-<hkern u1="À" u2="V" k="82" />
-<hkern u1="À" u2="T" k="143" />
-<hkern u1="À" u2="Q" k="41" />
-<hkern u1="À" u2="O" k="41" />
-<hkern u1="À" u2="J" k="-266" />
-<hkern u1="À" u2="G" k="41" />
-<hkern u1="À" u2="C" k="41" />
-<hkern u1="À" u2="'" k="143" />
-<hkern u1="À" u2=""" k="143" />
-<hkern u1="Á" u2="”" k="143" />
-<hkern u1="Á" u2="’" k="143" />
-<hkern u1="Á" u2="Ÿ" k="123" />
-<hkern u1="Á" u2="Œ" k="41" />
-<hkern u1="Á" u2="Ý" k="123" />
-<hkern u1="Á" u2="Ø" k="41" />
-<hkern u1="Á" u2="Ö" k="41" />
-<hkern u1="Á" u2="Õ" k="41" />
-<hkern u1="Á" u2="Ô" k="41" />
-<hkern u1="Á" u2="Ó" k="41" />
-<hkern u1="Á" u2="Ò" k="41" />
-<hkern u1="Á" u2="Ç" k="41" />
-<hkern u1="Á" u2="Y" k="123" />
-<hkern u1="Á" u2="W" k="82" />
-<hkern u1="Á" u2="V" k="82" />
-<hkern u1="Á" u2="T" k="143" />
-<hkern u1="Á" u2="Q" k="41" />
-<hkern u1="Á" u2="O" k="41" />
-<hkern u1="Á" u2="J" k="-266" />
-<hkern u1="Á" u2="G" k="41" />
-<hkern u1="Á" u2="C" k="41" />
-<hkern u1="Á" u2="'" k="143" />
-<hkern u1="Á" u2=""" k="143" />
-<hkern u1="Â" u2="”" k="143" />
-<hkern u1="Â" u2="’" k="143" />
-<hkern u1="Â" u2="Ÿ" k="123" />
-<hkern u1="Â" u2="Œ" k="41" />
-<hkern u1="Â" u2="Ý" k="123" />
-<hkern u1="Â" u2="Ø" k="41" />
-<hkern u1="Â" u2="Ö" k="41" />
-<hkern u1="Â" u2="Õ" k="41" />
-<hkern u1="Â" u2="Ô" k="41" />
-<hkern u1="Â" u2="Ó" k="41" />
-<hkern u1="Â" u2="Ò" k="41" />
-<hkern u1="Â" u2="Ç" k="41" />
-<hkern u1="Â" u2="Y" k="123" />
-<hkern u1="Â" u2="W" k="82" />
-<hkern u1="Â" u2="V" k="82" />
-<hkern u1="Â" u2="T" k="143" />
-<hkern u1="Â" u2="Q" k="41" />
-<hkern u1="Â" u2="O" k="41" />
-<hkern u1="Â" u2="J" k="-266" />
-<hkern u1="Â" u2="G" k="41" />
-<hkern u1="Â" u2="C" k="41" />
-<hkern u1="Â" u2="'" k="143" />
-<hkern u1="Â" u2=""" k="143" />
-<hkern u1="Ã" u2="”" k="143" />
-<hkern u1="Ã" u2="’" k="143" />
-<hkern u1="Ã" u2="Ÿ" k="123" />
-<hkern u1="Ã" u2="Œ" k="41" />
-<hkern u1="Ã" u2="Ý" k="123" />
-<hkern u1="Ã" u2="Ø" k="41" />
-<hkern u1="Ã" u2="Ö" k="41" />
-<hkern u1="Ã" u2="Õ" k="41" />
-<hkern u1="Ã" u2="Ô" k="41" />
-<hkern u1="Ã" u2="Ó" k="41" />
-<hkern u1="Ã" u2="Ò" k="41" />
-<hkern u1="Ã" u2="Ç" k="41" />
-<hkern u1="Ã" u2="Y" k="123" />
-<hkern u1="Ã" u2="W" k="82" />
-<hkern u1="Ã" u2="V" k="82" />
-<hkern u1="Ã" u2="T" k="143" />
-<hkern u1="Ã" u2="Q" k="41" />
-<hkern u1="Ã" u2="O" k="41" />
-<hkern u1="Ã" u2="J" k="-266" />
-<hkern u1="Ã" u2="G" k="41" />
-<hkern u1="Ã" u2="C" k="41" />
-<hkern u1="Ã" u2="'" k="143" />
-<hkern u1="Ã" u2=""" k="143" />
-<hkern u1="Ä" u2="”" k="143" />
-<hkern u1="Ä" u2="’" k="143" />
-<hkern u1="Ä" u2="Ÿ" k="123" />
-<hkern u1="Ä" u2="Œ" k="41" />
-<hkern u1="Ä" u2="Ý" k="123" />
-<hkern u1="Ä" u2="Ø" k="41" />
-<hkern u1="Ä" u2="Ö" k="41" />
-<hkern u1="Ä" u2="Õ" k="41" />
-<hkern u1="Ä" u2="Ô" k="41" />
-<hkern u1="Ä" u2="Ó" k="41" />
-<hkern u1="Ä" u2="Ò" k="41" />
-<hkern u1="Ä" u2="Ç" k="41" />
-<hkern u1="Ä" u2="Y" k="123" />
-<hkern u1="Ä" u2="W" k="82" />
-<hkern u1="Ä" u2="V" k="82" />
-<hkern u1="Ä" u2="T" k="143" />
-<hkern u1="Ä" u2="Q" k="41" />
-<hkern u1="Ä" u2="O" k="41" />
-<hkern u1="Ä" u2="J" k="-266" />
-<hkern u1="Ä" u2="G" k="41" />
-<hkern u1="Ä" u2="C" k="41" />
-<hkern u1="Ä" u2="'" k="143" />
-<hkern u1="Ä" u2=""" k="143" />
-<hkern u1="Å" u2="”" k="143" />
-<hkern u1="Å" u2="’" k="143" />
-<hkern u1="Å" u2="Ÿ" k="123" />
-<hkern u1="Å" u2="Œ" k="41" />
-<hkern u1="Å" u2="Ý" k="123" />
-<hkern u1="Å" u2="Ø" k="41" />
-<hkern u1="Å" u2="Ö" k="41" />
-<hkern u1="Å" u2="Õ" k="41" />
-<hkern u1="Å" u2="Ô" k="41" />
-<hkern u1="Å" u2="Ó" k="41" />
-<hkern u1="Å" u2="Ò" k="41" />
-<hkern u1="Å" u2="Ç" k="41" />
-<hkern u1="Å" u2="Y" k="123" />
-<hkern u1="Å" u2="W" k="82" />
-<hkern u1="Å" u2="V" k="82" />
-<hkern u1="Å" u2="T" k="143" />
-<hkern u1="Å" u2="Q" k="41" />
-<hkern u1="Å" u2="O" k="41" />
-<hkern u1="Å" u2="J" k="-266" />
-<hkern u1="Å" u2="G" k="41" />
-<hkern u1="Å" u2="C" k="41" />
-<hkern u1="Å" u2="'" k="143" />
-<hkern u1="Å" u2=""" k="143" />
-<hkern u1="Æ" u2="J" k="-123" />
-<hkern u1="Ç" u2="Œ" k="41" />
-<hkern u1="Ç" u2="Ø" k="41" />
-<hkern u1="Ç" u2="Ö" k="41" />
-<hkern u1="Ç" u2="Õ" k="41" />
-<hkern u1="Ç" u2="Ô" k="41" />
-<hkern u1="Ç" u2="Ó" k="41" />
-<hkern u1="Ç" u2="Ò" k="41" />
-<hkern u1="Ç" u2="Ç" k="41" />
-<hkern u1="Ç" u2="Q" k="41" />
-<hkern u1="Ç" u2="O" k="41" />
-<hkern u1="Ç" u2="G" k="41" />
-<hkern u1="Ç" u2="C" k="41" />
-<hkern u1="È" u2="J" k="-123" />
-<hkern u1="É" u2="J" k="-123" />
-<hkern u1="Ê" u2="J" k="-123" />
-<hkern u1="Ë" u2="J" k="-123" />
-<hkern u1="Ð" u2="„" k="82" />
-<hkern u1="Ð" u2="‚" k="82" />
-<hkern u1="Ð" u2="Ÿ" k="20" />
-<hkern u1="Ð" u2="Ý" k="20" />
-<hkern u1="Ð" u2="Å" k="41" />
-<hkern u1="Ð" u2="Ä" k="41" />
-<hkern u1="Ð" u2="Ã" k="41" />
-<hkern u1="Ð" u2="Â" k="41" />
-<hkern u1="Ð" u2="Á" k="41" />
-<hkern u1="Ð" u2="À" k="41" />
-<hkern u1="Ð" u2="Z" k="20" />
-<hkern u1="Ð" u2="Y" k="20" />
-<hkern u1="Ð" u2="X" k="41" />
-<hkern u1="Ð" u2="W" k="20" />
-<hkern u1="Ð" u2="V" k="20" />
-<hkern u1="Ð" u2="T" k="61" />
-<hkern u1="Ð" u2="A" k="41" />
-<hkern u1="Ð" u2="." k="82" />
-<hkern u1="Ð" u2="," k="82" />
-<hkern u1="Ò" u2="„" k="82" />
-<hkern u1="Ò" u2="‚" k="82" />
-<hkern u1="Ò" u2="Ÿ" k="20" />
-<hkern u1="Ò" u2="Ý" k="20" />
-<hkern u1="Ò" u2="Å" k="41" />
-<hkern u1="Ò" u2="Ä" k="41" />
-<hkern u1="Ò" u2="Ã" k="41" />
-<hkern u1="Ò" u2="Â" k="41" />
-<hkern u1="Ò" u2="Á" k="41" />
-<hkern u1="Ò" u2="À" k="41" />
-<hkern u1="Ò" u2="Z" k="20" />
-<hkern u1="Ò" u2="Y" k="20" />
-<hkern u1="Ò" u2="X" k="41" />
-<hkern u1="Ò" u2="W" k="20" />
-<hkern u1="Ò" u2="V" k="20" />
-<hkern u1="Ò" u2="T" k="61" />
-<hkern u1="Ò" u2="A" k="41" />
-<hkern u1="Ò" u2="." k="82" />
-<hkern u1="Ò" u2="," k="82" />
-<hkern u1="Ó" u2="„" k="82" />
-<hkern u1="Ó" u2="‚" k="82" />
-<hkern u1="Ó" u2="Ÿ" k="20" />
-<hkern u1="Ó" u2="Ý" k="20" />
-<hkern u1="Ó" u2="Å" k="41" />
-<hkern u1="Ó" u2="Ä" k="41" />
-<hkern u1="Ó" u2="Ã" k="41" />
-<hkern u1="Ó" u2="Â" k="41" />
-<hkern u1="Ó" u2="Á" k="41" />
-<hkern u1="Ó" u2="À" k="41" />
-<hkern u1="Ó" u2="Z" k="20" />
-<hkern u1="Ó" u2="Y" k="20" />
-<hkern u1="Ó" u2="X" k="41" />
-<hkern u1="Ó" u2="W" k="20" />
-<hkern u1="Ó" u2="V" k="20" />
-<hkern u1="Ó" u2="T" k="61" />
-<hkern u1="Ó" u2="A" k="41" />
-<hkern u1="Ó" u2="." k="82" />
-<hkern u1="Ó" u2="," k="82" />
-<hkern u1="Ô" u2="„" k="82" />
-<hkern u1="Ô" u2="‚" k="82" />
-<hkern u1="Ô" u2="Ÿ" k="20" />
-<hkern u1="Ô" u2="Ý" k="20" />
-<hkern u1="Ô" u2="Å" k="41" />
-<hkern u1="Ô" u2="Ä" k="41" />
-<hkern u1="Ô" u2="Ã" k="41" />
-<hkern u1="Ô" u2="Â" k="41" />
-<hkern u1="Ô" u2="Á" k="41" />
-<hkern u1="Ô" u2="À" k="41" />
-<hkern u1="Ô" u2="Z" k="20" />
-<hkern u1="Ô" u2="Y" k="20" />
-<hkern u1="Ô" u2="X" k="41" />
-<hkern u1="Ô" u2="W" k="20" />
-<hkern u1="Ô" u2="V" k="20" />
-<hkern u1="Ô" u2="T" k="61" />
-<hkern u1="Ô" u2="A" k="41" />
-<hkern u1="Ô" u2="." k="82" />
-<hkern u1="Ô" u2="," k="82" />
-<hkern u1="Õ" u2="„" k="82" />
-<hkern u1="Õ" u2="‚" k="82" />
-<hkern u1="Õ" u2="Ÿ" k="20" />
-<hkern u1="Õ" u2="Ý" k="20" />
-<hkern u1="Õ" u2="Å" k="41" />
-<hkern u1="Õ" u2="Ä" k="41" />
-<hkern u1="Õ" u2="Ã" k="41" />
-<hkern u1="Õ" u2="Â" k="41" />
-<hkern u1="Õ" u2="Á" k="41" />
-<hkern u1="Õ" u2="À" k="41" />
-<hkern u1="Õ" u2="Z" k="20" />
-<hkern u1="Õ" u2="Y" k="20" />
-<hkern u1="Õ" u2="X" k="41" />
-<hkern u1="Õ" u2="W" k="20" />
-<hkern u1="Õ" u2="V" k="20" />
-<hkern u1="Õ" u2="T" k="61" />
-<hkern u1="Õ" u2="A" k="41" />
-<hkern u1="Õ" u2="." k="82" />
-<hkern u1="Õ" u2="," k="82" />
-<hkern u1="Ö" u2="„" k="82" />
-<hkern u1="Ö" u2="‚" k="82" />
-<hkern u1="Ö" u2="Ÿ" k="20" />
-<hkern u1="Ö" u2="Ý" k="20" />
-<hkern u1="Ö" u2="Å" k="41" />
-<hkern u1="Ö" u2="Ä" k="41" />
-<hkern u1="Ö" u2="Ã" k="41" />
-<hkern u1="Ö" u2="Â" k="41" />
-<hkern u1="Ö" u2="Á" k="41" />
-<hkern u1="Ö" u2="À" k="41" />
-<hkern u1="Ö" u2="Z" k="20" />
-<hkern u1="Ö" u2="Y" k="20" />
-<hkern u1="Ö" u2="X" k="41" />
-<hkern u1="Ö" u2="W" k="20" />
-<hkern u1="Ö" u2="V" k="20" />
-<hkern u1="Ö" u2="T" k="61" />
-<hkern u1="Ö" u2="A" k="41" />
-<hkern u1="Ö" u2="." k="82" />
-<hkern u1="Ö" u2="," k="82" />
-<hkern u1="Ø" u2="„" k="82" />
-<hkern u1="Ø" u2="‚" k="82" />
-<hkern u1="Ø" u2="Ÿ" k="20" />
-<hkern u1="Ø" u2="Ý" k="20" />
-<hkern u1="Ø" u2="Å" k="41" />
-<hkern u1="Ø" u2="Ä" k="41" />
-<hkern u1="Ø" u2="Ã" k="41" />
-<hkern u1="Ø" u2="Â" k="41" />
-<hkern u1="Ø" u2="Á" k="41" />
-<hkern u1="Ø" u2="À" k="41" />
-<hkern u1="Ø" u2="Z" k="20" />
-<hkern u1="Ø" u2="Y" k="20" />
-<hkern u1="Ø" u2="X" k="41" />
-<hkern u1="Ø" u2="W" k="20" />
-<hkern u1="Ø" u2="V" k="20" />
-<hkern u1="Ø" u2="T" k="61" />
-<hkern u1="Ø" u2="A" k="41" />
-<hkern u1="Ø" u2="." k="82" />
-<hkern u1="Ø" u2="," k="82" />
-<hkern u1="Ù" u2="„" k="41" />
-<hkern u1="Ù" u2="‚" k="41" />
-<hkern u1="Ù" u2="Å" k="20" />
-<hkern u1="Ù" u2="Ä" k="20" />
-<hkern u1="Ù" u2="Ã" k="20" />
-<hkern u1="Ù" u2="Â" k="20" />
-<hkern u1="Ù" u2="Á" k="20" />
-<hkern u1="Ù" u2="À" k="20" />
-<hkern u1="Ù" u2="A" k="20" />
-<hkern u1="Ù" u2="." k="41" />
-<hkern u1="Ù" u2="," k="41" />
-<hkern u1="Ú" u2="„" k="41" />
-<hkern u1="Ú" u2="‚" k="41" />
-<hkern u1="Ú" u2="Å" k="20" />
-<hkern u1="Ú" u2="Ä" k="20" />
-<hkern u1="Ú" u2="Ã" k="20" />
-<hkern u1="Ú" u2="Â" k="20" />
-<hkern u1="Ú" u2="Á" k="20" />
-<hkern u1="Ú" u2="À" k="20" />
-<hkern u1="Ú" u2="A" k="20" />
-<hkern u1="Ú" u2="." k="41" />
-<hkern u1="Ú" u2="," k="41" />
-<hkern u1="Û" u2="„" k="41" />
-<hkern u1="Û" u2="‚" k="41" />
-<hkern u1="Û" u2="Å" k="20" />
-<hkern u1="Û" u2="Ä" k="20" />
-<hkern u1="Û" u2="Ã" k="20" />
-<hkern u1="Û" u2="Â" k="20" />
-<hkern u1="Û" u2="Á" k="20" />
-<hkern u1="Û" u2="À" k="20" />
-<hkern u1="Û" u2="A" k="20" />
-<hkern u1="Û" u2="." k="41" />
-<hkern u1="Û" u2="," k="41" />
-<hkern u1="Ü" u2="„" k="41" />
-<hkern u1="Ü" u2="‚" k="41" />
-<hkern u1="Ü" u2="Å" k="20" />
-<hkern u1="Ü" u2="Ä" k="20" />
-<hkern u1="Ü" u2="Ã" k="20" />
-<hkern u1="Ü" u2="Â" k="20" />
-<hkern u1="Ü" u2="Á" k="20" />
-<hkern u1="Ü" u2="À" k="20" />
-<hkern u1="Ü" u2="A" k="20" />
-<hkern u1="Ü" u2="." k="41" />
-<hkern u1="Ü" u2="," k="41" />
-<hkern u1="Ý" u2="„" k="123" />
-<hkern u1="Ý" u2="‚" k="123" />
-<hkern u1="Ý" u2="œ" k="102" />
-<hkern u1="Ý" u2="Œ" k="41" />
-<hkern u1="Ý" u2="ü" k="61" />
-<hkern u1="Ý" u2="û" k="61" />
-<hkern u1="Ý" u2="ú" k="61" />
-<hkern u1="Ý" u2="ù" k="61" />
-<hkern u1="Ý" u2="ø" k="102" />
-<hkern u1="Ý" u2="ö" k="102" />
-<hkern u1="Ý" u2="õ" k="102" />
-<hkern u1="Ý" u2="ô" k="102" />
-<hkern u1="Ý" u2="ó" k="102" />
-<hkern u1="Ý" u2="ò" k="102" />
-<hkern u1="Ý" u2="ë" k="102" />
-<hkern u1="Ý" u2="ê" k="102" />
-<hkern u1="Ý" u2="é" k="102" />
-<hkern u1="Ý" u2="è" k="102" />
-<hkern u1="Ý" u2="ç" k="102" />
-<hkern u1="Ý" u2="æ" k="102" />
-<hkern u1="Ý" u2="å" k="102" />
-<hkern u1="Ý" u2="ä" k="102" />
-<hkern u1="Ý" u2="ã" k="102" />
-<hkern u1="Ý" u2="â" k="102" />
-<hkern u1="Ý" u2="á" k="102" />
-<hkern u1="Ý" u2="à" k="102" />
-<hkern u1="Ý" u2="Ø" k="41" />
-<hkern u1="Ý" u2="Ö" k="41" />
-<hkern u1="Ý" u2="Õ" k="41" />
-<hkern u1="Ý" u2="Ô" k="41" />
-<hkern u1="Ý" u2="Ó" k="41" />
-<hkern u1="Ý" u2="Ò" k="41" />
-<hkern u1="Ý" u2="Ç" k="41" />
-<hkern u1="Ý" u2="Å" k="123" />
-<hkern u1="Ý" u2="Ä" k="123" />
-<hkern u1="Ý" u2="Ã" k="123" />
-<hkern u1="Ý" u2="Â" k="123" />
-<hkern u1="Ý" u2="Á" k="123" />
-<hkern u1="Ý" u2="À" k="123" />
-<hkern u1="Ý" u2="z" k="41" />
-<hkern u1="Ý" u2="u" k="61" />
-<hkern u1="Ý" u2="s" k="82" />
-<hkern u1="Ý" u2="r" k="61" />
-<hkern u1="Ý" u2="q" k="102" />
-<hkern u1="Ý" u2="p" k="61" />
-<hkern u1="Ý" u2="o" k="102" />
-<hkern u1="Ý" u2="n" k="61" />
-<hkern u1="Ý" u2="m" k="61" />
-<hkern u1="Ý" u2="g" k="41" />
-<hkern u1="Ý" u2="e" k="102" />
-<hkern u1="Ý" u2="d" k="102" />
-<hkern u1="Ý" u2="c" k="102" />
-<hkern u1="Ý" u2="a" k="102" />
-<hkern u1="Ý" u2="Q" k="41" />
-<hkern u1="Ý" u2="O" k="41" />
-<hkern u1="Ý" u2="G" k="41" />
-<hkern u1="Ý" u2="C" k="41" />
-<hkern u1="Ý" u2="A" k="123" />
-<hkern u1="Ý" u2="?" k="-41" />
-<hkern u1="Ý" u2="." k="123" />
-<hkern u1="Ý" u2="," k="123" />
-<hkern u1="Þ" u2="„" k="266" />
-<hkern u1="Þ" u2="‚" k="266" />
-<hkern u1="Þ" u2="Å" k="102" />
-<hkern u1="Þ" u2="Ä" k="102" />
-<hkern u1="Þ" u2="Ã" k="102" />
-<hkern u1="Þ" u2="Â" k="102" />
-<hkern u1="Þ" u2="Á" k="102" />
-<hkern u1="Þ" u2="À" k="102" />
-<hkern u1="Þ" u2="Z" k="20" />
-<hkern u1="Þ" u2="X" k="41" />
-<hkern u1="Þ" u2="A" k="102" />
-<hkern u1="Þ" u2="." k="266" />
-<hkern u1="Þ" u2="," k="266" />
-<hkern u1="à" u2="”" k="20" />
-<hkern u1="à" u2="’" k="20" />
-<hkern u1="à" u2="'" k="20" />
-<hkern u1="à" u2=""" k="20" />
-<hkern u1="á" u2="”" k="20" />
-<hkern u1="á" u2="’" k="20" />
-<hkern u1="á" u2="'" k="20" />
-<hkern u1="á" u2=""" k="20" />
-<hkern u1="â" u2="”" k="20" />
-<hkern u1="â" u2="’" k="20" />
-<hkern u1="â" u2="'" k="20" />
-<hkern u1="â" u2=""" k="20" />
-<hkern u1="ã" u2="”" k="20" />
-<hkern u1="ã" u2="’" k="20" />
-<hkern u1="ã" u2="'" k="20" />
-<hkern u1="ã" u2=""" k="20" />
-<hkern u1="ä" u2="”" k="20" />
-<hkern u1="ä" u2="’" k="20" />
-<hkern u1="ä" u2="'" k="20" />
-<hkern u1="ä" u2=""" k="20" />
-<hkern u1="å" u2="”" k="20" />
-<hkern u1="å" u2="’" k="20" />
-<hkern u1="å" u2="'" k="20" />
-<hkern u1="å" u2=""" k="20" />
-<hkern u1="è" u2="”" k="20" />
-<hkern u1="è" u2="’" k="20" />
-<hkern u1="è" u2="ý" k="41" />
-<hkern u1="è" u2="z" k="20" />
-<hkern u1="è" u2="y" k="41" />
-<hkern u1="è" u2="x" k="41" />
-<hkern u1="è" u2="w" k="41" />
-<hkern u1="è" u2="v" k="41" />
-<hkern u1="è" u2="'" k="20" />
-<hkern u1="è" u2=""" k="20" />
-<hkern u1="é" u2="”" k="20" />
-<hkern u1="é" u2="’" k="20" />
-<hkern u1="é" u2="ý" k="41" />
-<hkern u1="é" u2="z" k="20" />
-<hkern u1="é" u2="y" k="41" />
-<hkern u1="é" u2="x" k="41" />
-<hkern u1="é" u2="w" k="41" />
-<hkern u1="é" u2="v" k="41" />
-<hkern u1="é" u2="'" k="20" />
-<hkern u1="é" u2=""" k="20" />
-<hkern u1="ê" u2="”" k="20" />
-<hkern u1="ê" u2="’" k="20" />
-<hkern u1="ê" u2="ý" k="41" />
-<hkern u1="ê" u2="z" k="20" />
-<hkern u1="ê" u2="y" k="41" />
-<hkern u1="ê" u2="x" k="41" />
-<hkern u1="ê" u2="w" k="41" />
-<hkern u1="ê" u2="v" k="41" />
-<hkern u1="ê" u2="'" k="20" />
-<hkern u1="ê" u2=""" k="20" />
-<hkern u1="ë" u2="”" k="20" />
-<hkern u1="ë" u2="’" k="20" />
-<hkern u1="ë" u2="ý" k="41" />
-<hkern u1="ë" u2="z" k="20" />
-<hkern u1="ë" u2="y" k="41" />
-<hkern u1="ë" u2="x" k="41" />
-<hkern u1="ë" u2="w" k="41" />
-<hkern u1="ë" u2="v" k="41" />
-<hkern u1="ë" u2="'" k="20" />
-<hkern u1="ë" u2=""" k="20" />
-<hkern u1="ð" u2="”" k="20" />
-<hkern u1="ð" u2="’" k="20" />
-<hkern u1="ð" u2="ý" k="41" />
-<hkern u1="ð" u2="z" k="20" />
-<hkern u1="ð" u2="y" k="41" />
-<hkern u1="ð" u2="x" k="41" />
-<hkern u1="ð" u2="w" k="41" />
-<hkern u1="ð" u2="v" k="41" />
-<hkern u1="ð" u2="'" k="20" />
-<hkern u1="ð" u2=""" k="20" />
-<hkern u1="ò" u2="”" k="20" />
-<hkern u1="ò" u2="’" k="20" />
-<hkern u1="ò" u2="ý" k="41" />
-<hkern u1="ò" u2="z" k="20" />
-<hkern u1="ò" u2="y" k="41" />
-<hkern u1="ò" u2="x" k="41" />
-<hkern u1="ò" u2="w" k="41" />
-<hkern u1="ò" u2="v" k="41" />
-<hkern u1="ò" u2="'" k="20" />
-<hkern u1="ò" u2=""" k="20" />
-<hkern u1="ó" u2="”" k="20" />
-<hkern u1="ó" u2="’" k="20" />
-<hkern u1="ó" u2="ý" k="41" />
-<hkern u1="ó" u2="z" k="20" />
-<hkern u1="ó" u2="y" k="41" />
-<hkern u1="ó" u2="x" k="41" />
-<hkern u1="ó" u2="w" k="41" />
-<hkern u1="ó" u2="v" k="41" />
-<hkern u1="ó" u2="'" k="20" />
-<hkern u1="ó" u2=""" k="20" />
-<hkern u1="ô" u2="”" k="20" />
-<hkern u1="ô" u2="’" k="20" />
-<hkern u1="ô" u2="ý" k="41" />
-<hkern u1="ô" u2="z" k="20" />
-<hkern u1="ô" u2="y" k="41" />
-<hkern u1="ô" u2="x" k="41" />
-<hkern u1="ô" u2="w" k="41" />
-<hkern u1="ô" u2="v" k="41" />
-<hkern u1="ô" u2="'" k="20" />
-<hkern u1="ô" u2=""" k="20" />
-<hkern u1="ö" u2="”" k="41" />
-<hkern u1="ö" u2="’" k="41" />
-<hkern u1="ö" u2="'" k="41" />
-<hkern u1="ö" u2=""" k="41" />
-<hkern u1="ø" u2="”" k="20" />
-<hkern u1="ø" u2="’" k="20" />
-<hkern u1="ø" u2="ý" k="41" />
-<hkern u1="ø" u2="z" k="20" />
-<hkern u1="ø" u2="y" k="41" />
-<hkern u1="ø" u2="x" k="41" />
-<hkern u1="ø" u2="w" k="41" />
-<hkern u1="ø" u2="v" k="41" />
-<hkern u1="ø" u2="'" k="20" />
-<hkern u1="ø" u2=""" k="20" />
-<hkern u1="ý" u2="„" k="82" />
-<hkern u1="ý" u2="”" k="-82" />
-<hkern u1="ý" u2="‚" k="82" />
-<hkern u1="ý" u2="’" k="-82" />
-<hkern u1="ý" u2="?" k="-41" />
-<hkern u1="ý" u2="." k="82" />
-<hkern u1="ý" u2="," k="82" />
-<hkern u1="ý" u2="'" k="-82" />
-<hkern u1="ý" u2=""" k="-82" />
-<hkern u1="þ" u2="”" k="20" />
-<hkern u1="þ" u2="’" k="20" />
-<hkern u1="þ" u2="ý" k="41" />
-<hkern u1="þ" u2="z" k="20" />
-<hkern u1="þ" u2="y" k="41" />
-<hkern u1="þ" u2="x" k="41" />
-<hkern u1="þ" u2="w" k="41" />
-<hkern u1="þ" u2="v" k="41" />
-<hkern u1="þ" u2="'" k="20" />
-<hkern u1="þ" u2=""" k="20" />
-<hkern u1="ÿ" u2="„" k="82" />
-<hkern u1="ÿ" u2="”" k="-82" />
-<hkern u1="ÿ" u2="‚" k="82" />
-<hkern u1="ÿ" u2="’" k="-82" />
-<hkern u1="ÿ" u2="?" k="-41" />
-<hkern u1="ÿ" u2="." k="82" />
-<hkern u1="ÿ" u2="," k="82" />
-<hkern u1="ÿ" u2="'" k="-82" />
-<hkern u1="ÿ" u2=""" k="-82" />
-<hkern u1="Œ" u2="J" k="-123" />
-<hkern u1="Ÿ" u2="„" k="123" />
-<hkern u1="Ÿ" u2="‚" k="123" />
-<hkern u1="Ÿ" u2="œ" k="102" />
-<hkern u1="Ÿ" u2="Œ" k="41" />
-<hkern u1="Ÿ" u2="ü" k="61" />
-<hkern u1="Ÿ" u2="û" k="61" />
-<hkern u1="Ÿ" u2="ú" k="61" />
-<hkern u1="Ÿ" u2="ù" k="61" />
-<hkern u1="Ÿ" u2="ø" k="102" />
-<hkern u1="Ÿ" u2="ö" k="102" />
-<hkern u1="Ÿ" u2="õ" k="102" />
-<hkern u1="Ÿ" u2="ô" k="102" />
-<hkern u1="Ÿ" u2="ó" k="102" />
-<hkern u1="Ÿ" u2="ò" k="102" />
-<hkern u1="Ÿ" u2="ë" k="102" />
-<hkern u1="Ÿ" u2="ê" k="102" />
-<hkern u1="Ÿ" u2="é" k="102" />
-<hkern u1="Ÿ" u2="è" k="102" />
-<hkern u1="Ÿ" u2="ç" k="102" />
-<hkern u1="Ÿ" u2="æ" k="102" />
-<hkern u1="Ÿ" u2="å" k="102" />
-<hkern u1="Ÿ" u2="ä" k="102" />
-<hkern u1="Ÿ" u2="ã" k="102" />
-<hkern u1="Ÿ" u2="â" k="102" />
-<hkern u1="Ÿ" u2="á" k="102" />
-<hkern u1="Ÿ" u2="à" k="102" />
-<hkern u1="Ÿ" u2="Ø" k="41" />
-<hkern u1="Ÿ" u2="Ö" k="41" />
-<hkern u1="Ÿ" u2="Õ" k="41" />
-<hkern u1="Ÿ" u2="Ô" k="41" />
-<hkern u1="Ÿ" u2="Ó" k="41" />
-<hkern u1="Ÿ" u2="Ò" k="41" />
-<hkern u1="Ÿ" u2="Ç" k="41" />
-<hkern u1="Ÿ" u2="Å" k="123" />
-<hkern u1="Ÿ" u2="Ä" k="123" />
-<hkern u1="Ÿ" u2="Ã" k="123" />
-<hkern u1="Ÿ" u2="Â" k="123" />
-<hkern u1="Ÿ" u2="Á" k="123" />
-<hkern u1="Ÿ" u2="À" k="123" />
-<hkern u1="Ÿ" u2="z" k="41" />
-<hkern u1="Ÿ" u2="u" k="61" />
-<hkern u1="Ÿ" u2="s" k="82" />
-<hkern u1="Ÿ" u2="r" k="61" />
-<hkern u1="Ÿ" u2="q" k="102" />
-<hkern u1="Ÿ" u2="p" k="61" />
-<hkern u1="Ÿ" u2="o" k="102" />
-<hkern u1="Ÿ" u2="n" k="61" />
-<hkern u1="Ÿ" u2="m" k="61" />
-<hkern u1="Ÿ" u2="g" k="41" />
-<hkern u1="Ÿ" u2="e" k="102" />
-<hkern u1="Ÿ" u2="d" k="102" />
-<hkern u1="Ÿ" u2="c" k="102" />
-<hkern u1="Ÿ" u2="a" k="102" />
-<hkern u1="Ÿ" u2="Q" k="41" />
-<hkern u1="Ÿ" u2="O" k="41" />
-<hkern u1="Ÿ" u2="G" k="41" />
-<hkern u1="Ÿ" u2="C" k="41" />
-<hkern u1="Ÿ" u2="A" k="123" />
-<hkern u1="Ÿ" u2="?" k="-41" />
-<hkern u1="Ÿ" u2="." k="123" />
-<hkern u1="Ÿ" u2="," k="123" />
-<hkern u1="–" u2="T" k="82" />
-<hkern u1="—" u2="T" k="82" />
-<hkern u1="‘" u2="Ÿ" k="-20" />
-<hkern u1="‘" u2="œ" k="123" />
-<hkern u1="‘" u2="ü" k="61" />
-<hkern u1="‘" u2="û" k="61" />
-<hkern u1="‘" u2="ú" k="61" />
-<hkern u1="‘" u2="ù" k="61" />
-<hkern u1="‘" u2="ø" k="123" />
-<hkern u1="‘" u2="ö" k="123" />
-<hkern u1="‘" u2="õ" k="123" />
-<hkern u1="‘" u2="ô" k="123" />
-<hkern u1="‘" u2="ó" k="123" />
-<hkern u1="‘" u2="ò" k="123" />
-<hkern u1="‘" u2="ë" k="123" />
-<hkern u1="‘" u2="ê" k="123" />
-<hkern u1="‘" u2="é" k="123" />
-<hkern u1="‘" u2="è" k="123" />
-<hkern u1="‘" u2="ç" k="123" />
-<hkern u1="‘" u2="æ" k="82" />
-<hkern u1="‘" u2="å" k="82" />
-<hkern u1="‘" u2="ä" k="82" />
-<hkern u1="‘" u2="ã" k="82" />
-<hkern u1="‘" u2="â" k="82" />
-<hkern u1="‘" u2="á" k="82" />
-<hkern u1="‘" u2="à" k="123" />
-<hkern u1="‘" u2="Ý" k="-20" />
-<hkern u1="‘" u2="Å" k="143" />
-<hkern u1="‘" u2="Ä" k="143" />
-<hkern u1="‘" u2="Ã" k="143" />
-<hkern u1="‘" u2="Â" k="143" />
-<hkern u1="‘" u2="Á" k="143" />
-<hkern u1="‘" u2="À" k="143" />
-<hkern u1="‘" u2="u" k="61" />
-<hkern u1="‘" u2="s" k="61" />
-<hkern u1="‘" u2="r" k="61" />
-<hkern u1="‘" u2="q" k="123" />
-<hkern u1="‘" u2="p" k="61" />
-<hkern u1="‘" u2="o" k="123" />
-<hkern u1="‘" u2="n" k="61" />
-<hkern u1="‘" u2="m" k="61" />
-<hkern u1="‘" u2="g" k="61" />
-<hkern u1="‘" u2="e" k="123" />
-<hkern u1="‘" u2="d" k="123" />
-<hkern u1="‘" u2="c" k="123" />
-<hkern u1="‘" u2="a" k="82" />
-<hkern u1="‘" u2="Y" k="-20" />
-<hkern u1="‘" u2="W" k="-41" />
-<hkern u1="‘" u2="V" k="-41" />
-<hkern u1="‘" u2="T" k="-41" />
-<hkern u1="‘" u2="A" k="143" />
-<hkern u1="’" u2="Ÿ" k="-20" />
-<hkern u1="’" u2="œ" k="123" />
-<hkern u1="’" u2="ü" k="61" />
-<hkern u1="’" u2="û" k="61" />
-<hkern u1="’" u2="ú" k="61" />
-<hkern u1="’" u2="ù" k="61" />
-<hkern u1="’" u2="ø" k="123" />
-<hkern u1="’" u2="ö" k="123" />
-<hkern u1="’" u2="õ" k="123" />
-<hkern u1="’" u2="ô" k="123" />
-<hkern u1="’" u2="ó" k="123" />
-<hkern u1="’" u2="ò" k="123" />
-<hkern u1="’" u2="ë" k="123" />
-<hkern u1="’" u2="ê" k="123" />
-<hkern u1="’" u2="é" k="123" />
-<hkern u1="’" u2="è" k="123" />
-<hkern u1="’" u2="ç" k="123" />
-<hkern u1="’" u2="æ" k="82" />
-<hkern u1="’" u2="å" k="82" />
-<hkern u1="’" u2="ä" k="82" />
-<hkern u1="’" u2="ã" k="82" />
-<hkern u1="’" u2="â" k="82" />
-<hkern u1="’" u2="á" k="82" />
-<hkern u1="’" u2="à" k="123" />
-<hkern u1="’" u2="Ý" k="-20" />
-<hkern u1="’" u2="Å" k="143" />
-<hkern u1="’" u2="Ä" k="143" />
-<hkern u1="’" u2="Ã" k="143" />
-<hkern u1="’" u2="Â" k="143" />
-<hkern u1="’" u2="Á" k="143" />
-<hkern u1="’" u2="À" k="143" />
-<hkern u1="’" u2="u" k="61" />
-<hkern u1="’" u2="s" k="61" />
-<hkern u1="’" u2="r" k="61" />
-<hkern u1="’" u2="q" k="123" />
-<hkern u1="’" u2="p" k="61" />
-<hkern u1="’" u2="o" k="123" />
-<hkern u1="’" u2="n" k="61" />
-<hkern u1="’" u2="m" k="61" />
-<hkern u1="’" u2="g" k="61" />
-<hkern u1="’" u2="e" k="123" />
-<hkern u1="’" u2="d" k="123" />
-<hkern u1="’" u2="c" k="123" />
-<hkern u1="’" u2="a" k="82" />
-<hkern u1="’" u2="Y" k="-20" />
-<hkern u1="’" u2="W" k="-41" />
-<hkern u1="’" u2="V" k="-41" />
-<hkern u1="’" u2="T" k="-41" />
-<hkern u1="’" u2="A" k="143" />
-<hkern u1="‚" u2="Ÿ" k="123" />
-<hkern u1="‚" u2="Œ" k="102" />
-<hkern u1="‚" u2="Ý" k="123" />
-<hkern u1="‚" u2="Ü" k="41" />
-<hkern u1="‚" u2="Û" k="41" />
-<hkern u1="‚" u2="Ú" k="41" />
-<hkern u1="‚" u2="Ù" k="41" />
-<hkern u1="‚" u2="Ø" k="102" />
-<hkern u1="‚" u2="Ö" k="102" />
-<hkern u1="‚" u2="Õ" k="102" />
-<hkern u1="‚" u2="Ô" k="102" />
-<hkern u1="‚" u2="Ó" k="102" />
-<hkern u1="‚" u2="Ò" k="102" />
-<hkern u1="‚" u2="Ç" k="102" />
-<hkern u1="‚" u2="Y" k="123" />
-<hkern u1="‚" u2="W" k="123" />
-<hkern u1="‚" u2="V" k="123" />
-<hkern u1="‚" u2="U" k="41" />
-<hkern u1="‚" u2="T" k="143" />
-<hkern u1="‚" u2="Q" k="102" />
-<hkern u1="‚" u2="O" k="102" />
-<hkern u1="‚" u2="G" k="102" />
-<hkern u1="‚" u2="C" k="102" />
-<hkern u1="“" u2="Ÿ" k="-20" />
-<hkern u1="“" u2="œ" k="123" />
-<hkern u1="“" u2="ü" k="61" />
-<hkern u1="“" u2="û" k="61" />
-<hkern u1="“" u2="ú" k="61" />
-<hkern u1="“" u2="ù" k="61" />
-<hkern u1="“" u2="ø" k="123" />
-<hkern u1="“" u2="ö" k="123" />
-<hkern u1="“" u2="õ" k="123" />
-<hkern u1="“" u2="ô" k="123" />
-<hkern u1="“" u2="ó" k="123" />
-<hkern u1="“" u2="ò" k="123" />
-<hkern u1="“" u2="ë" k="123" />
-<hkern u1="“" u2="ê" k="123" />
-<hkern u1="“" u2="é" k="123" />
-<hkern u1="“" u2="è" k="123" />
-<hkern u1="“" u2="ç" k="123" />
-<hkern u1="“" u2="æ" k="82" />
-<hkern u1="“" u2="å" k="82" />
-<hkern u1="“" u2="ä" k="82" />
-<hkern u1="“" u2="ã" k="82" />
-<hkern u1="“" u2="â" k="82" />
-<hkern u1="“" u2="á" k="82" />
-<hkern u1="“" u2="à" k="123" />
-<hkern u1="“" u2="Ý" k="-20" />
-<hkern u1="“" u2="Å" k="143" />
-<hkern u1="“" u2="Ä" k="143" />
-<hkern u1="“" u2="Ã" k="143" />
-<hkern u1="“" u2="Â" k="143" />
-<hkern u1="“" u2="Á" k="143" />
-<hkern u1="“" u2="À" k="143" />
-<hkern u1="“" u2="u" k="61" />
-<hkern u1="“" u2="s" k="61" />
-<hkern u1="“" u2="r" k="61" />
-<hkern u1="“" u2="q" k="123" />
-<hkern u1="“" u2="p" k="61" />
-<hkern u1="“" u2="o" k="123" />
-<hkern u1="“" u2="n" k="61" />
-<hkern u1="“" u2="m" k="61" />
-<hkern u1="“" u2="g" k="61" />
-<hkern u1="“" u2="e" k="123" />
-<hkern u1="“" u2="d" k="123" />
-<hkern u1="“" u2="c" k="123" />
-<hkern u1="“" u2="a" k="82" />
-<hkern u1="“" u2="Y" k="-20" />
-<hkern u1="“" u2="W" k="-41" />
-<hkern u1="“" u2="V" k="-41" />
-<hkern u1="“" u2="T" k="-41" />
-<hkern u1="“" u2="A" k="143" />
-<hkern u1="„" u2="Ÿ" k="123" />
-<hkern u1="„" u2="Œ" k="102" />
-<hkern u1="„" u2="Ý" k="123" />
-<hkern u1="„" u2="Ü" k="41" />
-<hkern u1="„" u2="Û" k="41" />
-<hkern u1="„" u2="Ú" k="41" />
-<hkern u1="„" u2="Ù" k="41" />
-<hkern u1="„" u2="Ø" k="102" />
-<hkern u1="„" u2="Ö" k="102" />
-<hkern u1="„" u2="Õ" k="102" />
-<hkern u1="„" u2="Ô" k="102" />
-<hkern u1="„" u2="Ó" k="102" />
-<hkern u1="„" u2="Ò" k="102" />
-<hkern u1="„" u2="Ç" k="102" />
-<hkern u1="„" u2="Y" k="123" />
-<hkern u1="„" u2="W" k="123" />
-<hkern u1="„" u2="V" k="123" />
-<hkern u1="„" u2="U" k="41" />
-<hkern u1="„" u2="T" k="143" />
-<hkern u1="„" u2="Q" k="102" />
-<hkern u1="„" u2="O" k="102" />
-<hkern u1="„" u2="G" k="102" />
-<hkern u1="„" u2="C" k="102" />
-</font>
-</defs></svg>
\ No newline at end of file
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-semibold.ttf b/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-semibold.ttf
deleted file mode 100755
index ab9167d..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-semibold.ttf and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-semibold.woff b/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-semibold.woff
deleted file mode 100755
index ab7e4a0..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/opensans-semibold.woff and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/wp-font.eot b/plugins/wordpress-mobile-pack/admin/sass/fonts/wp-font.eot
deleted file mode 100755
index 4311126..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/wp-font.eot and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/wp-font.svg b/plugins/wordpress-mobile-pack/admin/sass/fonts/wp-font.svg
deleted file mode 100755
index 22420ea..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/fonts/wp-font.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Generated by IcoMoon</metadata>
-<defs>
-<font id="wpmp_dashboard" horiz-adv-x="1024">
-<font-face units-per-em="1024" ascent="960" descent="-64" />
-<missing-glyph horiz-adv-x="1024" />
-<glyph unicode=" " horiz-adv-x="512" d="" />
-<glyph unicode="1" glyph-name="close-x" d="M1001.185 911.269l-25.94 25.939-462.393-462.393-462.394 462.394-25.939-25.939 462.393-462.394-462.393-462.393 25.939-25.939 462.394 462.393 462.392-462.393 25.94 25.939-462.393 462.393z" />
-<glyph unicode="2" glyph-name="checked" horiz-adv-x="1264" d="M542.782 50.142c-16.217-16.217-42.544-16.217-58.861 0l-88.289 88.391c-0.2 0.2-0.1 0.601-0.2 0.801l-280.988 283.090c-16.316 16.217-16.316 42.544 0 58.861l88.289 88.391c16.316 16.316 42.644 16.316 58.961 0l252.058-253.861 530.043 529.943c16.217 16.316 42.644 16.316 58.961 0l88.289-88.391c16.417-16.316 16.417-42.644 0-58.961l-648.265-648.265z" />
-<glyph unicode="3" glyph-name="search" d="M898.304 168.038l-193.485 193.485c29.184 47.974 45.978 104.192 45.978 164.454 0 174.899-151.603 326.502-326.554 326.502-174.899 0-316.723-141.824-316.723-316.723 0-174.95 151.552-326.554 326.502-326.554 58.163 0 112.64 15.77 159.488 43.162l194.509-194.56c19.098-19.046 49.92-19.046 68.915 0l48.282 48.23c18.995 19.046 12.083 43.008-6.912 62.003zM205.005 535.757c0 121.088 98.15 219.29 219.238 219.29 121.139 0 229.069-107.93 229.069-229.069s-98.15-219.29-219.29-219.29-229.018 107.93-229.018 229.069z" />
-<glyph unicode="4" glyph-name="pencil" d="M965.536 718.656l-10.046-10.046-183.232 183.328 10.018 10.016c0 0 43.872 58.016 106.272 58.016 27.486 0 58.624-11.296 91.168-43.84 107.324-107.33-14.18-197.474-14.18-197.474zM895.328 648.416l-623.968-624.192-271.36-88.224 88.192 271.52v0.096h0.064l623.874 624.16 8.062-8.098 175.136-175.262zM88.32 24.354l135.584 39.008-92.608 98.624-42.976-137.632z" />
-<glyph unicode="5" glyph-name="tumblr" d="M576.032 512l-0.002-234.184c0-59.418-0.77-93.656 5.53-110.5 6.25-16.754 21.918-34.146 38.99-44.202 22.684-13.588 48.542-20.376 77.708-20.376 51.854 0 82.478 6.848 133.742 40.54v-153.944c-43.7-20.552-81.866-32.594-117.324-40.922-35.5-8.242-73.86-12.406-115.064-12.406-46.828 0-74.456 5.886-110.41 17.656-35.958 11.868-66.66 28.806-92.020 50.54-25.45 21.922-43.022 45.208-52.848 69.832-9.826 24.636-14.716 60.414-14.716 107.244v359.1h-137.426v145.006c40.208 13.042 85.164 31.788 113.78 56.152 28.754 24.45 51.766 53.706 69.106 87.944 17.392 34.146 29.348 77.712 35.872 130.516h165.084l-0.002-255.996h255.968v-192h-255.968z" />
-<glyph unicode="6" glyph-name="youtube" horiz-adv-x="878" d="M554.857 240v-120.571q0-38.286-22.286-38.286-13.143 0-25.714 12.571v172q12.571 12.571 25.714 12.571 22.286 0 22.286-38.286zM748 239.428v-26.286h-51.429v26.286q0 38.857 25.714 38.857t25.714-38.857zM196 364h61.143v53.714h-178.286v-53.714h60v-325.143h57.143v325.143zM360.571 38.857h50.857v282.286h-50.857v-216q-17.143-24-32.571-24-10.286 0-12 12-0.571 1.714-0.571 20v208h-50.857v-223.429q0-28 4.571-41.714 6.857-21.143 33.143-21.143 27.429 0 58.286 34.857v-30.857zM605.714 123.428v112.571q0 41.714-5.143 56.571-9.714 32-40.571 32-28.571 0-53.143-30.857v124h-50.857v-378.857h50.857v27.429q25.714-31.429 53.143-31.429 30.857 0 40.571 31.429 5.143 15.429 5.143 57.143zM798.857 129.143v7.429h-52q0-29.143-1.143-34.857-4-20.571-22.857-20.571-26.286 0-26.286 39.429v49.714h102.286v58.857q0 45.143-15.429 66.286-22.286 29.143-60.571 29.143-38.857 0-61.143-29.143-16-21.143-16-66.286v-98.857q0-45.143 16.571-66.286 22.286-29.143 61.714-29.143
41.143 0 61.714 30.286 10.286 15.429 12 30.857 1.143 5.143 1.143 33.143zM451.429 650.857v120q0 39.429-24.571 39.429t-24.571-39.429v-120q0-40 24.571-40t24.571 40zM862.286 221.714q0-133.714-14.857-200-8-33.714-33.143-56.571t-58.286-26.286q-105.143-12-317.143-12t-317.143 12q-33.143 3.429-58.571 26.286t-32.857 56.571q-14.857 64-14.857 200 0 133.714 14.857 200 8 33.714 33.143 56.571t58.857 26.857q104.571 11.429 316.571 11.429t317.143-11.429q33.143-4 58.571-26.857t32.857-56.571q14.857-64 14.857-200zM292 950.857h58.286l-69.143-228v-154.857h-57.143v154.857q-8 42.286-34.857 121.143-21.143 58.857-37.143 106.857h60.571l40.571-150.286zM503.429 760.571v-100q0-46.286-16-67.429-21.143-29.143-60.571-29.143-38.286 0-60 29.143-16 21.714-16 67.429v100q0 45.714 16 66.857 21.714 29.143 60 29.143 39.429 0 60.571-29.143 16-21.143 16-66.857zM694.857 853.143v-285.143h-52v31.429q-30.286-35.429-58.857-35.429-26.286 0-33.714 21.143-4.571 13.714-4.571 42.857v225.143h52v-209.714q0-18.857 0.571-20 1.714-12.571 1
2-12.571 15.429 0 32.571 24.571v217.714h52z" />
-<glyph unicode="7" glyph-name="dfp" d="M217.714 25.143q0-45.714-31.143-72t-77.429-26.286q-60.571 0-98.286 37.714l32.571 50.286q28-25.714 60.571-25.714 16.571 0 28.857 8.286t12.286 24.286q0 36.571-60 32l-14.857 32q4.571 5.714 18.571 24.857t24.286 30.857 21.143 22v0.571q-9.143 0-27.714-0.571t-27.714-0.571v-30.286h-60.571v86.857h190.286v-50.286l-54.286-65.714q29.143-6.857 46.286-28t17.143-50.286zM218.857 383.428v-90.857h-206.857q-3.429 20.571-3.429 30.857 0 29.143 13.429 53.143t32.286 38.857 37.714 27.143 32.286 24.857 13.429 25.714q0 14.286-8.286 22t-22.571 7.714q-26.286 0-46.286-33.143l-48.571 33.714q13.714 29.143 40.857 45.429t60.286 16.286q41.714 0 70.286-23.714t28.571-64.286q0-28.571-19.429-52.286t-42.857-36.857-43.143-28.857-20.286-30h72.571v34.286h60zM1024 201.143v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-694.857q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 8 5.143 13.143t13.143 5.143h694.857q7.429 0 12.857-5.429t5.429-12.857zM219.429 714.857v-56.571h-191.429v56.571h61.
143q0 23.429 0.286 69.714t0.286 69.143v6.857h-1.143q-4.571-9.714-28.571-30.857l-40.571 43.429 77.714 72.571h60.571v-230.857h61.714zM1024 493.714v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-694.857q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 8 5.143 13.143t13.143 5.143h694.857q7.429 0 12.857-5.429t5.429-12.857zM1024 786.286v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-694.857q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 7.429 5.429 12.857t12.857 5.429h694.857q7.429 0 12.857-5.429t5.429-12.857z" />
-<glyph unicode="f" glyph-name="facebook" d="M768 748.595h-146.227c-17.306 0-36.608-22.733-36.608-53.197v-105.574h182.835v-150.528h-182.835v-452.096h-172.646v452.045h-156.518v150.579h156.518v88.576c0 127.027 88.166 230.4 209.203 230.4h146.278v-160.205z" />
-<glyph unicode="g" glyph-name="googleplus" d="M101.888 673.843c0-76.442 25.549-131.686 75.878-164.096 41.216-26.573 89.088-30.566 113.971-30.566 6.042 0 10.854 0.256 14.234 0.461 0 0-7.885-51.354 30.208-102.195l-1.741 0.051c-65.997 0-281.293-13.824-281.293-190.822 0-180.070 197.734-189.184 237.363-189.184 3.123 0 4.915 0.051 4.915 0.051 0.461 0 3.277-0.102 8.090-0.102 25.446 0 91.238 3.174 152.371 32.922 79.258 38.451 119.501 105.421 119.501 198.912 0 90.368-61.235 144.128-105.984 183.45-27.29 23.962-50.893 44.646-50.893 64.768 0 20.48 17.203 35.891 39.014 55.398 35.226 31.539 68.506 76.442 68.506 161.331 0 74.65-9.677 124.723-69.325 156.467 6.246 3.174 28.211 5.478 39.117 7.014 32.307 4.403 79.565 9.421 79.565 35.789v5.069h-235.418c-2.355-0.051-238.080-8.806-238.080-224.717zM481.946 212.378c4.506-71.987-57.088-125.133-149.555-131.84-93.901-6.912-171.264 35.379-175.77 107.366-2.15 34.56 13.005 68.403 42.752 95.386 30.208 27.29 71.578 44.134 116.685 47.514 5.325 0.307 10.598 0.5
63 15.872 0.563 86.886 0 145.766-51.098 150.016-118.989zM420.454 723.149c23.091-81.254-11.776-166.195-67.328-181.862-6.4-1.792-13.005-2.714-19.661-2.714-50.944 0-101.376 51.507-120.064 122.47-10.445 39.885-9.626 74.701 2.355 108.237 11.776 32.922 32.922 55.245 59.546 62.72 6.4 1.843 13.056 2.714 19.712 2.714 61.44 0 100.966-25.498 125.44-111.565zM817.203 546.202v153.6h-97.28v-153.6h-153.6v-97.28h153.6v-153.6h97.28v153.6h153.6v97.28h-153.6z" />
-<glyph unicode="r" glyph-name="feed" d="M136.294 209.070c-75.196 0-136.292-61.334-136.292-136.076 0-75.154 61.1-135.802 136.292-135.802 75.466 0 136.494 60.648 136.494 135.802-0.002 74.742-61.024 136.076-136.494 136.076zM0.156 612.070v-196.258c127.784 0 247.958-49.972 338.458-140.512 90.384-90.318 140.282-211.036 140.282-339.3h197.122c-0.002 372.82-303.282 676.070-675.862 676.070zM0.388 960v-196.356c455.782 0 826.756-371.334 826.756-827.644h196.856c0 564.47-459.254 1024-1023.612 1024z" />
-<glyph unicode="t" glyph-name="twitter" d="M983.040 740.198c-34.714-15.411-71.936-25.754-111.053-30.464 39.936 23.91 70.605 61.798 84.992 106.906-37.325-22.118-78.694-38.246-122.675-46.899-35.277 37.581-85.504 61.030-141.107 61.030-106.752 0-193.28-86.528-193.28-193.229 0-15.155 1.69-29.901 5.018-44.032-160.614 8.038-303.053 84.992-398.336 201.933-16.691-28.518-26.266-61.747-26.266-97.178 0-67.072 34.15-126.208 86.016-160.87-31.693 1.024-61.491 9.677-87.552 24.166 0-0.819 0-1.587 0-2.406 0-93.645 66.662-171.725 155.034-189.542-16.179-4.403-33.28-6.758-50.944-6.758-12.442 0-24.525 1.178-36.352 3.43 24.576-76.8 96-132.659 180.531-134.195-66.15-51.866-149.453-82.739-240.026-82.739-15.616 0-30.976 0.922-46.080 2.714 85.504-54.835 187.085-86.835 296.294-86.835 355.482 0 549.888 294.502 549.888 549.939 0 8.346-0.154 16.691-0.563 24.986 37.786 27.238 70.502 61.286 96.461 100.045z" />
-<glyph unicode="w" glyph-name="wordpress" d="M128 448.008c0-148.026 88.322-275.968 216.43-336.578l-183.178 488.784c-21.308-46.508-33.252-97.982-33.252-152.206zM771.228 466.872c0 46.234-17.054 78.236-31.654 103.142-19.458 30.82-37.72 56.894-37.72 87.716 0 34.374 26.766 66.376 64.486 66.376 1.704 0 3.32-0.204 4.976-0.302-68.316 60.97-159.34 98.196-259.308 98.196-134.16 0-252.186-67.046-320.844-168.568 9.010-0.282 17.506-0.454 24.712-0.454 40.154 0 102.34 4.752 102.34 4.752 20.69 1.182 23.132-28.434 2.458-30.822 0 0-20.81-2.368-43.952-3.55l139.834-405.106 84.044 245.456-59.822 159.65c-20.688 1.184-40.278 3.55-40.278 3.55-20.702 1.192-18.272 32.002 2.438 30.822 0 0 63.4-4.752 101.134-4.752 40.146 0 102.35 4.752 102.35 4.752 20.702 1.182 23.14-28.434 2.446-30.822 0 0-20.834-2.372-43.948-3.55l138.78-402.018 38.312 124.632c16.58 51.75 29.216 88.9 29.216 120.9zM518.742 415.296l-115.226-326.058c34.416-9.858 70.794-15.238 108.488-15.238 44.716 0 87.604 7.518 127.518 21.2-1.018 1.602-1.97
4 3.304-2.75 5.154l-118.030 314.942zM848.962 627.428c1.652-11.91 2.588-24.686 2.588-38.458 0-37.93-7.292-80.596-29.202-133.95l-117.286-330.272c114.162 64.828 190.938 185.288 190.938 323.258 0 65.030-17.060 126.16-47.038 179.422zM512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM512 0c-247.424 0-448 200.576-448 448s200.576 448 448 448 448-200.576 448-448-200.576-448-448-448z" />
-<glyph unicode="ÿ" glyph-name="font-size" d="M64 448h384v-128h-128v-384h-128v384h-128zM960 704h-251.75v-768h-136.5v768h-251.75v128h640z" />
-<glyph unicode="ē" glyph-name="preview" d="M795.929 477.717c-53.762 0-97.234-43.682-97.234-97.234 0-12.81 10.5-23.311 23.311-23.311s23.311 10.5 23.311 23.311c0 27.931 22.891 50.822 50.822 50.822 12.81 0 23.311 10.5 23.311 23.311-0.21 12.81-10.71 23.101-23.521 23.101zM954.485 544.71c-5.67 5.46-11.76 10.71-18.061 15.751v0l-86.103 73.083c-33.181 23.521-72.663 38.431-115.504 41.372l4.62-4.62-52.292 52.502h-0.42c-14.491 13.23-34.021 21.421-55.232 21.421-36.541 0-67.412-23.731-77.913-56.702-10.5 6.72-22.681 10.71-35.911 11.55-2.1 0.21-4.41 0.21-6.51 0.21-14.911 0-28.771-4.41-40.532-11.76-10.71 32.761-41.582 56.492-77.913 56.492-21.211 0-40.532-7.98-55.232-21.421h-0.42l-47.672-47.882c-42.842-2.94-82.533-18.061-115.504-41.372l-86.103-73.083c-6.3-4.83-12.39-10.080-18.061-15.751-43.052-41.582-69.723-99.754-69.723-164.226 0-126.005 102.484-228.488 228.488-228.488 116.344 0 212.738 87.573 226.598 200.347 16.801-9.66 36.331-15.121 56.912-15.121 20.791 0 40.111 5.46 56.912 15.121 14.071-112
.564 110.254-200.137 226.598-200.137 126.005 0 228.488 102.484 228.488 228.488 0.21 64.472-26.461 122.645-69.513 164.226zM228.488 224.448c-86.103 0-155.826 69.723-155.826 155.826s69.723 155.826 155.826 155.826 155.826-69.723 155.826-155.826c0.21-85.893-69.723-155.826-155.826-155.826zM512.209 401.694c-27.931 0-50.612 22.681-50.612 50.612s22.681 50.612 50.612 50.612c27.931 0 50.612-22.681 50.612-50.612s-22.681-50.612-50.612-50.612zM795.929 224.448c-86.103 0-155.826 69.723-155.826 155.826s69.723 155.826 155.826 155.826 155.826-69.723 155.826-155.826c0-85.893-69.723-155.826-155.826-155.826zM228.488 477.717c-53.762 0-97.234-43.682-97.234-97.234 0-12.81 10.5-23.311 23.311-23.311s23.311 10.5 23.311 23.311c0 27.931 22.891 50.822 50.822 50.822 12.81 0 23.311 10.5 23.311 23.311-0.21 12.81-10.71 23.101-23.521 23.101z" />
-<glyph unicode="ĕ" glyph-name="cart, purchase, ecommerce, shopping" d="M384 32c0-53.019-42.981-96-96-96s-96 42.981-96 96c0 53.019 42.981 96 96 96s96-42.981 96-96zM1024 32c0-53.019-42.981-96-96-96s-96 42.981-96 96c0 53.019 42.981 96 96 96s96-42.981 96-96zM1024 448v384h-768c0 35.346-28.654 64-64 64h-192v-64h128l48.074-412.054c-29.294-23.458-48.074-59.5-48.074-99.946 0-70.696 57.308-128 128-128h768v64h-768c-35.346 0-64 28.654-64 64 0 0.218 0.014 0.436 0.016 0.656l831.984 127.344z" />
-<glyph unicode="" glyph-name="apple" d="M791.498 415.908c-1.294 129.682 105.758 191.876 110.542 194.966-60.152 88.020-153.85 100.078-187.242 101.472-79.742 8.074-155.596-46.948-196.066-46.948-40.368 0-102.818 45.754-168.952 44.552-86.916-1.292-167.058-50.538-211.812-128.38-90.304-156.698-23.126-388.84 64.89-515.926 43.008-62.204 94.292-132.076 161.626-129.58 64.842 2.588 89.362 41.958 167.756 41.958s100.428-41.958 169.050-40.67c69.774 1.296 113.982 63.398 156.692 125.796 49.39 72.168 69.726 142.038 70.924 145.626-1.548 0.706-136.060 52.236-137.408 207.134zM662.562 796.478c35.738 43.358 59.86 103.512 53.28 163.522-51.478-2.096-113.878-34.29-150.81-77.55-33.142-38.376-62.148-99.626-54.374-158.436 57.466-4.484 116.128 29.204 151.904 72.464z" />
-<glyph unicode="" glyph-name="lock" d="M592 512h-16v192c0 105.87-86.13 192-192 192h-128c-105.87 0-192-86.13-192-192v-192h-16c-26.4 0-48-21.6-48-48v-480c0-26.4 21.6-48 48-48h544c26.4 0 48 21.6 48 48v480c0 26.4-21.6 48-48 48zM192 704c0 35.29 28.71 64 64 64h128c35.29 0 64-28.71 64-64v-192h-256v192z" />
-<glyph unicode="" glyph-name="blocked" d="M874.040 810.040c-96.706 96.702-225.28 149.96-362.040 149.96s-265.334-53.258-362.040-149.96c-96.702-96.706-149.96-225.28-149.96-362.040s53.258-265.334 149.96-362.040c96.706-96.702 225.28-149.96 362.040-149.96s265.334 53.258 362.040 149.96c96.702 96.706 149.96 225.28 149.96 362.040s-53.258 265.334-149.96 362.040zM896 448c0-82.814-26.354-159.588-71.112-222.38l-535.266 535.268c62.792 44.758 139.564 71.112 222.378 71.112 211.738 0 384-172.262 384-384zM128 448c0 82.814 26.354 159.586 71.112 222.378l535.27-535.268c-62.794-44.756-139.568-71.11-222.382-71.11-211.738 0-384 172.262-384 384z" />
-<glyph unicode="" glyph-name="airplane" d="M768 320.032l-182.82 182.822 438.82 329.15-128.010 127.996-548.52-219.442-172.7 172.706c-49.78 49.778-119.302 61.706-154.502 26.508-35.198-35.198-23.268-104.726 26.51-154.5l172.686-172.684-219.464-548.582 127.99-128.006 329.19 438.868 182.826-182.828v-255.98h127.994l63.992 191.988 191.988 63.996v127.992l-255.98-0.004z" />
-<glyph unicode="" glyph-name="cloud" d="M1024 302.458c0 82.090-56.678 150.9-132.996 169.48-3.242 128.7-108.458 232.062-237.862 232.062-75.792 0-143.266-35.494-186.854-90.732-24.442 31.598-62.69 51.96-105.708 51.96-73.81 0-133.642-59.874-133.642-133.722 0-6.436 0.48-12.76 1.364-18.954-11.222 2.024-22.766 3.138-34.57 3.138-106.998 0.002-193.732-86.786-193.732-193.842 0-107.062 86.734-193.848 193.73-193.848l656.262 0.012c96.138 0.184 174.008 78.212 174.008 174.446z" />
-<glyph unicode="" glyph-name="stack" d="M1024 640l-512 256-512-256 512-256 512 256zM512 811.030l342.058-171.030-342.058-171.030-342.058 171.030 342.058 171.030zM921.444 499.278l102.556-51.278-512-256-512 256 102.556 51.278 409.444-204.722zM921.444 307.278l102.556-51.278-512-256-512 256 102.556 51.278 409.444-204.722z" />
-<glyph unicode="" glyph-name="tablet" d="M800 960h-640c-52.8 0-96-43.2-96-96v-832c0-52.8 43.2-96 96-96h640c52.8 0 96 43.2 96 96v832c0 52.8-43.2 96-96 96zM480-32c-17.672 0-32 14.326-32 32s14.328 32 32 32 32-14.326 32-32-14.328-32-32-32zM768 64h-576v768h576v-768z" />
-<glyph unicode="" glyph-name="paint-format" d="M1024 384v384h-192v64c0 35.2-28.8 64-64 64h-704c-35.2 0-64-28.8-64-64v-192c0-35.2 28.8-64 64-64h704c35.2 0 64 28.8 64 64v64h128v-256h-576v-128h-32c-17.674 0-32-14.326-32-32v-320c0-17.674 14.326-32 32-32h128c17.674 0 32 14.326 32 32v320c0 17.674-14.326 32-32 32h-32v64h576zM768 768h-704v64h704v-64z" />
-<glyph unicode="" glyph-name="shield" d="M960 960l-448-128-448 128c0 0-4.5-51.698 0-128l448-140.090 448 140.090c4.498 76.302 0 128 0 128zM72.19 764.894c23.986-250.696 113.49-672.234 439.81-828.894 326.32 156.66 415.824 578.198 439.81 828.894l-439.81-165.358-439.81 165.358z" />
-<glyph unicode="" glyph-name="share2" d="M864 256c-45.16 0-85.92-18.738-115.012-48.83l-431.004 215.502c1.314 8.252 2.016 16.706 2.016 25.328s-0.702 17.076-2.016 25.326l431.004 215.502c29.092-30.090 69.852-48.828 115.012-48.828 88.366 0 160 71.634 160 160s-71.634 160-160 160-160-71.634-160-160c0-8.622 0.704-17.076 2.016-25.326l-431.004-215.504c-29.092 30.090-69.852 48.83-115.012 48.83-88.366 0-160-71.636-160-160 0-88.368 71.634-160 160-160 45.16 0 85.92 18.738 115.012 48.828l431.004-215.502c-1.312-8.25-2.016-16.704-2.016-25.326 0-88.368 71.634-160 160-160s160 71.632 160 160c0 88.364-71.634 160-160 160z" />
-<glyph unicode="" glyph-name="coins" d="M912 224h-391.872c11.488 19.808 20.288 41.28 26.112 64h365.76c17.696 0 32-14.304 32-32 0-17.664-14.304-32-32-32zM912 320h-359.552c1.312 10.496 2.208 21.152 2.208 32 0 10.88-0.896 21.504-2.208 32h359.552c17.696 0 32-14.304 32-32 0-17.664-14.304-32-32-32zM912 416h-365.76c-5.856 22.72-14.624 44.192-26.112 64h391.872c17.696 0 32-14.304 32-32 0-17.664-14.304-32-32-32zM912 512h-413.696c-20.8 25.952-46.496 47.776-75.808 64h489.504c17.696 0 32-14.304 32-32 0-17.664-14.304-32-32-32zM912 608h-512c-17.696 0-32 14.336-32 32 0 17.696 14.304 32 32 32h512c17.696 0 32-14.304 32-32 0-17.664-14.304-32-32-32zM912 704h-512c-17.696 0-32 14.336-32 32 0 17.696 14.304 32 32 32h512c17.696 0 32-14.304 32-32 0-17.664-14.304-32-32-32zM528 352c0-123.712-100.32-224-224-224-123.712 0-224 100.288-224 224s100.288 224 224 224c123.68 0 224-100.288 224-224zM383.296 327.648c-3.232 7.648-7.392 14.304-12.608 19.968s-11.136 10.528-17.792 14.592c-6.656 4.064-13.44 7.68-20.384
10.912-6.944 3.2-13.728 6.208-20.384 9.088-6.656 2.848-12.64 5.92-17.888 9.184-5.28 3.264-9.472 7.008-12.608 11.2s-4.704 9.152-4.704 14.912c0 3.84 0.704 7.488 2.080 10.944 1.408 3.424 3.52 6.4 6.4 8.864 2.848 2.432 6.432 4.384 10.688 5.76 4.256 1.408 9.28 2.080 15.008 2.080 7.328 0 14.048-0.864 20.192-2.656 6.112-1.824 11.52-3.776 16.192-5.984 4.672-2.176 8.608-4.192 11.808-6.048s5.536-2.752 7.008-2.752 2.624 0.384 3.488 1.184c0.832 0.8 1.536 2.048 1.984 3.808 0.48 1.728 0.768 3.936 0.992 6.592 0.192 2.688 0.288 5.984 0.288 9.856 0 3.456-0.064 6.368-0.192 8.672-0.128 2.336-0.384 4.288-0.672 5.824-0.352 1.536-0.736 2.784-1.184 3.712-0.512 0.928-1.376 2.048-2.72 3.36-1.344 1.344-4.064 3.008-8.192 4.96-4.128 1.984-8.864 3.776-14.176 5.344-5.344 1.6-11.072 2.848-17.184 3.776-1.248 0.192-2.528 0.128-3.776 0.288v33.088h-31.488v-33.088c-5.792-0.768-11.392-1.92-16.832-3.488-10.592-3.072-19.776-7.68-27.584-13.888s-14.016-14.016-18.592-23.36c-4.608-9.408-6.88-20.288-6.88-32.672 0-10.784 1.6-
20.064 4.768-27.776 3.2-7.712 7.36-14.432 12.512-20.096s10.944-10.496 17.472-14.56c6.528-4.096 13.28-7.712 20.192-10.912 6.944-3.2 13.664-6.208 20.192-9.088s12.352-5.952 17.472-9.184c5.152-3.296 9.312-7.008 12.512-11.2 3.2-4.224 4.8-9.248 4.8-15.104 0-5.088-0.928-9.696-2.784-13.856-1.888-4.128-4.576-7.584-8.096-10.4s-7.808-4.96-12.864-6.496c-5.088-1.536-10.784-2.304-17.216-2.304-9.728 0-18.304 1.088-25.696 3.296s-13.76 4.64-19.104 7.328c-5.344 2.656-9.696 5.056-13.088 7.296-3.392 2.176-6.016 3.296-7.904 3.296-1.344 0-2.528-0.384-3.488-1.088-1.024-0.736-1.824-1.984-2.4-3.712-0.608-1.76-1.024-4-1.312-6.816s-0.416-6.272-0.416-10.4c0-6.144 0.384-10.848 1.088-14.112 0.736-3.296 1.984-5.792 3.712-7.488 1.728-1.728 4.544-3.68 8.48-5.952s8.832-4.384 14.688-6.432c5.856-2.016 12.64-3.776 20.288-5.248 7.648-1.44 15.968-2.144 24.896-2.144 0.384 0 0.736 0.064 1.152 0.064v-30.816h31.456v34.944c1.504 0.384 3.104 0.576 4.576 0.992 11.584 3.456 21.728 8.64 30.4 15.488s15.52 15.392 20.608 25.664c5.05
6 10.272 7.552 22.176 7.552 35.776 0.032 10.336-1.568 19.328-4.736 27.008zM498.304 192h413.696c17.696 0 32-14.304 32-32 0-17.664-14.304-32-32-32h-489.504c29.312 16.224 55.008 38.048 75.808 64z" />
-<glyph unicode="" glyph-name="headset_mic" d="M512 896.667q160 0 272-113t112-271v-428q0-52-38-90t-90-38h-256v86h298v42h-170v342h170v86q0 124-87 211t-211 87-211-87-87-211v-86h170v-342h-128q-52 0-90 38t-38 90v300q0 158 112 271t272 113z" />
-<glyph unicode="" glyph-name="image" d="M959.884 832c0.040-0.034 0.082-0.076 0.116-0.116v-767.77c-0.034-0.040-0.076-0.082-0.116-0.116h-895.77c-0.040 0.034-0.082 0.076-0.114 0.116v767.772c0.034 0.040 0.076 0.082 0.114 0.114h895.77zM960 896h-896c-35.2 0-64-28.8-64-64v-768c0-35.2 28.8-64 64-64h896c35.2 0 64 28.8 64 64v768c0 35.2-28.8 64-64 64v0zM832 672c0-53.020-42.98-96-96-96s-96 42.98-96 96 42.98 96 96 96 96-42.98 96-96zM896 128h-768v128l224 384 256-320h64l224 192z" />
-</font></defs></svg>
\ No newline at end of file
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/wp-font.ttf b/plugins/wordpress-mobile-pack/admin/sass/fonts/wp-font.ttf
deleted file mode 100755
index 2ff4b55..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/wp-font.ttf and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/fonts/wp-font.woff b/plugins/wordpress-mobile-pack/admin/sass/fonts/wp-font.woff
deleted file mode 100755
index 9ebd989..0000000
Binary files a/plugins/wordpress-mobile-pack/admin/sass/fonts/wp-font.woff and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/admin/sass/general.scss b/plugins/wordpress-mobile-pack/admin/sass/general.scss
deleted file mode 100755
index 58a8cc1..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/general.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-/**********************************************************************************************************************/
-/*
-/* IMPORT MIXINS
-/*
-/**********************************************************************************************************************/
-
-@import 'mixins/_mixins';
-
-/**********************************************************************************************************************/
-/*
-/* IMPORT CORE
-/*
-/**********************************************************************************************************************/
-
-@import 'core/_fonts';
-@import 'core/_ie';
-@import 'core/_variables';
-@import 'core/_core';
-@import 'core/_forms';
-@import 'core/_buttons';
-
-/**********************************************************************************************************************/
-/*
-/* IMPORT MODULES
-/*
-/**********************************************************************************************************************/
-
-@import 'modules/_content';
-@import 'modules/_settings';
-@import 'modules/_themes';
-@import 'modules/_look-and-feel';
-@import 'modules/_whats-new';
-@import 'modules/_perfect-scrollbar';
diff --git a/plugins/wordpress-mobile-pack/admin/sass/mixins/_display.scss b/plugins/wordpress-mobile-pack/admin/sass/mixins/_display.scss
deleted file mode 100755
index ad6e767..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/mixins/_display.scss
+++ /dev/null
@@ -1,154 +0,0 @@
-@mixin wbz-display-box($important: no) {
- @if $important == important{
- display: -webkit-box !important;
- display: -ms-flexbox !important;
- display: -moz-box !important;
- display: box !important;
- }
- @else {
- display: -webkit-box;
- display: -ms-flexbox;
- display: -moz-box;
- display: box;
- }
-}
-@mixin wbz-display-inline-box($important: no) {
- @if $important == important{
- display: -webkit-inline-box !important;
- display: -ms-inline-flexbox !important;
- display: -moz-inline-box !important;
- display: inline-flex !important;
- }
- @else {
- display: -webkit-inline-box;
- display: -ms-inline-flexbox;
- display: -moz-inline-box;
- display: inline-flex;
- }
-}
-@mixin wbz-box-flex($flex: 1, $preferredSize: auto, $important: no) {
- @if $important == important{
- -webkit-box-flex: $flex !important;
- -ms-flex: $flex 0 $preferredSize !important;
- -moz-box-flex: $flex !important;
- box-flex: $flex !important;
- flex: $flex 0 $preferredSize !important;
- }
- @else {
- -webkit-box-flex: $flex;
- -ms-flex: $flex 0 $preferredSize;
- -moz-box-flex: $flex;
- box-flex: $flex;
- flex: $flex 0 $preferredSize;
- }
-}
-@mixin wbz-box-orient($orient: horizontal, $important: no) {
- @if $important == important {
- -webkit-box-orient: $orient !important;
- -moz-box-orient: $orient !important;
- box-orient: $orient !important;
- @if $orient == horizontal {
- -ms-flex-direction: row !important;
- flex-direction: row !important;
- } @else {
- -ms-flex-direction: column !important;
- flex-direction: column !important;
- }
- } @else {
- -webkit-box-orient: $orient;
- -moz-box-orient: $orient;
- box-orient: $orient;
- @if $orient == horizontal {
- -ms-flex-direction: row;
- flex-direction: row;
- } @else {
- -ms-flex-direction: column;
- flex-direction: column;
- }
- }
-}
-@mixin wbz-box-pack($pack: start, $important: no) {
- @if $important == important {
- -webkit-box-pack: $pack !important;
- -moz-box-pack: $pack !important;
- -ms-flex-pack: $pack !important;
- box-pack: $pack !important;
- @if $pack == start {
- justify-content: flex-start !important;
- }
- @else if $pack == end {
- justify-content: flex-end !important;
- }
- @else if $pack == justify {
- justify-content: space-between !important;
- }
- @else {
- justify-content: $pack !important;
- }
- } @else {
- -webkit-box-pack: $pack;
- -moz-box-pack: $pack;
- -ms-flex-pack: $pack;
- box-pack: $pack;
- @if $pack == start {
- justify-content: flex-start;
- }
- @else if $pack == end {
- justify-content: flex-end;
- }
- @else if $pack == justify {
- justify-content: space-between;
- }
- @else {
- justify-content: $pack;
- }
- }
-}
-@mixin wbz-box-align($align: stretch, $important: no) {
- @if $important == important{
- -webkit-box-align: $align!important;
- -moz-box-align: $align!important;
- -ms-flex-align: $align!important;
- box-align: $align!important;
-
- @if $align == start {
- align-items: flex-start!important;
- }
- @else if $align == end {
- align-items: flex-end!important;
- }
- @else {
- align-items: $align!important;
- }
- }
- @else {
- -webkit-box-align: $align;
- -moz-box-align: $align;
- -ms-flex-align: $align;
- box-align: $align;
-
- @if $align == start {
- align-items: flex-start;
- }
- @else if $align == end {
- align-items: flex-end;
- }
- @else {
- align-items: $align;
- }
- }
-}
-@mixin wbz-box-sizing($value, $important: no){
- @if $important == important{
- -webkit-box-sizing: $value !important;
- -moz-box-sizing: $value !important;
- box-sizing: $value !important;
- }
- @else {
- -webkit-box-sizing: $value;
- -moz-box-sizing: $value;
- box-sizing: $value;
- }
-}
-
-
diff --git a/plugins/wordpress-mobile-pack/admin/sass/mixins/_icon.scss b/plugins/wordpress-mobile-pack/admin/sass/mixins/_icon.scss
deleted file mode 100755
index ea5ba93..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/mixins/_icon.scss
+++ /dev/null
@@ -1,58 +0,0 @@
-@mixin wbz-inline-icon($name, $font-size: 15px, $font-family: 'Appticles') {
- $character: wbz-icon-character-for-name($name);
-
- &:before {
- position: relative;
- text-align: center;
- font-family: $font-family!important;
- font-size: $font-size!important;
- font-weight: normal!important;
-
- @if $character {
- content: "#{$character}";
- } @else {
- content: "#{$name}";
- }
- }
-}
-
-
-@function wbz-icon-character-for-name($name) {
-
- // Row 1
- @if ($name == "facebook") { @return "f"; }
- @else if ($name == "twitter") { @return "t"; }
- @else if ($name == "google-plus") { @return "g"; }
- @else if ($name == "rss") { @return "r"; }
- @else if ($name == "wordpress") { @return "w"; }
- @else if ($name == "tumblr") { @return "\35"; }
- @else if ($name == "youtube") {@return "\36"; }
- @else if($name == "dfp") { @return "\37"; }
-
- @else if ($name == "close-x") { @return "\31"; }
- @else if ($name == "active") { @return "\32"; }
- @else if ($name == "preview") { @return "\113"; }
- @else if ($name == "edit") { @return "\34"; }
-
- @else if($name == "apple") { @return "\e800"; }
- @else if($name == "lock") { @return "\e801"; }
- @else if($name == "blocked") { @return "\e802"; }
- @else if($name == "airplane") { @return "\e803"; }
- @else if($name == "cloud") { @return "\e804"; }
- @else if($name == "stack") { @return "\e805"; }
- @else if($name == "tablet") { @return "\e806"; }
- @else if($name == "paint") { @return "\e807"; }
- @else if($name == "shield") { @return "\e808"; }
- @else if($name == "share") { @return "\e809"; }
-
- @else if($name == "coins") { @return "\e80a"; }
- @else if($name == "headset") { @return "\e80b"; }
- @else if($name == "pic") { @return "\e900"; }
-
- @else if ($name == "shopping") { @return "\115"; }
-
- @else {
- // @debug "#icon: icon with name '#{$name}' not found.";
- @return false;
- }
-}
diff --git a/plugins/wordpress-mobile-pack/admin/sass/mixins/_mixins.scss b/plugins/wordpress-mobile-pack/admin/sass/mixins/_mixins.scss
deleted file mode 100755
index cdfd2dd..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/mixins/_mixins.scss
+++ /dev/null
@@ -1,115 +0,0 @@
-/************************************************/
-/* import icon and display mixins files
-/************************************************/
-
-@import '_icon';
-@import '_display';
-
-/************************************************/
-/* mixins for css3 animations
-/************************************************/
-
-@mixin wbz-transform-origin($value, $important: no) {
- @if $important == important{
- -webkit-transform-origin: $value !important;
- -moz-transform-origin: $value !important;
- transform-origin: $value !important;
- }
- @else {
- -webkit-transform-origin: $value;
- -moz-transform-origin: $value;
- transform-origin: $value;
- }
-}
-@mixin wbz-transform($value, $important: no){
- @if $important == important{
- -webkit-transform: $value !important;
- -moz-transform: $value !important;
- transform: $value !important;
- }
- @else {
- -webkit-transform: $value;
- -moz-transform: $value;
- transform: $value;
- }
-}
-@mixin wbz-transition-timing($value, $important: no){
- @if $important == important{
- -webkit-transition-timing-function: $value !important;
- -moz-transition-timing-function: $value !important;
- transition-timing-function: $value !important;
- }
- @else {
- -webkit-transition-timing-function: $value;
- -moz-transition-timing-function: $value;
- transition-timing-function: $value;
- }
-}
-@mixin wbz-transition($value){
- -webkit-transition: $value;
- -moz-transition: $value;
- transition: $value;
-
-}
-
-/************************************************/
-/* other mixins
-/************************************************/
-@mixin wbz-box-shadow($value, $important: no){
- @if $important == important{
- -webkit-box-shadow: $value !important;
- -moz-box-shadow: $value !important;
- box-shadow: $value !important;
- }
- @else {
- -webkit-box-shadow: $value;
- -moz-box-shadow: $value;
- box-shadow: $value;
- }
-}
-@mixin wbz-border-radius($value, $important: no){
- @if $important == important{
- -webkit-border-radius: $value !important;
- -moz-border-radius: $value !important;
- border-radius: $value !important;
- }
- @else {
- -webkit-border-radius: $value;
- -moz-border-radius: $value;
- border-radius: $value;
- }
-}
-@mixin wbz-opacity($value, $important: no){
- @if $important == important{
- filter: progid:DXImageTransform.Microsoft.Alpha(opacity=$value*100) !important;
- -moz-opacity: $value !important;
- opacity: $value !important;
- }
- @else {
- filter: progid:DXImageTransform.Microsoft.Alpha(opacity=$value*100);
- -moz-opacity: $value;
- opacity: $value;
- }
-}
-@mixin wbz-spacer($value){
- clear: both;
- font-size: 1px;
- height: $value;
- line-height: 1px;
- overflow: hidden;
-}
-@mixin wbz-placeholder-color($value){
- ::-webkit-input-placeholder {
- color: $value;
- }
- :-moz-placeholder {
- color: $value;
- }
- ::-moz-placeholder {
- color: $value;
- }
- :-ms-input-placeholder {
- color: $value;
- }
-}
-
diff --git a/plugins/wordpress-mobile-pack/admin/sass/modules/_content.scss b/plugins/wordpress-mobile-pack/admin/sass/modules/_content.scss
deleted file mode 100755
index ce1cb44..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/modules/_content.scss
+++ /dev/null
@@ -1,398 +0,0 @@
-#wmpack-admin{
- .content{
- display: table;
- width:100%;
- .left-side{
- width: 100%;
- display: table;
- vertical-align: top;
-
- .details{
- padding:30px;
- background-color: $box-color;
-
- h2.title{
- font-family: 'OlRoundGothicLight', sans-serif;
- font-size: 25px;
- line-height: normal;
- color: $base-text-color;
- }
- }
- ul.categories{
- list-style-type: none;
- width: 100%;
- display: block;
-
- li{
- @include wbz-display-box();
- @include wbz-box-orient(horizontal);
- @include wbz-box-align(center);
- @include wbz-box-pack(justify);
- @include wbz-box-flex(1);
- background-color: #fcfcfc;
- height: 64px;
- width: 100%;
- border-bottom: #f0f1f2 1px solid;
- margin-bottom: 5px;
- cursor: pointer;
- vertical-align: middle;
-
- .row{
- @include wbz-display-box();
- @include wbz-box-orient(horizontal);
- @include wbz-box-align(center);
- height: 64px;
- width: 90%;
- vertical-align: middle;
- }
-
- &:hover{
- background-color: lighten($base-blue,45%);
- border-bottom: lighten($base-blue,41%) 1px solid;
- @include wbz-display-box();
- @include wbz-box-orient(horizontal);
-
- a{
- &.edit{
- display:block;
- }
- &.delete{
- @include wbz-display-box();
- }
- &[class^="icon-"]{
- .relative{
- .img{
- @include wbz-transform(translateY(30%) translateX(30%) scale(0.4));
- @include wbz-transition(all 0.3s ease-in-out);
- }
- }
- }
- }
- }
- .buttons{
- @include wbz-display-box();
- @include wbz-box-flex(1);
- @include wbz-box-pack(end);
- }
- span,
- a{
- font-family: 'AcordeRegular', sans-serif;
-
- &.status{
- @include wbz-display-box();
- font-size: 12px;
- color: #8c8d8d;
- width: 70px;
- position: relative;
- margin: 0 0 0 20px;
-
- &.active::before{
- content: '';
- @include wbz-display-box();
- position: absolute;
- width: 19px;
- height: 19px;
- border: #fff 3px solid;
- @include wbz-border-radius(19px);
- background-color: $base-green;
- left: -29px;
- top: 1px;
- }
- &.inactive::before{
- content: '';
- @include wbz-display-box();
- position: absolute;
- width: 19px;
- height: 19px;
- border: #fff 3px solid;
- @include wbz-border-radius(19px);
- background-color: darken($base-red,30%);
- left: -29px;
- top: 1px;
- }
- }
- &.pic{
- @include wbz-display-box();
- @include wbz-border-radius(48px);
-
- width: 48px;
- height: 48px;
- margin: 0 20px 0 0;
-
- background-color: #cbdde2;
- background-size: cover;
- background-position: center;
-
- color: #ffffff;
-
- &.default {
- @include wbz-inline-icon(pic, 24px);
-
- &::before{
- width: 48px;
- height: 48px;
- line-height: 48px;
- position: absolute;
- }
- }
- }
- &.title{
- @include wbz-display-box();
- font-size: 15px;
- color: $base-dark-blue;
- text-transform: uppercase;
- width: 300px;
- }
- &.posts{
- @include wbz-display-box();
- font-family: 'OpenSansItalic',sans-serif;
- color: $base-p-color;
- font-size: 15px;
- margin-right: 30px;
- @include wbz-box-flex(1);
- @include wbz-box-pack(end);
- }
- &.edit{
- @include wbz-inline-icon(edit, 24px);
- width: 63px;
- height: 63px;
- background: #cbdde2;
- color: #ffffff;
- border-left: 1px solid #e0edf1;
- display: none;
- position: relative;
- &:hover{
- background: #d3e3e8;
- }
- &::before{
- width: 63px;
- height: 63px;
- line-height: 63px;
- position: absolute;
- }
- }
- &.delete{
- @include wbz-inline-icon(close-x, 24px);
- width: 63px;
- height: 63px;
- background: #cbdde2;
- color: #ffffff;
- border-left: 1px solid #e0edf1;
- display: none;
- position: relative;
-
- &:hover{
- background: #d3e3e8;
- }
- &::before{
- width: 63px;
- height: 63px;
- line-height: 63px;
- position: absolute;
- }
- }
- &[class^="icon-"]{
- @include wbz-display-box();
- @include wbz-border-radius(48px);
- width: 48px;
- height: 48px;
- margin: 0 20px 0 0;
-
- &::before{
- width: 48px;
- height: 48px;
- line-height: 48px;
- }
- .relative{
- display: block;
- width: 0;
-
- .img{
- @include wbz-border-radius(48px);
- @include wbz-display-box();
- @include wbz-transform(translateY(0%) scale(1));
- @include wbz-transition(all 0.3s ease-in-out);
- width: 48px;
- height: 48px;
- left: 0px;
- top: 0px;
- position: absolute;
- background-color: #ffffff;
- @include wbz-box-shadow(inset 0 0 1px rgba(0,0,0,0.5));
- }
- }
- }
- }
- }
- &.pages{
- li{
- span{
- &.title{
-
- }
- }
- }
- }
- }
- }
- .branding-category {
-
- .custom-upload {
- position: relative;
- height: 36px;
- width: 450px;
- margin: 10px 0;
-
- &:hover{
- .fake-file{
- .btn{
- background: darken($base-grey, $darken-amounth/2);
- border: 1px solid darken($base-grey, $darken-amounth);
- }
- input{
- outline:none;
- border:1px solid darken($input-border,$darken-amounth);
- }
- }
- }
- .remove{
- position: absolute;
- top: 8px;
- right: 160px;
- width: 16px;
- height: 16px;
- z-index: 3;
- @include wbz-inline-icon(close-x, 9px);
- color: #ffffff;
- background: $base-color-darken;
- @include wbz-border-radius(16px);
- padding: 3px;
-
- &::before{
- top: -4px;
- left: 0px;
- display: block;
- }
- }
- }
- .custom-upload input[type=file] {
- outline: none;
- position: relative;
- text-align: right;
- @include wbz-opacity(0);
- z-index: 2;
- width: 430px;
- height: 100%;
- }
- .custom-upload .fake-file {
- position: relative;
- top: -38px;
- left: 0px;
- width: 430px;
- padding: 0;
- margin: 0;
- z-index: 1;
- line-height: 100%;
- @include wbz-display-box();
-
- .btn{
- margin: 0px 0px 0px 10px;
- }
- }
- .custom-upload .fake-file input {
- width: 300px;
- font-family: 'AcordeSemiBold', sans-serif;
- color: $input-color;
- font-size: $input-font-size;
- margin: 0;
- }
- .display-icon{
- text-align: left;
- height: 70px;
-
- .edit{
- margin: 20px 0 0 0;
- vertical-align: middle;
- text-align: center;
- float: left;
- }
- .remove{
- display: inline-block;
- margin: 28px 0 0 10px;
- }
- img{
- width: 120px;
- height: auto;
- display: inline-block;
- margin: 0 25px;
- float: left;
- }
- label{
- width: 100px;
- display: inline;
- float: left;
- margin: 25px 0 0 0;
- }
- }
- .cancel-link{
- position: relative;
-
- .cancel{
- position: absolute;
- top: -39px;
- right: -30px;
- }
- }
- }
- .button{
- margin:2px;
- padding: 0px 8px 1px 8px;
-
- &.insert-media{
- color: #555;
- background: #f7f7f7;
- box-shadow: inset 0 1px 0 #fff, 0 1px 0 rgba(0,0,0,.08);
- padding: 0px 7px 1px 5px;
- margin: 0px 5px 4px 0px;
- display: inline-block;
- line-height: 26px;
- font-size:13px;
- }
- }
- .wp-switch-editor{
- color:#555;
- height:20px;
- background: #ebebeb;
- border:1px solid #dedede;
- font: 13px/19px "Open Sans", sans-serif;
- margin: 5px 0 0 5px;
- padding: 3px 8px 4px;
- @include wbz-box-sizing(initial);
- }
- .wp-editor-wrap{
- min-width:100%;
- textarea{
- width:100%;
- height:auto;
- }
- &.tmce-active{
- .switch-tmce{
- background: #f5f5f5;
- color: #555;
- height: 20px;
- border-bottom-color:#f5f5f5;
- }
- }
- &.html-active {
- .switch-html {
- background: #f5f5f5;
- color: #555;
- height: 20px;
- border-bottom-color:#f5f5f5;
- }
- }
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/plugins/wordpress-mobile-pack/admin/sass/modules/_look-and-feel.scss b/plugins/wordpress-mobile-pack/admin/sass/modules/_look-and-feel.scss
deleted file mode 100755
index 43cd8c3..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/modules/_look-and-feel.scss
+++ /dev/null
@@ -1,287 +0,0 @@
-#wmpack-admin{
- .look-and-feel{
- display: table;
-
- .left-side{
- width: 100%;
- display: table;
- vertical-align: top;
-
- .details{
- padding:30px;
- background-color: $box-color;
-
- h2.title{
- font-family: 'OlRoundGothicLight', sans-serif;
- font-size: 25px;
- line-height: normal;
- color: $base-text-color;
- }
- .section-header{
- font-family: 'AcorderSemiBold', sans-serif;
- font-size: 18px;
- line-height: normal;
- color: $base-dark-blue;
- }
-
- .color-schemes{
- width: 50%;
- float: left;
-
- .colors{
- display: table;
- width: 260px;
- height: 16px;
- border: #daddde 1px solid;
-
- &.description{
- border: none;
- font-family: 'AcordeRegular', sans-serif;
- margin-left:56px;
- }
-
- [class^="color-"]{
- display: table-cell;
- height: 16px;
- width: 27px;
- text-align: center;
- }
-
- [class^="color-custom-"]{
- background: #eeeff1;
- border-right: 1px solid #fff;
- cursor:pointer;
-
- &:last-child{
- border-right:none;
- }
- }
- }
- }
-
- .color-schemes-custom {
-
- .set {
- width: 50%;
- float: left;
- margin-bottom: 10px;
-
- .wp-picker-container * {
- @include wbz-box-sizing(content-box);
- /*display: inherit;*/
-
- .button {
- margin-left: 6px;
- @include wbz-box-sizing(border-box);
- }
- }
- > label {
- width: 100%;
- }
- }
- }
-
- .font-chooser{
-
- label {
- position: relative;
- display: inline-block;
- width: 135px;
- }
-
- .subtext {
- font-size: 11px;
-
- a {
- font-size: 11px;
- }
- }
- }
-
- &.branding{
- label, p{
- font-family: 'AcordeRegular', sans-serif;
- font-size: 15px;
- line-height: normal;
- color: darken($base-blue,50%);
-
- }
- .custom-upload {
- position: relative;
- height: 36px;
- width: 450px;
- margin: 10px 0;
-
- &:hover{
- .fake-file{
- .btn{
- background: darken($base-grey, $darken-amounth/2);
- border: 1px solid darken($base-grey, $darken-amounth);
- }
- input{
- outline:none;
- border:1px solid darken($input-border,$darken-amounth);
- }
- }
- }
- .remove{
- position: absolute;
- top: 8px;
- right: 160px;
- width: 16px;
- height: 16px;
- z-index: 3;
- @include wbz-inline-icon(close-x, 9px);
- color: #ffffff;
- background: $base-color-darken;
- @include wbz-border-radius(16px);
- padding: 3px;
-
- &::before{
- top: -4px;
- left: 0px;
- display: block;
- }
- }
- }
- .custom-upload input[type=file] {
- outline: none;
- position: relative;
- text-align: right;
- @include wbz-opacity(0);
- z-index: 2;
- width: 430px;
- height: 100%;
- }
- .custom-upload .fake-file {
- position: relative;
- top: -38px;
- left: 0px;
- width: 430px;
- padding: 0;
- margin: 0;
- z-index: 1;
- line-height: 100%;
- @include wbz-display-box();
-
- .btn{
- margin: 0px 0px 0px 10px;
- }
- }
- .custom-upload .fake-file input {
- width: 300px;
- font-family: 'AcordeSemiBold', sans-serif;
- color: $input-color;
- font-size: $input-font-size;
- margin: 0;
- }
- .display-logo{
- text-align: left;
- height: 120px;
-
- .edit{
- margin: 47px 0 0 0;
- vertical-align: middle;
- text-align: center;
- float: left;
- }
- .remove{
- display: inline-block;
- margin: 55px 0 0 10px;
- }
- .img{
- width: 120px;
- height: 120px;
- display: inline-block;
- margin: 0 25px;
- float: left;
- }
- label{
- width: 100px;
- display: inline;
- float: left;
- margin: 55px 0 0 0;
- }
- }
- .display-icon{
- @include wbz-display-box();
- @include wbz-box-orient(horizontal);
- @include wbz-box-pack(start);
- @include wbz-box-align(center);
- text-align: left;
- height: 120px;
-
- .edit{
- margin: 47px 0 0 0;
- vertical-align: middle;
- text-align: center;
- float: left;
- }
- .remove{
- display: inline-block;
- margin: 55px 0 0 10px;
- }
- img{
- width: 120px;
- height: 120px;
- @include wbz-border-radius(120px);
- @include wbz-box-shadow(inset 0 0 5px 1px rgba(0,0,0,0.1));
- display: inline-block;
- margin: 0 25px;
- float: left;
- }
- label{
- width: 100px;
- display: inline;
- float: left;
- margin: 55px 0 0 0;
- }
- }
- .cancel-link{
- position: relative;
-
- .cancel{
- position: absolute;
- top: -39px;
- right: -30px;
- }
- }
-
- .wp-switch-editor{
- color:#555;
- height:20px;
- background: #ebebeb;
- border:1px solid #dedede;
- font: 13px/19px "Open Sans", sans-serif;
- margin: 5px 0 0 5px;
- padding: 3px 8px 4px;
- @include wbz-box-sizing(initial);
- }
- .wp-editor-wrap{
- width: 60%;
- float: left;
- textarea{
- width:100%;
- }
- &.tmce-active{
- .switch-tmce{
- background: #f5f5f5;
- color: #555;
- height: 20px;
- border-bottom-color:#f5f5f5;
- }
- }
- &.html-active {
- .switch-html {
- background: #f5f5f5;
- color: #555;
- height: 20px;
- border-bottom-color:#f5f5f5;
- }
- }
- }
- }
- }
- }
- }
-}
diff --git a/plugins/wordpress-mobile-pack/admin/sass/modules/_perfect-scrollbar.scss b/plugins/wordpress-mobile-pack/admin/sass/modules/_perfect-scrollbar.scss
deleted file mode 100755
index 91d336f..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/modules/_perfect-scrollbar.scss
+++ /dev/null
@@ -1,128 +0,0 @@
-/****************************/
-/* PERFECT SCROLLBAR */
-
-.ps-container .ps-scrollbar-x-rail {
- position: absolute; /* please don't change 'position' */
- bottom: 3px; /* there must be 'bottom' for ps-scrollbar-x-rail */
- height: 8px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- opacity: 0;
- filter: alpha(opacity = 0);
- -o-transition: background-color .2s linear, opacity .2s linear;
- -webkit-transition: background-color .2s linear, opacity .2s linear;
- -moz-transition: background-color .2s linear, opacity .2s linear;
- transition: background-color .2s linear, opacity .2s linear;
-}
-
-.ps-container:hover .ps-scrollbar-x-rail,
-.ps-container.hover .ps-scrollbar-x-rail {
- opacity: 0.6;
- filter: alpha(opacity = 60);
-}
-
-.ps-container .ps-scrollbar-x-rail:hover,
-.ps-container .ps-scrollbar-x-rail.hover {
- background-color: #eee;
- opacity: 0.9;
- filter: alpha(opacity = 90);
-}
-
-.ps-container .ps-scrollbar-x-rail.in-scrolling {
- background-color: #eee;
- opacity: 0.9;
- filter: alpha(opacity = 90);
-}
-
-.ps-container .ps-scrollbar-y-rail {
- position: absolute; /* please don't change 'position' */
- right: 3px; /* there must be 'right' for ps-scrollbar-y-rail */
- width: 8px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- opacity: 0;
- filter: alpha(opacity = 0);
- -o-transition: background-color .2s linear, opacity .2s linear;
- -webkit-transition: background-color .2s linear, opacity .2s linear;
- -moz-transition: background-color .2s linear, opacity .2s linear;
- transition: background-color .2s linear, opacity .2s linear;
-}
-
-.ps-container:hover .ps-scrollbar-y-rail,
-.ps-container.hover .ps-scrollbar-y-rail {
- opacity: 0.6;
- filter: alpha(opacity = 60);
-}
-
-.ps-container .ps-scrollbar-y-rail:hover,
-.ps-container .ps-scrollbar-y-rail.hover {
- background-color: #eee;
- opacity: 0.9;
- filter: alpha(opacity = 90);
-}
-
-.ps-container .ps-scrollbar-y-rail.in-scrolling {
- background-color: #eee;
- opacity: 0.9;
- filter: alpha(opacity = 90);
-}
-
-.ps-container .ps-scrollbar-x {
- position: absolute; /* please don't change 'position' */
- bottom: 0; /* there must be 'bottom' for ps-scrollbar-x */
- height: 8px;
- background-color: #aaa;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- -o-transition: background-color .2s linear;
- -webkit-transition: background-color.2s linear;
- -moz-transition: background-color .2s linear;
- transition: background-color .2s linear;
-}
-
-.ps-container.ie6 .ps-scrollbar-x {
- font-size: 0; /* fixed scrollbar height in xp sp3 ie6 */
-}
-
-.ps-container .ps-scrollbar-x-rail:hover .ps-scrollbar-x,
-.ps-container .ps-scrollbar-x-rail.hover .ps-scrollbar-x {
- background-color: #999;
-}
-
-.ps-container .ps-scrollbar-y {
- position: absolute; /* please don't change 'position' */
- right: 0; /* there must be 'right' for ps-scrollbar-y */
- width: 8px;
- background-color: #aaa;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- -o-transition: background-color .2s linear;
- -webkit-transition: background-color.2s linear;
- -moz-transition: background-color .2s linear;
- transition: background-color .2s linear;
-}
-
-.ps-container.ie6 .ps-scrollbar-y {
- font-size: 0; /* fixed scrollbar height in xp sp3 ie6 */
-}
-
-.ps-container .ps-scrollbar-y-rail:hover .ps-scrollbar-y,
-.ps-container .ps-scrollbar-y-rail.hover .ps-scrollbar-y {
- background-color: #999;
-}
-
-.ps-container.ie .ps-scrollbar-x,
-.ps-container.ie .ps-scrollbar-y {
- visibility: hidden;
-}
-
-.ps-container.ie:hover .ps-scrollbar-x,
-.ps-container.ie:hover .ps-scrollbar-y,
-.ps-container.ie.hover .ps-scrollbar-x,
-.ps-container.ie.hover .ps-scrollbar-y {
- visibility: visible;
-}
\ No newline at end of file
diff --git a/plugins/wordpress-mobile-pack/admin/sass/modules/_settings.scss b/plugins/wordpress-mobile-pack/admin/sass/modules/_settings.scss
deleted file mode 100755
index 3461a53..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/modules/_settings.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-#wmpack-admin{
- .settings{
- display: table;
-
- .left-side{
- width: 100%;
- display: table;
- vertical-align: top;
-
- .details{
- padding: 30px;
- background-color: $box-color;
-
- h2.title{
- font-family: 'OlRoundGothicLight', sans-serif;
- font-size: 25px;
- line-height: normal;
- color: $base-text-color;
- }
- .display-mode{
-
- p, label{
- font-family: 'AcordeRegular', sans-serif;
- font-size:15px;
- line-height: normal;
- color: $base-text-color;
- }
-
- .notices-container {
- width: 465px;
-
- .notice {
- max-width: 90%;
- }
- }
- }
- }
- }
- }
-}
diff --git a/plugins/wordpress-mobile-pack/admin/sass/modules/_themes.scss b/plugins/wordpress-mobile-pack/admin/sass/modules/_themes.scss
deleted file mode 100755
index e7e5bb4..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/modules/_themes.scss
+++ /dev/null
@@ -1,265 +0,0 @@
-#wmpack-admin{
- .themes{
- display: table;
-
- .left-side{
- width: 100%;
- display: table;
- vertical-align: top;
-
- $theme-box-width: 195px;
- $theme-box-height: 320px;
- $theme-box-margin: 25px;
- $theme-box-subsection-height: 41px;
-
- .corner{
- z-index: 1;
-
- &.active{
- .indicator{
- @include wbz-inline-icon(active, 11px);
- color: #ffffff;
-
- top: 0px;
- left: $theme-box-width - 44px;
-
- &::before{
- top: -40px;
- right: 18px;
- }
- }
- }
- }
- .details{
- padding:30px;
- background-color: $box-color;
-
- h2.title{
- font-family: 'OlRoundGothicLight', sans-serif;
- font-size: 25px;
- line-height: normal;
- color: $base-text-color;
- }
- .section-header{
- font-family: 'AcorderSemiBold', sans-serif;
- font-size: 18px;
- line-height: normal;
- color: $base-dark-blue;
- }
-
- &.theming{
- display: table;
- width: 100%;
-
- h2.title {
- text-align: center;
- }
-
- .themes{
- display: block;
- width: ($theme-box-width + $theme-box-margin) * 3 + 20;
- margin: 0 auto;
-
- .theme{
- display: inline-block;
- width: $theme-box-width;
- height: $theme-box-height;
- margin: 0 $theme-box-margin $theme-box-margin 0;
- position: relative;
-
- &:nth-child(3){
- margin: 0;
- }
-
- .name{
- font-family: 'AcordeRegular', sans-serif;
- font-size: 16px;
- color: $base-text-color;
- background: $base-color-lighter;
- height: $theme-box-subsection-height;
- border-bottom: 1px solid #dce0e0;
- padding: 10px;
- text-transform: uppercase;
- text-align: center;
- }
- .content{
- font-size: 14px;
- color: $base-p-color;
- height: $theme-box-subsection-height;
- padding: 5px 5px;
- text-align: center;
- }
- .image{
- background-size: cover;
- background-repeat: no-repeat;
- width: 100%;
- height: $theme-box-height - $theme-box-subsection-height * 2;
- overflow: hidden;
- position: relative;
-
- &:hover{
- .overlay{
- visibility: visible;
- @include wbz-transform(translateX(0%));
- @include wbz-opacity(1);
- @include wbz-transition(all 0.3s ease-in-out);
- }
- }
- }
- .overlay{
- background: rgba(154,202,64,0.9);
- position: absolute;
- width: $theme-box-width;
- height: $theme-box-height - $theme-box-subsection-height * 2;
- text-align: center;
-
- @include wbz-transform(translateX(-100%));
- @include wbz-opacity(0);
- @include wbz-transition(all 0.3s ease-in-out);
-
- .actions {
- @include wbz-display-box();
- display: flex;
- @include wbz-box-orient(horizontal);
- @include wbz-box-align(center);
- @include wbz-box-pack(center);
-
- .preview {
- @include wbz-inline-icon(preview, 20px);
- color: #ffffff;
- background: #333333;
- @include wbz-border-radius(33px);
- width: 33px;
- height: 33px;
- margin: 0 2px;
- float: none;
-
- &:hover {
- cursor: pointer;
- background: lighten(#333333, 10%);
- }
-
- &::before {
- width: 33px;
- height: 33px;
- line-height: 33px;
- }
- }
- }
-
- [class^="text"] {
- font-family: "OpenSansSemiBold", sans-serif;
- font-size: 13px;
- color: #333333;
- text-align: center;
- }
- }
- span.price {
- border-radius: 50px;
- background: $base-orange;
- color: #ffffff;
- padding: 3px 5px;
- }
- &.premium{
- /*.corner{
- .indicator{
- background: url(../images/ribbon-premium.png);
- width: 67px;
- height: 68px;
- position: absolute;
- top: -4px;
- right: -5px;
- left: $theme-box-width - 62px;
- }
- }*/
- .overlay{
- background: rgba(#fdf7d3,0.9);
-
- .unlock{
- @include wbz-inline-icon(unlock, 17px);
- color: #ffffff;
- background: $base-orange;
- @include wbz-border-radius(33px);
- width: 33px;
- height: 33px;
- margin: 0 2px;
- float: none;
-
- &:hover{
- cursor: pointer;
- background: lighten($base-orange, 10%);
- }
-
- &::before{
- width: 33px;
- height: 33px;
- top: 7px;
- left: 0px;
- }
- }
- .preview{
- background: $base-orange;
-
- &:hover{
- background: lighten($base-orange, 10%);
- }
- }
- .text{
- font-family: "OpenSansSemiBold", sans-serif;
- font-size: 13px;
- color: $base-text-color;
- text-align: center;
- display: block;
-
- &:last-child{
- font-size: 12px;
- font-family: "OpenSansRegular", sans-serif;
- }
- span{
- font-size: 15px;
- color: $base-text-color;
- display: block;
- }
- }
- .btn{
- margin: 0 auto;
- width: 150px;
- }
- .info{
- margin: 0 auto;
- width: $input-size-smaller + $btn-size-smallest + 10px;
-
- input[type="text"]{
- float: left;
- background: rgba(250,250,250,0.8);
- }
- .btn{
- float: left;
- margin: 0 0 0 10px;
- }
- }
- }
- .content {
- a.btn.smaller {
- width: 100%;
- line-height: normal;
- }
- }
- }
-
- &.bundle {
- margin-bottom: 0;
- }
- }
- }
-
- span.shopping {
- @include wbz-inline-icon(shopping, 17px);
- line-height: 33px;
- color: #ffffff;
- }
- }
- }
- }
- }
-}
diff --git a/plugins/wordpress-mobile-pack/admin/sass/modules/_whats-new.scss b/plugins/wordpress-mobile-pack/admin/sass/modules/_whats-new.scss
deleted file mode 100755
index 74a6bc5..0000000
--- a/plugins/wordpress-mobile-pack/admin/sass/modules/_whats-new.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-#wmpack-admin{
- .whats-new{
- display: table;
- .left-side{
- width: 100%;
- display: table;
- vertical-align: top;
-
-
- .details{
- padding:30px;
- background-color: $box-color;
-
- &.waitlist {
- padding-top: 0px;
-
- .waitlist-subscribe {
- border: 2px dotted $base-green;
- background: #f4f4f4;
- padding: 20px;
- margin: 0 20px 0 20px;
-
- p {
- text-align: center;
- }
-
- form {
- float: none;
- text-align: center;
-
- .error {
- width: 220px;
- margin: 0 auto;
- }
-
- .btn {
- margin: 0 auto;
- }
- }
- }
- .added {
- margin: 0 auto;
- }
- }
-
- h1{
- font-family: 'OlRoundGothicLight', sans-serif;
- font-size: 40px;
- line-height: 40px;
- color: $base-text-color;
- text-align: center;
- letter-spacing: 0.5px;
- }
- .upgrade-message{
- text-align: center;
- }
- h2.title{
- font-family: 'OlRoundGothicLight', sans-serif;
- font-size: 25px;
- line-height: normal;
- color: $base-text-color;
- }
- .showcase{
- width: 671px;
- margin: 0 auto;
- }
-
- &.features {
-
- padding-bottom: 0px;
-
- .feature {
-
- margin-bottom: 30px;
-
- img {
- width: 130px;
- height: auto;
- float: left;
- margin: 20px 30px 0 0;
- }
- .text {
- span {
- font-family: "OpenSansRegular", sans-serif;
- font-size: 14px;
- color: $base-text-color;
-
- &.title {
- display: block;
- margin: 15px 0 8px 0;
- font-size: 18px;
- color: #333333;
- }
- }
- }
- &.right {
- img {
- float: right;
- margin: 20px 0 0 30px;
- }
- }
- }
- }
- }
- }
- }
-}
diff --git a/plugins/wordpress-mobile-pack/core/config.php b/plugins/wordpress-mobile-pack/core/config.php
index 6b7b43e..3aa6a75 100755
--- a/plugins/wordpress-mobile-pack/core/config.php
+++ b/plugins/wordpress-mobile-pack/core/config.php
@@ -1,6 +1,6 @@
<?php
-define("WMP_VERSION", '2.2.8');
+define("WMP_VERSION", '2.2.9');
define('WMP_PLUGIN_NAME', 'WP Mobile Pack');
define('WMP_DOMAIN', 'wordpress-mobile-pack');
diff --git a/plugins/wordpress-mobile-pack/export/class-export.php b/plugins/wordpress-mobile-pack/export/class-export.php
index 3e2caa7..d7a4a6c 100755
--- a/plugins/wordpress-mobile-pack/export/class-export.php
+++ b/plugins/wordpress-mobile-pack/export/class-export.php
@@ -78,9 +78,18 @@ if ( ! class_exists( 'WMobilePack_Export' ) ) {
if (isset($image_metadata['sizes']) && is_array($image_metadata['sizes'])){
- $thumbnail = isset($image_metadata['sizes']['medium_large']) ? $image_metadata['sizes']['medium_large'] : $image_metadata['sizes']['large'];
+ $thumbnail = false;
- if (isset($thumbnail['file']) && isset($thumbnail['width']) && isset($thumbnail['height'])) {
+ // get the first image size that fits the format
+ foreach (array('medium_large', 'large') as $size_option){
+
+ if ( isset($image_metadata['sizes'][$size_option]) ){
+ $thumbnail = $image_metadata['sizes'][$size_option];
+ break;
+ }
+ }
+
+ if ($thumbnail !== false && isset($thumbnail['file']) && isset($thumbnail['width']) && isset($thumbnail['height'])) {
return array(
"src" => str_replace(basename($full_url), $thumbnail['file'], $full_url),
@@ -1264,7 +1273,7 @@ if ( ! class_exists( 'WMobilePack_Export' ) ) {
$comment_post_ID = $post->ID;
$comment_author = (isset($_GET['author'])) ? trim(strip_tags($_GET['author'])) : '';
$comment_author_email = (isset($_GET['email'])) ? trim($_GET['email']) : '';
- $comment_author_url = (isset($_GET['url'])) ? trim($this->purifier->purify($_GET['url'])) : '';
+ $comment_author_url = (isset($_GET['url'])) ? trim(filter_var($_GET['url'], FILTER_SANITIZE_URL)) : '';
$comment_content = (isset($_GET['comment'])) ? trim($this->purifier->purify($_GET['comment'])) : '';
$comment_type = 'comment';
$comment_parent = isset($_GET['comment_parent']) ? absint($_GET['comment_parent']) : 0;
@@ -1360,7 +1369,7 @@ if ( ! class_exists( 'WMobilePack_Export' ) ) {
'message' => 'Duplicate comment'
);
- echo $this->purifier->purify($_GET['callback']). '(' . json_encode($arr_response) . ')';
+ echo filter_var($_GET['callback'], FILTER_SANITIZE_STRING). '(' . json_encode($arr_response) . ')';
// end
exit();
@@ -1585,15 +1594,27 @@ if ( ! class_exists( 'WMobilePack_Export' ) ) {
// set blog name
$blog_name = get_bloginfo("name");
- // init response depending on the manifest type
+ // init response depending on the manifest type
if (isset($_GET['content']) && $_GET['content'] == 'androidmanifest') {
- $arr_manifest = array(
+ $arr_manifest = array(
'name' => $blog_name,
'start_url' => home_url(),
- 'display' => 'standalone'
+ 'display' => 'standalone',
+ 'orientation' => 'any'
);
+ if (!class_exists('WMobilePack_Themes_Config')) {
+ require_once(WMP_PLUGIN_PATH . 'inc/class-wmp-themes-config.php');
+ }
+
+ $background_color = WMobilePack_Themes_Config::get_manifest_background();
+
+ if ($background_color !== false){
+ $arr_manifest['theme_color'] = $background_color;
+ $arr_manifest['background_color'] = $background_color;
+ }
+
} else {
// remove domain name from the launch path
diff --git a/plugins/wordpress-mobile-pack/export/content.php b/plugins/wordpress-mobile-pack/export/content.php
index d1f7b06..85aafa3 100755
--- a/plugins/wordpress-mobile-pack/export/content.php
+++ b/plugins/wordpress-mobile-pack/export/content.php
@@ -18,7 +18,7 @@ if ( isset( $_GET['content'] ) ) {
if ( isset( $_GET['callback'] ) ) {
// filter callback param
- $callback = $export->purifier->purify( $_GET['callback'] );
+ $callback = filter_var($_GET['callback'], FILTER_SANITIZE_STRING);
header( 'Content-Type: application/javascript' );
diff --git a/plugins/wordpress-mobile-pack/frontend/class-application.php b/plugins/wordpress-mobile-pack/frontend/class-application.php
index ed33304..d684719 100755
--- a/plugins/wordpress-mobile-pack/frontend/class-application.php
+++ b/plugins/wordpress-mobile-pack/frontend/class-application.php
@@ -505,6 +505,12 @@ if (!class_exists('WMobilePack_Application')) {
$settings['comments_token'] = WMobilePack_Tokens::get_token();
+ if (!class_exists('WMobilePack_Themes_Config')) {
+ require_once(WMP_PLUGIN_PATH . 'inc/class-wmp-themes-config.php');
+ }
+
+ $settings['manifest_color'] = WMobilePack_Themes_Config::get_manifest_background($settings['color_scheme']);
+
return $settings;
}
diff --git a/plugins/wordpress-mobile-pack/frontend/themes/app1/template.php b/plugins/wordpress-mobile-pack/frontend/themes/app1/template.php
index 110c090..be447d4 100755
--- a/plugins/wordpress-mobile-pack/frontend/themes/app1/template.php
+++ b/plugins/wordpress-mobile-pack/frontend/themes/app1/template.php
@@ -34,6 +34,11 @@ if ($texts_json_exists === false) {
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<link rel="apple-touch-icon-precomposed" href="" />
<meta name="mobile-web-app-capable" content="yes" />
+
+ <?php if ($app_settings['manifest_color'] !== false) :?>
+ <meta name="theme-color" content="<?php echo $app_settings['manifest_color']; ?>">
+ <?php endif;?>
+
<link rel="manifest" href="<?php echo $export_path."content.php?content=androidmanifest";?>" />
<?php if ($app_settings['icon'] != ''): // icon path for Firefox ?>
@@ -41,6 +46,8 @@ if ($texts_json_exists === false) {
<?php endif;?>
<title><?php echo get_bloginfo("name");?></title>
+ <noscript>Your browser does not support JavaScript!</noscript>
+
<style type="text/css">
/**
* Example of an initial loading indicator.
diff --git a/plugins/wordpress-mobile-pack/inc/class-wmp-formatter.php b/plugins/wordpress-mobile-pack/inc/class-wmp-formatter.php
index 80629d1..ce108d3 100755
--- a/plugins/wordpress-mobile-pack/inc/class-wmp-formatter.php
+++ b/plugins/wordpress-mobile-pack/inc/class-wmp-formatter.php
@@ -1,210 +1,212 @@
-<?php
-
-// set HTML Purifier
-require_once WMP_PLUGIN_PATH . 'libs/htmlpurifier-4.6.0/library/HTMLPurifier.safe-includes.php';
-require_once WMP_PLUGIN_PATH . 'libs/htmlpurifier-html5/htmlpurifier_html5.php';
-
-if ( ! class_exists( 'WMobilePack_Formatter' ) ) {
-
- /**
- * Class WMobilePack_Formatter
- *
- * Contains different methods for formatting exported content
- */
- class WMobilePack_Formatter
- {
-
- /**
- *
- * Init an HTMLPurifier object for filtering exported content and return it.
- *
- * @return HTMLPurifier
- *
- */
- public static function init_purifier()
- {
-
- $config = HTMLPurifier_Config::createDefault();
-
- $config->set('Cache.DefinitionImpl', null); // disable cache
- $config->set('Core.Encoding', 'UTF-8');
-
- $config->set('HTML.AllowedElements', 'div,a,p,ol,li,ul,img,blockquote,em,span,h1,h2,h3,h4,h5,h6,i,u,strong,b,sup,br,cite,iframe,small,video,audio,source');
- $config->set('HTML.AllowedAttributes', '*.style,*.width,*.height,*.src,a.href,a.target,img.srcset,img.sizes,iframe.frameborder,iframe.marginheight,iframe.marginwidth,iframe.scrolling,iframe.allowfullscreen,*.poster,*.preload,*.controls,*.type,*.data-type');
-
- $config->set('Attr.AllowedFrameTargets', '_blank, _parent, _self, _top');
- $config->set('URI.AllowedSchemes', array('http' => true, 'https' => true, 'mailto' => true, 'news' => true, 'tel' => true, 'callto' => true, 'skype' => true, 'sms' => true, 'whatsapp' => true));
-
- $config->set('HTML.SafeIframe', 1);
- $config->set('URI.SafeIframeRegexp', "%^(https?:)?(http?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player.vimeo.com|www\.dailymotion.com|w.soundcloud.com|fast.wistia.net|fast.wistia.com|wi.st|flickrit.com|www.spreaker.com|spreaker.com|instagram.com|www.instagram.com|embed.spotify.com|play.spotify.com|spotify.com|player.youku.com|youku.com|maps.google.com)%");
-
- // extend purifier
- $Html5Purifier = new WMPHtmlPurifier();
- return $Html5Purifier->wmp_extended_purifier($config);
- }
-
-
- /**
- *
- * Format an article's or comment's date
- *
- * The date_i18n() method will translate months and days names if the locale files are found in the
- * /wp-content/languages folder.
- *
- * @param $date_timestamp
- */
- public static function format_date($date_timestamp)
- {
- if (date('Y') == date('Y', $date_timestamp))
- return date_i18n('D, F d', $date_timestamp);
-
- return date_i18n('F d, Y', $date_timestamp);
- }
-
-
- /**
- *
- * This method can truncate a string up to a number of characters while preserving whole words and HTML tags.
- *
- * @param string $text String to truncate.
- * @param integer $length Length of returned string, including ellipsis.
- * @param string $ending Ending to be appended to the trimmed string.
- * @param boolean $exact If false, $text will not be cut mid-word
- * @param boolean $considerHtml If true, HTML tags would be handled correctly
- * @param boolean $stripTags If true, all the tags except some allowed tags will be removed
- *
- * @return string = Trimmed string.
- */
- public static function truncate_html($text, $length = 200, $ending = '...', $exact = false, $considerHtml = true, $stripTags = true)
- {
-
- if ($considerHtml) {
-
- // remove all unwanted script tags
- $text = self::remove_script_tags($text);
-
- // if no_images is true, remove all images from the content
- if ($stripTags)
- $text = strip_tags($text, '<p><a><span><br><i><u><strong><b><sup><em>');
-
- // if the plain text is shorter than the maximum length, return the whole text
- if (strlen(preg_replace('/<.*?>/', '', $text)) <= $length) {
- return $text;
- }
-
- // splits all html-tags to scanable lines
- preg_match_all('/(<.+?>)?([^<>]*)/s', $text, $lines, PREG_SET_ORDER);
- $total_length = strlen($ending);
- $open_tags = array();
- $truncate = '';
-
- foreach ($lines as $line_matchings) {
-
- // if there is any html-tag in this line, handle it and add it (uncounted) to the output
- if (!empty($line_matchings[1])) {
-
- // if it's an "empty element" with or without xhtml-conform closing slash
- if (preg_match('/^<(\s*.+?\/\s*|\s*(img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param)(\s.+?)?)>$/is', $line_matchings[1])) {
-
- // do nothing
- // if tag is a closing tag
-
- } else if (preg_match('/^<\s*\/([^\s]+?)\s*>$/s', $line_matchings[1], $tag_matchings)) {
-
- // delete tag from $open_tags list
- $pos = array_search($tag_matchings[1], $open_tags);
- if ($pos !== false) {
- unset($open_tags[$pos]);
- }
-
- // if tag is an opening tag
- } else if (preg_match('/^<\s*([^\s>!]+).*?>$/s', $line_matchings[1], $tag_matchings)) {
- // add tag to the beginning of $open_tags list
- array_unshift($open_tags, strtolower($tag_matchings[1]));
- }
- // add html-tag to $truncate'd text
- $truncate .= $line_matchings[1];
- }
-
- // calculate the length of the plain text part of the line; handle entities as one character
- $content_length = strlen(preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', ' ', $line_matchings[2]));
-
- if ($total_length + $content_length > $length) {
-
- // the number of characters which are left
- $left = $length - $total_length;
- $entities_length = 0;
-
- // search for html entities
- if (preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', $line_matchings[2], $entities, PREG_OFFSET_CAPTURE)) {
- // calculate the real length of all entities in the legal range
- foreach ($entities[0] as $entity) {
- if ($entity[1] + 1 - $entities_length <= $left) {
- $left--;
- $entities_length += strlen($entity[0]);
- } else {
- // no more characters left
- break;
- }
- }
- }
-
- $truncate .= substr($line_matchings[2], 0, $left + $entities_length);
- // maximum length is reached, so get off the loop
- break;
- } else {
- $truncate .= $line_matchings[2];
- $total_length += $content_length;
- }
- // if the maximum length is reached, get off the loop
- if ($total_length >= $length) {
- break;
- }
- }
- } else {
- if (strlen($text) <= $length) {
- return $text;
- } else {
- $truncate = substr($text, 0, $length - strlen($ending));
- }
- }
-
- // if the words shouldn't be cut in the middle...
- if (!$exact) {
-
- // ...search the last occurrence of a space...
- $spacepos = strrpos($truncate, ' ');
-
- if ($spacepos !== false) {
- // ...and cut the text in this position
- $truncate = substr($truncate, 0, $spacepos);
- }
- }
-
- // add the defined ending to the text
- $truncate .= $ending;
- if ($considerHtml) {
- // close all unclosed html-tags
- foreach ($open_tags as $tag) {
- $truncate .= '</' . $tag . '>';
- }
- }
- return $truncate;
- }
-
-
- /**
- * Method used to remove script tags and everything in between them
- *
- * @param $text
- * @return string
- */
- public static function remove_script_tags($text)
- {
- $text = preg_replace("/<\s*script[^>]*>[\s\S]*?(<\s*\/script[^>]*>|$)/i", " ", $text);
- return $text;
- }
-
- }
-}
-
+<?php
+
+// set HTML Purifier
+require_once WMP_PLUGIN_PATH . 'libs/htmlpurifier-4.8.0/library/HTMLPurifier.safe-includes.php';
+require_once WMP_PLUGIN_PATH . 'libs/htmlpurifier-html5/htmlpurifier_html5.php';
+
+if ( ! class_exists( 'WMobilePack_Formatter' ) ) {
+
+ /**
+ * Class WMobilePack_Formatter
+ *
+ * Contains different methods for formatting exported content
+ */
+ class WMobilePack_Formatter
+ {
+
+ /**
+ *
+ * Init an HTMLPurifier object for filtering exported content and return it.
+ *
+ * @return HTMLPurifier
+ *
+ */
+ public static function init_purifier()
+ {
+
+ $config = HTMLPurifier_Config::createDefault();
+
+ $config->set('Cache.DefinitionImpl', null); // disable cache
+ $config->set('Core.Encoding', 'UTF-8');
+
+ $config->set('HTML.TargetNoreferrer', false);
+
+ $config->set('HTML.AllowedElements', 'div,a,p,ol,li,ul,img,blockquote,em,span,h1,h2,h3,h4,h5,h6,i,u,strong,b,sup,br,cite,iframe,small,video,audio,source');
+ $config->set('HTML.AllowedAttributes', '*.style,*.width,*.height,*.src,a.href,a.target,img.srcset,img.sizes,iframe.frameborder,iframe.marginheight,iframe.marginwidth,iframe.scrolling,iframe.allowfullscreen,*.poster,*.preload,*.controls,*.type,*.data-type');
+
+ $config->set('Attr.AllowedFrameTargets', '_blank, _parent, _self, _top');
+ $config->set('URI.AllowedSchemes', array('http' => true, 'https' => true, 'mailto' => true, 'news' => true, 'tel' => true, 'callto' => true, 'skype' => true, 'sms' => true, 'whatsapp' => true));
+
+ $config->set('HTML.SafeIframe', 1);
+ $config->set('URI.SafeIframeRegexp', "%^(https?:)?(http?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player.vimeo.com|www\.dailymotion.com|w.soundcloud.com|fast.wistia.net|fast.wistia.com|wi.st|flickrit.com|www.spreaker.com|spreaker.com|instagram.com|www.instagram.com|embed.spotify.com|play.spotify.com|spotify.com|player.youku.com|youku.com|maps.google.com)%");
+
+ // extend purifier
+ $Html5Purifier = new WMPHtmlPurifier();
+ return $Html5Purifier->wmp_extended_purifier($config);
+ }
+
+
+ /**
+ *
+ * Format an article's or comment's date
+ *
+ * The date_i18n() method will translate months and days names if the locale files are found in the
+ * /wp-content/languages folder.
+ *
+ * @param $date_timestamp
+ */
+ public static function format_date($date_timestamp)
+ {
+ if (date('Y') == date('Y', $date_timestamp))
+ return date_i18n('D, F d', $date_timestamp);
+
+ return date_i18n('F d, Y', $date_timestamp);
+ }
+
+
+ /**
+ *
+ * This method can truncate a string up to a number of characters while preserving whole words and HTML tags.
+ *
+ * @param string $text String to truncate.
+ * @param integer $length Length of returned string, including ellipsis.
+ * @param string $ending Ending to be appended to the trimmed string.
+ * @param boolean $exact If false, $text will not be cut mid-word
+ * @param boolean $considerHtml If true, HTML tags would be handled correctly
+ * @param boolean $stripTags If true, all the tags except some allowed tags will be removed
+ *
+ * @return string = Trimmed string.
+ */
+ public static function truncate_html($text, $length = 200, $ending = '...', $exact = false, $considerHtml = true, $stripTags = true)
+ {
+
+ if ($considerHtml) {
+
+ // remove all unwanted script tags
+ $text = self::remove_script_tags($text);
+
+ // if no_images is true, remove all images from the content
+ if ($stripTags)
+ $text = strip_tags($text, '<p><a><span><br><i><u><strong><b><sup><em>');
+
+ // if the plain text is shorter than the maximum length, return the whole text
+ if (strlen(preg_replace('/<.*?>/', '', $text)) <= $length) {
+ return $text;
+ }
+
+ // splits all html-tags to scanable lines
+ preg_match_all('/(<.+?>)?([^<>]*)/s', $text, $lines, PREG_SET_ORDER);
+ $total_length = strlen($ending);
+ $open_tags = array();
+ $truncate = '';
+
+ foreach ($lines as $line_matchings) {
+
+ // if there is any html-tag in this line, handle it and add it (uncounted) to the output
+ if (!empty($line_matchings[1])) {
+
+ // if it's an "empty element" with or without xhtml-conform closing slash
+ if (preg_match('/^<(\s*.+?\/\s*|\s*(img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param)(\s.+?)?)>$/is', $line_matchings[1])) {
+
+ // do nothing
+ // if tag is a closing tag
+
+ } else if (preg_match('/^<\s*\/([^\s]+?)\s*>$/s', $line_matchings[1], $tag_matchings)) {
+
+ // delete tag from $open_tags list
+ $pos = array_search($tag_matchings[1], $open_tags);
+ if ($pos !== false) {
+ unset($open_tags[$pos]);
+ }
+
+ // if tag is an opening tag
+ } else if (preg_match('/^<\s*([^\s>!]+).*?>$/s', $line_matchings[1], $tag_matchings)) {
+ // add tag to the beginning of $open_tags list
+ array_unshift($open_tags, strtolower($tag_matchings[1]));
+ }
+ // add html-tag to $truncate'd text
+ $truncate .= $line_matchings[1];
+ }
+
+ // calculate the length of the plain text part of the line; handle entities as one character
+ $content_length = strlen(preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', ' ', $line_matchings[2]));
+
+ if ($total_length + $content_length > $length) {
+
+ // the number of characters which are left
+ $left = $length - $total_length;
+ $entities_length = 0;
+
+ // search for html entities
+ if (preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', $line_matchings[2], $entities, PREG_OFFSET_CAPTURE)) {
+ // calculate the real length of all entities in the legal range
+ foreach ($entities[0] as $entity) {
+ if ($entity[1] + 1 - $entities_length <= $left) {
+ $left--;
+ $entities_length += strlen($entity[0]);
+ } else {
+ // no more characters left
+ break;
+ }
+ }
+ }
+
+ $truncate .= substr($line_matchings[2], 0, $left + $entities_length);
+ // maximum length is reached, so get off the loop
+ break;
+ } else {
+ $truncate .= $line_matchings[2];
+ $total_length += $content_length;
+ }
+ // if the maximum length is reached, get off the loop
+ if ($total_length >= $length) {
+ break;
+ }
+ }
+ } else {
+ if (strlen($text) <= $length) {
+ return $text;
+ } else {
+ $truncate = substr($text, 0, $length - strlen($ending));
+ }
+ }
+
+ // if the words shouldn't be cut in the middle...
+ if (!$exact) {
+
+ // ...search the last occurrence of a space...
+ $spacepos = strrpos($truncate, ' ');
+
+ if ($spacepos !== false) {
+ // ...and cut the text in this position
+ $truncate = substr($truncate, 0, $spacepos);
+ }
+ }
+
+ // add the defined ending to the text
+ $truncate .= $ending;
+ if ($considerHtml) {
+ // close all unclosed html-tags
+ foreach ($open_tags as $tag) {
+ $truncate .= '</' . $tag . '>';
+ }
+ }
+ return $truncate;
+ }
+
+
+ /**
+ * Method used to remove script tags and everything in between them
+ *
+ * @param $text
+ * @return string
+ */
+ public static function remove_script_tags($text)
+ {
+ $text = preg_replace("/<\s*script[^>]*>[\s\S]*?(<\s*\/script[^>]*>|$)/i", " ", $text);
+ return $text;
+ }
+
+ }
+}
+
diff --git a/plugins/wordpress-mobile-pack/inc/class-wmp-themes-config.php b/plugins/wordpress-mobile-pack/inc/class-wmp-themes-config.php
index e291439..f036ced 100755
--- a/plugins/wordpress-mobile-pack/inc/class-wmp-themes-config.php
+++ b/plugins/wordpress-mobile-pack/inc/class-wmp-themes-config.php
@@ -1,98 +1,131 @@
-<?php
-
-if ( ! class_exists( 'WMobilePack_Themes_Config' ) ) {
-
- /**
- * Overall Themes Config class
- */
- class WMobilePack_Themes_Config
- {
-
- /* ----------------------------------*/
- /* Properties */
- /* ----------------------------------*/
-
- public static $allowed_fonts = array(
- 'Roboto Light Condensed',
- 'Crimson Roman',
- 'Open Sans Condensed Light',
- 'Roboto Condensed Bold',
- 'Roboto Condensed Regular',
- 'Roboto Slab Light',
- 'Helvetica Neue Light Condensed',
- 'Helvetica Neue Bold Condensed',
- 'Gotham Book'
- );
-
- public static $color_schemes = array(
-
- 1 => array (
- 'labels' => array(
- 'Headlines and primary texts',
- 'Article background',
- 'Article border',
- 'Secondary texts - dates and other messages',
- 'Category label color',
- 'Category text color',
- 'Buttons',
- 'Side menu background',
- 'Form inputs text',
- 'Cover text color'
- ),
- 'vars' => array(
- 'base-text-color',
- 'shape-bg-color',
- 'article-border-color',
- 'extra-text-color',
- 'category-color',
- 'category-text-color',
- 'buttons-color',
- 'menu-color',
- 'form-color',
- 'cover-text-color'
- ),
- 'presets' => array(
- 1 => array(
- '#000000',
- '#ffffff',
- '#c3c3c3',
- '#2f2f2f',
- '#63a9dd',
- '#ffffff',
- '#37454c',
- '#f0f0f0',
- '#5c5c5c',
- '#ffffff'
- ),
- 2 => array(
- '#ffffff',
- '#212121',
- '#6e6e6e',
- '#eeeeee',
- '#ff4f64',
- '#ffffff',
- '#63a9dd',
- '#40454a',
- '#ededed',
- '#ffffff'
- ),
- 3 => array(
- '#4d3c2c',
- '#f5e4d2',
- '#cba37d',
- '#655547',
- '#f18a2e',
- '#ffffff',
- '#75ae62',
- '#dfccb8',
- '#f9efe4',
- '#ffffff'
- )
- ),
- 'cover' => 1,
- 'posts_per_page' => 1
- )
- );
- }
-}
-
+<?php
+
+if ( ! class_exists( 'WMobilePack_Themes_Config' ) ) {
+
+ /**
+ * Overall Themes Config class
+ */
+ class WMobilePack_Themes_Config
+ {
+
+ /* ----------------------------------*/
+ /* Properties */
+ /* ----------------------------------*/
+
+ public static $allowed_fonts = array(
+ 'Roboto Light Condensed',
+ 'Crimson Roman',
+ 'Open Sans Condensed Light',
+ 'Roboto Condensed Bold',
+ 'Roboto Condensed Regular',
+ 'Roboto Slab Light',
+ 'Helvetica Neue Light Condensed',
+ 'Helvetica Neue Bold Condensed',
+ 'Gotham Book'
+ );
+
+ public static $color_schemes = array(
+
+ 1 => array (
+ 'labels' => array(
+ 'Headlines and primary texts',
+ 'Article background',
+ 'Article border',
+ 'Secondary texts - dates and other messages',
+ 'Category label color',
+ 'Category text color',
+ 'Buttons',
+ 'Side menu background',
+ 'Form inputs text',
+ 'Cover text color'
+ ),
+ 'vars' => array(
+ 'base-text-color',
+ 'shape-bg-color',
+ 'article-border-color',
+ 'extra-text-color',
+ 'category-color',
+ 'category-text-color',
+ 'buttons-color',
+ 'menu-color',
+ 'form-color',
+ 'cover-text-color'
+ ),
+ 'presets' => array(
+ 1 => array(
+ '#000000',
+ '#ffffff',
+ '#c3c3c3',
+ '#2f2f2f',
+ '#63a9dd',
+ '#ffffff',
+ '#37454c',
+ '#f0f0f0',
+ '#5c5c5c',
+ '#ffffff'
+ ),
+ 2 => array(
+ '#ffffff',
+ '#212121',
+ '#6e6e6e',
+ '#eeeeee',
+ '#ff4f64',
+ '#ffffff',
+ '#63a9dd',
+ '#40454a',
+ '#ededed',
+ '#ffffff'
+ ),
+ 3 => array(
+ '#4d3c2c',
+ '#f5e4d2',
+ '#cba37d',
+ '#655547',
+ '#f18a2e',
+ '#ffffff',
+ '#75ae62',
+ '#dfccb8',
+ '#f9efe4',
+ '#ffffff'
+ )
+ ),
+ 'cover' => 1,
+ 'posts_per_page' => 1
+ )
+ );
+
+
+ /**
+ * Get the application's background color for the app manifest.
+ *
+ * @param int or null $color_scheme
+ * @return string or false
+ */
+ public static function get_manifest_background($color_scheme = null)
+ {
+
+ if ($color_scheme == null){
+ $color_scheme = WMobilePack_Options::get_setting('color_scheme');
+ }
+
+ switch ($color_scheme) {
+
+ case 0 :
+ $custom_colors = WMobilePack_Options::get_setting('custom_colors');
+
+ if (is_array($custom_colors) && isset($custom_colors[1])) {
+ return $custom_colors[1];
+ }
+ break;
+
+ case 1 :
+ case 2 :
+ case 3 :
+ return self::$color_schemes[1]['presets'][$color_scheme][1];
+ }
+
+ return false;
+ }
+ }
+}
+
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.composer.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.composer.php
deleted file mode 100755
index e7fd7d0..0000000
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.composer.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-if (!defined('HTMLPURIFIER_PREFIX')) {
- define('HTMLPURIFIER_PREFIX', __DIR__);
-}
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema.ser b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema.ser
deleted file mode 100755
index 22ea321..0000000
Binary files a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema.ser and /dev/null differ
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.Iframe.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.Iframe.txt
deleted file mode 100755
index 90963ab..0000000
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.Iframe.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Filter.Iframe
-TYPE: bool
-VERSION: 3.2.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
- This directive enables Iframe video embedding in HTML Purifier. Check
- <a href="http://htmlpurifier.org/docs/filter-custom.html">this document
- on embedding videos</a> for more information on what this filter does.
-</p>
---# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/tel.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/tel.php
deleted file mode 100755
index ecf1f18..0000000
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/tel.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * Validates 'tel:' phone number in URI to included only alphanumeric, hyphens, underscore, and optional leading "+"
- */
-class HTMLPurifier_URIScheme_tel extends HTMLPurifier_URIScheme {
-
- public $browsable = false;
- public $may_omit_host = true;
-
- public function doValidate(&$uri, $config, $context) {
- $uri->userinfo = null;
- $uri->host = null;
- $uri->port = null;
-
- // my legal phone # chars: alphanumeric, underscore, hyphen, optional "+" for the first character. That's it. But you can allow whatever you want. Just change this:
- $validCalltoPhoneNumberPattern = '/^\+?[a-zA-Z0-9_-]+$/i'; // <---whatever pattern you want to force phone numbers to match
- $proposedPhoneNumber = $uri->path;
-
- if (preg_match($validCalltoPhoneNumberPattern, $proposedPhoneNumber) !== 1) {
-
- // submitted phone # inside the href attribute value looks bad; reject the phone number, and let HTMLpurifier remove the whole href attribute on the submitted <a> tag.
- return false;
- } else {
- // submitted phone # inside the href attribute value looks OK; accept the phone number; HTMLpurifier should NOT strip the href attribute on the submitted <a> tag.
- return true;
- }
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.auto.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.auto.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.auto.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.auto.php
index c810e87..1960c39 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.auto.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.auto.php
@@ -1,11 +1,11 @@
-<?php
-
-/**
- * This is a stub include that automatically configures the include path.
- */
-
-set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
-require_once 'HTMLPurifier/Bootstrap.php';
-require_once 'HTMLPurifier.autoload.php';
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * This is a stub include that automatically configures the include path.
+ */
+
+set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
+require_once 'HTMLPurifier/Bootstrap.php';
+require_once 'HTMLPurifier.autoload.php';
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.autoload.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.autoload.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.autoload.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.autoload.php
index 63193c3..c3ea67e 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.autoload.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.autoload.php
@@ -1,27 +1,27 @@
-<?php
-
-/**
- * @file
- * Convenience file that registers autoload handler for HTML Purifier.
- * It also does some sanity checks.
- */
-
-if (function_exists('spl_autoload_register') && function_exists('spl_autoload_unregister')) {
- // We need unregister for our pre-registering functionality
- HTMLPurifier_Bootstrap::registerAutoload();
- if (function_exists('__autoload')) {
- // Be polite and ensure that userland autoload gets retained
- spl_autoload_register('__autoload');
- }
-} elseif (!function_exists('__autoload')) {
- function __autoload($class)
- {
- return HTMLPurifier_Bootstrap::autoload($class);
- }
-}
-
-if (ini_get('zend.ze1_compatibility_mode')) {
- trigger_error("HTML Purifier is not compatible with zend.ze1_compatibility_mode; please turn it off", E_USER_ERROR);
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * @file
+ * Convenience file that registers autoload handler for HTML Purifier.
+ * It also does some sanity checks.
+ */
+
+if (function_exists('spl_autoload_register') && function_exists('spl_autoload_unregister')) {
+ // We need unregister for our pre-registering functionality
+ HTMLPurifier_Bootstrap::registerAutoload();
+ if (function_exists('__autoload')) {
+ // Be polite and ensure that userland autoload gets retained
+ spl_autoload_register('__autoload');
+ }
+} elseif (!function_exists('__autoload')) {
+ function __autoload($class)
+ {
+ return HTMLPurifier_Bootstrap::autoload($class);
+ }
+}
+
+if (ini_get('zend.ze1_compatibility_mode')) {
+ trigger_error("HTML Purifier is not compatible with zend.ze1_compatibility_mode; please turn it off", E_USER_ERROR);
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.composer.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.composer.php
new file mode 100755
index 0000000..52acc56
--- /dev/null
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.composer.php
@@ -0,0 +1,4 @@
+<?php
+if (!defined('HTMLPURIFIER_PREFIX')) {
+ define('HTMLPURIFIER_PREFIX', dirname(__FILE__));
+}
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.func.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.func.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.func.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.func.php
index f26eed1..64b140b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.func.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.func.php
@@ -1,25 +1,25 @@
-<?php
-
-/**
- * @file
- * Defines a function wrapper for HTML Purifier for quick use.
- * @note ''HTMLPurifier()'' is NOT the same as ''new HTMLPurifier()''
- */
-
-/**
- * Purify HTML.
- * @param string $html String HTML to purify
- * @param mixed $config Configuration to use, can be any value accepted by
- * HTMLPurifier_Config::create()
- * @return string
- */
-function HTMLPurifier($html, $config = null)
-{
- static $purifier = false;
- if (!$purifier) {
- $purifier = new HTMLPurifier();
- }
- return $purifier->purify($html, $config);
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * @file
+ * Defines a function wrapper for HTML Purifier for quick use.
+ * @note ''HTMLPurifier()'' is NOT the same as ''new HTMLPurifier()''
+ */
+
+/**
+ * Purify HTML.
+ * @param string $html String HTML to purify
+ * @param mixed $config Configuration to use, can be any value accepted by
+ * HTMLPurifier_Config::create()
+ * @return string
+ */
+function HTMLPurifier($html, $config = null)
+{
+ static $purifier = false;
+ if (!$purifier) {
+ $purifier = new HTMLPurifier();
+ }
+ return $purifier->purify($html, $config);
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.includes.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.includes.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.includes.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.includes.php
index faac17a..b1131ef 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.includes.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.includes.php
@@ -1,229 +1,232 @@
-<?php
-
-/**
- * @file
- * This file was auto-generated by generate-includes.php and includes all of
- * the core files required by HTML Purifier. Use this if performance is a
- * primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
- * FILE, changes will be overwritten the next time the script is run.
- *
- * @version 4.6.0
- *
- * @warning
- * You must *not* include any other HTML Purifier files before this file,
- * because 'require' not 'require_once' is used.
- *
- * @warning
- * This file requires that the include path contains the HTML Purifier
- * library directory; this is not auto-set.
- */
-
-require 'HTMLPurifier.php';
-require 'HTMLPurifier/Arborize.php';
-require 'HTMLPurifier/AttrCollections.php';
-require 'HTMLPurifier/AttrDef.php';
-require 'HTMLPurifier/AttrTransform.php';
-require 'HTMLPurifier/AttrTypes.php';
-require 'HTMLPurifier/AttrValidator.php';
-require 'HTMLPurifier/Bootstrap.php';
-require 'HTMLPurifier/Definition.php';
-require 'HTMLPurifier/CSSDefinition.php';
-require 'HTMLPurifier/ChildDef.php';
-require 'HTMLPurifier/Config.php';
-require 'HTMLPurifier/ConfigSchema.php';
-require 'HTMLPurifier/ContentSets.php';
-require 'HTMLPurifier/Context.php';
-require 'HTMLPurifier/DefinitionCache.php';
-require 'HTMLPurifier/DefinitionCacheFactory.php';
-require 'HTMLPurifier/Doctype.php';
-require 'HTMLPurifier/DoctypeRegistry.php';
-require 'HTMLPurifier/ElementDef.php';
-require 'HTMLPurifier/Encoder.php';
-require 'HTMLPurifier/EntityLookup.php';
-require 'HTMLPurifier/EntityParser.php';
-require 'HTMLPurifier/ErrorCollector.php';
-require 'HTMLPurifier/ErrorStruct.php';
-require 'HTMLPurifier/Exception.php';
-require 'HTMLPurifier/Filter.php';
-require 'HTMLPurifier/Generator.php';
-require 'HTMLPurifier/HTMLDefinition.php';
-require 'HTMLPurifier/HTMLModule.php';
-require 'HTMLPurifier/HTMLModuleManager.php';
-require 'HTMLPurifier/IDAccumulator.php';
-require 'HTMLPurifier/Injector.php';
-require 'HTMLPurifier/Language.php';
-require 'HTMLPurifier/LanguageFactory.php';
-require 'HTMLPurifier/Length.php';
-require 'HTMLPurifier/Lexer.php';
-require 'HTMLPurifier/Node.php';
-require 'HTMLPurifier/PercentEncoder.php';
-require 'HTMLPurifier/PropertyList.php';
-require 'HTMLPurifier/PropertyListIterator.php';
-require 'HTMLPurifier/Queue.php';
-require 'HTMLPurifier/Strategy.php';
-require 'HTMLPurifier/StringHash.php';
-require 'HTMLPurifier/StringHashParser.php';
-require 'HTMLPurifier/TagTransform.php';
-require 'HTMLPurifier/Token.php';
-require 'HTMLPurifier/TokenFactory.php';
-require 'HTMLPurifier/URI.php';
-require 'HTMLPurifier/URIDefinition.php';
-require 'HTMLPurifier/URIFilter.php';
-require 'HTMLPurifier/URIParser.php';
-require 'HTMLPurifier/URIScheme.php';
-require 'HTMLPurifier/URISchemeRegistry.php';
-require 'HTMLPurifier/UnitConverter.php';
-require 'HTMLPurifier/VarParser.php';
-require 'HTMLPurifier/VarParserException.php';
-require 'HTMLPurifier/Zipper.php';
-require 'HTMLPurifier/AttrDef/CSS.php';
-require 'HTMLPurifier/AttrDef/Clone.php';
-require 'HTMLPurifier/AttrDef/Enum.php';
-require 'HTMLPurifier/AttrDef/Integer.php';
-require 'HTMLPurifier/AttrDef/Lang.php';
-require 'HTMLPurifier/AttrDef/Switch.php';
-require 'HTMLPurifier/AttrDef/Text.php';
-require 'HTMLPurifier/AttrDef/URI.php';
-require 'HTMLPurifier/AttrDef/CSS/Number.php';
-require 'HTMLPurifier/AttrDef/CSS/AlphaValue.php';
-require 'HTMLPurifier/AttrDef/CSS/Background.php';
-require 'HTMLPurifier/AttrDef/CSS/BackgroundPosition.php';
-require 'HTMLPurifier/AttrDef/CSS/Border.php';
-require 'HTMLPurifier/AttrDef/CSS/Color.php';
-require 'HTMLPurifier/AttrDef/CSS/Composite.php';
-require 'HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php';
-require 'HTMLPurifier/AttrDef/CSS/Filter.php';
-require 'HTMLPurifier/AttrDef/CSS/Font.php';
-require 'HTMLPurifier/AttrDef/CSS/FontFamily.php';
-require 'HTMLPurifier/AttrDef/CSS/Ident.php';
-require 'HTMLPurifier/AttrDef/CSS/ImportantDecorator.php';
-require 'HTMLPurifier/AttrDef/CSS/Length.php';
-require 'HTMLPurifier/AttrDef/CSS/ListStyle.php';
-require 'HTMLPurifier/AttrDef/CSS/Multiple.php';
-require 'HTMLPurifier/AttrDef/CSS/Percentage.php';
-require 'HTMLPurifier/AttrDef/CSS/TextDecoration.php';
-require 'HTMLPurifier/AttrDef/CSS/URI.php';
-require 'HTMLPurifier/AttrDef/HTML/Bool.php';
-require 'HTMLPurifier/AttrDef/HTML/Nmtokens.php';
-require 'HTMLPurifier/AttrDef/HTML/Class.php';
-require 'HTMLPurifier/AttrDef/HTML/Color.php';
-require 'HTMLPurifier/AttrDef/HTML/FrameTarget.php';
-require 'HTMLPurifier/AttrDef/HTML/ID.php';
-require 'HTMLPurifier/AttrDef/HTML/Pixels.php';
-require 'HTMLPurifier/AttrDef/HTML/Length.php';
-require 'HTMLPurifier/AttrDef/HTML/LinkTypes.php';
-require 'HTMLPurifier/AttrDef/HTML/MultiLength.php';
-require 'HTMLPurifier/AttrDef/URI/Email.php';
-require 'HTMLPurifier/AttrDef/URI/Host.php';
-require 'HTMLPurifier/AttrDef/URI/IPv4.php';
-require 'HTMLPurifier/AttrDef/URI/IPv6.php';
-require 'HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php';
-require 'HTMLPurifier/AttrTransform/Background.php';
-require 'HTMLPurifier/AttrTransform/BdoDir.php';
-require 'HTMLPurifier/AttrTransform/BgColor.php';
-require 'HTMLPurifier/AttrTransform/BoolToCSS.php';
-require 'HTMLPurifier/AttrTransform/Border.php';
-require 'HTMLPurifier/AttrTransform/EnumToCSS.php';
-require 'HTMLPurifier/AttrTransform/ImgRequired.php';
-require 'HTMLPurifier/AttrTransform/ImgSpace.php';
-require 'HTMLPurifier/AttrTransform/Input.php';
-require 'HTMLPurifier/AttrTransform/Lang.php';
-require 'HTMLPurifier/AttrTransform/Length.php';
-require 'HTMLPurifier/AttrTransform/Name.php';
-require 'HTMLPurifier/AttrTransform/NameSync.php';
-require 'HTMLPurifier/AttrTransform/Nofollow.php';
-require 'HTMLPurifier/AttrTransform/SafeEmbed.php';
-require 'HTMLPurifier/AttrTransform/SafeObject.php';
-require 'HTMLPurifier/AttrTransform/SafeParam.php';
-require 'HTMLPurifier/AttrTransform/ScriptRequired.php';
-require 'HTMLPurifier/AttrTransform/TargetBlank.php';
-require 'HTMLPurifier/AttrTransform/Textarea.php';
-require 'HTMLPurifier/ChildDef/Chameleon.php';
-require 'HTMLPurifier/ChildDef/Custom.php';
-require 'HTMLPurifier/ChildDef/Empty.php';
-require 'HTMLPurifier/ChildDef/List.php';
-require 'HTMLPurifier/ChildDef/Required.php';
-require 'HTMLPurifier/ChildDef/Optional.php';
-require 'HTMLPurifier/ChildDef/StrictBlockquote.php';
-require 'HTMLPurifier/ChildDef/Table.php';
-require 'HTMLPurifier/DefinitionCache/Decorator.php';
-require 'HTMLPurifier/DefinitionCache/Null.php';
-require 'HTMLPurifier/DefinitionCache/Serializer.php';
-require 'HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
-require 'HTMLPurifier/DefinitionCache/Decorator/Memory.php';
-require 'HTMLPurifier/HTMLModule/Bdo.php';
-require 'HTMLPurifier/HTMLModule/CommonAttributes.php';
-require 'HTMLPurifier/HTMLModule/Edit.php';
-require 'HTMLPurifier/HTMLModule/Forms.php';
-require 'HTMLPurifier/HTMLModule/Hypertext.php';
-require 'HTMLPurifier/HTMLModule/Iframe.php';
-require 'HTMLPurifier/HTMLModule/Image.php';
-require 'HTMLPurifier/HTMLModule/Legacy.php';
-require 'HTMLPurifier/HTMLModule/List.php';
-require 'HTMLPurifier/HTMLModule/Name.php';
-require 'HTMLPurifier/HTMLModule/Nofollow.php';
-require 'HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php';
-require 'HTMLPurifier/HTMLModule/Object.php';
-require 'HTMLPurifier/HTMLModule/Presentation.php';
-require 'HTMLPurifier/HTMLModule/Proprietary.php';
-require 'HTMLPurifier/HTMLModule/Ruby.php';
-require 'HTMLPurifier/HTMLModule/SafeEmbed.php';
-require 'HTMLPurifier/HTMLModule/SafeObject.php';
-require 'HTMLPurifier/HTMLModule/SafeScripting.php';
-require 'HTMLPurifier/HTMLModule/Scripting.php';
-require 'HTMLPurifier/HTMLModule/StyleAttribute.php';
-require 'HTMLPurifier/HTMLModule/Tables.php';
-require 'HTMLPurifier/HTMLModule/Target.php';
-require 'HTMLPurifier/HTMLModule/TargetBlank.php';
-require 'HTMLPurifier/HTMLModule/Text.php';
-require 'HTMLPurifier/HTMLModule/Tidy.php';
-require 'HTMLPurifier/HTMLModule/XMLCommonAttributes.php';
-require 'HTMLPurifier/HTMLModule/Tidy/Name.php';
-require 'HTMLPurifier/HTMLModule/Tidy/Proprietary.php';
-require 'HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php';
-require 'HTMLPurifier/HTMLModule/Tidy/Strict.php';
-require 'HTMLPurifier/HTMLModule/Tidy/Transitional.php';
-require 'HTMLPurifier/HTMLModule/Tidy/XHTML.php';
-require 'HTMLPurifier/Injector/AutoParagraph.php';
-require 'HTMLPurifier/Injector/DisplayLinkURI.php';
-require 'HTMLPurifier/Injector/Linkify.php';
-require 'HTMLPurifier/Injector/PurifierLinkify.php';
-require 'HTMLPurifier/Injector/RemoveEmpty.php';
-require 'HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php';
-require 'HTMLPurifier/Injector/SafeObject.php';
-require 'HTMLPurifier/Lexer/DOMLex.php';
-require 'HTMLPurifier/Lexer/DirectLex.php';
-require 'HTMLPurifier/Node/Comment.php';
-require 'HTMLPurifier/Node/Element.php';
-require 'HTMLPurifier/Node/Text.php';
-require 'HTMLPurifier/Strategy/Composite.php';
-require 'HTMLPurifier/Strategy/Core.php';
-require 'HTMLPurifier/Strategy/FixNesting.php';
-require 'HTMLPurifier/Strategy/MakeWellFormed.php';
-require 'HTMLPurifier/Strategy/RemoveForeignElements.php';
-require 'HTMLPurifier/Strategy/ValidateAttributes.php';
-require 'HTMLPurifier/TagTransform/Font.php';
-require 'HTMLPurifier/TagTransform/Simple.php';
-require 'HTMLPurifier/Token/Comment.php';
-require 'HTMLPurifier/Token/Tag.php';
-require 'HTMLPurifier/Token/Empty.php';
-require 'HTMLPurifier/Token/End.php';
-require 'HTMLPurifier/Token/Start.php';
-require 'HTMLPurifier/Token/Text.php';
-require 'HTMLPurifier/URIFilter/DisableExternal.php';
-require 'HTMLPurifier/URIFilter/DisableExternalResources.php';
-require 'HTMLPurifier/URIFilter/DisableResources.php';
-require 'HTMLPurifier/URIFilter/HostBlacklist.php';
-require 'HTMLPurifier/URIFilter/MakeAbsolute.php';
-require 'HTMLPurifier/URIFilter/Munge.php';
-require 'HTMLPurifier/URIFilter/SafeIframe.php';
-require 'HTMLPurifier/URIScheme/data.php';
-require 'HTMLPurifier/URIScheme/file.php';
-require 'HTMLPurifier/URIScheme/ftp.php';
-require 'HTMLPurifier/URIScheme/http.php';
-require 'HTMLPurifier/URIScheme/https.php';
-require 'HTMLPurifier/URIScheme/mailto.php';
-require 'HTMLPurifier/URIScheme/news.php';
-require 'HTMLPurifier/URIScheme/nntp.php';
-require 'HTMLPurifier/VarParser/Flexible.php';
-require 'HTMLPurifier/VarParser/Native.php';
+<?php
+
+/**
+ * @file
+ * This file was auto-generated by generate-includes.php and includes all of
+ * the core files required by HTML Purifier. Use this if performance is a
+ * primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
+ * FILE, changes will be overwritten the next time the script is run.
+ *
+ * @version 4.8.0
+ *
+ * @warning
+ * You must *not* include any other HTML Purifier files before this file,
+ * because 'require' not 'require_once' is used.
+ *
+ * @warning
+ * This file requires that the include path contains the HTML Purifier
+ * library directory; this is not auto-set.
+ */
+
+require 'HTMLPurifier.php';
+require 'HTMLPurifier/Arborize.php';
+require 'HTMLPurifier/AttrCollections.php';
+require 'HTMLPurifier/AttrDef.php';
+require 'HTMLPurifier/AttrTransform.php';
+require 'HTMLPurifier/AttrTypes.php';
+require 'HTMLPurifier/AttrValidator.php';
+require 'HTMLPurifier/Bootstrap.php';
+require 'HTMLPurifier/Definition.php';
+require 'HTMLPurifier/CSSDefinition.php';
+require 'HTMLPurifier/ChildDef.php';
+require 'HTMLPurifier/Config.php';
+require 'HTMLPurifier/ConfigSchema.php';
+require 'HTMLPurifier/ContentSets.php';
+require 'HTMLPurifier/Context.php';
+require 'HTMLPurifier/DefinitionCache.php';
+require 'HTMLPurifier/DefinitionCacheFactory.php';
+require 'HTMLPurifier/Doctype.php';
+require 'HTMLPurifier/DoctypeRegistry.php';
+require 'HTMLPurifier/ElementDef.php';
+require 'HTMLPurifier/Encoder.php';
+require 'HTMLPurifier/EntityLookup.php';
+require 'HTMLPurifier/EntityParser.php';
+require 'HTMLPurifier/ErrorCollector.php';
+require 'HTMLPurifier/ErrorStruct.php';
+require 'HTMLPurifier/Exception.php';
+require 'HTMLPurifier/Filter.php';
+require 'HTMLPurifier/Generator.php';
+require 'HTMLPurifier/HTMLDefinition.php';
+require 'HTMLPurifier/HTMLModule.php';
+require 'HTMLPurifier/HTMLModuleManager.php';
+require 'HTMLPurifier/IDAccumulator.php';
+require 'HTMLPurifier/Injector.php';
+require 'HTMLPurifier/Language.php';
+require 'HTMLPurifier/LanguageFactory.php';
+require 'HTMLPurifier/Length.php';
+require 'HTMLPurifier/Lexer.php';
+require 'HTMLPurifier/Node.php';
+require 'HTMLPurifier/PercentEncoder.php';
+require 'HTMLPurifier/PropertyList.php';
+require 'HTMLPurifier/PropertyListIterator.php';
+require 'HTMLPurifier/Queue.php';
+require 'HTMLPurifier/Strategy.php';
+require 'HTMLPurifier/StringHash.php';
+require 'HTMLPurifier/StringHashParser.php';
+require 'HTMLPurifier/TagTransform.php';
+require 'HTMLPurifier/Token.php';
+require 'HTMLPurifier/TokenFactory.php';
+require 'HTMLPurifier/URI.php';
+require 'HTMLPurifier/URIDefinition.php';
+require 'HTMLPurifier/URIFilter.php';
+require 'HTMLPurifier/URIParser.php';
+require 'HTMLPurifier/URIScheme.php';
+require 'HTMLPurifier/URISchemeRegistry.php';
+require 'HTMLPurifier/UnitConverter.php';
+require 'HTMLPurifier/VarParser.php';
+require 'HTMLPurifier/VarParserException.php';
+require 'HTMLPurifier/Zipper.php';
+require 'HTMLPurifier/AttrDef/CSS.php';
+require 'HTMLPurifier/AttrDef/Clone.php';
+require 'HTMLPurifier/AttrDef/Enum.php';
+require 'HTMLPurifier/AttrDef/Integer.php';
+require 'HTMLPurifier/AttrDef/Lang.php';
+require 'HTMLPurifier/AttrDef/Switch.php';
+require 'HTMLPurifier/AttrDef/Text.php';
+require 'HTMLPurifier/AttrDef/URI.php';
+require 'HTMLPurifier/AttrDef/CSS/Number.php';
+require 'HTMLPurifier/AttrDef/CSS/AlphaValue.php';
+require 'HTMLPurifier/AttrDef/CSS/Background.php';
+require 'HTMLPurifier/AttrDef/CSS/BackgroundPosition.php';
+require 'HTMLPurifier/AttrDef/CSS/Border.php';
+require 'HTMLPurifier/AttrDef/CSS/Color.php';
+require 'HTMLPurifier/AttrDef/CSS/Composite.php';
+require 'HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php';
+require 'HTMLPurifier/AttrDef/CSS/Filter.php';
+require 'HTMLPurifier/AttrDef/CSS/Font.php';
+require 'HTMLPurifier/AttrDef/CSS/FontFamily.php';
+require 'HTMLPurifier/AttrDef/CSS/Ident.php';
+require 'HTMLPurifier/AttrDef/CSS/ImportantDecorator.php';
+require 'HTMLPurifier/AttrDef/CSS/Length.php';
+require 'HTMLPurifier/AttrDef/CSS/ListStyle.php';
+require 'HTMLPurifier/AttrDef/CSS/Multiple.php';
+require 'HTMLPurifier/AttrDef/CSS/Percentage.php';
+require 'HTMLPurifier/AttrDef/CSS/TextDecoration.php';
+require 'HTMLPurifier/AttrDef/CSS/URI.php';
+require 'HTMLPurifier/AttrDef/HTML/Bool.php';
+require 'HTMLPurifier/AttrDef/HTML/Nmtokens.php';
+require 'HTMLPurifier/AttrDef/HTML/Class.php';
+require 'HTMLPurifier/AttrDef/HTML/Color.php';
+require 'HTMLPurifier/AttrDef/HTML/FrameTarget.php';
+require 'HTMLPurifier/AttrDef/HTML/ID.php';
+require 'HTMLPurifier/AttrDef/HTML/Pixels.php';
+require 'HTMLPurifier/AttrDef/HTML/Length.php';
+require 'HTMLPurifier/AttrDef/HTML/LinkTypes.php';
+require 'HTMLPurifier/AttrDef/HTML/MultiLength.php';
+require 'HTMLPurifier/AttrDef/URI/Email.php';
+require 'HTMLPurifier/AttrDef/URI/Host.php';
+require 'HTMLPurifier/AttrDef/URI/IPv4.php';
+require 'HTMLPurifier/AttrDef/URI/IPv6.php';
+require 'HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php';
+require 'HTMLPurifier/AttrTransform/Background.php';
+require 'HTMLPurifier/AttrTransform/BdoDir.php';
+require 'HTMLPurifier/AttrTransform/BgColor.php';
+require 'HTMLPurifier/AttrTransform/BoolToCSS.php';
+require 'HTMLPurifier/AttrTransform/Border.php';
+require 'HTMLPurifier/AttrTransform/EnumToCSS.php';
+require 'HTMLPurifier/AttrTransform/ImgRequired.php';
+require 'HTMLPurifier/AttrTransform/ImgSpace.php';
+require 'HTMLPurifier/AttrTransform/Input.php';
+require 'HTMLPurifier/AttrTransform/Lang.php';
+require 'HTMLPurifier/AttrTransform/Length.php';
+require 'HTMLPurifier/AttrTransform/Name.php';
+require 'HTMLPurifier/AttrTransform/NameSync.php';
+require 'HTMLPurifier/AttrTransform/Nofollow.php';
+require 'HTMLPurifier/AttrTransform/SafeEmbed.php';
+require 'HTMLPurifier/AttrTransform/SafeObject.php';
+require 'HTMLPurifier/AttrTransform/SafeParam.php';
+require 'HTMLPurifier/AttrTransform/ScriptRequired.php';
+require 'HTMLPurifier/AttrTransform/TargetBlank.php';
+require 'HTMLPurifier/AttrTransform/TargetNoreferrer.php';
+require 'HTMLPurifier/AttrTransform/Textarea.php';
+require 'HTMLPurifier/ChildDef/Chameleon.php';
+require 'HTMLPurifier/ChildDef/Custom.php';
+require 'HTMLPurifier/ChildDef/Empty.php';
+require 'HTMLPurifier/ChildDef/List.php';
+require 'HTMLPurifier/ChildDef/Required.php';
+require 'HTMLPurifier/ChildDef/Optional.php';
+require 'HTMLPurifier/ChildDef/StrictBlockquote.php';
+require 'HTMLPurifier/ChildDef/Table.php';
+require 'HTMLPurifier/DefinitionCache/Decorator.php';
+require 'HTMLPurifier/DefinitionCache/Null.php';
+require 'HTMLPurifier/DefinitionCache/Serializer.php';
+require 'HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
+require 'HTMLPurifier/DefinitionCache/Decorator/Memory.php';
+require 'HTMLPurifier/HTMLModule/Bdo.php';
+require 'HTMLPurifier/HTMLModule/CommonAttributes.php';
+require 'HTMLPurifier/HTMLModule/Edit.php';
+require 'HTMLPurifier/HTMLModule/Forms.php';
+require 'HTMLPurifier/HTMLModule/Hypertext.php';
+require 'HTMLPurifier/HTMLModule/Iframe.php';
+require 'HTMLPurifier/HTMLModule/Image.php';
+require 'HTMLPurifier/HTMLModule/Legacy.php';
+require 'HTMLPurifier/HTMLModule/List.php';
+require 'HTMLPurifier/HTMLModule/Name.php';
+require 'HTMLPurifier/HTMLModule/Nofollow.php';
+require 'HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php';
+require 'HTMLPurifier/HTMLModule/Object.php';
+require 'HTMLPurifier/HTMLModule/Presentation.php';
+require 'HTMLPurifier/HTMLModule/Proprietary.php';
+require 'HTMLPurifier/HTMLModule/Ruby.php';
+require 'HTMLPurifier/HTMLModule/SafeEmbed.php';
+require 'HTMLPurifier/HTMLModule/SafeObject.php';
+require 'HTMLPurifier/HTMLModule/SafeScripting.php';
+require 'HTMLPurifier/HTMLModule/Scripting.php';
+require 'HTMLPurifier/HTMLModule/StyleAttribute.php';
+require 'HTMLPurifier/HTMLModule/Tables.php';
+require 'HTMLPurifier/HTMLModule/Target.php';
+require 'HTMLPurifier/HTMLModule/TargetBlank.php';
+require 'HTMLPurifier/HTMLModule/TargetNoreferrer.php';
+require 'HTMLPurifier/HTMLModule/Text.php';
+require 'HTMLPurifier/HTMLModule/Tidy.php';
+require 'HTMLPurifier/HTMLModule/XMLCommonAttributes.php';
+require 'HTMLPurifier/HTMLModule/Tidy/Name.php';
+require 'HTMLPurifier/HTMLModule/Tidy/Proprietary.php';
+require 'HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php';
+require 'HTMLPurifier/HTMLModule/Tidy/Strict.php';
+require 'HTMLPurifier/HTMLModule/Tidy/Transitional.php';
+require 'HTMLPurifier/HTMLModule/Tidy/XHTML.php';
+require 'HTMLPurifier/Injector/AutoParagraph.php';
+require 'HTMLPurifier/Injector/DisplayLinkURI.php';
+require 'HTMLPurifier/Injector/Linkify.php';
+require 'HTMLPurifier/Injector/PurifierLinkify.php';
+require 'HTMLPurifier/Injector/RemoveEmpty.php';
+require 'HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php';
+require 'HTMLPurifier/Injector/SafeObject.php';
+require 'HTMLPurifier/Lexer/DOMLex.php';
+require 'HTMLPurifier/Lexer/DirectLex.php';
+require 'HTMLPurifier/Node/Comment.php';
+require 'HTMLPurifier/Node/Element.php';
+require 'HTMLPurifier/Node/Text.php';
+require 'HTMLPurifier/Strategy/Composite.php';
+require 'HTMLPurifier/Strategy/Core.php';
+require 'HTMLPurifier/Strategy/FixNesting.php';
+require 'HTMLPurifier/Strategy/MakeWellFormed.php';
+require 'HTMLPurifier/Strategy/RemoveForeignElements.php';
+require 'HTMLPurifier/Strategy/ValidateAttributes.php';
+require 'HTMLPurifier/TagTransform/Font.php';
+require 'HTMLPurifier/TagTransform/Simple.php';
+require 'HTMLPurifier/Token/Comment.php';
+require 'HTMLPurifier/Token/Tag.php';
+require 'HTMLPurifier/Token/Empty.php';
+require 'HTMLPurifier/Token/End.php';
+require 'HTMLPurifier/Token/Start.php';
+require 'HTMLPurifier/Token/Text.php';
+require 'HTMLPurifier/URIFilter/DisableExternal.php';
+require 'HTMLPurifier/URIFilter/DisableExternalResources.php';
+require 'HTMLPurifier/URIFilter/DisableResources.php';
+require 'HTMLPurifier/URIFilter/HostBlacklist.php';
+require 'HTMLPurifier/URIFilter/MakeAbsolute.php';
+require 'HTMLPurifier/URIFilter/Munge.php';
+require 'HTMLPurifier/URIFilter/SafeIframe.php';
+require 'HTMLPurifier/URIScheme/data.php';
+require 'HTMLPurifier/URIScheme/file.php';
+require 'HTMLPurifier/URIScheme/ftp.php';
+require 'HTMLPurifier/URIScheme/http.php';
+require 'HTMLPurifier/URIScheme/https.php';
+require 'HTMLPurifier/URIScheme/mailto.php';
+require 'HTMLPurifier/URIScheme/news.php';
+require 'HTMLPurifier/URIScheme/nntp.php';
+require 'HTMLPurifier/URIScheme/tel.php';
+require 'HTMLPurifier/VarParser/Flexible.php';
+require 'HTMLPurifier/VarParser/Native.php';
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.kses.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.kses.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.kses.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.kses.php
index cf0c322..7522900 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.kses.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.kses.php
@@ -1,30 +1,30 @@
-<?php
-
-/**
- * @file
- * Emulation layer for code that used kses(), substituting in HTML Purifier.
- */
-
-require_once dirname(__FILE__) . '/HTMLPurifier.auto.php';
-
-function kses($string, $allowed_html, $allowed_protocols = null)
-{
- $config = HTMLPurifier_Config::createDefault();
- $allowed_elements = array();
- $allowed_attributes = array();
- foreach ($allowed_html as $element => $attributes) {
- $allowed_elements[$element] = true;
- foreach ($attributes as $attribute => $x) {
- $allowed_attributes["$element.$attribute"] = true;
- }
- }
- $config->set('HTML.AllowedElements', $allowed_elements);
- $config->set('HTML.AllowedAttributes', $allowed_attributes);
- if ($allowed_protocols !== null) {
- $config->set('URI.AllowedSchemes', $allowed_protocols);
- }
- $purifier = new HTMLPurifier($config);
- return $purifier->purify($string);
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * @file
+ * Emulation layer for code that used kses(), substituting in HTML Purifier.
+ */
+
+require_once dirname(__FILE__) . '/HTMLPurifier.auto.php';
+
+function kses($string, $allowed_html, $allowed_protocols = null)
+{
+ $config = HTMLPurifier_Config::createDefault();
+ $allowed_elements = array();
+ $allowed_attributes = array();
+ foreach ($allowed_html as $element => $attributes) {
+ $allowed_elements[$element] = true;
+ foreach ($attributes as $attribute => $x) {
+ $allowed_attributes["$element.$attribute"] = true;
+ }
+ }
+ $config->set('HTML.AllowedElements', $allowed_elements);
+ $config->set('HTML.AllowedAttributes', $allowed_attributes);
+ if ($allowed_protocols !== null) {
+ $config->set('URI.AllowedSchemes', $allowed_protocols);
+ }
+ $purifier = new HTMLPurifier($config);
+ return $purifier->purify($string);
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.path.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.path.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.path.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.path.php
index 353492a..39b1b65 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.path.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.path.php
@@ -1,11 +1,11 @@
-<?php
-
-/**
- * @file
- * Convenience stub file that adds HTML Purifier's library file to the path
- * without any other side-effects.
- */
-
-set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * @file
+ * Convenience stub file that adds HTML Purifier's library file to the path
+ * without any other side-effects.
+ */
+
+set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.php
index 428a48b..38a78e8 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.php
@@ -1,292 +1,292 @@
-<?php
-
-/*! @mainpage
- *
- * HTML Purifier is an HTML filter that will take an arbitrary snippet of
- * HTML and rigorously test, validate and filter it into a version that
- * is safe for output onto webpages. It achieves this by:
- *
- * -# Lexing (parsing into tokens) the document,
- * -# Executing various strategies on the tokens:
- * -# Removing all elements not in the whitelist,
- * -# Making the tokens well-formed,
- * -# Fixing the nesting of the nodes, and
- * -# Validating attributes of the nodes; and
- * -# Generating HTML from the purified tokens.
- *
- * However, most users will only need to interface with the HTMLPurifier
- * and HTMLPurifier_Config.
- */
-
-/*
- HTML Purifier 4.6.0 - Standards Compliant HTML Filtering
- Copyright (C) 2006-2008 Edward Z. Yang
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * Facade that coordinates HTML Purifier's subsystems in order to purify HTML.
- *
- * @note There are several points in which configuration can be specified
- * for HTML Purifier. The precedence of these (from lowest to
- * highest) is as follows:
- * -# Instance: new HTMLPurifier($config)
- * -# Invocation: purify($html, $config)
- * These configurations are entirely independent of each other and
- * are *not* merged (this behavior may change in the future).
- *
- * @todo We need an easier way to inject strategies using the configuration
- * object.
- */
-class HTMLPurifier
-{
-
- /**
- * Version of HTML Purifier.
- * @type string
- */
- public $version = '4.6.0';
-
- /**
- * Constant with version of HTML Purifier.
- */
- const VERSION = '4.6.0';
-
- /**
- * Global configuration object.
- * @type HTMLPurifier_Config
- */
- public $config;
-
- /**
- * Array of extra filter objects to run on HTML,
- * for backwards compatibility.
- * @type HTMLPurifier_Filter[]
- */
- private $filters = array();
-
- /**
- * Single instance of HTML Purifier.
- * @type HTMLPurifier
- */
- private static $instance;
-
- /**
- * @type HTMLPurifier_Strategy_Core
- */
- protected $strategy;
-
- /**
- * @type HTMLPurifier_Generator
- */
- protected $generator;
-
- /**
- * Resultant context of last run purification.
- * Is an array of contexts if the last called method was purifyArray().
- * @type HTMLPurifier_Context
- */
- public $context;
-
- /**
- * Initializes the purifier.
- *
- * @param HTMLPurifier_Config $config Optional HTMLPurifier_Config object
- * for all instances of the purifier, if omitted, a default
- * configuration is supplied (which can be overridden on a
- * per-use basis).
- * The parameter can also be any type that
- * HTMLPurifier_Config::create() supports.
- */
- public function __construct($config = null)
- {
- $this->config = HTMLPurifier_Config::create($config);
- $this->strategy = new HTMLPurifier_Strategy_Core();
- }
-
- /**
- * Adds a filter to process the output. First come first serve
- *
- * @param HTMLPurifier_Filter $filter HTMLPurifier_Filter object
- */
- public function addFilter($filter)
- {
- trigger_error(
- 'HTMLPurifier->addFilter() is deprecated, use configuration directives' .
- ' in the Filter namespace or Filter.Custom',
- E_USER_WARNING
- );
- $this->filters[] = $filter;
- }
-
- /**
- * Filters an HTML snippet/document to be XSS-free and standards-compliant.
- *
- * @param string $html String of HTML to purify
- * @param HTMLPurifier_Config $config Config object for this operation,
- * if omitted, defaults to the config object specified during this
- * object's construction. The parameter can also be any type
- * that HTMLPurifier_Config::create() supports.
- *
- * @return string Purified HTML
- */
- public function purify($html, $config = null)
- {
- // :TODO: make the config merge in, instead of replace
- $config = $config ? HTMLPurifier_Config::create($config) : $this->config;
-
- // implementation is partially environment dependant, partially
- // configuration dependant
- $lexer = HTMLPurifier_Lexer::create($config);
-
- $context = new HTMLPurifier_Context();
-
- // setup HTML generator
- $this->generator = new HTMLPurifier_Generator($config, $context);
- $context->register('Generator', $this->generator);
-
- // set up global context variables
- if ($config->get('Core.CollectErrors')) {
- // may get moved out if other facilities use it
- $language_factory = HTMLPurifier_LanguageFactory::instance();
- $language = $language_factory->create($config, $context);
- $context->register('Locale', $language);
-
- $error_collector = new HTMLPurifier_ErrorCollector($context);
- $context->register('ErrorCollector', $error_collector);
- }
-
- // setup id_accumulator context, necessary due to the fact that
- // AttrValidator can be called from many places
- $id_accumulator = HTMLPurifier_IDAccumulator::build($config, $context);
- $context->register('IDAccumulator', $id_accumulator);
-
- $html = HTMLPurifier_Encoder::convertToUTF8($html, $config, $context);
-
- // setup filters
- $filter_flags = $config->getBatch('Filter');
- $custom_filters = $filter_flags['Custom'];
- unset($filter_flags['Custom']);
- $filters = array();
- foreach ($filter_flags as $filter => $flag) {
- if (!$flag) {
- continue;
- }
- if (strpos($filter, '.') !== false) {
- continue;
- }
- $class = "HTMLPurifier_Filter_$filter";
- $filters[] = new $class;
- }
- foreach ($custom_filters as $filter) {
- // maybe "HTMLPurifier_Filter_$filter", but be consistent with AutoFormat
- $filters[] = $filter;
- }
- $filters = array_merge($filters, $this->filters);
- // maybe prepare(), but later
-
- for ($i = 0, $filter_size = count($filters); $i < $filter_size; $i++) {
- $html = $filters[$i]->preFilter($html, $config, $context);
- }
-
- // purified HTML
- $html =
- $this->generator->generateFromTokens(
- // list of tokens
- $this->strategy->execute(
- // list of un-purified tokens
- $lexer->tokenizeHTML(
- // un-purified HTML
- $html,
- $config,
- $context
- ),
- $config,
- $context
- )
- );
-
- for ($i = $filter_size - 1; $i >= 0; $i--) {
- $html = $filters[$i]->postFilter($html, $config, $context);
- }
-
- $html = HTMLPurifier_Encoder::convertFromUTF8($html, $config, $context);
- $this->context =& $context;
- return $html;
- }
-
- /**
- * Filters an array of HTML snippets
- *
- * @param string[] $array_of_html Array of html snippets
- * @param HTMLPurifier_Config $config Optional config object for this operation.
- * See HTMLPurifier::purify() for more details.
- *
- * @return string[] Array of purified HTML
- */
- public function purifyArray($array_of_html, $config = null)
- {
- $context_array = array();
- foreach ($array_of_html as $key => $html) {
- $array_of_html[$key] = $this->purify($html, $config);
- $context_array[$key] = $this->context;
- }
- $this->context = $context_array;
- return $array_of_html;
- }
-
- /**
- * Singleton for enforcing just one HTML Purifier in your system
- *
- * @param HTMLPurifier|HTMLPurifier_Config $prototype Optional prototype
- * HTMLPurifier instance to overload singleton with,
- * or HTMLPurifier_Config instance to configure the
- * generated version with.
- *
- * @return HTMLPurifier
- */
- public static function instance($prototype = null)
- {
- if (!self::$instance || $prototype) {
- if ($prototype instanceof HTMLPurifier) {
- self::$instance = $prototype;
- } elseif ($prototype) {
- self::$instance = new HTMLPurifier($prototype);
- } else {
- self::$instance = new HTMLPurifier();
- }
- }
- return self::$instance;
- }
-
- /**
- * Singleton for enforcing just one HTML Purifier in your system
- *
- * @param HTMLPurifier|HTMLPurifier_Config $prototype Optional prototype
- * HTMLPurifier instance to overload singleton with,
- * or HTMLPurifier_Config instance to configure the
- * generated version with.
- *
- * @return HTMLPurifier
- * @note Backwards compatibility, see instance()
- */
- public static function getInstance($prototype = null)
- {
- return HTMLPurifier::instance($prototype);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/*! @mainpage
+ *
+ * HTML Purifier is an HTML filter that will take an arbitrary snippet of
+ * HTML and rigorously test, validate and filter it into a version that
+ * is safe for output onto webpages. It achieves this by:
+ *
+ * -# Lexing (parsing into tokens) the document,
+ * -# Executing various strategies on the tokens:
+ * -# Removing all elements not in the whitelist,
+ * -# Making the tokens well-formed,
+ * -# Fixing the nesting of the nodes, and
+ * -# Validating attributes of the nodes; and
+ * -# Generating HTML from the purified tokens.
+ *
+ * However, most users will only need to interface with the HTMLPurifier
+ * and HTMLPurifier_Config.
+ */
+
+/*
+ HTML Purifier 4.8.0 - Standards Compliant HTML Filtering
+ Copyright (C) 2006-2008 Edward Z. Yang
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * Facade that coordinates HTML Purifier's subsystems in order to purify HTML.
+ *
+ * @note There are several points in which configuration can be specified
+ * for HTML Purifier. The precedence of these (from lowest to
+ * highest) is as follows:
+ * -# Instance: new HTMLPurifier($config)
+ * -# Invocation: purify($html, $config)
+ * These configurations are entirely independent of each other and
+ * are *not* merged (this behavior may change in the future).
+ *
+ * @todo We need an easier way to inject strategies using the configuration
+ * object.
+ */
+class HTMLPurifier
+{
+
+ /**
+ * Version of HTML Purifier.
+ * @type string
+ */
+ public $version = '4.8.0';
+
+ /**
+ * Constant with version of HTML Purifier.
+ */
+ const VERSION = '4.8.0';
+
+ /**
+ * Global configuration object.
+ * @type HTMLPurifier_Config
+ */
+ public $config;
+
+ /**
+ * Array of extra filter objects to run on HTML,
+ * for backwards compatibility.
+ * @type HTMLPurifier_Filter[]
+ */
+ private $filters = array();
+
+ /**
+ * Single instance of HTML Purifier.
+ * @type HTMLPurifier
+ */
+ private static $instance;
+
+ /**
+ * @type HTMLPurifier_Strategy_Core
+ */
+ protected $strategy;
+
+ /**
+ * @type HTMLPurifier_Generator
+ */
+ protected $generator;
+
+ /**
+ * Resultant context of last run purification.
+ * Is an array of contexts if the last called method was purifyArray().
+ * @type HTMLPurifier_Context
+ */
+ public $context;
+
+ /**
+ * Initializes the purifier.
+ *
+ * @param HTMLPurifier_Config|mixed $config Optional HTMLPurifier_Config object
+ * for all instances of the purifier, if omitted, a default
+ * configuration is supplied (which can be overridden on a
+ * per-use basis).
+ * The parameter can also be any type that
+ * HTMLPurifier_Config::create() supports.
+ */
+ public function __construct($config = null)
+ {
+ $this->config = HTMLPurifier_Config::create($config);
+ $this->strategy = new HTMLPurifier_Strategy_Core();
+ }
+
+ /**
+ * Adds a filter to process the output. First come first serve
+ *
+ * @param HTMLPurifier_Filter $filter HTMLPurifier_Filter object
+ */
+ public function addFilter($filter)
+ {
+ trigger_error(
+ 'HTMLPurifier->addFilter() is deprecated, use configuration directives' .
+ ' in the Filter namespace or Filter.Custom',
+ E_USER_WARNING
+ );
+ $this->filters[] = $filter;
+ }
+
+ /**
+ * Filters an HTML snippet/document to be XSS-free and standards-compliant.
+ *
+ * @param string $html String of HTML to purify
+ * @param HTMLPurifier_Config $config Config object for this operation,
+ * if omitted, defaults to the config object specified during this
+ * object's construction. The parameter can also be any type
+ * that HTMLPurifier_Config::create() supports.
+ *
+ * @return string Purified HTML
+ */
+ public function purify($html, $config = null)
+ {
+ // :TODO: make the config merge in, instead of replace
+ $config = $config ? HTMLPurifier_Config::create($config) : $this->config;
+
+ // implementation is partially environment dependant, partially
+ // configuration dependant
+ $lexer = HTMLPurifier_Lexer::create($config);
+
+ $context = new HTMLPurifier_Context();
+
+ // setup HTML generator
+ $this->generator = new HTMLPurifier_Generator($config, $context);
+ $context->register('Generator', $this->generator);
+
+ // set up global context variables
+ if ($config->get('Core.CollectErrors')) {
+ // may get moved out if other facilities use it
+ $language_factory = HTMLPurifier_LanguageFactory::instance();
+ $language = $language_factory->create($config, $context);
+ $context->register('Locale', $language);
+
+ $error_collector = new HTMLPurifier_ErrorCollector($context);
+ $context->register('ErrorCollector', $error_collector);
+ }
+
+ // setup id_accumulator context, necessary due to the fact that
+ // AttrValidator can be called from many places
+ $id_accumulator = HTMLPurifier_IDAccumulator::build($config, $context);
+ $context->register('IDAccumulator', $id_accumulator);
+
+ $html = HTMLPurifier_Encoder::convertToUTF8($html, $config, $context);
+
+ // setup filters
+ $filter_flags = $config->getBatch('Filter');
+ $custom_filters = $filter_flags['Custom'];
+ unset($filter_flags['Custom']);
+ $filters = array();
+ foreach ($filter_flags as $filter => $flag) {
+ if (!$flag) {
+ continue;
+ }
+ if (strpos($filter, '.') !== false) {
+ continue;
+ }
+ $class = "HTMLPurifier_Filter_$filter";
+ $filters[] = new $class;
+ }
+ foreach ($custom_filters as $filter) {
+ // maybe "HTMLPurifier_Filter_$filter", but be consistent with AutoFormat
+ $filters[] = $filter;
+ }
+ $filters = array_merge($filters, $this->filters);
+ // maybe prepare(), but later
+
+ for ($i = 0, $filter_size = count($filters); $i < $filter_size; $i++) {
+ $html = $filters[$i]->preFilter($html, $config, $context);
+ }
+
+ // purified HTML
+ $html =
+ $this->generator->generateFromTokens(
+ // list of tokens
+ $this->strategy->execute(
+ // list of un-purified tokens
+ $lexer->tokenizeHTML(
+ // un-purified HTML
+ $html,
+ $config,
+ $context
+ ),
+ $config,
+ $context
+ )
+ );
+
+ for ($i = $filter_size - 1; $i >= 0; $i--) {
+ $html = $filters[$i]->postFilter($html, $config, $context);
+ }
+
+ $html = HTMLPurifier_Encoder::convertFromUTF8($html, $config, $context);
+ $this->context =& $context;
+ return $html;
+ }
+
+ /**
+ * Filters an array of HTML snippets
+ *
+ * @param string[] $array_of_html Array of html snippets
+ * @param HTMLPurifier_Config $config Optional config object for this operation.
+ * See HTMLPurifier::purify() for more details.
+ *
+ * @return string[] Array of purified HTML
+ */
+ public function purifyArray($array_of_html, $config = null)
+ {
+ $context_array = array();
+ foreach ($array_of_html as $key => $html) {
+ $array_of_html[$key] = $this->purify($html, $config);
+ $context_array[$key] = $this->context;
+ }
+ $this->context = $context_array;
+ return $array_of_html;
+ }
+
+ /**
+ * Singleton for enforcing just one HTML Purifier in your system
+ *
+ * @param HTMLPurifier|HTMLPurifier_Config $prototype Optional prototype
+ * HTMLPurifier instance to overload singleton with,
+ * or HTMLPurifier_Config instance to configure the
+ * generated version with.
+ *
+ * @return HTMLPurifier
+ */
+ public static function instance($prototype = null)
+ {
+ if (!self::$instance || $prototype) {
+ if ($prototype instanceof HTMLPurifier) {
+ self::$instance = $prototype;
+ } elseif ($prototype) {
+ self::$instance = new HTMLPurifier($prototype);
+ } else {
+ self::$instance = new HTMLPurifier();
+ }
+ }
+ return self::$instance;
+ }
+
+ /**
+ * Singleton for enforcing just one HTML Purifier in your system
+ *
+ * @param HTMLPurifier|HTMLPurifier_Config $prototype Optional prototype
+ * HTMLPurifier instance to overload singleton with,
+ * or HTMLPurifier_Config instance to configure the
+ * generated version with.
+ *
+ * @return HTMLPurifier
+ * @note Backwards compatibility, see instance()
+ */
+ public static function getInstance($prototype = null)
+ {
+ return HTMLPurifier::instance($prototype);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.safe-includes.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.safe-includes.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.safe-includes.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.safe-includes.php
index 1e085db..5f2090d 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier.safe-includes.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier.safe-includes.php
@@ -1,228 +1,230 @@
-<?php
-
-/**
- * @file
- * This file was auto-generated by generate-includes.php and includes all of
- * the core files required by HTML Purifier. This is a convenience stub that
- * includes all files using dirname(__FILE__) and require_once. PLEASE DO NOT
- * EDIT THIS FILE, changes will be overwritten the next time the script is run.
- *
- * Changes to include_path are not necessary.
- */
-
-$__dir = dirname(__FILE__);
-
-require_once $__dir . '/HTMLPurifier.php';
-require_once $__dir . '/HTMLPurifier/Arborize.php';
-require_once $__dir . '/HTMLPurifier/AttrCollections.php';
-require_once $__dir . '/HTMLPurifier/AttrDef.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform.php';
-require_once $__dir . '/HTMLPurifier/AttrTypes.php';
-require_once $__dir . '/HTMLPurifier/AttrValidator.php';
-require_once $__dir . '/HTMLPurifier/Bootstrap.php';
-require_once $__dir . '/HTMLPurifier/Definition.php';
-require_once $__dir . '/HTMLPurifier/CSSDefinition.php';
-require_once $__dir . '/HTMLPurifier/ChildDef.php';
-require_once $__dir . '/HTMLPurifier/Config.php';
-require_once $__dir . '/HTMLPurifier/ConfigSchema.php';
-require_once $__dir . '/HTMLPurifier/ContentSets.php';
-require_once $__dir . '/HTMLPurifier/Context.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCacheFactory.php';
-require_once $__dir . '/HTMLPurifier/Doctype.php';
-require_once $__dir . '/HTMLPurifier/DoctypeRegistry.php';
-require_once $__dir . '/HTMLPurifier/ElementDef.php';
-require_once $__dir . '/HTMLPurifier/Encoder.php';
-require_once $__dir . '/HTMLPurifier/EntityLookup.php';
-require_once $__dir . '/HTMLPurifier/EntityParser.php';
-require_once $__dir . '/HTMLPurifier/ErrorCollector.php';
-require_once $__dir . '/HTMLPurifier/ErrorStruct.php';
-require_once $__dir . '/HTMLPurifier/Exception.php';
-require_once $__dir . '/HTMLPurifier/Filter.php';
-require_once $__dir . '/HTMLPurifier/Generator.php';
-require_once $__dir . '/HTMLPurifier/HTMLDefinition.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule.php';
-require_once $__dir . '/HTMLPurifier/HTMLModuleManager.php';
-require_once $__dir . '/HTMLPurifier/IDAccumulator.php';
-require_once $__dir . '/HTMLPurifier/Injector.php';
-require_once $__dir . '/HTMLPurifier/Language.php';
-require_once $__dir . '/HTMLPurifier/LanguageFactory.php';
-require_once $__dir . '/HTMLPurifier/Length.php';
-require_once $__dir . '/HTMLPurifier/Lexer.php';
-require_once $__dir . '/HTMLPurifier/Node.php';
-require_once $__dir . '/HTMLPurifier/PercentEncoder.php';
-require_once $__dir . '/HTMLPurifier/PropertyList.php';
-require_once $__dir . '/HTMLPurifier/PropertyListIterator.php';
-require_once $__dir . '/HTMLPurifier/Queue.php';
-require_once $__dir . '/HTMLPurifier/Strategy.php';
-require_once $__dir . '/HTMLPurifier/StringHash.php';
-require_once $__dir . '/HTMLPurifier/StringHashParser.php';
-require_once $__dir . '/HTMLPurifier/TagTransform.php';
-require_once $__dir . '/HTMLPurifier/Token.php';
-require_once $__dir . '/HTMLPurifier/TokenFactory.php';
-require_once $__dir . '/HTMLPurifier/URI.php';
-require_once $__dir . '/HTMLPurifier/URIDefinition.php';
-require_once $__dir . '/HTMLPurifier/URIFilter.php';
-require_once $__dir . '/HTMLPurifier/URIParser.php';
-require_once $__dir . '/HTMLPurifier/URIScheme.php';
-require_once $__dir . '/HTMLPurifier/URISchemeRegistry.php';
-require_once $__dir . '/HTMLPurifier/UnitConverter.php';
-require_once $__dir . '/HTMLPurifier/VarParser.php';
-require_once $__dir . '/HTMLPurifier/VarParserException.php';
-require_once $__dir . '/HTMLPurifier/Zipper.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Clone.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Enum.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Integer.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Lang.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Switch.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Text.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Number.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/AlphaValue.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Background.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Border.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Color.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Composite.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Filter.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Font.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/FontFamily.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Ident.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Length.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/ListStyle.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Multiple.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Percentage.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/TextDecoration.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/URI.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Bool.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Nmtokens.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Class.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Color.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/FrameTarget.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/ID.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Pixels.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Length.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/LinkTypes.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/MultiLength.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/Email.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/Host.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/IPv4.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/IPv6.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Background.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/BdoDir.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/BgColor.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/BoolToCSS.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Border.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/EnumToCSS.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/ImgRequired.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/ImgSpace.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Input.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Lang.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Length.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Name.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/NameSync.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Nofollow.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/SafeEmbed.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/SafeObject.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/SafeParam.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/ScriptRequired.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/TargetBlank.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Textarea.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Chameleon.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Custom.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Empty.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/List.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Required.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Optional.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/StrictBlockquote.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Table.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Null.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Serializer.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator/Memory.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Bdo.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/CommonAttributes.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Edit.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Forms.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Hypertext.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Iframe.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Image.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Legacy.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/List.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Name.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Nofollow.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Object.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Presentation.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Proprietary.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Ruby.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/SafeEmbed.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/SafeObject.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/SafeScripting.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Scripting.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/StyleAttribute.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tables.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Target.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/TargetBlank.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Text.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/XMLCommonAttributes.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Name.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Proprietary.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Strict.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Transitional.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/XHTML.php';
-require_once $__dir . '/HTMLPurifier/Injector/AutoParagraph.php';
-require_once $__dir . '/HTMLPurifier/Injector/DisplayLinkURI.php';
-require_once $__dir . '/HTMLPurifier/Injector/Linkify.php';
-require_once $__dir . '/HTMLPurifier/Injector/PurifierLinkify.php';
-require_once $__dir . '/HTMLPurifier/Injector/RemoveEmpty.php';
-require_once $__dir . '/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php';
-require_once $__dir . '/HTMLPurifier/Injector/SafeObject.php';
-require_once $__dir . '/HTMLPurifier/Lexer/DOMLex.php';
-require_once $__dir . '/HTMLPurifier/Lexer/DirectLex.php';
-require_once $__dir . '/HTMLPurifier/Node/Comment.php';
-require_once $__dir . '/HTMLPurifier/Node/Element.php';
-require_once $__dir . '/HTMLPurifier/Node/Text.php';
-require_once $__dir . '/HTMLPurifier/Strategy/Composite.php';
-require_once $__dir . '/HTMLPurifier/Strategy/Core.php';
-require_once $__dir . '/HTMLPurifier/Strategy/FixNesting.php';
-require_once $__dir . '/HTMLPurifier/Strategy/MakeWellFormed.php';
-require_once $__dir . '/HTMLPurifier/Strategy/RemoveForeignElements.php';
-require_once $__dir . '/HTMLPurifier/Strategy/ValidateAttributes.php';
-require_once $__dir . '/HTMLPurifier/TagTransform/Font.php';
-require_once $__dir . '/HTMLPurifier/TagTransform/Simple.php';
-require_once $__dir . '/HTMLPurifier/Token/Comment.php';
-require_once $__dir . '/HTMLPurifier/Token/Tag.php';
-require_once $__dir . '/HTMLPurifier/Token/Empty.php';
-require_once $__dir . '/HTMLPurifier/Token/End.php';
-require_once $__dir . '/HTMLPurifier/Token/Start.php';
-require_once $__dir . '/HTMLPurifier/Token/Text.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternal.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternalResources.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/DisableResources.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/HostBlacklist.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/MakeAbsolute.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/Munge.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/SafeIframe.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/data.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/file.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/ftp.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/http.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/https.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/mailto.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/news.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/nntp.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/tel.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/callto.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/skype.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/sms.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/whatsapp.php';
-require_once $__dir . '/HTMLPurifier/VarParser/Flexible.php';
-require_once $__dir . '/HTMLPurifier/VarParser/Native.php';
\ No newline at end of file
+<?php
+
+/**
+ * @file
+ * This file was auto-generated by generate-includes.php and includes all of
+ * the core files required by HTML Purifier. This is a convenience stub that
+ * includes all files using dirname(__FILE__) and require_once. PLEASE DO NOT
+ * EDIT THIS FILE, changes will be overwritten the next time the script is run.
+ *
+ * Changes to include_path are not necessary.
+ */
+
+$__dir = dirname(__FILE__);
+
+require_once $__dir . '/HTMLPurifier.php';
+require_once $__dir . '/HTMLPurifier/Arborize.php';
+require_once $__dir . '/HTMLPurifier/AttrCollections.php';
+require_once $__dir . '/HTMLPurifier/AttrDef.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform.php';
+require_once $__dir . '/HTMLPurifier/AttrTypes.php';
+require_once $__dir . '/HTMLPurifier/AttrValidator.php';
+require_once $__dir . '/HTMLPurifier/Bootstrap.php';
+require_once $__dir . '/HTMLPurifier/Definition.php';
+require_once $__dir . '/HTMLPurifier/CSSDefinition.php';
+require_once $__dir . '/HTMLPurifier/ChildDef.php';
+require_once $__dir . '/HTMLPurifier/Config.php';
+require_once $__dir . '/HTMLPurifier/ConfigSchema.php';
+require_once $__dir . '/HTMLPurifier/ContentSets.php';
+require_once $__dir . '/HTMLPurifier/Context.php';
+require_once $__dir . '/HTMLPurifier/DefinitionCache.php';
+require_once $__dir . '/HTMLPurifier/DefinitionCacheFactory.php';
+require_once $__dir . '/HTMLPurifier/Doctype.php';
+require_once $__dir . '/HTMLPurifier/DoctypeRegistry.php';
+require_once $__dir . '/HTMLPurifier/ElementDef.php';
+require_once $__dir . '/HTMLPurifier/Encoder.php';
+require_once $__dir . '/HTMLPurifier/EntityLookup.php';
+require_once $__dir . '/HTMLPurifier/EntityParser.php';
+require_once $__dir . '/HTMLPurifier/ErrorCollector.php';
+require_once $__dir . '/HTMLPurifier/ErrorStruct.php';
+require_once $__dir . '/HTMLPurifier/Exception.php';
+require_once $__dir . '/HTMLPurifier/Filter.php';
+require_once $__dir . '/HTMLPurifier/Generator.php';
+require_once $__dir . '/HTMLPurifier/HTMLDefinition.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule.php';
+require_once $__dir . '/HTMLPurifier/HTMLModuleManager.php';
+require_once $__dir . '/HTMLPurifier/IDAccumulator.php';
+require_once $__dir . '/HTMLPurifier/Injector.php';
+require_once $__dir . '/HTMLPurifier/Language.php';
+require_once $__dir . '/HTMLPurifier/LanguageFactory.php';
+require_once $__dir . '/HTMLPurifier/Length.php';
+require_once $__dir . '/HTMLPurifier/Lexer.php';
+require_once $__dir . '/HTMLPurifier/Node.php';
+require_once $__dir . '/HTMLPurifier/PercentEncoder.php';
+require_once $__dir . '/HTMLPurifier/PropertyList.php';
+require_once $__dir . '/HTMLPurifier/PropertyListIterator.php';
+require_once $__dir . '/HTMLPurifier/Queue.php';
+require_once $__dir . '/HTMLPurifier/Strategy.php';
+require_once $__dir . '/HTMLPurifier/StringHash.php';
+require_once $__dir . '/HTMLPurifier/StringHashParser.php';
+require_once $__dir . '/HTMLPurifier/TagTransform.php';
+require_once $__dir . '/HTMLPurifier/Token.php';
+require_once $__dir . '/HTMLPurifier/TokenFactory.php';
+require_once $__dir . '/HTMLPurifier/URI.php';
+require_once $__dir . '/HTMLPurifier/URIDefinition.php';
+require_once $__dir . '/HTMLPurifier/URIFilter.php';
+require_once $__dir . '/HTMLPurifier/URIParser.php';
+require_once $__dir . '/HTMLPurifier/URIScheme.php';
+require_once $__dir . '/HTMLPurifier/URISchemeRegistry.php';
+require_once $__dir . '/HTMLPurifier/UnitConverter.php';
+require_once $__dir . '/HTMLPurifier/VarParser.php';
+require_once $__dir . '/HTMLPurifier/VarParserException.php';
+require_once $__dir . '/HTMLPurifier/Zipper.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/Clone.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/Enum.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/Integer.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/Lang.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/Switch.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/Text.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/URI.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Number.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/AlphaValue.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Background.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Border.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Color.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Composite.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Filter.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Font.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/FontFamily.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Ident.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Length.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/ListStyle.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Multiple.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Percentage.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/TextDecoration.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/URI.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Bool.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Nmtokens.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Class.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Color.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/FrameTarget.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/ID.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Pixels.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Length.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/LinkTypes.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/MultiLength.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/URI/Email.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/URI/Host.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/URI/IPv4.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/URI/IPv6.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/Background.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/BdoDir.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/BgColor.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/BoolToCSS.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/Border.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/EnumToCSS.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/ImgRequired.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/ImgSpace.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/Input.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/Lang.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/Length.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/Name.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/NameSync.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/Nofollow.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/SafeEmbed.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/SafeObject.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/SafeParam.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/ScriptRequired.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/TargetBlank.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/TargetNoreferrer.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/Textarea.php';
+require_once $__dir . '/HTMLPurifier/ChildDef/Chameleon.php';
+require_once $__dir . '/HTMLPurifier/ChildDef/Custom.php';
+require_once $__dir . '/HTMLPurifier/ChildDef/Empty.php';
+require_once $__dir . '/HTMLPurifier/ChildDef/List.php';
+require_once $__dir . '/HTMLPurifier/ChildDef/Required.php';
+require_once $__dir . '/HTMLPurifier/ChildDef/Optional.php';
+require_once $__dir . '/HTMLPurifier/ChildDef/StrictBlockquote.php';
+require_once $__dir . '/HTMLPurifier/ChildDef/Table.php';
+require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator.php';
+require_once $__dir . '/HTMLPurifier/DefinitionCache/Null.php';
+require_once $__dir . '/HTMLPurifier/DefinitionCache/Serializer.php';
+require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
+require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator/Memory.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Bdo.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/CommonAttributes.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Edit.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Forms.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Hypertext.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Iframe.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Image.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Legacy.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/List.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Name.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Nofollow.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Object.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Presentation.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Proprietary.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Ruby.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/SafeEmbed.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/SafeObject.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/SafeScripting.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Scripting.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/StyleAttribute.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Tables.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Target.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/TargetBlank.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/TargetNoreferrer.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Text.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/XMLCommonAttributes.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Name.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Proprietary.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Strict.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Transitional.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/XHTML.php';
+require_once $__dir . '/HTMLPurifier/Injector/AutoParagraph.php';
+require_once $__dir . '/HTMLPurifier/Injector/DisplayLinkURI.php';
+require_once $__dir . '/HTMLPurifier/Injector/Linkify.php';
+require_once $__dir . '/HTMLPurifier/Injector/PurifierLinkify.php';
+require_once $__dir . '/HTMLPurifier/Injector/RemoveEmpty.php';
+require_once $__dir . '/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php';
+require_once $__dir . '/HTMLPurifier/Injector/SafeObject.php';
+require_once $__dir . '/HTMLPurifier/Lexer/DOMLex.php';
+require_once $__dir . '/HTMLPurifier/Lexer/DirectLex.php';
+require_once $__dir . '/HTMLPurifier/Node/Comment.php';
+require_once $__dir . '/HTMLPurifier/Node/Element.php';
+require_once $__dir . '/HTMLPurifier/Node/Text.php';
+require_once $__dir . '/HTMLPurifier/Strategy/Composite.php';
+require_once $__dir . '/HTMLPurifier/Strategy/Core.php';
+require_once $__dir . '/HTMLPurifier/Strategy/FixNesting.php';
+require_once $__dir . '/HTMLPurifier/Strategy/MakeWellFormed.php';
+require_once $__dir . '/HTMLPurifier/Strategy/RemoveForeignElements.php';
+require_once $__dir . '/HTMLPurifier/Strategy/ValidateAttributes.php';
+require_once $__dir . '/HTMLPurifier/TagTransform/Font.php';
+require_once $__dir . '/HTMLPurifier/TagTransform/Simple.php';
+require_once $__dir . '/HTMLPurifier/Token/Comment.php';
+require_once $__dir . '/HTMLPurifier/Token/Tag.php';
+require_once $__dir . '/HTMLPurifier/Token/Empty.php';
+require_once $__dir . '/HTMLPurifier/Token/End.php';
+require_once $__dir . '/HTMLPurifier/Token/Start.php';
+require_once $__dir . '/HTMLPurifier/Token/Text.php';
+require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternal.php';
+require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternalResources.php';
+require_once $__dir . '/HTMLPurifier/URIFilter/DisableResources.php';
+require_once $__dir . '/HTMLPurifier/URIFilter/HostBlacklist.php';
+require_once $__dir . '/HTMLPurifier/URIFilter/MakeAbsolute.php';
+require_once $__dir . '/HTMLPurifier/URIFilter/Munge.php';
+require_once $__dir . '/HTMLPurifier/URIFilter/SafeIframe.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/data.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/file.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/ftp.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/http.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/https.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/mailto.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/news.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/nntp.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/tel.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/callto.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/skype.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/sms.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/whatsapp.php';
+require_once $__dir . '/HTMLPurifier/VarParser/Flexible.php';
+require_once $__dir . '/HTMLPurifier/VarParser/Native.php';
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Arborize.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Arborize.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Arborize.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Arborize.php
index eab6656..9e6617b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Arborize.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Arborize.php
@@ -1,71 +1,71 @@
-<?php
-
-/**
- * Converts a stream of HTMLPurifier_Token into an HTMLPurifier_Node,
- * and back again.
- *
- * @note This transformation is not an equivalence. We mutate the input
- * token stream to make it so; see all [MUT] markers in code.
- */
-class HTMLPurifier_Arborize
-{
- public static function arborize($tokens, $config, $context) {
- $definition = $config->getHTMLDefinition();
- $parent = new HTMLPurifier_Token_Start($definition->info_parent);
- $stack = array($parent->toNode());
- foreach ($tokens as $token) {
- $token->skip = null; // [MUT]
- $token->carryover = null; // [MUT]
- if ($token instanceof HTMLPurifier_Token_End) {
- $token->start = null; // [MUT]
- $r = array_pop($stack);
- assert($r->name === $token->name);
- assert(empty($token->attr));
- $r->endCol = $token->col;
- $r->endLine = $token->line;
- $r->endArmor = $token->armor;
- continue;
- }
- $node = $token->toNode();
- $stack[count($stack)-1]->children[] = $node;
- if ($token instanceof HTMLPurifier_Token_Start) {
- $stack[] = $node;
- }
- }
- assert(count($stack) == 1);
- return $stack[0];
- }
-
- public static function flatten($node, $config, $context) {
- $level = 0;
- $nodes = array($level => new HTMLPurifier_Queue(array($node)));
- $closingTokens = array();
- $tokens = array();
- do {
- while (!$nodes[$level]->isEmpty()) {
- $node = $nodes[$level]->shift(); // FIFO
- list($start, $end) = $node->toTokenPair();
- if ($level > 0) {
- $tokens[] = $start;
- }
- if ($end !== NULL) {
- $closingTokens[$level][] = $end;
- }
- if ($node instanceof HTMLPurifier_Node_Element) {
- $level++;
- $nodes[$level] = new HTMLPurifier_Queue();
- foreach ($node->children as $childNode) {
- $nodes[$level]->push($childNode);
- }
- }
- }
- $level--;
- if ($level && isset($closingTokens[$level])) {
- while ($token = array_pop($closingTokens[$level])) {
- $tokens[] = $token;
- }
- }
- } while ($level > 0);
- return $tokens;
- }
-}
+<?php
+
+/**
+ * Converts a stream of HTMLPurifier_Token into an HTMLPurifier_Node,
+ * and back again.
+ *
+ * @note This transformation is not an equivalence. We mutate the input
+ * token stream to make it so; see all [MUT] markers in code.
+ */
+class HTMLPurifier_Arborize
+{
+ public static function arborize($tokens, $config, $context) {
+ $definition = $config->getHTMLDefinition();
+ $parent = new HTMLPurifier_Token_Start($definition->info_parent);
+ $stack = array($parent->toNode());
+ foreach ($tokens as $token) {
+ $token->skip = null; // [MUT]
+ $token->carryover = null; // [MUT]
+ if ($token instanceof HTMLPurifier_Token_End) {
+ $token->start = null; // [MUT]
+ $r = array_pop($stack);
+ assert($r->name === $token->name);
+ assert(empty($token->attr));
+ $r->endCol = $token->col;
+ $r->endLine = $token->line;
+ $r->endArmor = $token->armor;
+ continue;
+ }
+ $node = $token->toNode();
+ $stack[count($stack)-1]->children[] = $node;
+ if ($token instanceof HTMLPurifier_Token_Start) {
+ $stack[] = $node;
+ }
+ }
+ assert(count($stack) == 1);
+ return $stack[0];
+ }
+
+ public static function flatten($node, $config, $context) {
+ $level = 0;
+ $nodes = array($level => new HTMLPurifier_Queue(array($node)));
+ $closingTokens = array();
+ $tokens = array();
+ do {
+ while (!$nodes[$level]->isEmpty()) {
+ $node = $nodes[$level]->shift(); // FIFO
+ list($start, $end) = $node->toTokenPair();
+ if ($level > 0) {
+ $tokens[] = $start;
+ }
+ if ($end !== NULL) {
+ $closingTokens[$level][] = $end;
+ }
+ if ($node instanceof HTMLPurifier_Node_Element) {
+ $level++;
+ $nodes[$level] = new HTMLPurifier_Queue();
+ foreach ($node->children as $childNode) {
+ $nodes[$level]->push($childNode);
+ }
+ }
+ }
+ $level--;
+ if ($level && isset($closingTokens[$level])) {
+ while ($token = array_pop($closingTokens[$level])) {
+ $tokens[] = $token;
+ }
+ }
+ } while ($level > 0);
+ return $tokens;
+ }
+}
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrCollections.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrCollections.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrCollections.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrCollections.php
index 2d2c7d2..c7b17cf 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrCollections.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrCollections.php
@@ -1,143 +1,148 @@
-<?php
-
-/**
- * Defines common attribute collections that modules reference
- */
-
-class HTMLPurifier_AttrCollections
-{
-
- /**
- * Associative array of attribute collections, indexed by name.
- * @type array
- */
- public $info = array();
-
- /**
- * Performs all expansions on internal data for use by other inclusions
- * It also collects all attribute collection extensions from
- * modules
- * @param HTMLPurifier_AttrTypes $attr_types HTMLPurifier_AttrTypes instance
- * @param HTMLPurifier_HTMLModule[] $modules Hash array of HTMLPurifier_HTMLModule members
- */
- public function __construct($attr_types, $modules)
- {
- // load extensions from the modules
- foreach ($modules as $module) {
- foreach ($module->attr_collections as $coll_i => $coll) {
- if (!isset($this->info[$coll_i])) {
- $this->info[$coll_i] = array();
- }
- foreach ($coll as $attr_i => $attr) {
- if ($attr_i === 0 && isset($this->info[$coll_i][$attr_i])) {
- // merge in includes
- $this->info[$coll_i][$attr_i] = array_merge(
- $this->info[$coll_i][$attr_i],
- $attr
- );
- continue;
- }
- $this->info[$coll_i][$attr_i] = $attr;
- }
- }
- }
- // perform internal expansions and inclusions
- foreach ($this->info as $name => $attr) {
- // merge attribute collections that include others
- $this->performInclusions($this->info[$name]);
- // replace string identifiers with actual attribute objects
- $this->expandIdentifiers($this->info[$name], $attr_types);
- }
- }
-
- /**
- * Takes a reference to an attribute associative array and performs
- * all inclusions specified by the zero index.
- * @param array &$attr Reference to attribute array
- */
- public function performInclusions(&$attr)
- {
- if (!isset($attr[0])) {
- return;
- }
- $merge = $attr[0];
- $seen = array(); // recursion guard
- // loop through all the inclusions
- for ($i = 0; isset($merge[$i]); $i++) {
- if (isset($seen[$merge[$i]])) {
- continue;
- }
- $seen[$merge[$i]] = true;
- // foreach attribute of the inclusion, copy it over
- if (!isset($this->info[$merge[$i]])) {
- continue;
- }
- foreach ($this->info[$merge[$i]] as $key => $value) {
- if (isset($attr[$key])) {
- continue;
- } // also catches more inclusions
- $attr[$key] = $value;
- }
- if (isset($this->info[$merge[$i]][0])) {
- // recursion
- $merge = array_merge($merge, $this->info[$merge[$i]][0]);
- }
- }
- unset($attr[0]);
- }
-
- /**
- * Expands all string identifiers in an attribute array by replacing
- * them with the appropriate values inside HTMLPurifier_AttrTypes
- * @param array &$attr Reference to attribute array
- * @param HTMLPurifier_AttrTypes $attr_types HTMLPurifier_AttrTypes instance
- */
- public function expandIdentifiers(&$attr, $attr_types)
- {
- // because foreach will process new elements we add, make sure we
- // skip duplicates
- $processed = array();
-
- foreach ($attr as $def_i => $def) {
- // skip inclusions
- if ($def_i === 0) {
- continue;
- }
-
- if (isset($processed[$def_i])) {
- continue;
- }
-
- // determine whether or not attribute is required
- if ($required = (strpos($def_i, '*') !== false)) {
- // rename the definition
- unset($attr[$def_i]);
- $def_i = trim($def_i, '*');
- $attr[$def_i] = $def;
- }
-
- $processed[$def_i] = true;
-
- // if we've already got a literal object, move on
- if (is_object($def)) {
- // preserve previous required
- $attr[$def_i]->required = ($required || $attr[$def_i]->required);
- continue;
- }
-
- if ($def === false) {
- unset($attr[$def_i]);
- continue;
- }
-
- if ($t = $attr_types->get($def)) {
- $attr[$def_i] = $t;
- $attr[$def_i]->required = $required;
- } else {
- unset($attr[$def_i]);
- }
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Defines common attribute collections that modules reference
+ */
+
+class HTMLPurifier_AttrCollections
+{
+
+ /**
+ * Associative array of attribute collections, indexed by name.
+ * @type array
+ */
+ public $info = array();
+
+ /**
+ * Performs all expansions on internal data for use by other inclusions
+ * It also collects all attribute collection extensions from
+ * modules
+ * @param HTMLPurifier_AttrTypes $attr_types HTMLPurifier_AttrTypes instance
+ * @param HTMLPurifier_HTMLModule[] $modules Hash array of HTMLPurifier_HTMLModule members
+ */
+ public function __construct($attr_types, $modules)
+ {
+ $this->doConstruct($attr_types, $modules);
+ }
+
+ public function doConstruct($attr_types, $modules)
+ {
+ // load extensions from the modules
+ foreach ($modules as $module) {
+ foreach ($module->attr_collections as $coll_i => $coll) {
+ if (!isset($this->info[$coll_i])) {
+ $this->info[$coll_i] = array();
+ }
+ foreach ($coll as $attr_i => $attr) {
+ if ($attr_i === 0 && isset($this->info[$coll_i][$attr_i])) {
+ // merge in includes
+ $this->info[$coll_i][$attr_i] = array_merge(
+ $this->info[$coll_i][$attr_i],
+ $attr
+ );
+ continue;
+ }
+ $this->info[$coll_i][$attr_i] = $attr;
+ }
+ }
+ }
+ // perform internal expansions and inclusions
+ foreach ($this->info as $name => $attr) {
+ // merge attribute collections that include others
+ $this->performInclusions($this->info[$name]);
+ // replace string identifiers with actual attribute objects
+ $this->expandIdentifiers($this->info[$name], $attr_types);
+ }
+ }
+
+ /**
+ * Takes a reference to an attribute associative array and performs
+ * all inclusions specified by the zero index.
+ * @param array &$attr Reference to attribute array
+ */
+ public function performInclusions(&$attr)
+ {
+ if (!isset($attr[0])) {
+ return;
+ }
+ $merge = $attr[0];
+ $seen = array(); // recursion guard
+ // loop through all the inclusions
+ for ($i = 0; isset($merge[$i]); $i++) {
+ if (isset($seen[$merge[$i]])) {
+ continue;
+ }
+ $seen[$merge[$i]] = true;
+ // foreach attribute of the inclusion, copy it over
+ if (!isset($this->info[$merge[$i]])) {
+ continue;
+ }
+ foreach ($this->info[$merge[$i]] as $key => $value) {
+ if (isset($attr[$key])) {
+ continue;
+ } // also catches more inclusions
+ $attr[$key] = $value;
+ }
+ if (isset($this->info[$merge[$i]][0])) {
+ // recursion
+ $merge = array_merge($merge, $this->info[$merge[$i]][0]);
+ }
+ }
+ unset($attr[0]);
+ }
+
+ /**
+ * Expands all string identifiers in an attribute array by replacing
+ * them with the appropriate values inside HTMLPurifier_AttrTypes
+ * @param array &$attr Reference to attribute array
+ * @param HTMLPurifier_AttrTypes $attr_types HTMLPurifier_AttrTypes instance
+ */
+ public function expandIdentifiers(&$attr, $attr_types)
+ {
+ // because foreach will process new elements we add, make sure we
+ // skip duplicates
+ $processed = array();
+
+ foreach ($attr as $def_i => $def) {
+ // skip inclusions
+ if ($def_i === 0) {
+ continue;
+ }
+
+ if (isset($processed[$def_i])) {
+ continue;
+ }
+
+ // determine whether or not attribute is required
+ if ($required = (strpos($def_i, '*') !== false)) {
+ // rename the definition
+ unset($attr[$def_i]);
+ $def_i = trim($def_i, '*');
+ $attr[$def_i] = $def;
+ }
+
+ $processed[$def_i] = true;
+
+ // if we've already got a literal object, move on
+ if (is_object($def)) {
+ // preserve previous required
+ $attr[$def_i]->required = ($required || $attr[$def_i]->required);
+ continue;
+ }
+
+ if ($def === false) {
+ unset($attr[$def_i]);
+ continue;
+ }
+
+ if ($t = $attr_types->get($def)) {
+ $attr[$def_i] = $t;
+ $attr[$def_i]->required = $required;
+ } else {
+ unset($attr[$def_i]);
+ }
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef.php
index 880d8f6..5ac0652 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef.php
@@ -1,138 +1,138 @@
-<?php
-
-/**
- * Base class for all validating attribute definitions.
- *
- * This family of classes forms the core for not only HTML attribute validation,
- * but also any sort of string that needs to be validated or cleaned (which
- * means CSS properties and composite definitions are defined here too).
- * Besides defining (through code) what precisely makes the string valid,
- * subclasses are also responsible for cleaning the code if possible.
- */
-
-abstract class HTMLPurifier_AttrDef
-{
-
- /**
- * Tells us whether or not an HTML attribute is minimized.
- * Has no meaning in other contexts.
- * @type bool
- */
- public $minimized = false;
-
- /**
- * Tells us whether or not an HTML attribute is required.
- * Has no meaning in other contexts
- * @type bool
- */
- public $required = false;
-
- /**
- * Validates and cleans passed string according to a definition.
- *
- * @param string $string String to be validated and cleaned.
- * @param HTMLPurifier_Config $config Mandatory HTMLPurifier_Config object.
- * @param HTMLPurifier_Context $context Mandatory HTMLPurifier_Context object.
- */
- abstract public function validate($string, $config, $context);
-
- /**
- * Convenience method that parses a string as if it were CDATA.
- *
- * This method process a string in the manner specified at
- * <http://www.w3.org/TR/html4/types.html#h-6.2> by removing
- * leading and trailing whitespace, ignoring line feeds, and replacing
- * carriage returns and tabs with spaces. While most useful for HTML
- * attributes specified as CDATA, it can also be applied to most CSS
- * values.
- *
- * @note This method is not entirely standards compliant, as trim() removes
- * more types of whitespace than specified in the spec. In practice,
- * this is rarely a problem, as those extra characters usually have
- * already been removed by HTMLPurifier_Encoder.
- *
- * @warning This processing is inconsistent with XML's whitespace handling
- * as specified by section 3.3.3 and referenced XHTML 1.0 section
- * 4.7. However, note that we are NOT necessarily
- * parsing XML, thus, this behavior may still be correct. We
- * assume that newlines have been normalized.
- */
- public function parseCDATA($string)
- {
- $string = trim($string);
- $string = str_replace(array("\n", "\t", "\r"), ' ', $string);
- return $string;
- }
-
- /**
- * Factory method for creating this class from a string.
- * @param string $string String construction info
- * @return HTMLPurifier_AttrDef Created AttrDef object corresponding to $string
- */
- public function make($string)
- {
- // default implementation, return a flyweight of this object.
- // If $string has an effect on the returned object (i.e. you
- // need to overload this method), it is best
- // to clone or instantiate new copies. (Instantiation is safer.)
- return $this;
- }
-
- /**
- * Removes spaces from rgb(0, 0, 0) so that shorthand CSS properties work
- * properly. THIS IS A HACK!
- * @param string $string a CSS colour definition
- * @return string
- */
- protected function mungeRgb($string)
- {
- return preg_replace('/rgb\((\d+)\s*,\s*(\d+)\s*,\s*(\d+)\)/', 'rgb(\1,\2,\3)', $string);
- }
-
- /**
- * Parses a possibly escaped CSS string and returns the "pure"
- * version of it.
- */
- protected function expandCSSEscape($string)
- {
- // flexibly parse it
- $ret = '';
- for ($i = 0, $c = strlen($string); $i < $c; $i++) {
- if ($string[$i] === '\\') {
- $i++;
- if ($i >= $c) {
- $ret .= '\\';
- break;
- }
- if (ctype_xdigit($string[$i])) {
- $code = $string[$i];
- for ($a = 1, $i++; $i < $c && $a < 6; $i++, $a++) {
- if (!ctype_xdigit($string[$i])) {
- break;
- }
- $code .= $string[$i];
- }
- // We have to be extremely careful when adding
- // new characters, to make sure we're not breaking
- // the encoding.
- $char = HTMLPurifier_Encoder::unichr(hexdec($code));
- if (HTMLPurifier_Encoder::cleanUTF8($char) === '') {
- continue;
- }
- $ret .= $char;
- if ($i < $c && trim($string[$i]) !== '') {
- $i--;
- }
- continue;
- }
- if ($string[$i] === "\n") {
- continue;
- }
- }
- $ret .= $string[$i];
- }
- return $ret;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Base class for all validating attribute definitions.
+ *
+ * This family of classes forms the core for not only HTML attribute validation,
+ * but also any sort of string that needs to be validated or cleaned (which
+ * means CSS properties and composite definitions are defined here too).
+ * Besides defining (through code) what precisely makes the string valid,
+ * subclasses are also responsible for cleaning the code if possible.
+ */
+
+abstract class HTMLPurifier_AttrDef
+{
+
+ /**
+ * Tells us whether or not an HTML attribute is minimized.
+ * Has no meaning in other contexts.
+ * @type bool
+ */
+ public $minimized = false;
+
+ /**
+ * Tells us whether or not an HTML attribute is required.
+ * Has no meaning in other contexts
+ * @type bool
+ */
+ public $required = false;
+
+ /**
+ * Validates and cleans passed string according to a definition.
+ *
+ * @param string $string String to be validated and cleaned.
+ * @param HTMLPurifier_Config $config Mandatory HTMLPurifier_Config object.
+ * @param HTMLPurifier_Context $context Mandatory HTMLPurifier_Context object.
+ */
+ abstract public function validate($string, $config, $context);
+
+ /**
+ * Convenience method that parses a string as if it were CDATA.
+ *
+ * This method process a string in the manner specified at
+ * <http://www.w3.org/TR/html4/types.html#h-6.2> by removing
+ * leading and trailing whitespace, ignoring line feeds, and replacing
+ * carriage returns and tabs with spaces. While most useful for HTML
+ * attributes specified as CDATA, it can also be applied to most CSS
+ * values.
+ *
+ * @note This method is not entirely standards compliant, as trim() removes
+ * more types of whitespace than specified in the spec. In practice,
+ * this is rarely a problem, as those extra characters usually have
+ * already been removed by HTMLPurifier_Encoder.
+ *
+ * @warning This processing is inconsistent with XML's whitespace handling
+ * as specified by section 3.3.3 and referenced XHTML 1.0 section
+ * 4.7. However, note that we are NOT necessarily
+ * parsing XML, thus, this behavior may still be correct. We
+ * assume that newlines have been normalized.
+ */
+ public function parseCDATA($string)
+ {
+ $string = trim($string);
+ $string = str_replace(array("\n", "\t", "\r"), ' ', $string);
+ return $string;
+ }
+
+ /**
+ * Factory method for creating this class from a string.
+ * @param string $string String construction info
+ * @return HTMLPurifier_AttrDef Created AttrDef object corresponding to $string
+ */
+ public function make($string)
+ {
+ // default implementation, return a flyweight of this object.
+ // If $string has an effect on the returned object (i.e. you
+ // need to overload this method), it is best
+ // to clone or instantiate new copies. (Instantiation is safer.)
+ return $this;
+ }
+
+ /**
+ * Removes spaces from rgb(0, 0, 0) so that shorthand CSS properties work
+ * properly. THIS IS A HACK!
+ * @param string $string a CSS colour definition
+ * @return string
+ */
+ protected function mungeRgb($string)
+ {
+ return preg_replace('/rgb\((\d+)\s*,\s*(\d+)\s*,\s*(\d+)\)/', 'rgb(\1,\2,\3)', $string);
+ }
+
+ /**
+ * Parses a possibly escaped CSS string and returns the "pure"
+ * version of it.
+ */
+ protected function expandCSSEscape($string)
+ {
+ // flexibly parse it
+ $ret = '';
+ for ($i = 0, $c = strlen($string); $i < $c; $i++) {
+ if ($string[$i] === '\\') {
+ $i++;
+ if ($i >= $c) {
+ $ret .= '\\';
+ break;
+ }
+ if (ctype_xdigit($string[$i])) {
+ $code = $string[$i];
+ for ($a = 1, $i++; $i < $c && $a < 6; $i++, $a++) {
+ if (!ctype_xdigit($string[$i])) {
+ break;
+ }
+ $code .= $string[$i];
+ }
+ // We have to be extremely careful when adding
+ // new characters, to make sure we're not breaking
+ // the encoding.
+ $char = HTMLPurifier_Encoder::unichr(hexdec($code));
+ if (HTMLPurifier_Encoder::cleanUTF8($char) === '') {
+ continue;
+ }
+ $ret .= $char;
+ if ($i < $c && trim($string[$i]) !== '') {
+ $i--;
+ }
+ continue;
+ }
+ if ($string[$i] === "\n") {
+ continue;
+ }
+ }
+ $ret .= $string[$i];
+ }
+ return $ret;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS.php
similarity index 93%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS.php
index 81afcf9..2b977ca 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS.php
@@ -1,106 +1,111 @@
-<?php
-
-/**
- * Validates the HTML attribute style, otherwise known as CSS.
- * @note We don't implement the whole CSS specification, so it might be
- * difficult to reuse this component in the context of validating
- * actual stylesheet declarations.
- * @note If we were really serious about validating the CSS, we would
- * tokenize the styles and then parse the tokens. Obviously, we
- * are not doing that. Doing that could seriously harm performance,
- * but would make these components a lot more viable for a CSS
- * filtering solution.
- */
-class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
-{
-
- /**
- * @param string $css
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($css, $config, $context)
- {
- $css = $this->parseCDATA($css);
-
- $definition = $config->getCSSDefinition();
-
- // we're going to break the spec and explode by semicolons.
- // This is because semicolon rarely appears in escaped form
- // Doing this is generally flaky but fast
- // IT MIGHT APPEAR IN URIs, see HTMLPurifier_AttrDef_CSSURI
- // for details
-
- $declarations = explode(';', $css);
- $propvalues = array();
-
- /**
- * Name of the current CSS property being validated.
- */
- $property = false;
- $context->register('CurrentCSSProperty', $property);
-
- foreach ($declarations as $declaration) {
- if (!$declaration) {
- continue;
- }
- if (!strpos($declaration, ':')) {
- continue;
- }
- list($property, $value) = explode(':', $declaration, 2);
- $property = trim($property);
- $value = trim($value);
- $ok = false;
- do {
- if (isset($definition->info[$property])) {
- $ok = true;
- break;
- }
- if (ctype_lower($property)) {
- break;
- }
- $property = strtolower($property);
- if (isset($definition->info[$property])) {
- $ok = true;
- break;
- }
- } while (0);
- if (!$ok) {
- continue;
- }
- // inefficient call, since the validator will do this again
- if (strtolower(trim($value)) !== 'inherit') {
- // inherit works for everything (but only on the base property)
- $result = $definition->info[$property]->validate(
- $value,
- $config,
- $context
- );
- } else {
- $result = 'inherit';
- }
- if ($result === false) {
- continue;
- }
- $propvalues[$property] = $result;
- }
-
- $context->destroy('CurrentCSSProperty');
-
- // procedure does not write the new CSS simultaneously, so it's
- // slightly inefficient, but it's the only way of getting rid of
- // duplicates. Perhaps config to optimize it, but not now.
-
- $new_declarations = '';
- foreach ($propvalues as $prop => $value) {
- $new_declarations .= "$prop:$value;";
- }
-
- return $new_declarations ? $new_declarations : false;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates the HTML attribute style, otherwise known as CSS.
+ * @note We don't implement the whole CSS specification, so it might be
+ * difficult to reuse this component in the context of validating
+ * actual stylesheet declarations.
+ * @note If we were really serious about validating the CSS, we would
+ * tokenize the styles and then parse the tokens. Obviously, we
+ * are not doing that. Doing that could seriously harm performance,
+ * but would make these components a lot more viable for a CSS
+ * filtering solution.
+ */
+class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * @param string $css
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($css, $config, $context)
+ {
+ $css = $this->parseCDATA($css);
+
+ $definition = $config->getCSSDefinition();
+ $allow_duplicates = $config->get("CSS.AllowDuplicates");
+
+ // we're going to break the spec and explode by semicolons.
+ // This is because semicolon rarely appears in escaped form
+ // Doing this is generally flaky but fast
+ // IT MIGHT APPEAR IN URIs, see HTMLPurifier_AttrDef_CSSURI
+ // for details
+
+ $declarations = explode(';', $css);
+ $propvalues = array();
+ $new_declarations = '';
+
+ /**
+ * Name of the current CSS property being validated.
+ */
+ $property = false;
+ $context->register('CurrentCSSProperty', $property);
+
+ foreach ($declarations as $declaration) {
+ if (!$declaration) {
+ continue;
+ }
+ if (!strpos($declaration, ':')) {
+ continue;
+ }
+ list($property, $value) = explode(':', $declaration, 2);
+ $property = trim($property);
+ $value = trim($value);
+ $ok = false;
+ do {
+ if (isset($definition->info[$property])) {
+ $ok = true;
+ break;
+ }
+ if (ctype_lower($property)) {
+ break;
+ }
+ $property = strtolower($property);
+ if (isset($definition->info[$property])) {
+ $ok = true;
+ break;
+ }
+ } while (0);
+ if (!$ok) {
+ continue;
+ }
+ // inefficient call, since the validator will do this again
+ if (strtolower(trim($value)) !== 'inherit') {
+ // inherit works for everything (but only on the base property)
+ $result = $definition->info[$property]->validate(
+ $value,
+ $config,
+ $context
+ );
+ } else {
+ $result = 'inherit';
+ }
+ if ($result === false) {
+ continue;
+ }
+ if ($allow_duplicates) {
+ $new_declarations .= "$property:$result;";
+ } else {
+ $propvalues[$property] = $result;
+ }
+ }
+
+ $context->destroy('CurrentCSSProperty');
+
+ // procedure does not write the new CSS simultaneously, so it's
+ // slightly inefficient, but it's the only way of getting rid of
+ // duplicates. Perhaps config to optimize it, but not now.
+
+ foreach ($propvalues as $prop => $value) {
+ $new_declarations .= "$prop:$value;";
+ }
+
+ return $new_declarations ? $new_declarations : false;
+
+ }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
index 1a30e8f..af2b83d 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
@@ -1,34 +1,34 @@
-<?php
-
-class HTMLPurifier_AttrDef_CSS_AlphaValue extends HTMLPurifier_AttrDef_CSS_Number
-{
-
- public function __construct()
- {
- parent::__construct(false); // opacity is non-negative, but we will clamp it
- }
-
- /**
- * @param string $number
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return string
- */
- public function validate($number, $config, $context)
- {
- $result = parent::validate($number, $config, $context);
- if ($result === false) {
- return $result;
- }
- $float = (float)$result;
- if ($float < 0.0) {
- $result = '0';
- }
- if ($float > 1.0) {
- $result = '1';
- }
- return $result;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_AttrDef_CSS_AlphaValue extends HTMLPurifier_AttrDef_CSS_Number
+{
+
+ public function __construct()
+ {
+ parent::__construct(false); // opacity is non-negative, but we will clamp it
+ }
+
+ /**
+ * @param string $number
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return string
+ */
+ public function validate($number, $config, $context)
+ {
+ $result = parent::validate($number, $config, $context);
+ if ($result === false) {
+ return $result;
+ }
+ $float = (float)$result;
+ if ($float < 0.0) {
+ $result = '0';
+ }
+ if ($float > 1.0) {
+ $result = '1';
+ }
+ return $result;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Background.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Background.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Background.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Background.php
index ecd6e27..7f1ea3b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Background.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Background.php
@@ -1,111 +1,111 @@
-<?php
-
-/**
- * Validates shorthand CSS property background.
- * @warning Does not support url tokens that have internal spaces.
- */
-class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
-{
-
- /**
- * Local copy of component validators.
- * @type HTMLPurifier_AttrDef[]
- * @note See HTMLPurifier_AttrDef_Font::$info for a similar impl.
- */
- protected $info;
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function __construct($config)
- {
- $def = $config->getCSSDefinition();
- $this->info['background-color'] = $def->info['background-color'];
- $this->info['background-image'] = $def->info['background-image'];
- $this->info['background-repeat'] = $def->info['background-repeat'];
- $this->info['background-attachment'] = $def->info['background-attachment'];
- $this->info['background-position'] = $def->info['background-position'];
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- // regular pre-processing
- $string = $this->parseCDATA($string);
- if ($string === '') {
- return false;
- }
-
- // munge rgb() decl if necessary
- $string = $this->mungeRgb($string);
-
- // assumes URI doesn't have spaces in it
- $bits = explode(' ', $string); // bits to process
-
- $caught = array();
- $caught['color'] = false;
- $caught['image'] = false;
- $caught['repeat'] = false;
- $caught['attachment'] = false;
- $caught['position'] = false;
-
- $i = 0; // number of catches
-
- foreach ($bits as $bit) {
- if ($bit === '') {
- continue;
- }
- foreach ($caught as $key => $status) {
- if ($key != 'position') {
- if ($status !== false) {
- continue;
- }
- $r = $this->info['background-' . $key]->validate($bit, $config, $context);
- } else {
- $r = $bit;
- }
- if ($r === false) {
- continue;
- }
- if ($key == 'position') {
- if ($caught[$key] === false) {
- $caught[$key] = '';
- }
- $caught[$key] .= $r . ' ';
- } else {
- $caught[$key] = $r;
- }
- $i++;
- break;
- }
- }
-
- if (!$i) {
- return false;
- }
- if ($caught['position'] !== false) {
- $caught['position'] = $this->info['background-position']->
- validate($caught['position'], $config, $context);
- }
-
- $ret = array();
- foreach ($caught as $value) {
- if ($value === false) {
- continue;
- }
- $ret[] = $value;
- }
-
- if (empty($ret)) {
- return false;
- }
- return implode(' ', $ret);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates shorthand CSS property background.
+ * @warning Does not support url tokens that have internal spaces.
+ */
+class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * Local copy of component validators.
+ * @type HTMLPurifier_AttrDef[]
+ * @note See HTMLPurifier_AttrDef_Font::$info for a similar impl.
+ */
+ protected $info;
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function __construct($config)
+ {
+ $def = $config->getCSSDefinition();
+ $this->info['background-color'] = $def->info['background-color'];
+ $this->info['background-image'] = $def->info['background-image'];
+ $this->info['background-repeat'] = $def->info['background-repeat'];
+ $this->info['background-attachment'] = $def->info['background-attachment'];
+ $this->info['background-position'] = $def->info['background-position'];
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ // regular pre-processing
+ $string = $this->parseCDATA($string);
+ if ($string === '') {
+ return false;
+ }
+
+ // munge rgb() decl if necessary
+ $string = $this->mungeRgb($string);
+
+ // assumes URI doesn't have spaces in it
+ $bits = explode(' ', $string); // bits to process
+
+ $caught = array();
+ $caught['color'] = false;
+ $caught['image'] = false;
+ $caught['repeat'] = false;
+ $caught['attachment'] = false;
+ $caught['position'] = false;
+
+ $i = 0; // number of catches
+
+ foreach ($bits as $bit) {
+ if ($bit === '') {
+ continue;
+ }
+ foreach ($caught as $key => $status) {
+ if ($key != 'position') {
+ if ($status !== false) {
+ continue;
+ }
+ $r = $this->info['background-' . $key]->validate($bit, $config, $context);
+ } else {
+ $r = $bit;
+ }
+ if ($r === false) {
+ continue;
+ }
+ if ($key == 'position') {
+ if ($caught[$key] === false) {
+ $caught[$key] = '';
+ }
+ $caught[$key] .= $r . ' ';
+ } else {
+ $caught[$key] = $r;
+ }
+ $i++;
+ break;
+ }
+ }
+
+ if (!$i) {
+ return false;
+ }
+ if ($caught['position'] !== false) {
+ $caught['position'] = $this->info['background-position']->
+ validate($caught['position'], $config, $context);
+ }
+
+ $ret = array();
+ foreach ($caught as $value) {
+ if ($value === false) {
+ continue;
+ }
+ $ret[] = $value;
+ }
+
+ if (empty($ret)) {
+ return false;
+ }
+ return implode(' ', $ret);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
index f95de5b..4580ef5 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
@@ -1,157 +1,157 @@
-<?php
-
-/* W3C says:
- [ // adjective and number must be in correct order, even if
- // you could switch them without introducing ambiguity.
- // some browsers support that syntax
- [
- <percentage> | <length> | left | center | right
- ]
- [
- <percentage> | <length> | top | center | bottom
- ]?
- ] |
- [ // this signifies that the vertical and horizontal adjectives
- // can be arbitrarily ordered, however, there can only be two,
- // one of each, or none at all
- [
- left | center | right
- ] ||
- [
- top | center | bottom
- ]
- ]
- top, left = 0%
- center, (none) = 50%
- bottom, right = 100%
-*/
-
-/* QuirksMode says:
- keyword + length/percentage must be ordered correctly, as per W3C
-
- Internet Explorer and Opera, however, support arbitrary ordering. We
- should fix it up.
-
- Minor issue though, not strictly necessary.
-*/
-
-// control freaks may appreciate the ability to convert these to
-// percentages or something, but it's not necessary
-
-/**
- * Validates the value of background-position.
- */
-class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
-{
-
- /**
- * @type HTMLPurifier_AttrDef_CSS_Length
- */
- protected $length;
-
- /**
- * @type HTMLPurifier_AttrDef_CSS_Percentage
- */
- protected $percentage;
-
- public function __construct()
- {
- $this->length = new HTMLPurifier_AttrDef_CSS_Length();
- $this->percentage = new HTMLPurifier_AttrDef_CSS_Percentage();
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- $string = $this->parseCDATA($string);
- $bits = explode(' ', $string);
-
- $keywords = array();
- $keywords['h'] = false; // left, right
- $keywords['v'] = false; // top, bottom
- $keywords['ch'] = false; // center (first word)
- $keywords['cv'] = false; // center (second word)
- $measures = array();
-
- $i = 0;
-
- $lookup = array(
- 'top' => 'v',
- 'bottom' => 'v',
- 'left' => 'h',
- 'right' => 'h',
- 'center' => 'c'
- );
-
- foreach ($bits as $bit) {
- if ($bit === '') {
- continue;
- }
-
- // test for keyword
- $lbit = ctype_lower($bit) ? $bit : strtolower($bit);
- if (isset($lookup[$lbit])) {
- $status = $lookup[$lbit];
- if ($status == 'c') {
- if ($i == 0) {
- $status = 'ch';
- } else {
- $status = 'cv';
- }
- }
- $keywords[$status] = $lbit;
- $i++;
- }
-
- // test for length
- $r = $this->length->validate($bit, $config, $context);
- if ($r !== false) {
- $measures[] = $r;
- $i++;
- }
-
- // test for percentage
- $r = $this->percentage->validate($bit, $config, $context);
- if ($r !== false) {
- $measures[] = $r;
- $i++;
- }
- }
-
- if (!$i) {
- return false;
- } // no valid values were caught
-
- $ret = array();
-
- // first keyword
- if ($keywords['h']) {
- $ret[] = $keywords['h'];
- } elseif ($keywords['ch']) {
- $ret[] = $keywords['ch'];
- $keywords['cv'] = false; // prevent re-use: center = center center
- } elseif (count($measures)) {
- $ret[] = array_shift($measures);
- }
-
- if ($keywords['v']) {
- $ret[] = $keywords['v'];
- } elseif ($keywords['cv']) {
- $ret[] = $keywords['cv'];
- } elseif (count($measures)) {
- $ret[] = array_shift($measures);
- }
-
- if (empty($ret)) {
- return false;
- }
- return implode(' ', $ret);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/* W3C says:
+ [ // adjective and number must be in correct order, even if
+ // you could switch them without introducing ambiguity.
+ // some browsers support that syntax
+ [
+ <percentage> | <length> | left | center | right
+ ]
+ [
+ <percentage> | <length> | top | center | bottom
+ ]?
+ ] |
+ [ // this signifies that the vertical and horizontal adjectives
+ // can be arbitrarily ordered, however, there can only be two,
+ // one of each, or none at all
+ [
+ left | center | right
+ ] ||
+ [
+ top | center | bottom
+ ]
+ ]
+ top, left = 0%
+ center, (none) = 50%
+ bottom, right = 100%
+*/
+
+/* QuirksMode says:
+ keyword + length/percentage must be ordered correctly, as per W3C
+
+ Internet Explorer and Opera, however, support arbitrary ordering. We
+ should fix it up.
+
+ Minor issue though, not strictly necessary.
+*/
+
+// control freaks may appreciate the ability to convert these to
+// percentages or something, but it's not necessary
+
+/**
+ * Validates the value of background-position.
+ */
+class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * @type HTMLPurifier_AttrDef_CSS_Length
+ */
+ protected $length;
+
+ /**
+ * @type HTMLPurifier_AttrDef_CSS_Percentage
+ */
+ protected $percentage;
+
+ public function __construct()
+ {
+ $this->length = new HTMLPurifier_AttrDef_CSS_Length();
+ $this->percentage = new HTMLPurifier_AttrDef_CSS_Percentage();
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ $string = $this->parseCDATA($string);
+ $bits = explode(' ', $string);
+
+ $keywords = array();
+ $keywords['h'] = false; // left, right
+ $keywords['v'] = false; // top, bottom
+ $keywords['ch'] = false; // center (first word)
+ $keywords['cv'] = false; // center (second word)
+ $measures = array();
+
+ $i = 0;
+
+ $lookup = array(
+ 'top' => 'v',
+ 'bottom' => 'v',
+ 'left' => 'h',
+ 'right' => 'h',
+ 'center' => 'c'
+ );
+
+ foreach ($bits as $bit) {
+ if ($bit === '') {
+ continue;
+ }
+
+ // test for keyword
+ $lbit = ctype_lower($bit) ? $bit : strtolower($bit);
+ if (isset($lookup[$lbit])) {
+ $status = $lookup[$lbit];
+ if ($status == 'c') {
+ if ($i == 0) {
+ $status = 'ch';
+ } else {
+ $status = 'cv';
+ }
+ }
+ $keywords[$status] = $lbit;
+ $i++;
+ }
+
+ // test for length
+ $r = $this->length->validate($bit, $config, $context);
+ if ($r !== false) {
+ $measures[] = $r;
+ $i++;
+ }
+
+ // test for percentage
+ $r = $this->percentage->validate($bit, $config, $context);
+ if ($r !== false) {
+ $measures[] = $r;
+ $i++;
+ }
+ }
+
+ if (!$i) {
+ return false;
+ } // no valid values were caught
+
+ $ret = array();
+
+ // first keyword
+ if ($keywords['h']) {
+ $ret[] = $keywords['h'];
+ } elseif ($keywords['ch']) {
+ $ret[] = $keywords['ch'];
+ $keywords['cv'] = false; // prevent re-use: center = center center
+ } elseif (count($measures)) {
+ $ret[] = array_shift($measures);
+ }
+
+ if ($keywords['v']) {
+ $ret[] = $keywords['v'];
+ } elseif ($keywords['cv']) {
+ $ret[] = $keywords['cv'];
+ } elseif (count($measures)) {
+ $ret[] = array_shift($measures);
+ }
+
+ if (empty($ret)) {
+ return false;
+ }
+ return implode(' ', $ret);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Border.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Border.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Border.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Border.php
index bd310ff..16243ba 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Border.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Border.php
@@ -1,56 +1,56 @@
-<?php
-
-/**
- * Validates the border property as defined by CSS.
- */
-class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef
-{
-
- /**
- * Local copy of properties this property is shorthand for.
- * @type HTMLPurifier_AttrDef[]
- */
- protected $info = array();
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function __construct($config)
- {
- $def = $config->getCSSDefinition();
- $this->info['border-width'] = $def->info['border-width'];
- $this->info['border-style'] = $def->info['border-style'];
- $this->info['border-top-color'] = $def->info['border-top-color'];
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- $string = $this->parseCDATA($string);
- $string = $this->mungeRgb($string);
- $bits = explode(' ', $string);
- $done = array(); // segments we've finished
- $ret = ''; // return value
- foreach ($bits as $bit) {
- foreach ($this->info as $propname => $validator) {
- if (isset($done[$propname])) {
- continue;
- }
- $r = $validator->validate($bit, $config, $context);
- if ($r !== false) {
- $ret .= $r . ' ';
- $done[$propname] = true;
- break;
- }
- }
- }
- return rtrim($ret);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates the border property as defined by CSS.
+ */
+class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * Local copy of properties this property is shorthand for.
+ * @type HTMLPurifier_AttrDef[]
+ */
+ protected $info = array();
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function __construct($config)
+ {
+ $def = $config->getCSSDefinition();
+ $this->info['border-width'] = $def->info['border-width'];
+ $this->info['border-style'] = $def->info['border-style'];
+ $this->info['border-top-color'] = $def->info['border-top-color'];
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ $string = $this->parseCDATA($string);
+ $string = $this->mungeRgb($string);
+ $bits = explode(' ', $string);
+ $done = array(); // segments we've finished
+ $ret = ''; // return value
+ foreach ($bits as $bit) {
+ foreach ($this->info as $propname => $validator) {
+ if (isset($done[$propname])) {
+ continue;
+ }
+ $r = $validator->validate($bit, $config, $context);
+ if ($r !== false) {
+ $ret .= $r . ' ';
+ $done[$propname] = true;
+ break;
+ }
+ }
+ }
+ return rtrim($ret);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Color.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Color.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Color.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Color.php
index e553c65..16d2a6b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Color.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Color.php
@@ -1,105 +1,105 @@
-<?php
-
-/**
- * Validates Color as defined by CSS.
- */
-class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
-{
-
- /**
- * @param string $color
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($color, $config, $context)
- {
- static $colors = null;
- if ($colors === null) {
- $colors = $config->get('Core.ColorKeywords');
- }
-
- $color = trim($color);
- if ($color === '') {
- return false;
- }
-
- $lower = strtolower($color);
- if (isset($colors[$lower])) {
- return $colors[$lower];
- }
-
- if (strpos($color, 'rgb(') !== false) {
- // rgb literal handling
- $length = strlen($color);
- if (strpos($color, ')') !== $length - 1) {
- return false;
- }
- $triad = substr($color, 4, $length - 4 - 1);
- $parts = explode(',', $triad);
- if (count($parts) !== 3) {
- return false;
- }
- $type = false; // to ensure that they're all the same type
- $new_parts = array();
- foreach ($parts as $part) {
- $part = trim($part);
- if ($part === '') {
- return false;
- }
- $length = strlen($part);
- if ($part[$length - 1] === '%') {
- // handle percents
- if (!$type) {
- $type = 'percentage';
- } elseif ($type !== 'percentage') {
- return false;
- }
- $num = (float)substr($part, 0, $length - 1);
- if ($num < 0) {
- $num = 0;
- }
- if ($num > 100) {
- $num = 100;
- }
- $new_parts[] = "$num%";
- } else {
- // handle integers
- if (!$type) {
- $type = 'integer';
- } elseif ($type !== 'integer') {
- return false;
- }
- $num = (int)$part;
- if ($num < 0) {
- $num = 0;
- }
- if ($num > 255) {
- $num = 255;
- }
- $new_parts[] = (string)$num;
- }
- }
- $new_triad = implode(',', $new_parts);
- $color = "rgb($new_triad)";
- } else {
- // hexadecimal handling
- if ($color[0] === '#') {
- $hex = substr($color, 1);
- } else {
- $hex = $color;
- $color = '#' . $color;
- }
- $length = strlen($hex);
- if ($length !== 3 && $length !== 6) {
- return false;
- }
- if (!ctype_xdigit($hex)) {
- return false;
- }
- }
- return $color;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates Color as defined by CSS.
+ */
+class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * @param string $color
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($color, $config, $context)
+ {
+ static $colors = null;
+ if ($colors === null) {
+ $colors = $config->get('Core.ColorKeywords');
+ }
+
+ $color = trim($color);
+ if ($color === '') {
+ return false;
+ }
+
+ $lower = strtolower($color);
+ if (isset($colors[$lower])) {
+ return $colors[$lower];
+ }
+
+ if (strpos($color, 'rgb(') !== false) {
+ // rgb literal handling
+ $length = strlen($color);
+ if (strpos($color, ')') !== $length - 1) {
+ return false;
+ }
+ $triad = substr($color, 4, $length - 4 - 1);
+ $parts = explode(',', $triad);
+ if (count($parts) !== 3) {
+ return false;
+ }
+ $type = false; // to ensure that they're all the same type
+ $new_parts = array();
+ foreach ($parts as $part) {
+ $part = trim($part);
+ if ($part === '') {
+ return false;
+ }
+ $length = strlen($part);
+ if ($part[$length - 1] === '%') {
+ // handle percents
+ if (!$type) {
+ $type = 'percentage';
+ } elseif ($type !== 'percentage') {
+ return false;
+ }
+ $num = (float)substr($part, 0, $length - 1);
+ if ($num < 0) {
+ $num = 0;
+ }
+ if ($num > 100) {
+ $num = 100;
+ }
+ $new_parts[] = "$num%";
+ } else {
+ // handle integers
+ if (!$type) {
+ $type = 'integer';
+ } elseif ($type !== 'integer') {
+ return false;
+ }
+ $num = (int)$part;
+ if ($num < 0) {
+ $num = 0;
+ }
+ if ($num > 255) {
+ $num = 255;
+ }
+ $new_parts[] = (string)$num;
+ }
+ }
+ $new_triad = implode(',', $new_parts);
+ $color = "rgb($new_triad)";
+ } else {
+ // hexadecimal handling
+ if ($color[0] === '#') {
+ $hex = substr($color, 1);
+ } else {
+ $hex = $color;
+ $color = '#' . $color;
+ }
+ $length = strlen($hex);
+ if ($length !== 3 && $length !== 6) {
+ return false;
+ }
+ if (!ctype_xdigit($hex)) {
+ return false;
+ }
+ }
+ return $color;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Composite.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Composite.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Composite.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Composite.php
index 3890023..9c17505 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Composite.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Composite.php
@@ -1,48 +1,48 @@
-<?php
-
-/**
- * Allows multiple validators to attempt to validate attribute.
- *
- * Composite is just what it sounds like: a composite of many validators.
- * This means that multiple HTMLPurifier_AttrDef objects will have a whack
- * at the string. If one of them passes, that's what is returned. This is
- * especially useful for CSS values, which often are a choice between
- * an enumerated set of predefined values or a flexible data type.
- */
-class HTMLPurifier_AttrDef_CSS_Composite extends HTMLPurifier_AttrDef
-{
-
- /**
- * List of objects that may process strings.
- * @type HTMLPurifier_AttrDef[]
- * @todo Make protected
- */
- public $defs;
-
- /**
- * @param HTMLPurifier_AttrDef[] $defs List of HTMLPurifier_AttrDef objects
- */
- public function __construct($defs)
- {
- $this->defs = $defs;
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- foreach ($this->defs as $i => $def) {
- $result = $this->defs[$i]->validate($string, $config, $context);
- if ($result !== false) {
- return $result;
- }
- }
- return false;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Allows multiple validators to attempt to validate attribute.
+ *
+ * Composite is just what it sounds like: a composite of many validators.
+ * This means that multiple HTMLPurifier_AttrDef objects will have a whack
+ * at the string. If one of them passes, that's what is returned. This is
+ * especially useful for CSS values, which often are a choice between
+ * an enumerated set of predefined values or a flexible data type.
+ */
+class HTMLPurifier_AttrDef_CSS_Composite extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * List of objects that may process strings.
+ * @type HTMLPurifier_AttrDef[]
+ * @todo Make protected
+ */
+ public $defs;
+
+ /**
+ * @param HTMLPurifier_AttrDef[] $defs List of HTMLPurifier_AttrDef objects
+ */
+ public function __construct($defs)
+ {
+ $this->defs = $defs;
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ foreach ($this->defs as $i => $def) {
+ $result = $this->defs[$i]->validate($string, $config, $context);
+ if ($result !== false) {
+ return $result;
+ }
+ }
+ return false;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
index ff0d897..9d77cc9 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
@@ -1,44 +1,44 @@
-<?php
-
-/**
- * Decorator which enables CSS properties to be disabled for specific elements.
- */
-class HTMLPurifier_AttrDef_CSS_DenyElementDecorator extends HTMLPurifier_AttrDef
-{
- /**
- * @type HTMLPurifier_AttrDef
- */
- public $def;
- /**
- * @type string
- */
- public $element;
-
- /**
- * @param HTMLPurifier_AttrDef $def Definition to wrap
- * @param string $element Element to deny
- */
- public function __construct($def, $element)
- {
- $this->def = $def;
- $this->element = $element;
- }
-
- /**
- * Checks if CurrentToken is set and equal to $this->element
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- $token = $context->get('CurrentToken', true);
- if ($token && $token->name == $this->element) {
- return false;
- }
- return $this->def->validate($string, $config, $context);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Decorator which enables CSS properties to be disabled for specific elements.
+ */
+class HTMLPurifier_AttrDef_CSS_DenyElementDecorator extends HTMLPurifier_AttrDef
+{
+ /**
+ * @type HTMLPurifier_AttrDef
+ */
+ public $def;
+ /**
+ * @type string
+ */
+ public $element;
+
+ /**
+ * @param HTMLPurifier_AttrDef $def Definition to wrap
+ * @param string $element Element to deny
+ */
+ public function __construct($def, $element)
+ {
+ $this->def = $def;
+ $this->element = $element;
+ }
+
+ /**
+ * Checks if CurrentToken is set and equal to $this->element
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ $token = $context->get('CurrentToken', true);
+ if ($token && $token->name == $this->element) {
+ return false;
+ }
+ return $this->def->validate($string, $config, $context);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Filter.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Filter.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Filter.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Filter.php
index 019722a..bde4c33 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Filter.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Filter.php
@@ -1,77 +1,77 @@
-<?php
-
-/**
- * Microsoft's proprietary filter: CSS property
- * @note Currently supports the alpha filter. In the future, this will
- * probably need an extensible framework
- */
-class HTMLPurifier_AttrDef_CSS_Filter extends HTMLPurifier_AttrDef
-{
- /**
- * @type HTMLPurifier_AttrDef_Integer
- */
- protected $intValidator;
-
- public function __construct()
- {
- $this->intValidator = new HTMLPurifier_AttrDef_Integer();
- }
-
- /**
- * @param string $value
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($value, $config, $context)
- {
- $value = $this->parseCDATA($value);
- if ($value === 'none') {
- return $value;
- }
- // if we looped this we could support multiple filters
- $function_length = strcspn($value, '(');
- $function = trim(substr($value, 0, $function_length));
- if ($function !== 'alpha' &&
- $function !== 'Alpha' &&
- $function !== 'progid:DXImageTransform.Microsoft.Alpha'
- ) {
- return false;
- }
- $cursor = $function_length + 1;
- $parameters_length = strcspn($value, ')', $cursor);
- $parameters = substr($value, $cursor, $parameters_length);
- $params = explode(',', $parameters);
- $ret_params = array();
- $lookup = array();
- foreach ($params as $param) {
- list($key, $value) = explode('=', $param);
- $key = trim($key);
- $value = trim($value);
- if (isset($lookup[$key])) {
- continue;
- }
- if ($key !== 'opacity') {
- continue;
- }
- $value = $this->intValidator->validate($value, $config, $context);
- if ($value === false) {
- continue;
- }
- $int = (int)$value;
- if ($int > 100) {
- $value = '100';
- }
- if ($int < 0) {
- $value = '0';
- }
- $ret_params[] = "$key=$value";
- $lookup[$key] = true;
- }
- $ret_parameters = implode(',', $ret_params);
- $ret_function = "$function($ret_parameters)";
- return $ret_function;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Microsoft's proprietary filter: CSS property
+ * @note Currently supports the alpha filter. In the future, this will
+ * probably need an extensible framework
+ */
+class HTMLPurifier_AttrDef_CSS_Filter extends HTMLPurifier_AttrDef
+{
+ /**
+ * @type HTMLPurifier_AttrDef_Integer
+ */
+ protected $intValidator;
+
+ public function __construct()
+ {
+ $this->intValidator = new HTMLPurifier_AttrDef_Integer();
+ }
+
+ /**
+ * @param string $value
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($value, $config, $context)
+ {
+ $value = $this->parseCDATA($value);
+ if ($value === 'none') {
+ return $value;
+ }
+ // if we looped this we could support multiple filters
+ $function_length = strcspn($value, '(');
+ $function = trim(substr($value, 0, $function_length));
+ if ($function !== 'alpha' &&
+ $function !== 'Alpha' &&
+ $function !== 'progid:DXImageTransform.Microsoft.Alpha'
+ ) {
+ return false;
+ }
+ $cursor = $function_length + 1;
+ $parameters_length = strcspn($value, ')', $cursor);
+ $parameters = substr($value, $cursor, $parameters_length);
+ $params = explode(',', $parameters);
+ $ret_params = array();
+ $lookup = array();
+ foreach ($params as $param) {
+ list($key, $value) = explode('=', $param);
+ $key = trim($key);
+ $value = trim($value);
+ if (isset($lookup[$key])) {
+ continue;
+ }
+ if ($key !== 'opacity') {
+ continue;
+ }
+ $value = $this->intValidator->validate($value, $config, $context);
+ if ($value === false) {
+ continue;
+ }
+ $int = (int)$value;
+ if ($int > 100) {
+ $value = '100';
+ }
+ if ($int < 0) {
+ $value = '0';
+ }
+ $ret_params[] = "$key=$value";
+ $lookup[$key] = true;
+ }
+ $ret_parameters = implode(',', $ret_params);
+ $ret_function = "$function($ret_parameters)";
+ return $ret_function;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Font.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Font.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Font.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Font.php
index b9b63f8..579b97e 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Font.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Font.php
@@ -1,176 +1,176 @@
-<?php
-
-/**
- * Validates shorthand CSS property font.
- */
-class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
-{
-
- /**
- * Local copy of validators
- * @type HTMLPurifier_AttrDef[]
- * @note If we moved specific CSS property definitions to their own
- * classes instead of having them be assembled at run time by
- * CSSDefinition, this wouldn't be necessary. We'd instantiate
- * our own copies.
- */
- protected $info = array();
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function __construct($config)
- {
- $def = $config->getCSSDefinition();
- $this->info['font-style'] = $def->info['font-style'];
- $this->info['font-variant'] = $def->info['font-variant'];
- $this->info['font-weight'] = $def->info['font-weight'];
- $this->info['font-size'] = $def->info['font-size'];
- $this->info['line-height'] = $def->info['line-height'];
- $this->info['font-family'] = $def->info['font-family'];
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- static $system_fonts = array(
- 'caption' => true,
- 'icon' => true,
- 'menu' => true,
- 'message-box' => true,
- 'small-caption' => true,
- 'status-bar' => true
- );
-
- // regular pre-processing
- $string = $this->parseCDATA($string);
- if ($string === '') {
- return false;
- }
-
- // check if it's one of the keywords
- $lowercase_string = strtolower($string);
- if (isset($system_fonts[$lowercase_string])) {
- return $lowercase_string;
- }
-
- $bits = explode(' ', $string); // bits to process
- $stage = 0; // this indicates what we're looking for
- $caught = array(); // which stage 0 properties have we caught?
- $stage_1 = array('font-style', 'font-variant', 'font-weight');
- $final = ''; // output
-
- for ($i = 0, $size = count($bits); $i < $size; $i++) {
- if ($bits[$i] === '') {
- continue;
- }
- switch ($stage) {
- case 0: // attempting to catch font-style, font-variant or font-weight
- foreach ($stage_1 as $validator_name) {
- if (isset($caught[$validator_name])) {
- continue;
- }
- $r = $this->info[$validator_name]->validate(
- $bits[$i],
- $config,
- $context
- );
- if ($r !== false) {
- $final .= $r . ' ';
- $caught[$validator_name] = true;
- break;
- }
- }
- // all three caught, continue on
- if (count($caught) >= 3) {
- $stage = 1;
- }
- if ($r !== false) {
- break;
- }
- case 1: // attempting to catch font-size and perhaps line-height
- $found_slash = false;
- if (strpos($bits[$i], '/') !== false) {
- list($font_size, $line_height) =
- explode('/', $bits[$i]);
- if ($line_height === '') {
- // ooh, there's a space after the slash!
- $line_height = false;
- $found_slash = true;
- }
- } else {
- $font_size = $bits[$i];
- $line_height = false;
- }
- $r = $this->info['font-size']->validate(
- $font_size,
- $config,
- $context
- );
- if ($r !== false) {
- $final .= $r;
- // attempt to catch line-height
- if ($line_height === false) {
- // we need to scroll forward
- for ($j = $i + 1; $j < $size; $j++) {
- if ($bits[$j] === '') {
- continue;
- }
- if ($bits[$j] === '/') {
- if ($found_slash) {
- return false;
- } else {
- $found_slash = true;
- continue;
- }
- }
- $line_height = $bits[$j];
- break;
- }
- } else {
- // slash already found
- $found_slash = true;
- $j = $i;
- }
- if ($found_slash) {
- $i = $j;
- $r = $this->info['line-height']->validate(
- $line_height,
- $config,
- $context
- );
- if ($r !== false) {
- $final .= '/' . $r;
- }
- }
- $final .= ' ';
- $stage = 2;
- break;
- }
- return false;
- case 2: // attempting to catch font-family
- $font_family =
- implode(' ', array_slice($bits, $i, $size - $i));
- $r = $this->info['font-family']->validate(
- $font_family,
- $config,
- $context
- );
- if ($r !== false) {
- $final .= $r . ' ';
- // processing completed successfully
- return rtrim($final);
- }
- return false;
- }
- }
- return false;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates shorthand CSS property font.
+ */
+class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * Local copy of validators
+ * @type HTMLPurifier_AttrDef[]
+ * @note If we moved specific CSS property definitions to their own
+ * classes instead of having them be assembled at run time by
+ * CSSDefinition, this wouldn't be necessary. We'd instantiate
+ * our own copies.
+ */
+ protected $info = array();
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function __construct($config)
+ {
+ $def = $config->getCSSDefinition();
+ $this->info['font-style'] = $def->info['font-style'];
+ $this->info['font-variant'] = $def->info['font-variant'];
+ $this->info['font-weight'] = $def->info['font-weight'];
+ $this->info['font-size'] = $def->info['font-size'];
+ $this->info['line-height'] = $def->info['line-height'];
+ $this->info['font-family'] = $def->info['font-family'];
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ static $system_fonts = array(
+ 'caption' => true,
+ 'icon' => true,
+ 'menu' => true,
+ 'message-box' => true,
+ 'small-caption' => true,
+ 'status-bar' => true
+ );
+
+ // regular pre-processing
+ $string = $this->parseCDATA($string);
+ if ($string === '') {
+ return false;
+ }
+
+ // check if it's one of the keywords
+ $lowercase_string = strtolower($string);
+ if (isset($system_fonts[$lowercase_string])) {
+ return $lowercase_string;
+ }
+
+ $bits = explode(' ', $string); // bits to process
+ $stage = 0; // this indicates what we're looking for
+ $caught = array(); // which stage 0 properties have we caught?
+ $stage_1 = array('font-style', 'font-variant', 'font-weight');
+ $final = ''; // output
+
+ for ($i = 0, $size = count($bits); $i < $size; $i++) {
+ if ($bits[$i] === '') {
+ continue;
+ }
+ switch ($stage) {
+ case 0: // attempting to catch font-style, font-variant or font-weight
+ foreach ($stage_1 as $validator_name) {
+ if (isset($caught[$validator_name])) {
+ continue;
+ }
+ $r = $this->info[$validator_name]->validate(
+ $bits[$i],
+ $config,
+ $context
+ );
+ if ($r !== false) {
+ $final .= $r . ' ';
+ $caught[$validator_name] = true;
+ break;
+ }
+ }
+ // all three caught, continue on
+ if (count($caught) >= 3) {
+ $stage = 1;
+ }
+ if ($r !== false) {
+ break;
+ }
+ case 1: // attempting to catch font-size and perhaps line-height
+ $found_slash = false;
+ if (strpos($bits[$i], '/') !== false) {
+ list($font_size, $line_height) =
+ explode('/', $bits[$i]);
+ if ($line_height === '') {
+ // ooh, there's a space after the slash!
+ $line_height = false;
+ $found_slash = true;
+ }
+ } else {
+ $font_size = $bits[$i];
+ $line_height = false;
+ }
+ $r = $this->info['font-size']->validate(
+ $font_size,
+ $config,
+ $context
+ );
+ if ($r !== false) {
+ $final .= $r;
+ // attempt to catch line-height
+ if ($line_height === false) {
+ // we need to scroll forward
+ for ($j = $i + 1; $j < $size; $j++) {
+ if ($bits[$j] === '') {
+ continue;
+ }
+ if ($bits[$j] === '/') {
+ if ($found_slash) {
+ return false;
+ } else {
+ $found_slash = true;
+ continue;
+ }
+ }
+ $line_height = $bits[$j];
+ break;
+ }
+ } else {
+ // slash already found
+ $found_slash = true;
+ $j = $i;
+ }
+ if ($found_slash) {
+ $i = $j;
+ $r = $this->info['line-height']->validate(
+ $line_height,
+ $config,
+ $context
+ );
+ if ($r !== false) {
+ $final .= '/' . $r;
+ }
+ }
+ $final .= ' ';
+ $stage = 2;
+ break;
+ }
+ return false;
+ case 2: // attempting to catch font-family
+ $font_family =
+ implode(' ', array_slice($bits, $i, $size - $i));
+ $r = $this->info['font-family']->validate(
+ $font_family,
+ $config,
+ $context
+ );
+ if ($r !== false) {
+ $final .= $r . ' ';
+ // processing completed successfully
+ return rtrim($final);
+ }
+ return false;
+ }
+ }
+ return false;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/FontFamily.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
index f9af36d..74e24c8 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
@@ -1,219 +1,219 @@
-<?php
-
-/**
- * Validates a font family list according to CSS spec
- */
-class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
-{
-
- protected $mask = null;
-
- public function __construct()
- {
- $this->mask = '_- ';
- for ($c = 'a'; $c <= 'z'; $c++) {
- $this->mask .= $c;
- }
- for ($c = 'A'; $c <= 'Z'; $c++) {
- $this->mask .= $c;
- }
- for ($c = '0'; $c <= '9'; $c++) {
- $this->mask .= $c;
- } // cast-y, but should be fine
- // special bytes used by UTF-8
- for ($i = 0x80; $i <= 0xFF; $i++) {
- // We don't bother excluding invalid bytes in this range,
- // because the our restriction of well-formed UTF-8 will
- // prevent these from ever occurring.
- $this->mask .= chr($i);
- }
-
- /*
- PHP's internal strcspn implementation is
- O(length of string * length of mask), making it inefficient
- for large masks. However, it's still faster than
- preg_match 8)
- for (p = s1;;) {
- spanp = s2;
- do {
- if (*spanp == c || p == s1_end) {
- return p - s1;
- }
- } while (spanp++ < (s2_end - 1));
- c = *++p;
- }
- */
- // possible optimization: invert the mask.
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- static $generic_names = array(
- 'serif' => true,
- 'sans-serif' => true,
- 'monospace' => true,
- 'fantasy' => true,
- 'cursive' => true
- );
- $allowed_fonts = $config->get('CSS.AllowedFonts');
-
- // assume that no font names contain commas in them
- $fonts = explode(',', $string);
- $final = '';
- foreach ($fonts as $font) {
- $font = trim($font);
- if ($font === '') {
- continue;
- }
- // match a generic name
- if (isset($generic_names[$font])) {
- if ($allowed_fonts === null || isset($allowed_fonts[$font])) {
- $final .= $font . ', ';
- }
- continue;
- }
- // match a quoted name
- if ($font[0] === '"' || $font[0] === "'") {
- $length = strlen($font);
- if ($length <= 2) {
- continue;
- }
- $quote = $font[0];
- if ($font[$length - 1] !== $quote) {
- continue;
- }
- $font = substr($font, 1, $length - 2);
- }
-
- $font = $this->expandCSSEscape($font);
-
- // $font is a pure representation of the font name
-
- if ($allowed_fonts !== null && !isset($allowed_fonts[$font])) {
- continue;
- }
-
- if (ctype_alnum($font) && $font !== '') {
- // very simple font, allow it in unharmed
- $final .= $font . ', ';
- continue;
- }
-
- // bugger out on whitespace. form feed (0C) really
- // shouldn't show up regardless
- $font = str_replace(array("\n", "\t", "\r", "\x0C"), ' ', $font);
-
- // Here, there are various classes of characters which need
- // to be treated differently:
- // - Alphanumeric characters are essentially safe. We
- // handled these above.
- // - Spaces require quoting, though most parsers will do
- // the right thing if there aren't any characters that
- // can be misinterpreted
- // - Dashes rarely occur, but they fairly unproblematic
- // for parsing/rendering purposes.
- // The above characters cover the majority of Western font
- // names.
- // - Arbitrary Unicode characters not in ASCII. Because
- // most parsers give little thought to Unicode, treatment
- // of these codepoints is basically uniform, even for
- // punctuation-like codepoints. These characters can
- // show up in non-Western pages and are supported by most
- // major browsers, for example: "ＭＳ 明朝" is a
- // legitimate font-name
- // <http://ja.wikipedia.org/wiki/MS_明朝>. See
- // the CSS3 spec for more examples:
- // <http://www.w3.org/TR/2011/WD-css3-fonts-20110324/localizedfamilynames.png>
- // You can see live samples of these on the Internet:
- // <http://www.google.co.jp/search?q=font-family+ＭＳ+明朝|ゴシック>
- // However, most of these fonts have ASCII equivalents:
- // for example, 'MS Mincho', and it's considered
- // professional to use ASCII font names instead of
- // Unicode font names. Thanks Takeshi Terada for
- // providing this information.
- // The following characters, to my knowledge, have not been
- // used to name font names.
- // - Single quote. While theoretically you might find a
- // font name that has a single quote in its name (serving
- // as an apostrophe, e.g. Dave's Scribble), I haven't
- // been able to find any actual examples of this.
- // Internet Explorer's cssText translation (which I
- // believe is invoked by innerHTML) normalizes any
- // quoting to single quotes, and fails to escape single
- // quotes. (Note that this is not IE's behavior for all
- // CSS properties, just some sort of special casing for
- // font-family). So a single quote *cannot* be used
- // safely in the font-family context if there will be an
- // innerHTML/cssText translation. Note that Firefox 3.x
- // does this too.
- // - Double quote. In IE, these get normalized to
- // single-quotes, no matter what the encoding. (Fun
- // fact, in IE8, the 'content' CSS property gained
- // support, where they special cased to preserve encoded
- // double quotes, but still translate unadorned double
- // quotes into single quotes.) So, because their
- // fixpoint behavior is identical to single quotes, they
- // cannot be allowed either. Firefox 3.x displays
- // single-quote style behavior.
- // - Backslashes are reduced by one (so \\ -> \) every
- // iteration, so they cannot be used safely. This shows
- // up in IE7, IE8 and FF3
- // - Semicolons, commas and backticks are handled properly.
- // - The rest of the ASCII punctuation is handled properly.
- // We haven't checked what browsers do to unadorned
- // versions, but this is not important as long as the
- // browser doesn't /remove/ surrounding quotes (as IE does
- // for HTML).
- //
- // With these results in hand, we conclude that there are
- // various levels of safety:
- // - Paranoid: alphanumeric, spaces and dashes(?)
- // - International: Paranoid + non-ASCII Unicode
- // - Edgy: Everything except quotes, backslashes
- // - NoJS: Standards compliance, e.g. sod IE. Note that
- // with some judicious character escaping (since certain
- // types of escaping doesn't work) this is theoretically
- // OK as long as innerHTML/cssText is not called.
- // We believe that international is a reasonable default
- // (that we will implement now), and once we do more
- // extensive research, we may feel comfortable with dropping
- // it down to edgy.
-
- // Edgy: alphanumeric, spaces, dashes, underscores and Unicode. Use of
- // str(c)spn assumes that the string was already well formed
- // Unicode (which of course it is).
- if (strspn($font, $this->mask) !== strlen($font)) {
- continue;
- }
-
- // Historical:
- // In the absence of innerHTML/cssText, these ugly
- // transforms don't pose a security risk (as \\ and \"
- // might--these escapes are not supported by most browsers).
- // We could try to be clever and use single-quote wrapping
- // when there is a double quote present, but I have choosen
- // not to implement that. (NOTE: you can reduce the amount
- // of escapes by one depending on what quoting style you use)
- // $font = str_replace('\\', '\\5C ', $font);
- // $font = str_replace('"', '\\22 ', $font);
- // $font = str_replace("'", '\\27 ', $font);
-
- // font possibly with spaces, requires quoting
- $final .= "'$font', ";
- }
- $final = rtrim($final, ', ');
- if ($final === '') {
- return false;
- }
- return $final;
- }
-
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates a font family list according to CSS spec
+ */
+class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
+{
+
+ protected $mask = null;
+
+ public function __construct()
+ {
+ $this->mask = '_- ';
+ for ($c = 'a'; $c <= 'z'; $c++) {
+ $this->mask .= $c;
+ }
+ for ($c = 'A'; $c <= 'Z'; $c++) {
+ $this->mask .= $c;
+ }
+ for ($c = '0'; $c <= '9'; $c++) {
+ $this->mask .= $c;
+ } // cast-y, but should be fine
+ // special bytes used by UTF-8
+ for ($i = 0x80; $i <= 0xFF; $i++) {
+ // We don't bother excluding invalid bytes in this range,
+ // because the our restriction of well-formed UTF-8 will
+ // prevent these from ever occurring.
+ $this->mask .= chr($i);
+ }
+
+ /*
+ PHP's internal strcspn implementation is
+ O(length of string * length of mask), making it inefficient
+ for large masks. However, it's still faster than
+ preg_match 8)
+ for (p = s1;;) {
+ spanp = s2;
+ do {
+ if (*spanp == c || p == s1_end) {
+ return p - s1;
+ }
+ } while (spanp++ < (s2_end - 1));
+ c = *++p;
+ }
+ */
+ // possible optimization: invert the mask.
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ static $generic_names = array(
+ 'serif' => true,
+ 'sans-serif' => true,
+ 'monospace' => true,
+ 'fantasy' => true,
+ 'cursive' => true
+ );
+ $allowed_fonts = $config->get('CSS.AllowedFonts');
+
+ // assume that no font names contain commas in them
+ $fonts = explode(',', $string);
+ $final = '';
+ foreach ($fonts as $font) {
+ $font = trim($font);
+ if ($font === '') {
+ continue;
+ }
+ // match a generic name
+ if (isset($generic_names[$font])) {
+ if ($allowed_fonts === null || isset($allowed_fonts[$font])) {
+ $final .= $font . ', ';
+ }
+ continue;
+ }
+ // match a quoted name
+ if ($font[0] === '"' || $font[0] === "'") {
+ $length = strlen($font);
+ if ($length <= 2) {
+ continue;
+ }
+ $quote = $font[0];
+ if ($font[$length - 1] !== $quote) {
+ continue;
+ }
+ $font = substr($font, 1, $length - 2);
+ }
+
+ $font = $this->expandCSSEscape($font);
+
+ // $font is a pure representation of the font name
+
+ if ($allowed_fonts !== null && !isset($allowed_fonts[$font])) {
+ continue;
+ }
+
+ if (ctype_alnum($font) && $font !== '') {
+ // very simple font, allow it in unharmed
+ $final .= $font . ', ';
+ continue;
+ }
+
+ // bugger out on whitespace. form feed (0C) really
+ // shouldn't show up regardless
+ $font = str_replace(array("\n", "\t", "\r", "\x0C"), ' ', $font);
+
+ // Here, there are various classes of characters which need
+ // to be treated differently:
+ // - Alphanumeric characters are essentially safe. We
+ // handled these above.
+ // - Spaces require quoting, though most parsers will do
+ // the right thing if there aren't any characters that
+ // can be misinterpreted
+ // - Dashes rarely occur, but they fairly unproblematic
+ // for parsing/rendering purposes.
+ // The above characters cover the majority of Western font
+ // names.
+ // - Arbitrary Unicode characters not in ASCII. Because
+ // most parsers give little thought to Unicode, treatment
+ // of these codepoints is basically uniform, even for
+ // punctuation-like codepoints. These characters can
+ // show up in non-Western pages and are supported by most
+ // major browsers, for example: "ＭＳ 明朝" is a
+ // legitimate font-name
+ // <http://ja.wikipedia.org/wiki/MS_明朝>. See
+ // the CSS3 spec for more examples:
+ // <http://www.w3.org/TR/2011/WD-css3-fonts-20110324/localizedfamilynames.png>
+ // You can see live samples of these on the Internet:
+ // <http://www.google.co.jp/search?q=font-family+ＭＳ+明朝|ゴシック>
+ // However, most of these fonts have ASCII equivalents:
+ // for example, 'MS Mincho', and it's considered
+ // professional to use ASCII font names instead of
+ // Unicode font names. Thanks Takeshi Terada for
+ // providing this information.
+ // The following characters, to my knowledge, have not been
+ // used to name font names.
+ // - Single quote. While theoretically you might find a
+ // font name that has a single quote in its name (serving
+ // as an apostrophe, e.g. Dave's Scribble), I haven't
+ // been able to find any actual examples of this.
+ // Internet Explorer's cssText translation (which I
+ // believe is invoked by innerHTML) normalizes any
+ // quoting to single quotes, and fails to escape single
+ // quotes. (Note that this is not IE's behavior for all
+ // CSS properties, just some sort of special casing for
+ // font-family). So a single quote *cannot* be used
+ // safely in the font-family context if there will be an
+ // innerHTML/cssText translation. Note that Firefox 3.x
+ // does this too.
+ // - Double quote. In IE, these get normalized to
+ // single-quotes, no matter what the encoding. (Fun
+ // fact, in IE8, the 'content' CSS property gained
+ // support, where they special cased to preserve encoded
+ // double quotes, but still translate unadorned double
+ // quotes into single quotes.) So, because their
+ // fixpoint behavior is identical to single quotes, they
+ // cannot be allowed either. Firefox 3.x displays
+ // single-quote style behavior.
+ // - Backslashes are reduced by one (so \\ -> \) every
+ // iteration, so they cannot be used safely. This shows
+ // up in IE7, IE8 and FF3
+ // - Semicolons, commas and backticks are handled properly.
+ // - The rest of the ASCII punctuation is handled properly.
+ // We haven't checked what browsers do to unadorned
+ // versions, but this is not important as long as the
+ // browser doesn't /remove/ surrounding quotes (as IE does
+ // for HTML).
+ //
+ // With these results in hand, we conclude that there are
+ // various levels of safety:
+ // - Paranoid: alphanumeric, spaces and dashes(?)
+ // - International: Paranoid + non-ASCII Unicode
+ // - Edgy: Everything except quotes, backslashes
+ // - NoJS: Standards compliance, e.g. sod IE. Note that
+ // with some judicious character escaping (since certain
+ // types of escaping doesn't work) this is theoretically
+ // OK as long as innerHTML/cssText is not called.
+ // We believe that international is a reasonable default
+ // (that we will implement now), and once we do more
+ // extensive research, we may feel comfortable with dropping
+ // it down to edgy.
+
+ // Edgy: alphanumeric, spaces, dashes, underscores and Unicode. Use of
+ // str(c)spn assumes that the string was already well formed
+ // Unicode (which of course it is).
+ if (strspn($font, $this->mask) !== strlen($font)) {
+ continue;
+ }
+
+ // Historical:
+ // In the absence of innerHTML/cssText, these ugly
+ // transforms don't pose a security risk (as \\ and \"
+ // might--these escapes are not supported by most browsers).
+ // We could try to be clever and use single-quote wrapping
+ // when there is a double quote present, but I have choosen
+ // not to implement that. (NOTE: you can reduce the amount
+ // of escapes by one depending on what quoting style you use)
+ // $font = str_replace('\\', '\\5C ', $font);
+ // $font = str_replace('"', '\\22 ', $font);
+ // $font = str_replace("'", '\\27 ', $font);
+
+ // font possibly with spaces, requires quoting
+ $final .= "'$font', ";
+ }
+ $final = rtrim($final, ', ');
+ if ($final === '') {
+ return false;
+ }
+ return $final;
+ }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Ident.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Ident.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Ident.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Ident.php
index 5f13edf..973002c 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Ident.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Ident.php
@@ -1,32 +1,32 @@
-<?php
-
-/**
- * Validates based on {ident} CSS grammar production
- */
-class HTMLPurifier_AttrDef_CSS_Ident extends HTMLPurifier_AttrDef
-{
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- $string = trim($string);
-
- // early abort: '' and '0' (strings that convert to false) are invalid
- if (!$string) {
- return false;
- }
-
- $pattern = '/^(-?[A-Za-z_][A-Za-z_\-0-9]*)$/';
- if (!preg_match($pattern, $string)) {
- return false;
- }
- return $string;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates based on {ident} CSS grammar production
+ */
+class HTMLPurifier_AttrDef_CSS_Ident extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ $string = trim($string);
+
+ // early abort: '' and '0' (strings that convert to false) are invalid
+ if (!$string) {
+ return false;
+ }
+
+ $pattern = '/^(-?[A-Za-z_][A-Za-z_\-0-9]*)$/';
+ if (!preg_match($pattern, $string)) {
+ return false;
+ }
+ return $string;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
index f484849..ffc989f 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
@@ -1,56 +1,56 @@
-<?php
-
-/**
- * Decorator which enables !important to be used in CSS values.
- */
-class HTMLPurifier_AttrDef_CSS_ImportantDecorator extends HTMLPurifier_AttrDef
-{
- /**
- * @type HTMLPurifier_AttrDef
- */
- public $def;
- /**
- * @type bool
- */
- public $allow;
-
- /**
- * @param HTMLPurifier_AttrDef $def Definition to wrap
- * @param bool $allow Whether or not to allow !important
- */
- public function __construct($def, $allow = false)
- {
- $this->def = $def;
- $this->allow = $allow;
- }
-
- /**
- * Intercepts and removes !important if necessary
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- // test for ! and important tokens
- $string = trim($string);
- $is_important = false;
- // :TODO: optimization: test directly for !important and ! important
- if (strlen($string) >= 9 && substr($string, -9) === 'important') {
- $temp = rtrim(substr($string, 0, -9));
- // use a temp, because we might want to restore important
- if (strlen($temp) >= 1 && substr($temp, -1) === '!') {
- $string = rtrim(substr($temp, 0, -1));
- $is_important = true;
- }
- }
- $string = $this->def->validate($string, $config, $context);
- if ($this->allow && $is_important) {
- $string .= ' !important';
- }
- return $string;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Decorator which enables !important to be used in CSS values.
+ */
+class HTMLPurifier_AttrDef_CSS_ImportantDecorator extends HTMLPurifier_AttrDef
+{
+ /**
+ * @type HTMLPurifier_AttrDef
+ */
+ public $def;
+ /**
+ * @type bool
+ */
+ public $allow;
+
+ /**
+ * @param HTMLPurifier_AttrDef $def Definition to wrap
+ * @param bool $allow Whether or not to allow !important
+ */
+ public function __construct($def, $allow = false)
+ {
+ $this->def = $def;
+ $this->allow = $allow;
+ }
+
+ /**
+ * Intercepts and removes !important if necessary
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ // test for ! and important tokens
+ $string = trim($string);
+ $is_important = false;
+ // :TODO: optimization: test directly for !important and ! important
+ if (strlen($string) >= 9 && substr($string, -9) === 'important') {
+ $temp = rtrim(substr($string, 0, -9));
+ // use a temp, because we might want to restore important
+ if (strlen($temp) >= 1 && substr($temp, -1) === '!') {
+ $string = rtrim(substr($temp, 0, -1));
+ $is_important = true;
+ }
+ }
+ $string = $this->def->validate($string, $config, $context);
+ if ($this->allow && $is_important) {
+ $string .= ' !important';
+ }
+ return $string;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Length.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Length.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Length.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Length.php
index 88da41d..f12453a 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Length.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Length.php
@@ -1,77 +1,77 @@
-<?php
-
-/**
- * Represents a Length as defined by CSS.
- */
-class HTMLPurifier_AttrDef_CSS_Length extends HTMLPurifier_AttrDef
-{
-
- /**
- * @type HTMLPurifier_Length|string
- */
- protected $min;
-
- /**
- * @type HTMLPurifier_Length|string
- */
- protected $max;
-
- /**
- * @param HTMLPurifier_Length|string $min Minimum length, or null for no bound. String is also acceptable.
- * @param HTMLPurifier_Length|string $max Maximum length, or null for no bound. String is also acceptable.
- */
- public function __construct($min = null, $max = null)
- {
- $this->min = $min !== null ? HTMLPurifier_Length::make($min) : null;
- $this->max = $max !== null ? HTMLPurifier_Length::make($max) : null;
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- $string = $this->parseCDATA($string);
-
- // Optimizations
- if ($string === '') {
- return false;
- }
- if ($string === '0') {
- return '0';
- }
- if (strlen($string) === 1) {
- return false;
- }
-
- $length = HTMLPurifier_Length::make($string);
- if (!$length->isValid()) {
- return false;
- }
-
- if ($this->min) {
- $c = $length->compareTo($this->min);
- if ($c === false) {
- return false;
- }
- if ($c < 0) {
- return false;
- }
- }
- if ($this->max) {
- $c = $length->compareTo($this->max);
- if ($c === false) {
- return false;
- }
- if ($c > 0) {
- return false;
- }
- }
- return $length->toString();
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Represents a Length as defined by CSS.
+ */
+class HTMLPurifier_AttrDef_CSS_Length extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * @type HTMLPurifier_Length|string
+ */
+ protected $min;
+
+ /**
+ * @type HTMLPurifier_Length|string
+ */
+ protected $max;
+
+ /**
+ * @param HTMLPurifier_Length|string $min Minimum length, or null for no bound. String is also acceptable.
+ * @param HTMLPurifier_Length|string $max Maximum length, or null for no bound. String is also acceptable.
+ */
+ public function __construct($min = null, $max = null)
+ {
+ $this->min = $min !== null ? HTMLPurifier_Length::make($min) : null;
+ $this->max = $max !== null ? HTMLPurifier_Length::make($max) : null;
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ $string = $this->parseCDATA($string);
+
+ // Optimizations
+ if ($string === '') {
+ return false;
+ }
+ if ($string === '0') {
+ return '0';
+ }
+ if (strlen($string) === 1) {
+ return false;
+ }
+
+ $length = HTMLPurifier_Length::make($string);
+ if (!$length->isValid()) {
+ return false;
+ }
+
+ if ($this->min) {
+ $c = $length->compareTo($this->min);
+ if ($c === false) {
+ return false;
+ }
+ if ($c < 0) {
+ return false;
+ }
+ }
+ if ($this->max) {
+ $c = $length->compareTo($this->max);
+ if ($c === false) {
+ return false;
+ }
+ if ($c > 0) {
+ return false;
+ }
+ }
+ return $length->toString();
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/ListStyle.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
index b4cce9a..e74d426 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
@@ -1,112 +1,112 @@
-<?php
-
-/**
- * Validates shorthand CSS property list-style.
- * @warning Does not support url tokens that have internal spaces.
- */
-class HTMLPurifier_AttrDef_CSS_ListStyle extends HTMLPurifier_AttrDef
-{
-
- /**
- * Local copy of validators.
- * @type HTMLPurifier_AttrDef[]
- * @note See HTMLPurifier_AttrDef_CSS_Font::$info for a similar impl.
- */
- protected $info;
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function __construct($config)
- {
- $def = $config->getCSSDefinition();
- $this->info['list-style-type'] = $def->info['list-style-type'];
- $this->info['list-style-position'] = $def->info['list-style-position'];
- $this->info['list-style-image'] = $def->info['list-style-image'];
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- // regular pre-processing
- $string = $this->parseCDATA($string);
- if ($string === '') {
- return false;
- }
-
- // assumes URI doesn't have spaces in it
- $bits = explode(' ', strtolower($string)); // bits to process
-
- $caught = array();
- $caught['type'] = false;
- $caught['position'] = false;
- $caught['image'] = false;
-
- $i = 0; // number of catches
- $none = false;
-
- foreach ($bits as $bit) {
- if ($i >= 3) {
- return;
- } // optimization bit
- if ($bit === '') {
- continue;
- }
- foreach ($caught as $key => $status) {
- if ($status !== false) {
- continue;
- }
- $r = $this->info['list-style-' . $key]->validate($bit, $config, $context);
- if ($r === false) {
- continue;
- }
- if ($r === 'none') {
- if ($none) {
- continue;
- } else {
- $none = true;
- }
- if ($key == 'image') {
- continue;
- }
- }
- $caught[$key] = $r;
- $i++;
- break;
- }
- }
-
- if (!$i) {
- return false;
- }
-
- $ret = array();
-
- // construct type
- if ($caught['type']) {
- $ret[] = $caught['type'];
- }
-
- // construct image
- if ($caught['image']) {
- $ret[] = $caught['image'];
- }
-
- // construct position
- if ($caught['position']) {
- $ret[] = $caught['position'];
- }
-
- if (empty($ret)) {
- return false;
- }
- return implode(' ', $ret);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates shorthand CSS property list-style.
+ * @warning Does not support url tokens that have internal spaces.
+ */
+class HTMLPurifier_AttrDef_CSS_ListStyle extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * Local copy of validators.
+ * @type HTMLPurifier_AttrDef[]
+ * @note See HTMLPurifier_AttrDef_CSS_Font::$info for a similar impl.
+ */
+ protected $info;
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function __construct($config)
+ {
+ $def = $config->getCSSDefinition();
+ $this->info['list-style-type'] = $def->info['list-style-type'];
+ $this->info['list-style-position'] = $def->info['list-style-position'];
+ $this->info['list-style-image'] = $def->info['list-style-image'];
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ // regular pre-processing
+ $string = $this->parseCDATA($string);
+ if ($string === '') {
+ return false;
+ }
+
+ // assumes URI doesn't have spaces in it
+ $bits = explode(' ', strtolower($string)); // bits to process
+
+ $caught = array();
+ $caught['type'] = false;
+ $caught['position'] = false;
+ $caught['image'] = false;
+
+ $i = 0; // number of catches
+ $none = false;
+
+ foreach ($bits as $bit) {
+ if ($i >= 3) {
+ return;
+ } // optimization bit
+ if ($bit === '') {
+ continue;
+ }
+ foreach ($caught as $key => $status) {
+ if ($status !== false) {
+ continue;
+ }
+ $r = $this->info['list-style-' . $key]->validate($bit, $config, $context);
+ if ($r === false) {
+ continue;
+ }
+ if ($r === 'none') {
+ if ($none) {
+ continue;
+ } else {
+ $none = true;
+ }
+ if ($key == 'image') {
+ continue;
+ }
+ }
+ $caught[$key] = $r;
+ $i++;
+ break;
+ }
+ }
+
+ if (!$i) {
+ return false;
+ }
+
+ $ret = array();
+
+ // construct type
+ if ($caught['type']) {
+ $ret[] = $caught['type'];
+ }
+
+ // construct image
+ if ($caught['image']) {
+ $ret[] = $caught['image'];
+ }
+
+ // construct position
+ if ($caught['position']) {
+ $ret[] = $caught['position'];
+ }
+
+ if (empty($ret)) {
+ return false;
+ }
+ return implode(' ', $ret);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Multiple.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Multiple.php
similarity index 94%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Multiple.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Multiple.php
index 73d586f..e707f87 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Multiple.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Multiple.php
@@ -1,71 +1,71 @@
-<?php
-
-/**
- * Framework class for strings that involve multiple values.
- *
- * Certain CSS properties such as border-width and margin allow multiple
- * lengths to be specified. This class can take a vanilla border-width
- * definition and multiply it, usually into a max of four.
- *
- * @note Even though the CSS specification isn't clear about it, inherit
- * can only be used alone: it will never manifest as part of a multi
- * shorthand declaration. Thus, this class does not allow inherit.
- */
-class HTMLPurifier_AttrDef_CSS_Multiple extends HTMLPurifier_AttrDef
-{
- /**
- * Instance of component definition to defer validation to.
- * @type HTMLPurifier_AttrDef
- * @todo Make protected
- */
- public $single;
-
- /**
- * Max number of values allowed.
- * @todo Make protected
- */
- public $max;
-
- /**
- * @param HTMLPurifier_AttrDef $single HTMLPurifier_AttrDef to multiply
- * @param int $max Max number of values allowed (usually four)
- */
- public function __construct($single, $max = 4)
- {
- $this->single = $single;
- $this->max = $max;
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- $string = $this->parseCDATA($string);
- if ($string === '') {
- return false;
- }
- $parts = explode(' ', $string); // parseCDATA replaced \r, \t and \n
- $length = count($parts);
- $final = '';
- for ($i = 0, $num = 0; $i < $length && $num < $this->max; $i++) {
- if (ctype_space($parts[$i])) {
- continue;
- }
- $result = $this->single->validate($parts[$i], $config, $context);
- if ($result !== false) {
- $final .= $result . ' ';
- $num++;
- }
- }
- if ($final === '') {
- return false;
- }
- return rtrim($final);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Framework class for strings that involve multiple values.
+ *
+ * Certain CSS properties such as border-width and margin allow multiple
+ * lengths to be specified. This class can take a vanilla border-width
+ * definition and multiply it, usually into a max of four.
+ *
+ * @note Even though the CSS specification isn't clear about it, inherit
+ * can only be used alone: it will never manifest as part of a multi
+ * shorthand declaration. Thus, this class does not allow inherit.
+ */
+class HTMLPurifier_AttrDef_CSS_Multiple extends HTMLPurifier_AttrDef
+{
+ /**
+ * Instance of component definition to defer validation to.
+ * @type HTMLPurifier_AttrDef
+ * @todo Make protected
+ */
+ public $single;
+
+ /**
+ * Max number of values allowed.
+ * @todo Make protected
+ */
+ public $max;
+
+ /**
+ * @param HTMLPurifier_AttrDef $single HTMLPurifier_AttrDef to multiply
+ * @param int $max Max number of values allowed (usually four)
+ */
+ public function __construct($single, $max = 4)
+ {
+ $this->single = $single;
+ $this->max = $max;
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ $string = $this->mungeRgb($this->parseCDATA($string));
+ if ($string === '') {
+ return false;
+ }
+ $parts = explode(' ', $string); // parseCDATA replaced \r, \t and \n
+ $length = count($parts);
+ $final = '';
+ for ($i = 0, $num = 0; $i < $length && $num < $this->max; $i++) {
+ if (ctype_space($parts[$i])) {
+ continue;
+ }
+ $result = $this->single->validate($parts[$i], $config, $context);
+ if ($result !== false) {
+ $final .= $result . ' ';
+ $num++;
+ }
+ }
+ if ($final === '') {
+ return false;
+ }
+ return rtrim($final);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Number.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Number.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Number.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Number.php
index c78f6c9..8edc159 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Number.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Number.php
@@ -1,84 +1,84 @@
-<?php
-
-/**
- * Validates a number as defined by the CSS spec.
- */
-class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef
-{
-
- /**
- * Indicates whether or not only positive values are allowed.
- * @type bool
- */
- protected $non_negative = false;
-
- /**
- * @param bool $non_negative indicates whether negatives are forbidden
- */
- public function __construct($non_negative = false)
- {
- $this->non_negative = $non_negative;
- }
-
- /**
- * @param string $number
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return string|bool
- * @warning Some contexts do not pass $config, $context. These
- * variables should not be used without checking HTMLPurifier_Length
- */
- public function validate($number, $config, $context)
- {
- $number = $this->parseCDATA($number);
-
- if ($number === '') {
- return false;
- }
- if ($number === '0') {
- return '0';
- }
-
- $sign = '';
- switch ($number[0]) {
- case '-':
- if ($this->non_negative) {
- return false;
- }
- $sign = '-';
- case '+':
- $number = substr($number, 1);
- }
-
- if (ctype_digit($number)) {
- $number = ltrim($number, '0');
- return $number ? $sign . $number : '0';
- }
-
- // Period is the only non-numeric character allowed
- if (strpos($number, '.') === false) {
- return false;
- }
-
- list($left, $right) = explode('.', $number, 2);
-
- if ($left === '' && $right === '') {
- return false;
- }
- if ($left !== '' && !ctype_digit($left)) {
- return false;
- }
-
- $left = ltrim($left, '0');
- $right = rtrim($right, '0');
-
- if ($right === '') {
- return $left ? $sign . $left : '0';
- } elseif (!ctype_digit($right)) {
- return false;
- }
- return $sign . $left . '.' . $right;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates a number as defined by the CSS spec.
+ */
+class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * Indicates whether or not only positive values are allowed.
+ * @type bool
+ */
+ protected $non_negative = false;
+
+ /**
+ * @param bool $non_negative indicates whether negatives are forbidden
+ */
+ public function __construct($non_negative = false)
+ {
+ $this->non_negative = $non_negative;
+ }
+
+ /**
+ * @param string $number
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return string|bool
+ * @warning Some contexts do not pass $config, $context. These
+ * variables should not be used without checking HTMLPurifier_Length
+ */
+ public function validate($number, $config, $context)
+ {
+ $number = $this->parseCDATA($number);
+
+ if ($number === '') {
+ return false;
+ }
+ if ($number === '0') {
+ return '0';
+ }
+
+ $sign = '';
+ switch ($number[0]) {
+ case '-':
+ if ($this->non_negative) {
+ return false;
+ }
+ $sign = '-';
+ case '+':
+ $number = substr($number, 1);
+ }
+
+ if (ctype_digit($number)) {
+ $number = ltrim($number, '0');
+ return $number ? $sign . $number : '0';
+ }
+
+ // Period is the only non-numeric character allowed
+ if (strpos($number, '.') === false) {
+ return false;
+ }
+
+ list($left, $right) = explode('.', $number, 2);
+
+ if ($left === '' && $right === '') {
+ return false;
+ }
+ if ($left !== '' && !ctype_digit($left)) {
+ return false;
+ }
+
+ $left = ltrim($left, '0');
+ $right = rtrim($right, '0');
+
+ if ($right === '') {
+ return $left ? $sign . $left : '0';
+ } elseif (!ctype_digit($right)) {
+ return false;
+ }
+ return $sign . $left . '.' . $right;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Percentage.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Percentage.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Percentage.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Percentage.php
index aac1a6f..f0f25c5 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/Percentage.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/Percentage.php
@@ -1,54 +1,54 @@
-<?php
-
-/**
- * Validates a Percentage as defined by the CSS spec.
- */
-class HTMLPurifier_AttrDef_CSS_Percentage extends HTMLPurifier_AttrDef
-{
-
- /**
- * Instance to defer number validation to.
- * @type HTMLPurifier_AttrDef_CSS_Number
- */
- protected $number_def;
-
- /**
- * @param bool $non_negative Whether to forbid negative values
- */
- public function __construct($non_negative = false)
- {
- $this->number_def = new HTMLPurifier_AttrDef_CSS_Number($non_negative);
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- $string = $this->parseCDATA($string);
-
- if ($string === '') {
- return false;
- }
- $length = strlen($string);
- if ($length === 1) {
- return false;
- }
- if ($string[$length - 1] !== '%') {
- return false;
- }
-
- $number = substr($string, 0, $length - 1);
- $number = $this->number_def->validate($number, $config, $context);
-
- if ($number === false) {
- return false;
- }
- return "$number%";
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates a Percentage as defined by the CSS spec.
+ */
+class HTMLPurifier_AttrDef_CSS_Percentage extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * Instance to defer number validation to.
+ * @type HTMLPurifier_AttrDef_CSS_Number
+ */
+ protected $number_def;
+
+ /**
+ * @param bool $non_negative Whether to forbid negative values
+ */
+ public function __construct($non_negative = false)
+ {
+ $this->number_def = new HTMLPurifier_AttrDef_CSS_Number($non_negative);
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ $string = $this->parseCDATA($string);
+
+ if ($string === '') {
+ return false;
+ }
+ $length = strlen($string);
+ if ($length === 1) {
+ return false;
+ }
+ if ($string[$length - 1] !== '%') {
+ return false;
+ }
+
+ $number = substr($string, 0, $length - 1);
+ $number = $this->number_def->validate($number, $config, $context);
+
+ if ($number === false) {
+ return false;
+ }
+ return "$number%";
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
index 3992de0..5fd4b7f 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
@@ -1,46 +1,46 @@
-<?php
-
-/**
- * Validates the value for the CSS property text-decoration
- * @note This class could be generalized into a version that acts sort of
- * like Enum except you can compound the allowed values.
- */
-class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef
-{
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- static $allowed_values = array(
- 'line-through' => true,
- 'overline' => true,
- 'underline' => true,
- );
-
- $string = strtolower($this->parseCDATA($string));
-
- if ($string === 'none') {
- return $string;
- }
-
- $parts = explode(' ', $string);
- $final = '';
- foreach ($parts as $part) {
- if (isset($allowed_values[$part])) {
- $final .= $part . ' ';
- }
- }
- $final = rtrim($final);
- if ($final === '') {
- return false;
- }
- return $final;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates the value for the CSS property text-decoration
+ * @note This class could be generalized into a version that acts sort of
+ * like Enum except you can compound the allowed values.
+ */
+class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ static $allowed_values = array(
+ 'line-through' => true,
+ 'overline' => true,
+ 'underline' => true,
+ );
+
+ $string = strtolower($this->parseCDATA($string));
+
+ if ($string === 'none') {
+ return $string;
+ }
+
+ $parts = explode(' ', $string);
+ $final = '';
+ foreach ($parts as $part) {
+ if (isset($allowed_values[$part])) {
+ $final .= $part . ' ';
+ }
+ }
+ $final = rtrim($final);
+ if ($final === '') {
+ return false;
+ }
+ return $final;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/URI.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/URI.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/URI.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/URI.php
index 482b099..6617aca 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/CSS/URI.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/CSS/URI.php
@@ -1,74 +1,77 @@
-<?php
-
-/**
- * Validates a URI in CSS syntax, which uses url('http://example.com')
- * @note While theoretically speaking a URI in a CSS document could
- * be non-embedded, as of CSS2 there is no such usage so we're
- * generalizing it. This may need to be changed in the future.
- * @warning Since HTMLPurifier_AttrDef_CSS blindly uses semicolons as
- * the separator, you cannot put a literal semicolon in
- * in the URI. Try percent encoding it, in that case.
- */
-class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
-{
-
- public function __construct()
- {
- parent::__construct(true); // always embedded
- }
-
- /**
- * @param string $uri_string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($uri_string, $config, $context)
- {
- // parse the URI out of the string and then pass it onto
- // the parent object
-
- $uri_string = $this->parseCDATA($uri_string);
- if (strpos($uri_string, 'url(') !== 0) {
- return false;
- }
- $uri_string = substr($uri_string, 4);
- $new_length = strlen($uri_string) - 1;
- if ($uri_string[$new_length] != ')') {
- return false;
- }
- $uri = trim(substr($uri_string, 0, $new_length));
-
- if (!empty($uri) && ($uri[0] == "'" || $uri[0] == '"')) {
- $quote = $uri[0];
- $new_length = strlen($uri) - 1;
- if ($uri[$new_length] !== $quote) {
- return false;
- }
- $uri = substr($uri, 1, $new_length - 1);
- }
-
- $uri = $this->expandCSSEscape($uri);
-
- $result = parent::validate($uri, $config, $context);
-
- if ($result === false) {
- return false;
- }
-
- // extra sanity check; should have been done by URI
- $result = str_replace(array('"', "\\", "\n", "\x0c", "\r"), "", $result);
-
- // suspicious characters are ()'; we're going to percent encode
- // them for safety.
- $result = str_replace(array('(', ')', "'"), array('%28', '%29', '%27'), $result);
-
- // there's an extra bug where ampersands lose their escaping on
- // an innerHTML cycle, so a very unlucky query parameter could
- // then change the meaning of the URL. Unfortunately, there's
- // not much we can do about that...
- return "url(\"$result\")";
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates a URI in CSS syntax, which uses url('http://example.com')
+ * @note While theoretically speaking a URI in a CSS document could
+ * be non-embedded, as of CSS2 there is no such usage so we're
+ * generalizing it. This may need to be changed in the future.
+ * @warning Since HTMLPurifier_AttrDef_CSS blindly uses semicolons as
+ * the separator, you cannot put a literal semicolon in
+ * in the URI. Try percent encoding it, in that case.
+ */
+class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
+{
+
+ public function __construct()
+ {
+ parent::__construct(true); // always embedded
+ }
+
+ /**
+ * @param string $uri_string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($uri_string, $config, $context)
+ {
+ // parse the URI out of the string and then pass it onto
+ // the parent object
+
+ $uri_string = $this->parseCDATA($uri_string);
+ if (strpos($uri_string, 'url(') !== 0) {
+ return false;
+ }
+ $uri_string = substr($uri_string, 4);
+ if (strlen($uri_string) == 0) {
+ return false;
+ }
+ $new_length = strlen($uri_string) - 1;
+ if ($uri_string[$new_length] != ')') {
+ return false;
+ }
+ $uri = trim(substr($uri_string, 0, $new_length));
+
+ if (!empty($uri) && ($uri[0] == "'" || $uri[0] == '"')) {
+ $quote = $uri[0];
+ $new_length = strlen($uri) - 1;
+ if ($uri[$new_length] !== $quote) {
+ return false;
+ }
+ $uri = substr($uri, 1, $new_length - 1);
+ }
+
+ $uri = $this->expandCSSEscape($uri);
+
+ $result = parent::validate($uri, $config, $context);
+
+ if ($result === false) {
+ return false;
+ }
+
+ // extra sanity check; should have been done by URI
+ $result = str_replace(array('"', "\\", "\n", "\x0c", "\r"), "", $result);
+
+ // suspicious characters are ()'; we're going to percent encode
+ // them for safety.
+ $result = str_replace(array('(', ')', "'"), array('%28', '%29', '%27'), $result);
+
+ // there's an extra bug where ampersands lose their escaping on
+ // an innerHTML cycle, so a very unlucky query parameter could
+ // then change the meaning of the URL. Unfortunately, there's
+ // not much we can do about that...
+ return "url(\"$result\")";
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Clone.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Clone.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Clone.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Clone.php
index b181d1b..6698a00 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Clone.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Clone.php
@@ -1,44 +1,44 @@
-<?php
-
-/**
- * Dummy AttrDef that mimics another AttrDef, BUT it generates clones
- * with make.
- */
-class HTMLPurifier_AttrDef_Clone extends HTMLPurifier_AttrDef
-{
- /**
- * What we're cloning.
- * @type HTMLPurifier_AttrDef
- */
- protected $clone;
-
- /**
- * @param HTMLPurifier_AttrDef $clone
- */
- public function __construct($clone)
- {
- $this->clone = $clone;
- }
-
- /**
- * @param string $v
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($v, $config, $context)
- {
- return $this->clone->validate($v, $config, $context);
- }
-
- /**
- * @param string $string
- * @return HTMLPurifier_AttrDef
- */
- public function make($string)
- {
- return clone $this->clone;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Dummy AttrDef that mimics another AttrDef, BUT it generates clones
+ * with make.
+ */
+class HTMLPurifier_AttrDef_Clone extends HTMLPurifier_AttrDef
+{
+ /**
+ * What we're cloning.
+ * @type HTMLPurifier_AttrDef
+ */
+ protected $clone;
+
+ /**
+ * @param HTMLPurifier_AttrDef $clone
+ */
+ public function __construct($clone)
+ {
+ $this->clone = $clone;
+ }
+
+ /**
+ * @param string $v
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($v, $config, $context)
+ {
+ return $this->clone->validate($v, $config, $context);
+ }
+
+ /**
+ * @param string $string
+ * @return HTMLPurifier_AttrDef
+ */
+ public function make($string)
+ {
+ return clone $this->clone;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Enum.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Enum.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Enum.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Enum.php
index b40122b..8abda7f 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Enum.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Enum.php
@@ -1,73 +1,73 @@
-<?php
-
-// Enum = Enumerated
-/**
- * Validates a keyword against a list of valid values.
- * @warning The case-insensitive compare of this function uses PHP's
- * built-in strtolower and ctype_lower functions, which may
- * cause problems with international comparisons
- */
-class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef
-{
-
- /**
- * Lookup table of valid values.
- * @type array
- * @todo Make protected
- */
- public $valid_values = array();
-
- /**
- * Bool indicating whether or not enumeration is case sensitive.
- * @note In general this is always case insensitive.
- */
- protected $case_sensitive = false; // values according to W3C spec
-
- /**
- * @param array $valid_values List of valid values
- * @param bool $case_sensitive Whether or not case sensitive
- */
- public function __construct($valid_values = array(), $case_sensitive = false)
- {
- $this->valid_values = array_flip($valid_values);
- $this->case_sensitive = $case_sensitive;
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- $string = trim($string);
- if (!$this->case_sensitive) {
- // we may want to do full case-insensitive libraries
- $string = ctype_lower($string) ? $string : strtolower($string);
- }
- $result = isset($this->valid_values[$string]);
-
- return $result ? $string : false;
- }
-
- /**
- * @param string $string In form of comma-delimited list of case-insensitive
- * valid values. Example: "foo,bar,baz". Prepend "s:" to make
- * case sensitive
- * @return HTMLPurifier_AttrDef_Enum
- */
- public function make($string)
- {
- if (strlen($string) > 2 && $string[0] == 's' && $string[1] == ':') {
- $string = substr($string, 2);
- $sensitive = true;
- } else {
- $sensitive = false;
- }
- $values = explode(',', $string);
- return new HTMLPurifier_AttrDef_Enum($values, $sensitive);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+// Enum = Enumerated
+/**
+ * Validates a keyword against a list of valid values.
+ * @warning The case-insensitive compare of this function uses PHP's
+ * built-in strtolower and ctype_lower functions, which may
+ * cause problems with international comparisons
+ */
+class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * Lookup table of valid values.
+ * @type array
+ * @todo Make protected
+ */
+ public $valid_values = array();
+
+ /**
+ * Bool indicating whether or not enumeration is case sensitive.
+ * @note In general this is always case insensitive.
+ */
+ protected $case_sensitive = false; // values according to W3C spec
+
+ /**
+ * @param array $valid_values List of valid values
+ * @param bool $case_sensitive Whether or not case sensitive
+ */
+ public function __construct($valid_values = array(), $case_sensitive = false)
+ {
+ $this->valid_values = array_flip($valid_values);
+ $this->case_sensitive = $case_sensitive;
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ $string = trim($string);
+ if (!$this->case_sensitive) {
+ // we may want to do full case-insensitive libraries
+ $string = ctype_lower($string) ? $string : strtolower($string);
+ }
+ $result = isset($this->valid_values[$string]);
+
+ return $result ? $string : false;
+ }
+
+ /**
+ * @param string $string In form of comma-delimited list of case-insensitive
+ * valid values. Example: "foo,bar,baz". Prepend "s:" to make
+ * case sensitive
+ * @return HTMLPurifier_AttrDef_Enum
+ */
+ public function make($string)
+ {
+ if (strlen($string) > 2 && $string[0] == 's' && $string[1] == ':') {
+ $string = substr($string, 2);
+ $sensitive = true;
+ } else {
+ $sensitive = false;
+ }
+ $values = explode(',', $string);
+ return new HTMLPurifier_AttrDef_Enum($values, $sensitive);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Bool.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Bool.php
similarity index 88%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Bool.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Bool.php
index 1463c64..dea15d2 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Bool.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Bool.php
@@ -1,51 +1,48 @@
-<?php
-
-/**
- * Validates a boolean attribute
- */
-class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef
-{
-
- /**
- * @type bool
- */
- protected $name;
-
- /**
- * @type bool
- */
- public $minimized = true;
-
- /**
- * @param bool $name
- */
- public function __construct($name = false)
- {
- $this->name = $name;
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- if (empty($string)) {
- return false;
- }
- return $this->name;
- }
-
- /**
- * @param string $string Name of attribute
- * @return HTMLPurifier_AttrDef_HTML_Bool
- */
- public function make($string)
- {
- return new HTMLPurifier_AttrDef_HTML_Bool($string);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates a boolean attribute
+ */
+class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * @type bool
+ */
+ protected $name;
+
+ /**
+ * @type bool
+ */
+ public $minimized = true;
+
+ /**
+ * @param bool $name
+ */
+ public function __construct($name = false)
+ {
+ $this->name = $name;
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ return $this->name;
+ }
+
+ /**
+ * @param string $string Name of attribute
+ * @return HTMLPurifier_AttrDef_HTML_Bool
+ */
+ public function make($string)
+ {
+ return new HTMLPurifier_AttrDef_HTML_Bool($string);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Class.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Class.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Class.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Class.php
index b874c7e..d501348 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Class.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Class.php
@@ -1,48 +1,48 @@
-<?php
-
-/**
- * Implements special behavior for class attribute (normally NMTOKENS)
- */
-class HTMLPurifier_AttrDef_HTML_Class extends HTMLPurifier_AttrDef_HTML_Nmtokens
-{
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- protected function split($string, $config, $context)
- {
- // really, this twiddle should be lazy loaded
- $name = $config->getDefinition('HTML')->doctype->name;
- if ($name == "XHTML 1.1" || $name == "XHTML 2.0") {
- return parent::split($string, $config, $context);
- } else {
- return preg_split('/\s+/', $string);
- }
- }
-
- /**
- * @param array $tokens
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- protected function filter($tokens, $config, $context)
- {
- $allowed = $config->get('Attr.AllowedClasses');
- $forbidden = $config->get('Attr.ForbiddenClasses');
- $ret = array();
- foreach ($tokens as $token) {
- if (($allowed === null || isset($allowed[$token])) &&
- !isset($forbidden[$token]) &&
- // We need this O(n) check because of PHP's array
- // implementation that casts -0 to 0.
- !in_array($token, $ret, true)
- ) {
- $ret[] = $token;
- }
- }
- return $ret;
- }
-}
+<?php
+
+/**
+ * Implements special behavior for class attribute (normally NMTOKENS)
+ */
+class HTMLPurifier_AttrDef_HTML_Class extends HTMLPurifier_AttrDef_HTML_Nmtokens
+{
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ protected function split($string, $config, $context)
+ {
+ // really, this twiddle should be lazy loaded
+ $name = $config->getDefinition('HTML')->doctype->name;
+ if ($name == "XHTML 1.1" || $name == "XHTML 2.0") {
+ return parent::split($string, $config, $context);
+ } else {
+ return preg_split('/\s+/', $string);
+ }
+ }
+
+ /**
+ * @param array $tokens
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ protected function filter($tokens, $config, $context)
+ {
+ $allowed = $config->get('Attr.AllowedClasses');
+ $forbidden = $config->get('Attr.ForbiddenClasses');
+ $ret = array();
+ foreach ($tokens as $token) {
+ if (($allowed === null || isset($allowed[$token])) &&
+ !isset($forbidden[$token]) &&
+ // We need this O(n) check because of PHP's array
+ // implementation that casts -0 to 0.
+ !in_array($token, $ret, true)
+ ) {
+ $ret[] = $token;
+ }
+ }
+ return $ret;
+ }
+}
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Color.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Color.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Color.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Color.php
index 25c93fc..946ebb7 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Color.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Color.php
@@ -1,51 +1,51 @@
-<?php
-
-/**
- * Validates a color according to the HTML spec.
- */
-class HTMLPurifier_AttrDef_HTML_Color extends HTMLPurifier_AttrDef
-{
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- static $colors = null;
- if ($colors === null) {
- $colors = $config->get('Core.ColorKeywords');
- }
-
- $string = trim($string);
-
- if (empty($string)) {
- return false;
- }
- $lower = strtolower($string);
- if (isset($colors[$lower])) {
- return $colors[$lower];
- }
- if ($string[0] === '#') {
- $hex = substr($string, 1);
- } else {
- $hex = $string;
- }
-
- $length = strlen($hex);
- if ($length !== 3 && $length !== 6) {
- return false;
- }
- if (!ctype_xdigit($hex)) {
- return false;
- }
- if ($length === 3) {
- $hex = $hex[0] . $hex[0] . $hex[1] . $hex[1] . $hex[2] . $hex[2];
- }
- return "#$hex";
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates a color according to the HTML spec.
+ */
+class HTMLPurifier_AttrDef_HTML_Color extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ static $colors = null;
+ if ($colors === null) {
+ $colors = $config->get('Core.ColorKeywords');
+ }
+
+ $string = trim($string);
+
+ if (empty($string)) {
+ return false;
+ }
+ $lower = strtolower($string);
+ if (isset($colors[$lower])) {
+ return $colors[$lower];
+ }
+ if ($string[0] === '#') {
+ $hex = substr($string, 1);
+ } else {
+ $hex = $string;
+ }
+
+ $length = strlen($hex);
+ if ($length !== 3 && $length !== 6) {
+ return false;
+ }
+ if (!ctype_xdigit($hex)) {
+ return false;
+ }
+ if ($length === 3) {
+ $hex = $hex[0] . $hex[0] . $hex[1] . $hex[1] . $hex[2] . $hex[2];
+ }
+ return "#$hex";
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
index 7446b6d..d79ba12 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
@@ -1,38 +1,38 @@
-<?php
-
-/**
- * Special-case enum attribute definition that lazy loads allowed frame targets
- */
-class HTMLPurifier_AttrDef_HTML_FrameTarget extends HTMLPurifier_AttrDef_Enum
-{
-
- /**
- * @type array
- */
- public $valid_values = false; // uninitialized value
-
- /**
- * @type bool
- */
- protected $case_sensitive = false;
-
- public function __construct()
- {
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- if ($this->valid_values === false) {
- $this->valid_values = $config->get('Attr.AllowedFrameTargets');
- }
- return parent::validate($string, $config, $context);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Special-case enum attribute definition that lazy loads allowed frame targets
+ */
+class HTMLPurifier_AttrDef_HTML_FrameTarget extends HTMLPurifier_AttrDef_Enum
+{
+
+ /**
+ * @type array
+ */
+ public $valid_values = false; // uninitialized value
+
+ /**
+ * @type bool
+ */
+ protected $case_sensitive = false;
+
+ public function __construct()
+ {
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ if ($this->valid_values === false) {
+ $this->valid_values = $config->get('Attr.AllowedFrameTargets');
+ }
+ return parent::validate($string, $config, $context);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/ID.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/ID.php
similarity index 80%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/ID.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/ID.php
index ccd4a24..4ba4561 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/ID.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/ID.php
@@ -1,105 +1,113 @@
-<?php
-
-/**
- * Validates the HTML attribute ID.
- * @warning Even though this is the id processor, it
- * will ignore the directive Attr:IDBlacklist, since it will only
- * go according to the ID accumulator. Since the accumulator is
- * automatically generated, it will have already absorbed the
- * blacklist. If you're hacking around, make sure you use load()!
- */
-
-class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef
-{
-
- // selector is NOT a valid thing to use for IDREFs, because IDREFs
- // *must* target IDs that exist, whereas selector #ids do not.
-
- /**
- * Determines whether or not we're validating an ID in a CSS
- * selector context.
- * @type bool
- */
- protected $selector;
-
- /**
- * @param bool $selector
- */
- public function __construct($selector = false)
- {
- $this->selector = $selector;
- }
-
- /**
- * @param string $id
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($id, $config, $context)
- {
- if (!$this->selector && !$config->get('Attr.EnableID')) {
- return false;
- }
-
- $id = trim($id); // trim it first
-
- if ($id === '') {
- return false;
- }
-
- $prefix = $config->get('Attr.IDPrefix');
- if ($prefix !== '') {
- $prefix .= $config->get('Attr.IDPrefixLocal');
- // prevent re-appending the prefix
- if (strpos($id, $prefix) !== 0) {
- $id = $prefix . $id;
- }
- } elseif ($config->get('Attr.IDPrefixLocal') !== '') {
- trigger_error(
- '%Attr.IDPrefixLocal cannot be used unless ' .
- '%Attr.IDPrefix is set',
- E_USER_WARNING
- );
- }
-
- if (!$this->selector) {
- $id_accumulator =& $context->get('IDAccumulator');
- if (isset($id_accumulator->ids[$id])) {
- return false;
- }
- }
-
- // we purposely avoid using regex, hopefully this is faster
-
- if (ctype_alpha($id)) {
- $result = true;
- } else {
- if (!ctype_alpha(@$id[0])) {
- return false;
- }
- // primitive style of regexps, I suppose
- $trim = trim(
- $id,
- 'A..Za..z0..9:-._'
- );
- $result = ($trim === '');
- }
-
- $regexp = $config->get('Attr.IDBlacklistRegexp');
- if ($regexp && preg_match($regexp, $id)) {
- return false;
- }
-
- if (!$this->selector && $result) {
- $id_accumulator->add($id);
- }
-
- // if no change was made to the ID, return the result
- // else, return the new id if stripping whitespace made it
- // valid, or return false.
- return $result ? $id : false;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates the HTML attribute ID.
+ * @warning Even though this is the id processor, it
+ * will ignore the directive Attr:IDBlacklist, since it will only
+ * go according to the ID accumulator. Since the accumulator is
+ * automatically generated, it will have already absorbed the
+ * blacklist. If you're hacking around, make sure you use load()!
+ */
+
+class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef
+{
+
+ // selector is NOT a valid thing to use for IDREFs, because IDREFs
+ // *must* target IDs that exist, whereas selector #ids do not.
+
+ /**
+ * Determines whether or not we're validating an ID in a CSS
+ * selector context.
+ * @type bool
+ */
+ protected $selector;
+
+ /**
+ * @param bool $selector
+ */
+ public function __construct($selector = false)
+ {
+ $this->selector = $selector;
+ }
+
+ /**
+ * @param string $id
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($id, $config, $context)
+ {
+ if (!$this->selector && !$config->get('Attr.EnableID')) {
+ return false;
+ }
+
+ $id = trim($id); // trim it first
+
+ if ($id === '') {
+ return false;
+ }
+
+ $prefix = $config->get('Attr.IDPrefix');
+ if ($prefix !== '') {
+ $prefix .= $config->get('Attr.IDPrefixLocal');
+ // prevent re-appending the prefix
+ if (strpos($id, $prefix) !== 0) {
+ $id = $prefix . $id;
+ }
+ } elseif ($config->get('Attr.IDPrefixLocal') !== '') {
+ trigger_error(
+ '%Attr.IDPrefixLocal cannot be used unless ' .
+ '%Attr.IDPrefix is set',
+ E_USER_WARNING
+ );
+ }
+
+ if (!$this->selector) {
+ $id_accumulator =& $context->get('IDAccumulator');
+ if (isset($id_accumulator->ids[$id])) {
+ return false;
+ }
+ }
+
+ // we purposely avoid using regex, hopefully this is faster
+
+ if ($config->get('Attr.ID.HTML5') === true) {
+ if (preg_match('/[\t\n\x0b\x0c ]/', $id)) {
+ return false;
+ }
+ } else {
+ if (ctype_alpha($id)) {
+ // OK
+ } else {
+ if (!ctype_alpha(@$id[0])) {
+ return false;
+ }
+ // primitive style of regexps, I suppose
+ $trim = trim(
+ $id,
+ 'A..Za..z0..9:-._'
+ );
+ if ($trim !== '') {
+ return false;
+ }
+ }
+ }
+
+ $regexp = $config->get('Attr.IDBlacklistRegexp');
+ if ($regexp && preg_match($regexp, $id)) {
+ return false;
+ }
+
+ if (!$this->selector) {
+ $id_accumulator->add($id);
+ }
+
+ // if no change was made to the ID, return the result
+ // else, return the new id if stripping whitespace made it
+ // valid, or return false.
+ return $id;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Length.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Length.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Length.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Length.php
index c8f5188..1c4006f 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Length.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Length.php
@@ -1,56 +1,56 @@
-<?php
-
-/**
- * Validates the HTML type length (not to be confused with CSS's length).
- *
- * This accepts integer pixels or percentages as lengths for certain
- * HTML attributes.
- */
-
-class HTMLPurifier_AttrDef_HTML_Length extends HTMLPurifier_AttrDef_HTML_Pixels
-{
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- $string = trim($string);
- if ($string === '') {
- return false;
- }
-
- $parent_result = parent::validate($string, $config, $context);
- if ($parent_result !== false) {
- return $parent_result;
- }
-
- $length = strlen($string);
- $last_char = $string[$length - 1];
-
- if ($last_char !== '%') {
- return false;
- }
-
- $points = substr($string, 0, $length - 1);
-
- if (!is_numeric($points)) {
- return false;
- }
-
- $points = (int)$points;
-
- if ($points < 0) {
- return '0%';
- }
- if ($points > 100) {
- return '100%';
- }
- return ((string)$points) . '%';
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates the HTML type length (not to be confused with CSS's length).
+ *
+ * This accepts integer pixels or percentages as lengths for certain
+ * HTML attributes.
+ */
+
+class HTMLPurifier_AttrDef_HTML_Length extends HTMLPurifier_AttrDef_HTML_Pixels
+{
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ $string = trim($string);
+ if ($string === '') {
+ return false;
+ }
+
+ $parent_result = parent::validate($string, $config, $context);
+ if ($parent_result !== false) {
+ return $parent_result;
+ }
+
+ $length = strlen($string);
+ $last_char = $string[$length - 1];
+
+ if ($last_char !== '%') {
+ return false;
+ }
+
+ $points = substr($string, 0, $length - 1);
+
+ if (!is_numeric($points)) {
+ return false;
+ }
+
+ $points = (int)$points;
+
+ if ($points < 0) {
+ return '0%';
+ }
+ if ($points > 100) {
+ return '100%';
+ }
+ return ((string)$points) . '%';
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
index 3f56934..63fa04c 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
@@ -1,72 +1,72 @@
-<?php
-
-/**
- * Validates a rel/rev link attribute against a directive of allowed values
- * @note We cannot use Enum because link types allow multiple
- * values.
- * @note Assumes link types are ASCII text
- */
-class HTMLPurifier_AttrDef_HTML_LinkTypes extends HTMLPurifier_AttrDef
-{
-
- /**
- * Name config attribute to pull.
- * @type string
- */
- protected $name;
-
- /**
- * @param string $name
- */
- public function __construct($name)
- {
- $configLookup = array(
- 'rel' => 'AllowedRel',
- 'rev' => 'AllowedRev'
- );
- if (!isset($configLookup[$name])) {
- trigger_error(
- 'Unrecognized attribute name for link ' .
- 'relationship.',
- E_USER_ERROR
- );
- return;
- }
- $this->name = $configLookup[$name];
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- $allowed = $config->get('Attr.' . $this->name);
- if (empty($allowed)) {
- return false;
- }
-
- $string = $this->parseCDATA($string);
- $parts = explode(' ', $string);
-
- // lookup to prevent duplicates
- $ret_lookup = array();
- foreach ($parts as $part) {
- $part = strtolower(trim($part));
- if (!isset($allowed[$part])) {
- continue;
- }
- $ret_lookup[$part] = true;
- }
-
- if (empty($ret_lookup)) {
- return false;
- }
- $string = implode(' ', array_keys($ret_lookup));
- return $string;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates a rel/rev link attribute against a directive of allowed values
+ * @note We cannot use Enum because link types allow multiple
+ * values.
+ * @note Assumes link types are ASCII text
+ */
+class HTMLPurifier_AttrDef_HTML_LinkTypes extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * Name config attribute to pull.
+ * @type string
+ */
+ protected $name;
+
+ /**
+ * @param string $name
+ */
+ public function __construct($name)
+ {
+ $configLookup = array(
+ 'rel' => 'AllowedRel',
+ 'rev' => 'AllowedRev'
+ );
+ if (!isset($configLookup[$name])) {
+ trigger_error(
+ 'Unrecognized attribute name for link ' .
+ 'relationship.',
+ E_USER_ERROR
+ );
+ return;
+ }
+ $this->name = $configLookup[$name];
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ $allowed = $config->get('Attr.' . $this->name);
+ if (empty($allowed)) {
+ return false;
+ }
+
+ $string = $this->parseCDATA($string);
+ $parts = explode(' ', $string);
+
+ // lookup to prevent duplicates
+ $ret_lookup = array();
+ foreach ($parts as $part) {
+ $part = strtolower(trim($part));
+ if (!isset($allowed[$part])) {
+ continue;
+ }
+ $ret_lookup[$part] = true;
+ }
+
+ if (empty($ret_lookup)) {
+ return false;
+ }
+ $string = implode(' ', array_keys($ret_lookup));
+ return $string;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/MultiLength.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
index eb713e1..bbb20f2 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
@@ -1,60 +1,60 @@
-<?php
-
-/**
- * Validates a MultiLength as defined by the HTML spec.
- *
- * A multilength is either a integer (pixel count), a percentage, or
- * a relative number.
- */
-class HTMLPurifier_AttrDef_HTML_MultiLength extends HTMLPurifier_AttrDef_HTML_Length
-{
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- $string = trim($string);
- if ($string === '') {
- return false;
- }
-
- $parent_result = parent::validate($string, $config, $context);
- if ($parent_result !== false) {
- return $parent_result;
- }
-
- $length = strlen($string);
- $last_char = $string[$length - 1];
-
- if ($last_char !== '*') {
- return false;
- }
-
- $int = substr($string, 0, $length - 1);
-
- if ($int == '') {
- return '*';
- }
- if (!is_numeric($int)) {
- return false;
- }
-
- $int = (int)$int;
- if ($int < 0) {
- return false;
- }
- if ($int == 0) {
- return '0';
- }
- if ($int == 1) {
- return '*';
- }
- return ((string)$int) . '*';
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates a MultiLength as defined by the HTML spec.
+ *
+ * A multilength is either a integer (pixel count), a percentage, or
+ * a relative number.
+ */
+class HTMLPurifier_AttrDef_HTML_MultiLength extends HTMLPurifier_AttrDef_HTML_Length
+{
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ $string = trim($string);
+ if ($string === '') {
+ return false;
+ }
+
+ $parent_result = parent::validate($string, $config, $context);
+ if ($parent_result !== false) {
+ return $parent_result;
+ }
+
+ $length = strlen($string);
+ $last_char = $string[$length - 1];
+
+ if ($last_char !== '*') {
+ return false;
+ }
+
+ $int = substr($string, 0, $length - 1);
+
+ if ($int == '') {
+ return '*';
+ }
+ if (!is_numeric($int)) {
+ return false;
+ }
+
+ $int = (int)$int;
+ if ($int < 0) {
+ return false;
+ }
+ if ($int == 0) {
+ return '0';
+ }
+ if ($int == 1) {
+ return '*';
+ }
+ return ((string)$int) . '*';
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
index ecb070c..f79683b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
@@ -1,70 +1,70 @@
-<?php
-
-/**
- * Validates contents based on NMTOKENS attribute type.
- */
-class HTMLPurifier_AttrDef_HTML_Nmtokens extends HTMLPurifier_AttrDef
-{
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- $string = trim($string);
-
- // early abort: '' and '0' (strings that convert to false) are invalid
- if (!$string) {
- return false;
- }
-
- $tokens = $this->split($string, $config, $context);
- $tokens = $this->filter($tokens, $config, $context);
- if (empty($tokens)) {
- return false;
- }
- return implode(' ', $tokens);
- }
-
- /**
- * Splits a space separated list of tokens into its constituent parts.
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- protected function split($string, $config, $context)
- {
- // OPTIMIZABLE!
- // do the preg_match, capture all subpatterns for reformulation
-
- // we don't support U+00A1 and up codepoints or
- // escaping because I don't know how to do that with regexps
- // and plus it would complicate optimization efforts (you never
- // see that anyway).
- $pattern = '/(?:(?<=\s)|\A)' . // look behind for space or string start
- '((?:--|-?[A-Za-z_])[A-Za-z_\-0-9]*)' .
- '(?:(?=\s)|\z)/'; // look ahead for space or string end
- preg_match_all($pattern, $string, $matches);
- return $matches[1];
- }
-
- /**
- * Template method for removing certain tokens based on arbitrary criteria.
- * @note If we wanted to be really functional, we'd do an array_filter
- * with a callback. But... we're not.
- * @param array $tokens
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- protected function filter($tokens, $config, $context)
- {
- return $tokens;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates contents based on NMTOKENS attribute type.
+ */
+class HTMLPurifier_AttrDef_HTML_Nmtokens extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ $string = trim($string);
+
+ // early abort: '' and '0' (strings that convert to false) are invalid
+ if (!$string) {
+ return false;
+ }
+
+ $tokens = $this->split($string, $config, $context);
+ $tokens = $this->filter($tokens, $config, $context);
+ if (empty($tokens)) {
+ return false;
+ }
+ return implode(' ', $tokens);
+ }
+
+ /**
+ * Splits a space separated list of tokens into its constituent parts.
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ protected function split($string, $config, $context)
+ {
+ // OPTIMIZABLE!
+ // do the preg_match, capture all subpatterns for reformulation
+
+ // we don't support U+00A1 and up codepoints or
+ // escaping because I don't know how to do that with regexps
+ // and plus it would complicate optimization efforts (you never
+ // see that anyway).
+ $pattern = '/(?:(?<=\s)|\A)' . // look behind for space or string start
+ '((?:--|-?[A-Za-z_])[A-Za-z_\-0-9]*)' .
+ '(?:(?=\s)|\z)/'; // look ahead for space or string end
+ preg_match_all($pattern, $string, $matches);
+ return $matches[1];
+ }
+
+ /**
+ * Template method for removing certain tokens based on arbitrary criteria.
+ * @note If we wanted to be really functional, we'd do an array_filter
+ * with a callback. But... we're not.
+ * @param array $tokens
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ protected function filter($tokens, $config, $context)
+ {
+ return $tokens;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Pixels.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Pixels.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Pixels.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Pixels.php
index 1a68f23..a1d019e 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/HTML/Pixels.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/HTML/Pixels.php
@@ -1,76 +1,76 @@
-<?php
-
-/**
- * Validates an integer representation of pixels according to the HTML spec.
- */
-class HTMLPurifier_AttrDef_HTML_Pixels extends HTMLPurifier_AttrDef
-{
-
- /**
- * @type int
- */
- protected $max;
-
- /**
- * @param int $max
- */
- public function __construct($max = null)
- {
- $this->max = $max;
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- $string = trim($string);
- if ($string === '0') {
- return $string;
- }
- if ($string === '') {
- return false;
- }
- $length = strlen($string);
- if (substr($string, $length - 2) == 'px') {
- $string = substr($string, 0, $length - 2);
- }
- if (!is_numeric($string)) {
- return false;
- }
- $int = (int)$string;
-
- if ($int < 0) {
- return '0';
- }
-
- // upper-bound value, extremely high values can
- // crash operating systems, see <http://ha.ckers.org/imagecrash.html>
- // WARNING, above link WILL crash you if you're using Windows
-
- if ($this->max !== null && $int > $this->max) {
- return (string)$this->max;
- }
- return (string)$int;
- }
-
- /**
- * @param string $string
- * @return HTMLPurifier_AttrDef
- */
- public function make($string)
- {
- if ($string === '') {
- $max = null;
- } else {
- $max = (int)$string;
- }
- $class = get_class($this);
- return new $class($max);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates an integer representation of pixels according to the HTML spec.
+ */
+class HTMLPurifier_AttrDef_HTML_Pixels extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * @type int
+ */
+ protected $max;
+
+ /**
+ * @param int $max
+ */
+ public function __construct($max = null)
+ {
+ $this->max = $max;
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ $string = trim($string);
+ if ($string === '0') {
+ return $string;
+ }
+ if ($string === '') {
+ return false;
+ }
+ $length = strlen($string);
+ if (substr($string, $length - 2) == 'px') {
+ $string = substr($string, 0, $length - 2);
+ }
+ if (!is_numeric($string)) {
+ return false;
+ }
+ $int = (int)$string;
+
+ if ($int < 0) {
+ return '0';
+ }
+
+ // upper-bound value, extremely high values can
+ // crash operating systems, see <http://ha.ckers.org/imagecrash.html>
+ // WARNING, above link WILL crash you if you're using Windows
+
+ if ($this->max !== null && $int > $this->max) {
+ return (string)$this->max;
+ }
+ return (string)$int;
+ }
+
+ /**
+ * @param string $string
+ * @return HTMLPurifier_AttrDef
+ */
+ public function make($string)
+ {
+ if ($string === '') {
+ $max = null;
+ } else {
+ $max = (int)$string;
+ }
+ $class = get_class($this);
+ return new $class($max);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Integer.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Integer.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Integer.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Integer.php
index c98376d..400e707 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Integer.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Integer.php
@@ -1,91 +1,91 @@
-<?php
-
-/**
- * Validates an integer.
- * @note While this class was modeled off the CSS definition, no currently
- * allowed CSS uses this type. The properties that do are: widows,
- * orphans, z-index, counter-increment, counter-reset. Some of the
- * HTML attributes, however, find use for a non-negative version of this.
- */
-class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef
-{
-
- /**
- * Whether or not negative values are allowed.
- * @type bool
- */
- protected $negative = true;
-
- /**
- * Whether or not zero is allowed.
- * @type bool
- */
- protected $zero = true;
-
- /**
- * Whether or not positive values are allowed.
- * @type bool
- */
- protected $positive = true;
-
- /**
- * @param $negative Bool indicating whether or not negative values are allowed
- * @param $zero Bool indicating whether or not zero is allowed
- * @param $positive Bool indicating whether or not positive values are allowed
- */
- public function __construct($negative = true, $zero = true, $positive = true)
- {
- $this->negative = $negative;
- $this->zero = $zero;
- $this->positive = $positive;
- }
-
- /**
- * @param string $integer
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($integer, $config, $context)
- {
- $integer = $this->parseCDATA($integer);
- if ($integer === '') {
- return false;
- }
-
- // we could possibly simply typecast it to integer, but there are
- // certain fringe cases that must not return an integer.
-
- // clip leading sign
- if ($this->negative && $integer[0] === '-') {
- $digits = substr($integer, 1);
- if ($digits === '0') {
- $integer = '0';
- } // rm minus sign for zero
- } elseif ($this->positive && $integer[0] === '+') {
- $digits = $integer = substr($integer, 1); // rm unnecessary plus
- } else {
- $digits = $integer;
- }
-
- // test if it's numeric
- if (!ctype_digit($digits)) {
- return false;
- }
-
- // perform scope tests
- if (!$this->zero && $integer == 0) {
- return false;
- }
- if (!$this->positive && $integer > 0) {
- return false;
- }
- if (!$this->negative && $integer < 0) {
- return false;
- }
-
- return $integer;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates an integer.
+ * @note While this class was modeled off the CSS definition, no currently
+ * allowed CSS uses this type. The properties that do are: widows,
+ * orphans, z-index, counter-increment, counter-reset. Some of the
+ * HTML attributes, however, find use for a non-negative version of this.
+ */
+class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * Whether or not negative values are allowed.
+ * @type bool
+ */
+ protected $negative = true;
+
+ /**
+ * Whether or not zero is allowed.
+ * @type bool
+ */
+ protected $zero = true;
+
+ /**
+ * Whether or not positive values are allowed.
+ * @type bool
+ */
+ protected $positive = true;
+
+ /**
+ * @param $negative Bool indicating whether or not negative values are allowed
+ * @param $zero Bool indicating whether or not zero is allowed
+ * @param $positive Bool indicating whether or not positive values are allowed
+ */
+ public function __construct($negative = true, $zero = true, $positive = true)
+ {
+ $this->negative = $negative;
+ $this->zero = $zero;
+ $this->positive = $positive;
+ }
+
+ /**
+ * @param string $integer
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($integer, $config, $context)
+ {
+ $integer = $this->parseCDATA($integer);
+ if ($integer === '') {
+ return false;
+ }
+
+ // we could possibly simply typecast it to integer, but there are
+ // certain fringe cases that must not return an integer.
+
+ // clip leading sign
+ if ($this->negative && $integer[0] === '-') {
+ $digits = substr($integer, 1);
+ if ($digits === '0') {
+ $integer = '0';
+ } // rm minus sign for zero
+ } elseif ($this->positive && $integer[0] === '+') {
+ $digits = $integer = substr($integer, 1); // rm unnecessary plus
+ } else {
+ $digits = $integer;
+ }
+
+ // test if it's numeric
+ if (!ctype_digit($digits)) {
+ return false;
+ }
+
+ // perform scope tests
+ if (!$this->zero && $integer == 0) {
+ return false;
+ }
+ if (!$this->positive && $integer > 0) {
+ return false;
+ }
+ if (!$this->negative && $integer < 0) {
+ return false;
+ }
+
+ return $integer;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Lang.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Lang.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Lang.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Lang.php
index 6ad0f79..2a55cea 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Lang.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Lang.php
@@ -1,86 +1,86 @@
-<?php
-
-/**
- * Validates the HTML attribute lang, effectively a language code.
- * @note Built according to RFC 3066, which obsoleted RFC 1766
- */
-class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef
-{
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- $string = trim($string);
- if (!$string) {
- return false;
- }
-
- $subtags = explode('-', $string);
- $num_subtags = count($subtags);
-
- if ($num_subtags == 0) { // sanity check
- return false;
- }
-
- // process primary subtag : $subtags[0]
- $length = strlen($subtags[0]);
- switch ($length) {
- case 0:
- return false;
- case 1:
- if (!($subtags[0] == 'x' || $subtags[0] == 'i')) {
- return false;
- }
- break;
- case 2:
- case 3:
- if (!ctype_alpha($subtags[0])) {
- return false;
- } elseif (!ctype_lower($subtags[0])) {
- $subtags[0] = strtolower($subtags[0]);
- }
- break;
- default:
- return false;
- }
-
- $new_string = $subtags[0];
- if ($num_subtags == 1) {
- return $new_string;
- }
-
- // process second subtag : $subtags[1]
- $length = strlen($subtags[1]);
- if ($length == 0 || ($length == 1 && $subtags[1] != 'x') || $length > 8 || !ctype_alnum($subtags[1])) {
- return $new_string;
- }
- if (!ctype_lower($subtags[1])) {
- $subtags[1] = strtolower($subtags[1]);
- }
-
- $new_string .= '-' . $subtags[1];
- if ($num_subtags == 2) {
- return $new_string;
- }
-
- // process all other subtags, index 2 and up
- for ($i = 2; $i < $num_subtags; $i++) {
- $length = strlen($subtags[$i]);
- if ($length == 0 || $length > 8 || !ctype_alnum($subtags[$i])) {
- return $new_string;
- }
- if (!ctype_lower($subtags[$i])) {
- $subtags[$i] = strtolower($subtags[$i]);
- }
- $new_string .= '-' . $subtags[$i];
- }
- return $new_string;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates the HTML attribute lang, effectively a language code.
+ * @note Built according to RFC 3066, which obsoleted RFC 1766
+ */
+class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ $string = trim($string);
+ if (!$string) {
+ return false;
+ }
+
+ $subtags = explode('-', $string);
+ $num_subtags = count($subtags);
+
+ if ($num_subtags == 0) { // sanity check
+ return false;
+ }
+
+ // process primary subtag : $subtags[0]
+ $length = strlen($subtags[0]);
+ switch ($length) {
+ case 0:
+ return false;
+ case 1:
+ if (!($subtags[0] == 'x' || $subtags[0] == 'i')) {
+ return false;
+ }
+ break;
+ case 2:
+ case 3:
+ if (!ctype_alpha($subtags[0])) {
+ return false;
+ } elseif (!ctype_lower($subtags[0])) {
+ $subtags[0] = strtolower($subtags[0]);
+ }
+ break;
+ default:
+ return false;
+ }
+
+ $new_string = $subtags[0];
+ if ($num_subtags == 1) {
+ return $new_string;
+ }
+
+ // process second subtag : $subtags[1]
+ $length = strlen($subtags[1]);
+ if ($length == 0 || ($length == 1 && $subtags[1] != 'x') || $length > 8 || !ctype_alnum($subtags[1])) {
+ return $new_string;
+ }
+ if (!ctype_lower($subtags[1])) {
+ $subtags[1] = strtolower($subtags[1]);
+ }
+
+ $new_string .= '-' . $subtags[1];
+ if ($num_subtags == 2) {
+ return $new_string;
+ }
+
+ // process all other subtags, index 2 and up
+ for ($i = 2; $i < $num_subtags; $i++) {
+ $length = strlen($subtags[$i]);
+ if ($length == 0 || $length > 8 || !ctype_alnum($subtags[$i])) {
+ return $new_string;
+ }
+ if (!ctype_lower($subtags[$i])) {
+ $subtags[$i] = strtolower($subtags[$i]);
+ }
+ $new_string .= '-' . $subtags[$i];
+ }
+ return $new_string;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Switch.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Switch.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Switch.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Switch.php
index 078291f..c7eb319 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Switch.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Switch.php
@@ -1,53 +1,53 @@
-<?php
-
-/**
- * Decorator that, depending on a token, switches between two definitions.
- */
-class HTMLPurifier_AttrDef_Switch
-{
-
- /**
- * @type string
- */
- protected $tag;
-
- /**
- * @type HTMLPurifier_AttrDef
- */
- protected $withTag;
-
- /**
- * @type HTMLPurifier_AttrDef
- */
- protected $withoutTag;
-
- /**
- * @param string $tag Tag name to switch upon
- * @param HTMLPurifier_AttrDef $with_tag Call if token matches tag
- * @param HTMLPurifier_AttrDef $without_tag Call if token doesn't match, or there is no token
- */
- public function __construct($tag, $with_tag, $without_tag)
- {
- $this->tag = $tag;
- $this->withTag = $with_tag;
- $this->withoutTag = $without_tag;
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- $token = $context->get('CurrentToken', true);
- if (!$token || $token->name !== $this->tag) {
- return $this->withoutTag->validate($string, $config, $context);
- } else {
- return $this->withTag->validate($string, $config, $context);
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Decorator that, depending on a token, switches between two definitions.
+ */
+class HTMLPurifier_AttrDef_Switch
+{
+
+ /**
+ * @type string
+ */
+ protected $tag;
+
+ /**
+ * @type HTMLPurifier_AttrDef
+ */
+ protected $withTag;
+
+ /**
+ * @type HTMLPurifier_AttrDef
+ */
+ protected $withoutTag;
+
+ /**
+ * @param string $tag Tag name to switch upon
+ * @param HTMLPurifier_AttrDef $with_tag Call if token matches tag
+ * @param HTMLPurifier_AttrDef $without_tag Call if token doesn't match, or there is no token
+ */
+ public function __construct($tag, $with_tag, $without_tag)
+ {
+ $this->tag = $tag;
+ $this->withTag = $with_tag;
+ $this->withoutTag = $without_tag;
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ $token = $context->get('CurrentToken', true);
+ if (!$token || $token->name !== $this->tag) {
+ return $this->withoutTag->validate($string, $config, $context);
+ } else {
+ return $this->withTag->validate($string, $config, $context);
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Text.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Text.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Text.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Text.php
index 9f23bac..4553a4e 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/Text.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/Text.php
@@ -1,21 +1,21 @@
-<?php
-
-/**
- * Validates arbitrary text according to the HTML spec.
- */
-class HTMLPurifier_AttrDef_Text extends HTMLPurifier_AttrDef
-{
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- return $this->parseCDATA($string);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates arbitrary text according to the HTML spec.
+ */
+class HTMLPurifier_AttrDef_Text extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ return $this->parseCDATA($string);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI.php
index a1097cd..c1cd897 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI.php
@@ -1,111 +1,111 @@
-<?php
-
-/**
- * Validates a URI as defined by RFC 3986.
- * @note Scheme-specific mechanics deferred to HTMLPurifier_URIScheme
- */
-class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
-{
-
- /**
- * @type HTMLPurifier_URIParser
- */
- protected $parser;
-
- /**
- * @type bool
- */
- protected $embedsResource;
-
- /**
- * @param bool $embeds_resource Does the URI here result in an extra HTTP request?
- */
- public function __construct($embeds_resource = false)
- {
- $this->parser = new HTMLPurifier_URIParser();
- $this->embedsResource = (bool)$embeds_resource;
- }
-
- /**
- * @param string $string
- * @return HTMLPurifier_AttrDef_URI
- */
- public function make($string)
- {
- $embeds = ($string === 'embedded');
- return new HTMLPurifier_AttrDef_URI($embeds);
- }
-
- /**
- * @param string $uri
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($uri, $config, $context)
- {
- if ($config->get('URI.Disable')) {
- return false;
- }
-
- $uri = $this->parseCDATA($uri);
-
- // parse the URI
- $uri = $this->parser->parse($uri);
- if ($uri === false) {
- return false;
- }
-
- // add embedded flag to context for validators
- $context->register('EmbeddedURI', $this->embedsResource);
-
- $ok = false;
- do {
-
- // generic validation
- $result = $uri->validate($config, $context);
- if (!$result) {
- break;
- }
-
- // chained filtering
- $uri_def = $config->getDefinition('URI');
- $result = $uri_def->filter($uri, $config, $context);
- if (!$result) {
- break;
- }
-
- // scheme-specific validation
- $scheme_obj = $uri->getSchemeObj($config, $context);
- if (!$scheme_obj) {
- break;
- }
- if ($this->embedsResource && !$scheme_obj->browsable) {
- break;
- }
- $result = $scheme_obj->validate($uri, $config, $context);
- if (!$result) {
- break;
- }
-
- // Post chained filtering
- $result = $uri_def->postFilter($uri, $config, $context);
- if (!$result) {
- break;
- }
-
- // survived gauntlet
- $ok = true;
-
- } while (false);
-
- $context->destroy('EmbeddedURI');
- if (!$ok) {
- return false;
- }
- // back to string
- return $uri->toString();
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates a URI as defined by RFC 3986.
+ * @note Scheme-specific mechanics deferred to HTMLPurifier_URIScheme
+ */
+class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * @type HTMLPurifier_URIParser
+ */
+ protected $parser;
+
+ /**
+ * @type bool
+ */
+ protected $embedsResource;
+
+ /**
+ * @param bool $embeds_resource Does the URI here result in an extra HTTP request?
+ */
+ public function __construct($embeds_resource = false)
+ {
+ $this->parser = new HTMLPurifier_URIParser();
+ $this->embedsResource = (bool)$embeds_resource;
+ }
+
+ /**
+ * @param string $string
+ * @return HTMLPurifier_AttrDef_URI
+ */
+ public function make($string)
+ {
+ $embeds = ($string === 'embedded');
+ return new HTMLPurifier_AttrDef_URI($embeds);
+ }
+
+ /**
+ * @param string $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($uri, $config, $context)
+ {
+ if ($config->get('URI.Disable')) {
+ return false;
+ }
+
+ $uri = $this->parseCDATA($uri);
+
+ // parse the URI
+ $uri = $this->parser->parse($uri);
+ if ($uri === false) {
+ return false;
+ }
+
+ // add embedded flag to context for validators
+ $context->register('EmbeddedURI', $this->embedsResource);
+
+ $ok = false;
+ do {
+
+ // generic validation
+ $result = $uri->validate($config, $context);
+ if (!$result) {
+ break;
+ }
+
+ // chained filtering
+ $uri_def = $config->getDefinition('URI');
+ $result = $uri_def->filter($uri, $config, $context);
+ if (!$result) {
+ break;
+ }
+
+ // scheme-specific validation
+ $scheme_obj = $uri->getSchemeObj($config, $context);
+ if (!$scheme_obj) {
+ break;
+ }
+ if ($this->embedsResource && !$scheme_obj->browsable) {
+ break;
+ }
+ $result = $scheme_obj->validate($uri, $config, $context);
+ if (!$result) {
+ break;
+ }
+
+ // Post chained filtering
+ $result = $uri_def->postFilter($uri, $config, $context);
+ if (!$result) {
+ break;
+ }
+
+ // survived gauntlet
+ $ok = true;
+
+ } while (false);
+
+ $context->destroy('EmbeddedURI');
+ if (!$ok) {
+ return false;
+ }
+ // back to string
+ return $uri->toString();
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI/Email.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI/Email.php
similarity index 94%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI/Email.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI/Email.php
index 846d388..daf32b7 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI/Email.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI/Email.php
@@ -1,20 +1,20 @@
-<?php
-
-abstract class HTMLPurifier_AttrDef_URI_Email extends HTMLPurifier_AttrDef
-{
-
- /**
- * Unpacks a mailbox into its display-name and address
- * @param string $string
- * @return mixed
- */
- public function unpack($string)
- {
- // needs to be implemented
- }
-
-}
-
-// sub-implementations
-
-// vim: et sw=4 sts=4
+<?php
+
+abstract class HTMLPurifier_AttrDef_URI_Email extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * Unpacks a mailbox into its display-name and address
+ * @param string $string
+ * @return mixed
+ */
+ public function unpack($string)
+ {
+ // needs to be implemented
+ }
+
+}
+
+// sub-implementations
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
index 3b041ce..52c0d59 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
@@ -1,29 +1,29 @@
-<?php
-
-/**
- * Primitive email validation class based on the regexp found at
- * http://www.regular-expressions.info/email.html
- */
-class HTMLPurifier_AttrDef_URI_Email_SimpleCheck extends HTMLPurifier_AttrDef_URI_Email
-{
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- // no support for named mailboxes i.e. "Bob <bob@example.com>"
- // that needs more percent encoding to be done
- if ($string == '') {
- return false;
- }
- $string = trim($string);
- $result = preg_match('/^[A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i', $string);
- return $result ? $string : false;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Primitive email validation class based on the regexp found at
+ * http://www.regular-expressions.info/email.html
+ */
+class HTMLPurifier_AttrDef_URI_Email_SimpleCheck extends HTMLPurifier_AttrDef_URI_Email
+{
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ // no support for named mailboxes i.e. "Bob <bob@example.com>"
+ // that needs more percent encoding to be done
+ if ($string == '') {
+ return false;
+ }
+ $string = trim($string);
+ $result = preg_match('/^[A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i', $string);
+ return $result ? $string : false;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI/Host.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI/Host.php
similarity index 85%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI/Host.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI/Host.php
index 0145778..151f7af 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI/Host.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI/Host.php
@@ -1,128 +1,137 @@
-<?php
-
-/**
- * Validates a host according to the IPv4, IPv6 and DNS (future) specifications.
- */
-class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
-{
-
- /**
- * IPv4 sub-validator.
- * @type HTMLPurifier_AttrDef_URI_IPv4
- */
- protected $ipv4;
-
- /**
- * IPv6 sub-validator.
- * @type HTMLPurifier_AttrDef_URI_IPv6
- */
- protected $ipv6;
-
- public function __construct()
- {
- $this->ipv4 = new HTMLPurifier_AttrDef_URI_IPv4();
- $this->ipv6 = new HTMLPurifier_AttrDef_URI_IPv6();
- }
-
- /**
- * @param string $string
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($string, $config, $context)
- {
- $length = strlen($string);
- // empty hostname is OK; it's usually semantically equivalent:
- // the default host as defined by a URI scheme is used:
- //
- // If the URI scheme defines a default for host, then that
- // default applies when the host subcomponent is undefined
- // or when the registered name is empty (zero length).
- if ($string === '') {
- return '';
- }
- if ($length > 1 && $string[0] === '[' && $string[$length - 1] === ']') {
- //IPv6
- $ip = substr($string, 1, $length - 2);
- $valid = $this->ipv6->validate($ip, $config, $context);
- if ($valid === false) {
- return false;
- }
- return '[' . $valid . ']';
- }
-
- // need to do checks on unusual encodings too
- $ipv4 = $this->ipv4->validate($string, $config, $context);
- if ($ipv4 !== false) {
- return $ipv4;
- }
-
- // A regular domain name.
-
- // This doesn't match I18N domain names, but we don't have proper IRI support,
- // so force users to insert Punycode.
-
- // There is not a good sense in which underscores should be
- // allowed, since it's technically not! (And if you go as
- // far to allow everything as specified by the DNS spec...
- // well, that's literally everything, modulo some space limits
- // for the components and the overall name (which, by the way,
- // we are NOT checking!). So we (arbitrarily) decide this:
- // let's allow underscores wherever we would have allowed
- // hyphens, if they are enabled. This is a pretty good match
- // for browser behavior, for example, a large number of browsers
- // cannot handle foo_.example.com, but foo_bar.example.com is
- // fairly well supported.
- $underscore = $config->get('Core.AllowHostnameUnderscore') ? '_' : '';
-
- // The productions describing this are:
- $a = '[a-z]'; // alpha
- $an = '[a-z0-9]'; // alphanum
- $and = "[a-z0-9-$underscore]"; // alphanum | "-"
- // domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum
- $domainlabel = "$an($and*$an)?";
- // toplabel = alpha | alpha *( alphanum | "-" ) alphanum
- $toplabel = "$a($and*$an)?";
- // hostname = *( domainlabel "." ) toplabel [ "." ]
- if (preg_match("/^($domainlabel\.)*$toplabel\.?$/i", $string)) {
- return $string;
- }
-
- // If we have Net_IDNA2 support, we can support IRIs by
- // punycoding them. (This is the most portable thing to do,
- // since otherwise we have to assume browsers support
-
- if ($config->get('Core.EnableIDNA')) {
- $idna = new Net_IDNA2(array('encoding' => 'utf8', 'overlong' => false, 'strict' => true));
- // we need to encode each period separately
- $parts = explode('.', $string);
- try {
- $new_parts = array();
- foreach ($parts as $part) {
- $encodable = false;
- for ($i = 0, $c = strlen($part); $i < $c; $i++) {
- if (ord($part[$i]) > 0x7a) {
- $encodable = true;
- break;
- }
- }
- if (!$encodable) {
- $new_parts[] = $part;
- } else {
- $new_parts[] = $idna->encode($part);
- }
- }
- $string = implode('.', $new_parts);
- if (preg_match("/^($domainlabel\.)*$toplabel\.?$/i", $string)) {
- return $string;
- }
- } catch (Exception $e) {
- // XXX error reporting
- }
- }
- return false;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates a host according to the IPv4, IPv6 and DNS (future) specifications.
+ */
+class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * IPv4 sub-validator.
+ * @type HTMLPurifier_AttrDef_URI_IPv4
+ */
+ protected $ipv4;
+
+ /**
+ * IPv6 sub-validator.
+ * @type HTMLPurifier_AttrDef_URI_IPv6
+ */
+ protected $ipv6;
+
+ public function __construct()
+ {
+ $this->ipv4 = new HTMLPurifier_AttrDef_URI_IPv4();
+ $this->ipv6 = new HTMLPurifier_AttrDef_URI_IPv6();
+ }
+
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($string, $config, $context)
+ {
+ $length = strlen($string);
+ // empty hostname is OK; it's usually semantically equivalent:
+ // the default host as defined by a URI scheme is used:
+ //
+ // If the URI scheme defines a default for host, then that
+ // default applies when the host subcomponent is undefined
+ // or when the registered name is empty (zero length).
+ if ($string === '') {
+ return '';
+ }
+ if ($length > 1 && $string[0] === '[' && $string[$length - 1] === ']') {
+ //IPv6
+ $ip = substr($string, 1, $length - 2);
+ $valid = $this->ipv6->validate($ip, $config, $context);
+ if ($valid === false) {
+ return false;
+ }
+ return '[' . $valid . ']';
+ }
+
+ // need to do checks on unusual encodings too
+ $ipv4 = $this->ipv4->validate($string, $config, $context);
+ if ($ipv4 !== false) {
+ return $ipv4;
+ }
+
+ // A regular domain name.
+
+ // This doesn't match I18N domain names, but we don't have proper IRI support,
+ // so force users to insert Punycode.
+
+ // There is not a good sense in which underscores should be
+ // allowed, since it's technically not! (And if you go as
+ // far to allow everything as specified by the DNS spec...
+ // well, that's literally everything, modulo some space limits
+ // for the components and the overall name (which, by the way,
+ // we are NOT checking!). So we (arbitrarily) decide this:
+ // let's allow underscores wherever we would have allowed
+ // hyphens, if they are enabled. This is a pretty good match
+ // for browser behavior, for example, a large number of browsers
+ // cannot handle foo_.example.com, but foo_bar.example.com is
+ // fairly well supported.
+ $underscore = $config->get('Core.AllowHostnameUnderscore') ? '_' : '';
+
+ // Based off of RFC 1738, but amended so that
+ // as per RFC 3696, the top label need only not be all numeric.
+ // The productions describing this are:
+ $a = '[a-z]'; // alpha
+ $an = '[a-z0-9]'; // alphanum
+ $and = "[a-z0-9-$underscore]"; // alphanum | "-"
+ // domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum
+ $domainlabel = "$an(?:$and*$an)?";
+ // AMENDED as per RFC 3696
+ // toplabel = alphanum | alphanum *( alphanum | "-" ) alphanum
+ // side condition: not all numeric
+ $toplabel = "$an(?:$and*$an)?";
+ // hostname = *( domainlabel "." ) toplabel [ "." ]
+ if (preg_match("/^(?:$domainlabel\.)*($toplabel)\.?$/i", $string, $matches)) {
+ if (!ctype_digit($matches[1])) {
+ return $string;
+ }
+ }
+
+ // PHP 5.3 and later support this functionality natively
+ if (function_exists('idn_to_ascii')) {
+ return idn_to_ascii($string);
+
+ // If we have Net_IDNA2 support, we can support IRIs by
+ // punycoding them. (This is the most portable thing to do,
+ // since otherwise we have to assume browsers support
+ } elseif ($config->get('Core.EnableIDNA')) {
+ $idna = new Net_IDNA2(array('encoding' => 'utf8', 'overlong' => false, 'strict' => true));
+ // we need to encode each period separately
+ $parts = explode('.', $string);
+ try {
+ $new_parts = array();
+ foreach ($parts as $part) {
+ $encodable = false;
+ for ($i = 0, $c = strlen($part); $i < $c; $i++) {
+ if (ord($part[$i]) > 0x7a) {
+ $encodable = true;
+ break;
+ }
+ }
+ if (!$encodable) {
+ $new_parts[] = $part;
+ } else {
+ $new_parts[] = $idna->encode($part);
+ }
+ }
+ $string = implode('.', $new_parts);
+ if (preg_match("/^($domainlabel\.)*$toplabel\.?$/i", $string)) {
+ return $string;
+ }
+ } catch (Exception $e) {
+ // XXX error reporting
+ }
+ }
+ return false;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI/IPv4.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI/IPv4.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI/IPv4.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI/IPv4.php
index bbc8a77..30ac16c 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI/IPv4.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI/IPv4.php
@@ -1,45 +1,45 @@
-<?php
-
-/**
- * Validates an IPv4 address
- * @author Feyd @ forums.devnetwork.net (public domain)
- */
-class HTMLPurifier_AttrDef_URI_IPv4 extends HTMLPurifier_AttrDef
-{
-
- /**
- * IPv4 regex, protected so that IPv6 can reuse it.
- * @type string
- */
- protected $ip4;
-
- /**
- * @param string $aIP
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($aIP, $config, $context)
- {
- if (!$this->ip4) {
- $this->_loadRegex();
- }
-
- if (preg_match('#^' . $this->ip4 . '$#s', $aIP)) {
- return $aIP;
- }
- return false;
- }
-
- /**
- * Lazy load function to prevent regex from being stuffed in
- * cache.
- */
- protected function _loadRegex()
- {
- $oct = '(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])'; // 0-255
- $this->ip4 = "(?:{$oct}\\.{$oct}\\.{$oct}\\.{$oct})";
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates an IPv4 address
+ * @author Feyd @ forums.devnetwork.net (public domain)
+ */
+class HTMLPurifier_AttrDef_URI_IPv4 extends HTMLPurifier_AttrDef
+{
+
+ /**
+ * IPv4 regex, protected so that IPv6 can reuse it.
+ * @type string
+ */
+ protected $ip4;
+
+ /**
+ * @param string $aIP
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($aIP, $config, $context)
+ {
+ if (!$this->ip4) {
+ $this->_loadRegex();
+ }
+
+ if (preg_match('#^' . $this->ip4 . '$#s', $aIP)) {
+ return $aIP;
+ }
+ return false;
+ }
+
+ /**
+ * Lazy load function to prevent regex from being stuffed in
+ * cache.
+ */
+ protected function _loadRegex()
+ {
+ $oct = '(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])'; // 0-255
+ $this->ip4 = "(?:{$oct}\\.{$oct}\\.{$oct}\\.{$oct})";
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI/IPv6.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI/IPv6.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI/IPv6.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI/IPv6.php
index 67f148b..f243793 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrDef/URI/IPv6.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrDef/URI/IPv6.php
@@ -1,89 +1,89 @@
-<?php
-
-/**
- * Validates an IPv6 address.
- * @author Feyd @ forums.devnetwork.net (public domain)
- * @note This function requires brackets to have been removed from address
- * in URI.
- */
-class HTMLPurifier_AttrDef_URI_IPv6 extends HTMLPurifier_AttrDef_URI_IPv4
-{
-
- /**
- * @param string $aIP
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string
- */
- public function validate($aIP, $config, $context)
- {
- if (!$this->ip4) {
- $this->_loadRegex();
- }
-
- $original = $aIP;
-
- $hex = '[0-9a-fA-F]';
- $blk = '(?:' . $hex . '{1,4})';
- $pre = '(?:/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))'; // /0 - /128
-
- // prefix check
- if (strpos($aIP, '/') !== false) {
- if (preg_match('#' . $pre . '$#s', $aIP, $find)) {
- $aIP = substr($aIP, 0, 0 - strlen($find[0]));
- unset($find);
- } else {
- return false;
- }
- }
-
- // IPv4-compatiblity check
- if (preg_match('#(?<=:' . ')' . $this->ip4 . '$#s', $aIP, $find)) {
- $aIP = substr($aIP, 0, 0 - strlen($find[0]));
- $ip = explode('.', $find[0]);
- $ip = array_map('dechex', $ip);
- $aIP .= $ip[0] . $ip[1] . ':' . $ip[2] . $ip[3];
- unset($find, $ip);
- }
-
- // compression check
- $aIP = explode('::', $aIP);
- $c = count($aIP);
- if ($c > 2) {
- return false;
- } elseif ($c == 2) {
- list($first, $second) = $aIP;
- $first = explode(':', $first);
- $second = explode(':', $second);
-
- if (count($first) + count($second) > 8) {
- return false;
- }
-
- while (count($first) < 8) {
- array_push($first, '0');
- }
-
- array_splice($first, 8 - count($second), 8, $second);
- $aIP = $first;
- unset($first, $second);
- } else {
- $aIP = explode(':', $aIP[0]);
- }
- $c = count($aIP);
-
- if ($c != 8) {
- return false;
- }
-
- // All the pieces should be 16-bit hex strings. Are they?
- foreach ($aIP as $piece) {
- if (!preg_match('#^[0-9a-fA-F]{4}$#s', sprintf('%04s', $piece))) {
- return false;
- }
- }
- return $original;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates an IPv6 address.
+ * @author Feyd @ forums.devnetwork.net (public domain)
+ * @note This function requires brackets to have been removed from address
+ * in URI.
+ */
+class HTMLPurifier_AttrDef_URI_IPv6 extends HTMLPurifier_AttrDef_URI_IPv4
+{
+
+ /**
+ * @param string $aIP
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
+ public function validate($aIP, $config, $context)
+ {
+ if (!$this->ip4) {
+ $this->_loadRegex();
+ }
+
+ $original = $aIP;
+
+ $hex = '[0-9a-fA-F]';
+ $blk = '(?:' . $hex . '{1,4})';
+ $pre = '(?:/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))'; // /0 - /128
+
+ // prefix check
+ if (strpos($aIP, '/') !== false) {
+ if (preg_match('#' . $pre . '$#s', $aIP, $find)) {
+ $aIP = substr($aIP, 0, 0 - strlen($find[0]));
+ unset($find);
+ } else {
+ return false;
+ }
+ }
+
+ // IPv4-compatiblity check
+ if (preg_match('#(?<=:' . ')' . $this->ip4 . '$#s', $aIP, $find)) {
+ $aIP = substr($aIP, 0, 0 - strlen($find[0]));
+ $ip = explode('.', $find[0]);
+ $ip = array_map('dechex', $ip);
+ $aIP .= $ip[0] . $ip[1] . ':' . $ip[2] . $ip[3];
+ unset($find, $ip);
+ }
+
+ // compression check
+ $aIP = explode('::', $aIP);
+ $c = count($aIP);
+ if ($c > 2) {
+ return false;
+ } elseif ($c == 2) {
+ list($first, $second) = $aIP;
+ $first = explode(':', $first);
+ $second = explode(':', $second);
+
+ if (count($first) + count($second) > 8) {
+ return false;
+ }
+
+ while (count($first) < 8) {
+ array_push($first, '0');
+ }
+
+ array_splice($first, 8 - count($second), 8, $second);
+ $aIP = $first;
+ unset($first, $second);
+ } else {
+ $aIP = explode(':', $aIP[0]);
+ }
+ $c = count($aIP);
+
+ if ($c != 8) {
+ return false;
+ }
+
+ // All the pieces should be 16-bit hex strings. Are they?
+ foreach ($aIP as $piece) {
+ if (!preg_match('#^[0-9a-fA-F]{4}$#s', sprintf('%04s', $piece))) {
+ return false;
+ }
+ }
+ return $original;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform.php
index d9baaf3..b428331 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform.php
@@ -1,60 +1,60 @@
-<?php
-
-/**
- * Processes an entire attribute array for corrections needing multiple values.
- *
- * Occasionally, a certain attribute will need to be removed and popped onto
- * another value. Instead of creating a complex return syntax for
- * HTMLPurifier_AttrDef, we just pass the whole attribute array to a
- * specialized object and have that do the special work. That is the
- * family of HTMLPurifier_AttrTransform.
- *
- * An attribute transformation can be assigned to run before or after
- * HTMLPurifier_AttrDef validation. See HTMLPurifier_HTMLDefinition for
- * more details.
- */
-
-abstract class HTMLPurifier_AttrTransform
-{
-
- /**
- * Abstract: makes changes to the attributes dependent on multiple values.
- *
- * @param array $attr Assoc array of attributes, usually from
- * HTMLPurifier_Token_Tag::$attr
- * @param HTMLPurifier_Config $config Mandatory HTMLPurifier_Config object.
- * @param HTMLPurifier_Context $context Mandatory HTMLPurifier_Context object
- * @return array Processed attribute array.
- */
- abstract public function transform($attr, $config, $context);
-
- /**
- * Prepends CSS properties to the style attribute, creating the
- * attribute if it doesn't exist.
- * @param array &$attr Attribute array to process (passed by reference)
- * @param string $css CSS to prepend
- */
- public function prependCSS(&$attr, $css)
- {
- $attr['style'] = isset($attr['style']) ? $attr['style'] : '';
- $attr['style'] = $css . $attr['style'];
- }
-
- /**
- * Retrieves and removes an attribute
- * @param array &$attr Attribute array to process (passed by reference)
- * @param mixed $key Key of attribute to confiscate
- * @return mixed
- */
- public function confiscateAttr(&$attr, $key)
- {
- if (!isset($attr[$key])) {
- return null;
- }
- $value = $attr[$key];
- unset($attr[$key]);
- return $value;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Processes an entire attribute array for corrections needing multiple values.
+ *
+ * Occasionally, a certain attribute will need to be removed and popped onto
+ * another value. Instead of creating a complex return syntax for
+ * HTMLPurifier_AttrDef, we just pass the whole attribute array to a
+ * specialized object and have that do the special work. That is the
+ * family of HTMLPurifier_AttrTransform.
+ *
+ * An attribute transformation can be assigned to run before or after
+ * HTMLPurifier_AttrDef validation. See HTMLPurifier_HTMLDefinition for
+ * more details.
+ */
+
+abstract class HTMLPurifier_AttrTransform
+{
+
+ /**
+ * Abstract: makes changes to the attributes dependent on multiple values.
+ *
+ * @param array $attr Assoc array of attributes, usually from
+ * HTMLPurifier_Token_Tag::$attr
+ * @param HTMLPurifier_Config $config Mandatory HTMLPurifier_Config object.
+ * @param HTMLPurifier_Context $context Mandatory HTMLPurifier_Context object
+ * @return array Processed attribute array.
+ */
+ abstract public function transform($attr, $config, $context);
+
+ /**
+ * Prepends CSS properties to the style attribute, creating the
+ * attribute if it doesn't exist.
+ * @param array &$attr Attribute array to process (passed by reference)
+ * @param string $css CSS to prepend
+ */
+ public function prependCSS(&$attr, $css)
+ {
+ $attr['style'] = isset($attr['style']) ? $attr['style'] : '';
+ $attr['style'] = $css . $attr['style'];
+ }
+
+ /**
+ * Retrieves and removes an attribute
+ * @param array &$attr Attribute array to process (passed by reference)
+ * @param mixed $key Key of attribute to confiscate
+ * @return mixed
+ */
+ public function confiscateAttr(&$attr, $key)
+ {
+ if (!isset($attr[$key])) {
+ return null;
+ }
+ $value = $attr[$key];
+ unset($attr[$key]);
+ return $value;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Background.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Background.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Background.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Background.php
index f0f0006..2f72869 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Background.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Background.php
@@ -1,28 +1,28 @@
-<?php
-
-/**
- * Pre-transform that changes proprietary background attribute to CSS.
- */
-class HTMLPurifier_AttrTransform_Background extends HTMLPurifier_AttrTransform
-{
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- if (!isset($attr['background'])) {
- return $attr;
- }
-
- $background = $this->confiscateAttr($attr, 'background');
- // some validation should happen here
-
- $this->prependCSS($attr, "background-image:url($background);");
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Pre-transform that changes proprietary background attribute to CSS.
+ */
+class HTMLPurifier_AttrTransform_Background extends HTMLPurifier_AttrTransform
+{
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ if (!isset($attr['background'])) {
+ return $attr;
+ }
+
+ $background = $this->confiscateAttr($attr, 'background');
+ // some validation should happen here
+
+ $this->prependCSS($attr, "background-image:url($background);");
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/BdoDir.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/BdoDir.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/BdoDir.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/BdoDir.php
index 86dcb17..d66c04a 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/BdoDir.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/BdoDir.php
@@ -1,27 +1,27 @@
-<?php
-
-// this MUST be placed in post, as it assumes that any value in dir is valid
-
-/**
- * Post-trasnform that ensures that bdo tags have the dir attribute set.
- */
-class HTMLPurifier_AttrTransform_BdoDir extends HTMLPurifier_AttrTransform
-{
-
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- if (isset($attr['dir'])) {
- return $attr;
- }
- $attr['dir'] = $config->get('Attr.DefaultTextDir');
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+// this MUST be placed in post, as it assumes that any value in dir is valid
+
+/**
+ * Post-trasnform that ensures that bdo tags have the dir attribute set.
+ */
+class HTMLPurifier_AttrTransform_BdoDir extends HTMLPurifier_AttrTransform
+{
+
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ if (isset($attr['dir'])) {
+ return $attr;
+ }
+ $attr['dir'] = $config->get('Attr.DefaultTextDir');
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/BgColor.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/BgColor.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/BgColor.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/BgColor.php
index e45e9ba..0f51fd2 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/BgColor.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/BgColor.php
@@ -1,28 +1,28 @@
-<?php
-
-/**
- * Pre-transform that changes deprecated bgcolor attribute to CSS.
- */
-class HTMLPurifier_AttrTransform_BgColor extends HTMLPurifier_AttrTransform
-{
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- if (!isset($attr['bgcolor'])) {
- return $attr;
- }
-
- $bgcolor = $this->confiscateAttr($attr, 'bgcolor');
- // some validation should happen here
-
- $this->prependCSS($attr, "background-color:$bgcolor;");
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Pre-transform that changes deprecated bgcolor attribute to CSS.
+ */
+class HTMLPurifier_AttrTransform_BgColor extends HTMLPurifier_AttrTransform
+{
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ if (!isset($attr['bgcolor'])) {
+ return $attr;
+ }
+
+ $bgcolor = $this->confiscateAttr($attr, 'bgcolor');
+ // some validation should happen here
+
+ $this->prependCSS($attr, "background-color:$bgcolor;");
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/BoolToCSS.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/BoolToCSS.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/BoolToCSS.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/BoolToCSS.php
index 29d7ff2..f25cd01 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/BoolToCSS.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/BoolToCSS.php
@@ -1,47 +1,47 @@
-<?php
-
-/**
- * Pre-transform that changes converts a boolean attribute to fixed CSS
- */
-class HTMLPurifier_AttrTransform_BoolToCSS extends HTMLPurifier_AttrTransform
-{
- /**
- * Name of boolean attribute that is trigger.
- * @type string
- */
- protected $attr;
-
- /**
- * CSS declarations to add to style, needs trailing semicolon.
- * @type string
- */
- protected $css;
-
- /**
- * @param string $attr attribute name to convert from
- * @param string $css CSS declarations to add to style (needs semicolon)
- */
- public function __construct($attr, $css)
- {
- $this->attr = $attr;
- $this->css = $css;
- }
-
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- if (!isset($attr[$this->attr])) {
- return $attr;
- }
- unset($attr[$this->attr]);
- $this->prependCSS($attr, $this->css);
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Pre-transform that changes converts a boolean attribute to fixed CSS
+ */
+class HTMLPurifier_AttrTransform_BoolToCSS extends HTMLPurifier_AttrTransform
+{
+ /**
+ * Name of boolean attribute that is trigger.
+ * @type string
+ */
+ protected $attr;
+
+ /**
+ * CSS declarations to add to style, needs trailing semicolon.
+ * @type string
+ */
+ protected $css;
+
+ /**
+ * @param string $attr attribute name to convert from
+ * @param string $css CSS declarations to add to style (needs semicolon)
+ */
+ public function __construct($attr, $css)
+ {
+ $this->attr = $attr;
+ $this->css = $css;
+ }
+
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ if (!isset($attr[$this->attr])) {
+ return $attr;
+ }
+ unset($attr[$this->attr]);
+ $this->prependCSS($attr, $this->css);
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Border.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Border.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Border.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Border.php
index 90a8dea..057dc01 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Border.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Border.php
@@ -1,26 +1,26 @@
-<?php
-
-/**
- * Pre-transform that changes deprecated border attribute to CSS.
- */
-class HTMLPurifier_AttrTransform_Border extends HTMLPurifier_AttrTransform
-{
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- if (!isset($attr['border'])) {
- return $attr;
- }
- $border_width = $this->confiscateAttr($attr, 'border');
- // some validation should happen here
- $this->prependCSS($attr, "border:{$border_width}px solid;");
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Pre-transform that changes deprecated border attribute to CSS.
+ */
+class HTMLPurifier_AttrTransform_Border extends HTMLPurifier_AttrTransform
+{
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ if (!isset($attr['border'])) {
+ return $attr;
+ }
+ $border_width = $this->confiscateAttr($attr, 'border');
+ // some validation should happen here
+ $this->prependCSS($attr, "border:{$border_width}px solid;");
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/EnumToCSS.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/EnumToCSS.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/EnumToCSS.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/EnumToCSS.php
index e2bfbf0..7ccd0e3 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/EnumToCSS.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/EnumToCSS.php
@@ -1,68 +1,68 @@
-<?php
-
-/**
- * Generic pre-transform that converts an attribute with a fixed number of
- * values (enumerated) to CSS.
- */
-class HTMLPurifier_AttrTransform_EnumToCSS extends HTMLPurifier_AttrTransform
-{
- /**
- * Name of attribute to transform from.
- * @type string
- */
- protected $attr;
-
- /**
- * Lookup array of attribute values to CSS.
- * @type array
- */
- protected $enumToCSS = array();
-
- /**
- * Case sensitivity of the matching.
- * @type bool
- * @warning Currently can only be guaranteed to work with ASCII
- * values.
- */
- protected $caseSensitive = false;
-
- /**
- * @param string $attr Attribute name to transform from
- * @param array $enum_to_css Lookup array of attribute values to CSS
- * @param bool $case_sensitive Case sensitivity indicator, default false
- */
- public function __construct($attr, $enum_to_css, $case_sensitive = false)
- {
- $this->attr = $attr;
- $this->enumToCSS = $enum_to_css;
- $this->caseSensitive = (bool)$case_sensitive;
- }
-
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- if (!isset($attr[$this->attr])) {
- return $attr;
- }
-
- $value = trim($attr[$this->attr]);
- unset($attr[$this->attr]);
-
- if (!$this->caseSensitive) {
- $value = strtolower($value);
- }
-
- if (!isset($this->enumToCSS[$value])) {
- return $attr;
- }
- $this->prependCSS($attr, $this->enumToCSS[$value]);
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Generic pre-transform that converts an attribute with a fixed number of
+ * values (enumerated) to CSS.
+ */
+class HTMLPurifier_AttrTransform_EnumToCSS extends HTMLPurifier_AttrTransform
+{
+ /**
+ * Name of attribute to transform from.
+ * @type string
+ */
+ protected $attr;
+
+ /**
+ * Lookup array of attribute values to CSS.
+ * @type array
+ */
+ protected $enumToCSS = array();
+
+ /**
+ * Case sensitivity of the matching.
+ * @type bool
+ * @warning Currently can only be guaranteed to work with ASCII
+ * values.
+ */
+ protected $caseSensitive = false;
+
+ /**
+ * @param string $attr Attribute name to transform from
+ * @param array $enum_to_css Lookup array of attribute values to CSS
+ * @param bool $case_sensitive Case sensitivity indicator, default false
+ */
+ public function __construct($attr, $enum_to_css, $case_sensitive = false)
+ {
+ $this->attr = $attr;
+ $this->enumToCSS = $enum_to_css;
+ $this->caseSensitive = (bool)$case_sensitive;
+ }
+
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ if (!isset($attr[$this->attr])) {
+ return $attr;
+ }
+
+ $value = trim($attr[$this->attr]);
+ unset($attr[$this->attr]);
+
+ if (!$this->caseSensitive) {
+ $value = strtolower($value);
+ }
+
+ if (!isset($this->enumToCSS[$value])) {
+ return $attr;
+ }
+ $this->prependCSS($attr, $this->enumToCSS[$value]);
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/ImgRequired.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/ImgRequired.php
similarity index 87%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/ImgRequired.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/ImgRequired.php
index 561b4d9..235ebb3 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/ImgRequired.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/ImgRequired.php
@@ -1,48 +1,47 @@
-<?php
-
-// must be called POST validation
-
-/**
- * Transform that supplies default values for the src and alt attributes
- * in img tags, as well as prevents the img tag from being removed
- * because of a missing alt tag. This needs to be registered as both
- * a pre and post attribute transform.
- */
-class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform
-{
-
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- $src = true;
- if (!isset($attr['src'])) {
- if ($config->get('Core.RemoveInvalidImg')) {
- return $attr;
- }
- $attr['src'] = $config->get('Attr.DefaultInvalidImage');
- $src = false;
- }
-
- if (!isset($attr['alt'])) {
- if ($src) {
- $alt = $config->get('Attr.DefaultImageAlt');
- if ($alt === null) {
- // truncate if the alt is too long
- $attr['alt'] = substr(basename($attr['src']), 0, 40);
- } else {
- $attr['alt'] = $alt;
- }
- } else {
- $attr['alt'] = $config->get('Attr.DefaultInvalidImageAlt');
- }
- }
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+// must be called POST validation
+
+/**
+ * Transform that supplies default values for the src and alt attributes
+ * in img tags, as well as prevents the img tag from being removed
+ * because of a missing alt tag. This needs to be registered as both
+ * a pre and post attribute transform.
+ */
+class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform
+{
+
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ $src = true;
+ if (!isset($attr['src'])) {
+ if ($config->get('Core.RemoveInvalidImg')) {
+ return $attr;
+ }
+ $attr['src'] = $config->get('Attr.DefaultInvalidImage');
+ $src = false;
+ }
+
+ if (!isset($attr['alt'])) {
+ if ($src) {
+ $alt = $config->get('Attr.DefaultImageAlt');
+ if ($alt === null) {
+ $attr['alt'] = basename($attr['src']);
+ } else {
+ $attr['alt'] = $alt;
+ }
+ } else {
+ $attr['alt'] = $config->get('Attr.DefaultInvalidImageAlt');
+ }
+ }
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/ImgSpace.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/ImgSpace.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/ImgSpace.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/ImgSpace.php
index aec42ae..350b335 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/ImgSpace.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/ImgSpace.php
@@ -1,61 +1,61 @@
-<?php
-
-/**
- * Pre-transform that changes deprecated hspace and vspace attributes to CSS
- */
-class HTMLPurifier_AttrTransform_ImgSpace extends HTMLPurifier_AttrTransform
-{
- /**
- * @type string
- */
- protected $attr;
-
- /**
- * @type array
- */
- protected $css = array(
- 'hspace' => array('left', 'right'),
- 'vspace' => array('top', 'bottom')
- );
-
- /**
- * @param string $attr
- */
- public function __construct($attr)
- {
- $this->attr = $attr;
- if (!isset($this->css[$attr])) {
- trigger_error(htmlspecialchars($attr) . ' is not valid space attribute');
- }
- }
-
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- if (!isset($attr[$this->attr])) {
- return $attr;
- }
-
- $width = $this->confiscateAttr($attr, $this->attr);
- // some validation could happen here
-
- if (!isset($this->css[$this->attr])) {
- return $attr;
- }
-
- $style = '';
- foreach ($this->css[$this->attr] as $suffix) {
- $property = "margin-$suffix";
- $style .= "$property:{$width}px;";
- }
- $this->prependCSS($attr, $style);
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Pre-transform that changes deprecated hspace and vspace attributes to CSS
+ */
+class HTMLPurifier_AttrTransform_ImgSpace extends HTMLPurifier_AttrTransform
+{
+ /**
+ * @type string
+ */
+ protected $attr;
+
+ /**
+ * @type array
+ */
+ protected $css = array(
+ 'hspace' => array('left', 'right'),
+ 'vspace' => array('top', 'bottom')
+ );
+
+ /**
+ * @param string $attr
+ */
+ public function __construct($attr)
+ {
+ $this->attr = $attr;
+ if (!isset($this->css[$attr])) {
+ trigger_error(htmlspecialchars($attr) . ' is not valid space attribute');
+ }
+ }
+
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ if (!isset($attr[$this->attr])) {
+ return $attr;
+ }
+
+ $width = $this->confiscateAttr($attr, $this->attr);
+ // some validation could happen here
+
+ if (!isset($this->css[$this->attr])) {
+ return $attr;
+ }
+
+ $style = '';
+ foreach ($this->css[$this->attr] as $suffix) {
+ $property = "margin-$suffix";
+ $style .= "$property:{$width}px;";
+ }
+ $this->prependCSS($attr, $style);
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Input.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Input.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Input.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Input.php
index 17a2ce4..3ab47ed 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Input.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Input.php
@@ -1,56 +1,56 @@
-<?php
-
-/**
- * Performs miscellaneous cross attribute validation and filtering for
- * input elements. This is meant to be a post-transform.
- */
-class HTMLPurifier_AttrTransform_Input extends HTMLPurifier_AttrTransform
-{
- /**
- * @type HTMLPurifier_AttrDef_HTML_Pixels
- */
- protected $pixels;
-
- public function __construct()
- {
- $this->pixels = new HTMLPurifier_AttrDef_HTML_Pixels();
- }
-
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- if (!isset($attr['type'])) {
- $t = 'text';
- } else {
- $t = strtolower($attr['type']);
- }
- if (isset($attr['checked']) && $t !== 'radio' && $t !== 'checkbox') {
- unset($attr['checked']);
- }
- if (isset($attr['maxlength']) && $t !== 'text' && $t !== 'password') {
- unset($attr['maxlength']);
- }
- if (isset($attr['size']) && $t !== 'text' && $t !== 'password') {
- $result = $this->pixels->validate($attr['size'], $config, $context);
- if ($result === false) {
- unset($attr['size']);
- } else {
- $attr['size'] = $result;
- }
- }
- if (isset($attr['src']) && $t !== 'image') {
- unset($attr['src']);
- }
- if (!isset($attr['value']) && ($t === 'radio' || $t === 'checkbox')) {
- $attr['value'] = '';
- }
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Performs miscellaneous cross attribute validation and filtering for
+ * input elements. This is meant to be a post-transform.
+ */
+class HTMLPurifier_AttrTransform_Input extends HTMLPurifier_AttrTransform
+{
+ /**
+ * @type HTMLPurifier_AttrDef_HTML_Pixels
+ */
+ protected $pixels;
+
+ public function __construct()
+ {
+ $this->pixels = new HTMLPurifier_AttrDef_HTML_Pixels();
+ }
+
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ if (!isset($attr['type'])) {
+ $t = 'text';
+ } else {
+ $t = strtolower($attr['type']);
+ }
+ if (isset($attr['checked']) && $t !== 'radio' && $t !== 'checkbox') {
+ unset($attr['checked']);
+ }
+ if (isset($attr['maxlength']) && $t !== 'text' && $t !== 'password') {
+ unset($attr['maxlength']);
+ }
+ if (isset($attr['size']) && $t !== 'text' && $t !== 'password') {
+ $result = $this->pixels->validate($attr['size'], $config, $context);
+ if ($result === false) {
+ unset($attr['size']);
+ } else {
+ $attr['size'] = $result;
+ }
+ }
+ if (isset($attr['src']) && $t !== 'image') {
+ unset($attr['src']);
+ }
+ if (!isset($attr['value']) && ($t === 'radio' || $t === 'checkbox')) {
+ $attr['value'] = '';
+ }
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Lang.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Lang.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Lang.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Lang.php
index 591b8ca..5b0aff0 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Lang.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Lang.php
@@ -1,31 +1,31 @@
-<?php
-
-/**
- * Post-transform that copies lang's value to xml:lang (and vice-versa)
- * @note Theoretically speaking, this could be a pre-transform, but putting
- * post is more efficient.
- */
-class HTMLPurifier_AttrTransform_Lang extends HTMLPurifier_AttrTransform
-{
-
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- $lang = isset($attr['lang']) ? $attr['lang'] : false;
- $xml_lang = isset($attr['xml:lang']) ? $attr['xml:lang'] : false;
-
- if ($lang !== false && $xml_lang === false) {
- $attr['xml:lang'] = $lang;
- } elseif ($xml_lang !== false) {
- $attr['lang'] = $xml_lang;
- }
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Post-transform that copies lang's value to xml:lang (and vice-versa)
+ * @note Theoretically speaking, this could be a pre-transform, but putting
+ * post is more efficient.
+ */
+class HTMLPurifier_AttrTransform_Lang extends HTMLPurifier_AttrTransform
+{
+
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ $lang = isset($attr['lang']) ? $attr['lang'] : false;
+ $xml_lang = isset($attr['xml:lang']) ? $attr['xml:lang'] : false;
+
+ if ($lang !== false && $xml_lang === false) {
+ $attr['xml:lang'] = $lang;
+ } elseif ($xml_lang !== false) {
+ $attr['lang'] = $xml_lang;
+ }
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Length.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Length.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Length.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Length.php
index c4bfd97..853f335 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Length.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Length.php
@@ -1,45 +1,45 @@
-<?php
-
-/**
- * Class for handling width/height length attribute transformations to CSS
- */
-class HTMLPurifier_AttrTransform_Length extends HTMLPurifier_AttrTransform
-{
-
- /**
- * @type string
- */
- protected $name;
-
- /**
- * @type string
- */
- protected $cssName;
-
- public function __construct($name, $css_name = null)
- {
- $this->name = $name;
- $this->cssName = $css_name ? $css_name : $name;
- }
-
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- if (!isset($attr[$this->name])) {
- return $attr;
- }
- $length = $this->confiscateAttr($attr, $this->name);
- if (ctype_digit($length)) {
- $length .= 'px';
- }
- $this->prependCSS($attr, $this->cssName . ":$length;");
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Class for handling width/height length attribute transformations to CSS
+ */
+class HTMLPurifier_AttrTransform_Length extends HTMLPurifier_AttrTransform
+{
+
+ /**
+ * @type string
+ */
+ protected $name;
+
+ /**
+ * @type string
+ */
+ protected $cssName;
+
+ public function __construct($name, $css_name = null)
+ {
+ $this->name = $name;
+ $this->cssName = $css_name ? $css_name : $name;
+ }
+
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ if (!isset($attr[$this->name])) {
+ return $attr;
+ }
+ $length = $this->confiscateAttr($attr, $this->name);
+ if (ctype_digit($length)) {
+ $length .= 'px';
+ }
+ $this->prependCSS($attr, $this->cssName . ":$length;");
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Name.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Name.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Name.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Name.php
index a874d0f..63cce68 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Name.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Name.php
@@ -1,33 +1,33 @@
-<?php
-
-/**
- * Pre-transform that changes deprecated name attribute to ID if necessary
- */
-class HTMLPurifier_AttrTransform_Name extends HTMLPurifier_AttrTransform
-{
-
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- // Abort early if we're using relaxed definition of name
- if ($config->get('HTML.Attr.Name.UseCDATA')) {
- return $attr;
- }
- if (!isset($attr['name'])) {
- return $attr;
- }
- $id = $this->confiscateAttr($attr, 'name');
- if (isset($attr['id'])) {
- return $attr;
- }
- $attr['id'] = $id;
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Pre-transform that changes deprecated name attribute to ID if necessary
+ */
+class HTMLPurifier_AttrTransform_Name extends HTMLPurifier_AttrTransform
+{
+
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ // Abort early if we're using relaxed definition of name
+ if ($config->get('HTML.Attr.Name.UseCDATA')) {
+ return $attr;
+ }
+ if (!isset($attr['name'])) {
+ return $attr;
+ }
+ $id = $this->confiscateAttr($attr, 'name');
+ if (isset($attr['id'])) {
+ return $attr;
+ }
+ $attr['id'] = $id;
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/NameSync.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/NameSync.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/NameSync.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/NameSync.php
index 457f811..36079b7 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/NameSync.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/NameSync.php
@@ -1,41 +1,41 @@
-<?php
-
-/**
- * Post-transform that performs validation to the name attribute; if
- * it is present with an equivalent id attribute, it is passed through;
- * otherwise validation is performed.
- */
-class HTMLPurifier_AttrTransform_NameSync extends HTMLPurifier_AttrTransform
-{
-
- public function __construct()
- {
- $this->idDef = new HTMLPurifier_AttrDef_HTML_ID();
- }
-
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- if (!isset($attr['name'])) {
- return $attr;
- }
- $name = $attr['name'];
- if (isset($attr['id']) && $attr['id'] === $name) {
- return $attr;
- }
- $result = $this->idDef->validate($name, $config, $context);
- if ($result === false) {
- unset($attr['name']);
- } else {
- $attr['name'] = $result;
- }
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Post-transform that performs validation to the name attribute; if
+ * it is present with an equivalent id attribute, it is passed through;
+ * otherwise validation is performed.
+ */
+class HTMLPurifier_AttrTransform_NameSync extends HTMLPurifier_AttrTransform
+{
+
+ public function __construct()
+ {
+ $this->idDef = new HTMLPurifier_AttrDef_HTML_ID();
+ }
+
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ if (!isset($attr['name'])) {
+ return $attr;
+ }
+ $name = $attr['name'];
+ if (isset($attr['id']) && $attr['id'] === $name) {
+ return $attr;
+ }
+ $result = $this->idDef->validate($name, $config, $context);
+ if ($result === false) {
+ unset($attr['name']);
+ } else {
+ $attr['name'] = $result;
+ }
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Nofollow.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Nofollow.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Nofollow.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Nofollow.php
index 25173c2..1057ebe 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Nofollow.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Nofollow.php
@@ -1,52 +1,52 @@
-<?php
-
-// must be called POST validation
-
-/**
- * Adds rel="nofollow" to all outbound links. This transform is
- * only attached if Attr.Nofollow is TRUE.
- */
-class HTMLPurifier_AttrTransform_Nofollow extends HTMLPurifier_AttrTransform
-{
- /**
- * @type HTMLPurifier_URIParser
- */
- private $parser;
-
- public function __construct()
- {
- $this->parser = new HTMLPurifier_URIParser();
- }
-
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- if (!isset($attr['href'])) {
- return $attr;
- }
-
- // XXX Kind of inefficient
- $url = $this->parser->parse($attr['href']);
- $scheme = $url->getSchemeObj($config, $context);
-
- if ($scheme->browsable && !$url->isLocal($config, $context)) {
- if (isset($attr['rel'])) {
- $rels = explode(' ', $attr['rel']);
- if (!in_array('nofollow', $rels)) {
- $rels[] = 'nofollow';
- }
- $attr['rel'] = implode(' ', $rels);
- } else {
- $attr['rel'] = 'nofollow';
- }
- }
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+// must be called POST validation
+
+/**
+ * Adds rel="nofollow" to all outbound links. This transform is
+ * only attached if Attr.Nofollow is TRUE.
+ */
+class HTMLPurifier_AttrTransform_Nofollow extends HTMLPurifier_AttrTransform
+{
+ /**
+ * @type HTMLPurifier_URIParser
+ */
+ private $parser;
+
+ public function __construct()
+ {
+ $this->parser = new HTMLPurifier_URIParser();
+ }
+
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ if (!isset($attr['href'])) {
+ return $attr;
+ }
+
+ // XXX Kind of inefficient
+ $url = $this->parser->parse($attr['href']);
+ $scheme = $url->getSchemeObj($config, $context);
+
+ if ($scheme->browsable && !$url->isLocal($config, $context)) {
+ if (isset($attr['rel'])) {
+ $rels = explode(' ', $attr['rel']);
+ if (!in_array('nofollow', $rels)) {
+ $rels[] = 'nofollow';
+ }
+ $attr['rel'] = implode(' ', $rels);
+ } else {
+ $attr['rel'] = 'nofollow';
+ }
+ }
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/SafeEmbed.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/SafeEmbed.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/SafeEmbed.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/SafeEmbed.php
index 98ebf49..231c81a 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/SafeEmbed.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/SafeEmbed.php
@@ -1,25 +1,25 @@
-<?php
-
-class HTMLPurifier_AttrTransform_SafeEmbed extends HTMLPurifier_AttrTransform
-{
- /**
- * @type string
- */
- public $name = "SafeEmbed";
-
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- $attr['allowscriptaccess'] = 'never';
- $attr['allownetworking'] = 'internal';
- $attr['type'] = 'application/x-shockwave-flash';
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_AttrTransform_SafeEmbed extends HTMLPurifier_AttrTransform
+{
+ /**
+ * @type string
+ */
+ public $name = "SafeEmbed";
+
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ $attr['allowscriptaccess'] = 'never';
+ $attr['allownetworking'] = 'internal';
+ $attr['type'] = 'application/x-shockwave-flash';
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/SafeObject.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/SafeObject.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/SafeObject.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/SafeObject.php
index b71a8f9..d1f3a4d 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/SafeObject.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/SafeObject.php
@@ -1,28 +1,28 @@
-<?php
-
-/**
- * Writes default type for all objects. Currently only supports flash.
- */
-class HTMLPurifier_AttrTransform_SafeObject extends HTMLPurifier_AttrTransform
-{
- /**
- * @type string
- */
- public $name = "SafeObject";
-
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- if (!isset($attr['type'])) {
- $attr['type'] = 'application/x-shockwave-flash';
- }
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Writes default type for all objects. Currently only supports flash.
+ */
+class HTMLPurifier_AttrTransform_SafeObject extends HTMLPurifier_AttrTransform
+{
+ /**
+ * @type string
+ */
+ public $name = "SafeObject";
+
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ if (!isset($attr['type'])) {
+ $attr['type'] = 'application/x-shockwave-flash';
+ }
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/SafeParam.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/SafeParam.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/SafeParam.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/SafeParam.php
index 2066441..1143b4b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/SafeParam.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/SafeParam.php
@@ -1,79 +1,79 @@
-<?php
-
-/**
- * Validates name/value pairs in param tags to be used in safe objects. This
- * will only allow name values it recognizes, and pre-fill certain attributes
- * with required values.
- *
- * @note
- * This class only supports Flash. In the future, Quicktime support
- * may be added.
- *
- * @warning
- * This class expects an injector to add the necessary parameters tags.
- */
-class HTMLPurifier_AttrTransform_SafeParam extends HTMLPurifier_AttrTransform
-{
- /**
- * @type string
- */
- public $name = "SafeParam";
-
- /**
- * @type HTMLPurifier_AttrDef_URI
- */
- private $uri;
-
- public function __construct()
- {
- $this->uri = new HTMLPurifier_AttrDef_URI(true); // embedded
- $this->wmode = new HTMLPurifier_AttrDef_Enum(array('window', 'opaque', 'transparent'));
- }
-
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- // If we add support for other objects, we'll need to alter the
- // transforms.
- switch ($attr['name']) {
- // application/x-shockwave-flash
- // Keep this synchronized with Injector/SafeObject.php
- case 'allowScriptAccess':
- $attr['value'] = 'never';
- break;
- case 'allowNetworking':
- $attr['value'] = 'internal';
- break;
- case 'allowFullScreen':
- if ($config->get('HTML.FlashAllowFullScreen')) {
- $attr['value'] = ($attr['value'] == 'true') ? 'true' : 'false';
- } else {
- $attr['value'] = 'false';
- }
- break;
- case 'wmode':
- $attr['value'] = $this->wmode->validate($attr['value'], $config, $context);
- break;
- case 'movie':
- case 'src':
- $attr['name'] = "movie";
- $attr['value'] = $this->uri->validate($attr['value'], $config, $context);
- break;
- case 'flashvars':
- // we're going to allow arbitrary inputs to the SWF, on
- // the reasoning that it could only hack the SWF, not us.
- break;
- // add other cases to support other param name/value pairs
- default:
- $attr['name'] = $attr['value'] = null;
- }
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates name/value pairs in param tags to be used in safe objects. This
+ * will only allow name values it recognizes, and pre-fill certain attributes
+ * with required values.
+ *
+ * @note
+ * This class only supports Flash. In the future, Quicktime support
+ * may be added.
+ *
+ * @warning
+ * This class expects an injector to add the necessary parameters tags.
+ */
+class HTMLPurifier_AttrTransform_SafeParam extends HTMLPurifier_AttrTransform
+{
+ /**
+ * @type string
+ */
+ public $name = "SafeParam";
+
+ /**
+ * @type HTMLPurifier_AttrDef_URI
+ */
+ private $uri;
+
+ public function __construct()
+ {
+ $this->uri = new HTMLPurifier_AttrDef_URI(true); // embedded
+ $this->wmode = new HTMLPurifier_AttrDef_Enum(array('window', 'opaque', 'transparent'));
+ }
+
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ // If we add support for other objects, we'll need to alter the
+ // transforms.
+ switch ($attr['name']) {
+ // application/x-shockwave-flash
+ // Keep this synchronized with Injector/SafeObject.php
+ case 'allowScriptAccess':
+ $attr['value'] = 'never';
+ break;
+ case 'allowNetworking':
+ $attr['value'] = 'internal';
+ break;
+ case 'allowFullScreen':
+ if ($config->get('HTML.FlashAllowFullScreen')) {
+ $attr['value'] = ($attr['value'] == 'true') ? 'true' : 'false';
+ } else {
+ $attr['value'] = 'false';
+ }
+ break;
+ case 'wmode':
+ $attr['value'] = $this->wmode->validate($attr['value'], $config, $context);
+ break;
+ case 'movie':
+ case 'src':
+ $attr['name'] = "movie";
+ $attr['value'] = $this->uri->validate($attr['value'], $config, $context);
+ break;
+ case 'flashvars':
+ // we're going to allow arbitrary inputs to the SWF, on
+ // the reasoning that it could only hack the SWF, not us.
+ break;
+ // add other cases to support other param name/value pairs
+ default:
+ $attr['name'] = $attr['value'] = null;
+ }
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/ScriptRequired.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/ScriptRequired.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/ScriptRequired.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/ScriptRequired.php
index 49445b4..b7057bb 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/ScriptRequired.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/ScriptRequired.php
@@ -1,23 +1,23 @@
-<?php
-
-/**
- * Implements required attribute stipulation for <script>
- */
-class HTMLPurifier_AttrTransform_ScriptRequired extends HTMLPurifier_AttrTransform
-{
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- if (!isset($attr['type'])) {
- $attr['type'] = 'text/javascript';
- }
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Implements required attribute stipulation for <script>
+ */
+class HTMLPurifier_AttrTransform_ScriptRequired extends HTMLPurifier_AttrTransform
+{
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ if (!isset($attr['type'])) {
+ $attr['type'] = 'text/javascript';
+ }
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/TargetBlank.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/TargetBlank.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/TargetBlank.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/TargetBlank.php
index f66dcf8..dd63ea8 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/TargetBlank.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/TargetBlank.php
@@ -1,45 +1,45 @@
-<?php
-
-// must be called POST validation
-
-/**
- * Adds target="blank" to all outbound links. This transform is
- * only attached if Attr.TargetBlank is TRUE. This works regardless
- * of whether or not Attr.AllowedFrameTargets
- */
-class HTMLPurifier_AttrTransform_TargetBlank extends HTMLPurifier_AttrTransform
-{
- /**
- * @type HTMLPurifier_URIParser
- */
- private $parser;
-
- public function __construct()
- {
- $this->parser = new HTMLPurifier_URIParser();
- }
-
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- if (!isset($attr['href'])) {
- return $attr;
- }
-
- // XXX Kind of inefficient
- $url = $this->parser->parse($attr['href']);
- $scheme = $url->getSchemeObj($config, $context);
-
- if ($scheme->browsable && !$url->isBenign($config, $context)) {
- $attr['target'] = '_blank';
- }
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+// must be called POST validation
+
+/**
+ * Adds target="blank" to all outbound links. This transform is
+ * only attached if Attr.TargetBlank is TRUE. This works regardless
+ * of whether or not Attr.AllowedFrameTargets
+ */
+class HTMLPurifier_AttrTransform_TargetBlank extends HTMLPurifier_AttrTransform
+{
+ /**
+ * @type HTMLPurifier_URIParser
+ */
+ private $parser;
+
+ public function __construct()
+ {
+ $this->parser = new HTMLPurifier_URIParser();
+ }
+
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ if (!isset($attr['href'])) {
+ return $attr;
+ }
+
+ // XXX Kind of inefficient
+ $url = $this->parser->parse($attr['href']);
+ $scheme = $url->getSchemeObj($config, $context);
+
+ if ($scheme->browsable && !$url->isBenign($config, $context)) {
+ $attr['target'] = '_blank';
+ }
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/TargetNoreferrer.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/TargetNoreferrer.php
new file mode 100755
index 0000000..587dc2e
--- /dev/null
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/TargetNoreferrer.php
@@ -0,0 +1,37 @@
+<?php
+
+// must be called POST validation
+
+/**
+ * Adds rel="noreferrer" to any links which target a different window
+ * than the current one. This is used to prevent malicious websites
+ * from silently replacing the original window, which could be used
+ * to do phishing.
+ * This transform is controlled by %HTML.TargetNoreferrer.
+ */
+class HTMLPurifier_AttrTransform_TargetNoreferrer extends HTMLPurifier_AttrTransform
+{
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ if (isset($attr['rel'])) {
+ $rels = explode(' ', $attr['rel']);
+ } else {
+ $rels = array();
+ }
+ if (isset($attr['target']) && !in_array('noreferrer', $rels)) {
+ $rels[] = 'noreferrer';
+ }
+ if (!empty($rels) || isset($attr['rel'])) {
+ $attr['rel'] = implode(' ', $rels);
+ }
+
+ return $attr;
+ }
+}
+
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Textarea.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Textarea.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Textarea.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Textarea.php
index 182fdda..6a9f33a 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTransform/Textarea.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTransform/Textarea.php
@@ -1,27 +1,27 @@
-<?php
-
-/**
- * Sets height/width defaults for <textarea>
- */
-class HTMLPurifier_AttrTransform_Textarea extends HTMLPurifier_AttrTransform
-{
- /**
- * @param array $attr
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function transform($attr, $config, $context)
- {
- // Calculated from Firefox
- if (!isset($attr['cols'])) {
- $attr['cols'] = '22';
- }
- if (!isset($attr['rows'])) {
- $attr['rows'] = '3';
- }
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Sets height/width defaults for <textarea>
+ */
+class HTMLPurifier_AttrTransform_Textarea extends HTMLPurifier_AttrTransform
+{
+ /**
+ * @param array $attr
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function transform($attr, $config, $context)
+ {
+ // Calculated from Firefox
+ if (!isset($attr['cols'])) {
+ $attr['cols'] = '22';
+ }
+ if (!isset($attr['rows'])) {
+ $attr['rows'] = '3';
+ }
+ return $attr;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTypes.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTypes.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTypes.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTypes.php
index 7e8019b..3b70520 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrTypes.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrTypes.php
@@ -1,96 +1,96 @@
-<?php
-
-/**
- * Provides lookup array of attribute types to HTMLPurifier_AttrDef objects
- */
-class HTMLPurifier_AttrTypes
-{
- /**
- * Lookup array of attribute string identifiers to concrete implementations.
- * @type HTMLPurifier_AttrDef[]
- */
- protected $info = array();
-
- /**
- * Constructs the info array, supplying default implementations for attribute
- * types.
- */
- public function __construct()
- {
- // XXX This is kind of poor, since we don't actually /clone/
- // instances; instead, we use the supplied make() attribute. So,
- // the underlying class must know how to deal with arguments.
- // With the old implementation of Enum, that ignored its
- // arguments when handling a make dispatch, the IAlign
- // definition wouldn't work.
-
- // pseudo-types, must be instantiated via shorthand
- $this->info['Enum'] = new HTMLPurifier_AttrDef_Enum();
- $this->info['Bool'] = new HTMLPurifier_AttrDef_HTML_Bool();
-
- $this->info['CDATA'] = new HTMLPurifier_AttrDef_Text();
- $this->info['ID'] = new HTMLPurifier_AttrDef_HTML_ID();
- $this->info['Length'] = new HTMLPurifier_AttrDef_HTML_Length();
- $this->info['MultiLength'] = new HTMLPurifier_AttrDef_HTML_MultiLength();
- $this->info['NMTOKENS'] = new HTMLPurifier_AttrDef_HTML_Nmtokens();
- $this->info['Pixels'] = new HTMLPurifier_AttrDef_HTML_Pixels();
- $this->info['Text'] = new HTMLPurifier_AttrDef_Text();
- $this->info['URI'] = new HTMLPurifier_AttrDef_URI();
- $this->info['LanguageCode'] = new HTMLPurifier_AttrDef_Lang();
- $this->info['Color'] = new HTMLPurifier_AttrDef_HTML_Color();
- $this->info['IAlign'] = self::makeEnum('top,middle,bottom,left,right');
- $this->info['LAlign'] = self::makeEnum('top,bottom,left,right');
- $this->info['FrameTarget'] = new HTMLPurifier_AttrDef_HTML_FrameTarget();
-
- // unimplemented aliases
- $this->info['ContentType'] = new HTMLPurifier_AttrDef_Text();
- $this->info['ContentTypes'] = new HTMLPurifier_AttrDef_Text();
- $this->info['Charsets'] = new HTMLPurifier_AttrDef_Text();
- $this->info['Character'] = new HTMLPurifier_AttrDef_Text();
-
- // "proprietary" types
- $this->info['Class'] = new HTMLPurifier_AttrDef_HTML_Class();
-
- // number is really a positive integer (one or more digits)
- // FIXME: ^^ not always, see start and value of list items
- $this->info['Number'] = new HTMLPurifier_AttrDef_Integer(false, false, true);
- }
-
- private static function makeEnum($in)
- {
- return new HTMLPurifier_AttrDef_Clone(new HTMLPurifier_AttrDef_Enum(explode(',', $in)));
- }
-
- /**
- * Retrieves a type
- * @param string $type String type name
- * @return HTMLPurifier_AttrDef Object AttrDef for type
- */
- public function get($type)
- {
- // determine if there is any extra info tacked on
- if (strpos($type, '#') !== false) {
- list($type, $string) = explode('#', $type, 2);
- } else {
- $string = '';
- }
-
- if (!isset($this->info[$type])) {
- trigger_error('Cannot retrieve undefined attribute type ' . $type, E_USER_ERROR);
- return;
- }
- return $this->info[$type]->make($string);
- }
-
- /**
- * Sets a new implementation for a type
- * @param string $type String type name
- * @param HTMLPurifier_AttrDef $impl Object AttrDef for type
- */
- public function set($type, $impl)
- {
- $this->info[$type] = $impl;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Provides lookup array of attribute types to HTMLPurifier_AttrDef objects
+ */
+class HTMLPurifier_AttrTypes
+{
+ /**
+ * Lookup array of attribute string identifiers to concrete implementations.
+ * @type HTMLPurifier_AttrDef[]
+ */
+ protected $info = array();
+
+ /**
+ * Constructs the info array, supplying default implementations for attribute
+ * types.
+ */
+ public function __construct()
+ {
+ // XXX This is kind of poor, since we don't actually /clone/
+ // instances; instead, we use the supplied make() attribute. So,
+ // the underlying class must know how to deal with arguments.
+ // With the old implementation of Enum, that ignored its
+ // arguments when handling a make dispatch, the IAlign
+ // definition wouldn't work.
+
+ // pseudo-types, must be instantiated via shorthand
+ $this->info['Enum'] = new HTMLPurifier_AttrDef_Enum();
+ $this->info['Bool'] = new HTMLPurifier_AttrDef_HTML_Bool();
+
+ $this->info['CDATA'] = new HTMLPurifier_AttrDef_Text();
+ $this->info['ID'] = new HTMLPurifier_AttrDef_HTML_ID();
+ $this->info['Length'] = new HTMLPurifier_AttrDef_HTML_Length();
+ $this->info['MultiLength'] = new HTMLPurifier_AttrDef_HTML_MultiLength();
+ $this->info['NMTOKENS'] = new HTMLPurifier_AttrDef_HTML_Nmtokens();
+ $this->info['Pixels'] = new HTMLPurifier_AttrDef_HTML_Pixels();
+ $this->info['Text'] = new HTMLPurifier_AttrDef_Text();
+ $this->info['URI'] = new HTMLPurifier_AttrDef_URI();
+ $this->info['LanguageCode'] = new HTMLPurifier_AttrDef_Lang();
+ $this->info['Color'] = new HTMLPurifier_AttrDef_HTML_Color();
+ $this->info['IAlign'] = self::makeEnum('top,middle,bottom,left,right');
+ $this->info['LAlign'] = self::makeEnum('top,bottom,left,right');
+ $this->info['FrameTarget'] = new HTMLPurifier_AttrDef_HTML_FrameTarget();
+
+ // unimplemented aliases
+ $this->info['ContentType'] = new HTMLPurifier_AttrDef_Text();
+ $this->info['ContentTypes'] = new HTMLPurifier_AttrDef_Text();
+ $this->info['Charsets'] = new HTMLPurifier_AttrDef_Text();
+ $this->info['Character'] = new HTMLPurifier_AttrDef_Text();
+
+ // "proprietary" types
+ $this->info['Class'] = new HTMLPurifier_AttrDef_HTML_Class();
+
+ // number is really a positive integer (one or more digits)
+ // FIXME: ^^ not always, see start and value of list items
+ $this->info['Number'] = new HTMLPurifier_AttrDef_Integer(false, false, true);
+ }
+
+ private static function makeEnum($in)
+ {
+ return new HTMLPurifier_AttrDef_Clone(new HTMLPurifier_AttrDef_Enum(explode(',', $in)));
+ }
+
+ /**
+ * Retrieves a type
+ * @param string $type String type name
+ * @return HTMLPurifier_AttrDef Object AttrDef for type
+ */
+ public function get($type)
+ {
+ // determine if there is any extra info tacked on
+ if (strpos($type, '#') !== false) {
+ list($type, $string) = explode('#', $type, 2);
+ } else {
+ $string = '';
+ }
+
+ if (!isset($this->info[$type])) {
+ trigger_error('Cannot retrieve undefined attribute type ' . $type, E_USER_ERROR);
+ return;
+ }
+ return $this->info[$type]->make($string);
+ }
+
+ /**
+ * Sets a new implementation for a type
+ * @param string $type String type name
+ * @param HTMLPurifier_AttrDef $impl Object AttrDef for type
+ */
+ public function set($type, $impl)
+ {
+ $this->info[$type] = $impl;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrValidator.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrValidator.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrValidator.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrValidator.php
index 1a2b0b6..f97dc93 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/AttrValidator.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/AttrValidator.php
@@ -1,178 +1,178 @@
-<?php
-
-/**
- * Validates the attributes of a token. Doesn't manage required attributes
- * very well. The only reason we factored this out was because RemoveForeignElements
- * also needed it besides ValidateAttributes.
- */
-class HTMLPurifier_AttrValidator
-{
-
- /**
- * Validates the attributes of a token, mutating it as necessary.
- * that has valid tokens
- * @param HTMLPurifier_Token $token Token to validate.
- * @param HTMLPurifier_Config $config Instance of HTMLPurifier_Config
- * @param HTMLPurifier_Context $context Instance of HTMLPurifier_Context
- */
- public function validateToken($token, $config, $context)
- {
- $definition = $config->getHTMLDefinition();
- $e =& $context->get('ErrorCollector', true);
-
- // initialize IDAccumulator if necessary
- $ok =& $context->get('IDAccumulator', true);
- if (!$ok) {
- $id_accumulator = HTMLPurifier_IDAccumulator::build($config, $context);
- $context->register('IDAccumulator', $id_accumulator);
- }
-
- // initialize CurrentToken if necessary
- $current_token =& $context->get('CurrentToken', true);
- if (!$current_token) {
- $context->register('CurrentToken', $token);
- }
-
- if (!$token instanceof HTMLPurifier_Token_Start &&
- !$token instanceof HTMLPurifier_Token_Empty
- ) {
- return;
- }
-
- // create alias to global definition array, see also $defs
- // DEFINITION CALL
- $d_defs = $definition->info_global_attr;
-
- // don't update token until the very end, to ensure an atomic update
- $attr = $token->attr;
-
- // do global transformations (pre)
- // nothing currently utilizes this
- foreach ($definition->info_attr_transform_pre as $transform) {
- $attr = $transform->transform($o = $attr, $config, $context);
- if ($e) {
- if ($attr != $o) {
- $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
- }
- }
- }
-
- // do local transformations only applicable to this element (pre)
- // ex. <p align="right"> to <p style="text-align:right;">
- foreach ($definition->info[$token->name]->attr_transform_pre as $transform) {
- $attr = $transform->transform($o = $attr, $config, $context);
- if ($e) {
- if ($attr != $o) {
- $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
- }
- }
- }
-
- // create alias to this element's attribute definition array, see
- // also $d_defs (global attribute definition array)
- // DEFINITION CALL
- $defs = $definition->info[$token->name]->attr;
-
- $attr_key = false;
- $context->register('CurrentAttr', $attr_key);
-
- // iterate through all the attribute keypairs
- // Watch out for name collisions: $key has previously been used
- foreach ($attr as $attr_key => $value) {
-
- // call the definition
- if (isset($defs[$attr_key])) {
- // there is a local definition defined
- if ($defs[$attr_key] === false) {
- // We've explicitly been told not to allow this element.
- // This is usually when there's a global definition
- // that must be overridden.
- // Theoretically speaking, we could have a
- // AttrDef_DenyAll, but this is faster!
- $result = false;
- } else {
- // validate according to the element's definition
- $result = $defs[$attr_key]->validate(
- $value,
- $config,
- $context
- );
- }
- } elseif (isset($d_defs[$attr_key])) {
- // there is a global definition defined, validate according
- // to the global definition
- $result = $d_defs[$attr_key]->validate(
- $value,
- $config,
- $context
- );
- } else {
- // system never heard of the attribute? DELETE!
- $result = false;
- }
-
- // put the results into effect
- if ($result === false || $result === null) {
- // this is a generic error message that should replaced
- // with more specific ones when possible
- if ($e) {
- $e->send(E_ERROR, 'AttrValidator: Attribute removed');
- }
-
- // remove the attribute
- unset($attr[$attr_key]);
- } elseif (is_string($result)) {
- // generally, if a substitution is happening, there
- // was some sort of implicit correction going on. We'll
- // delegate it to the attribute classes to say exactly what.
-
- // simple substitution
- $attr[$attr_key] = $result;
- } else {
- // nothing happens
- }
-
- // we'd also want slightly more complicated substitution
- // involving an array as the return value,
- // although we're not sure how colliding attributes would
- // resolve (certain ones would be completely overriden,
- // others would prepend themselves).
- }
-
- $context->destroy('CurrentAttr');
-
- // post transforms
-
- // global (error reporting untested)
- foreach ($definition->info_attr_transform_post as $transform) {
- $attr = $transform->transform($o = $attr, $config, $context);
- if ($e) {
- if ($attr != $o) {
- $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
- }
- }
- }
-
- // local (error reporting untested)
- foreach ($definition->info[$token->name]->attr_transform_post as $transform) {
- $attr = $transform->transform($o = $attr, $config, $context);
- if ($e) {
- if ($attr != $o) {
- $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
- }
- }
- }
-
- $token->attr = $attr;
-
- // destroy CurrentToken if we made it ourselves
- if (!$current_token) {
- $context->destroy('CurrentToken');
- }
-
- }
-
-
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates the attributes of a token. Doesn't manage required attributes
+ * very well. The only reason we factored this out was because RemoveForeignElements
+ * also needed it besides ValidateAttributes.
+ */
+class HTMLPurifier_AttrValidator
+{
+
+ /**
+ * Validates the attributes of a token, mutating it as necessary.
+ * that has valid tokens
+ * @param HTMLPurifier_Token $token Token to validate.
+ * @param HTMLPurifier_Config $config Instance of HTMLPurifier_Config
+ * @param HTMLPurifier_Context $context Instance of HTMLPurifier_Context
+ */
+ public function validateToken($token, $config, $context)
+ {
+ $definition = $config->getHTMLDefinition();
+ $e =& $context->get('ErrorCollector', true);
+
+ // initialize IDAccumulator if necessary
+ $ok =& $context->get('IDAccumulator', true);
+ if (!$ok) {
+ $id_accumulator = HTMLPurifier_IDAccumulator::build($config, $context);
+ $context->register('IDAccumulator', $id_accumulator);
+ }
+
+ // initialize CurrentToken if necessary
+ $current_token =& $context->get('CurrentToken', true);
+ if (!$current_token) {
+ $context->register('CurrentToken', $token);
+ }
+
+ if (!$token instanceof HTMLPurifier_Token_Start &&
+ !$token instanceof HTMLPurifier_Token_Empty
+ ) {
+ return;
+ }
+
+ // create alias to global definition array, see also $defs
+ // DEFINITION CALL
+ $d_defs = $definition->info_global_attr;
+
+ // don't update token until the very end, to ensure an atomic update
+ $attr = $token->attr;
+
+ // do global transformations (pre)
+ // nothing currently utilizes this
+ foreach ($definition->info_attr_transform_pre as $transform) {
+ $attr = $transform->transform($o = $attr, $config, $context);
+ if ($e) {
+ if ($attr != $o) {
+ $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
+ }
+ }
+ }
+
+ // do local transformations only applicable to this element (pre)
+ // ex. <p align="right"> to <p style="text-align:right;">
+ foreach ($definition->info[$token->name]->attr_transform_pre as $transform) {
+ $attr = $transform->transform($o = $attr, $config, $context);
+ if ($e) {
+ if ($attr != $o) {
+ $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
+ }
+ }
+ }
+
+ // create alias to this element's attribute definition array, see
+ // also $d_defs (global attribute definition array)
+ // DEFINITION CALL
+ $defs = $definition->info[$token->name]->attr;
+
+ $attr_key = false;
+ $context->register('CurrentAttr', $attr_key);
+
+ // iterate through all the attribute keypairs
+ // Watch out for name collisions: $key has previously been used
+ foreach ($attr as $attr_key => $value) {
+
+ // call the definition
+ if (isset($defs[$attr_key])) {
+ // there is a local definition defined
+ if ($defs[$attr_key] === false) {
+ // We've explicitly been told not to allow this element.
+ // This is usually when there's a global definition
+ // that must be overridden.
+ // Theoretically speaking, we could have a
+ // AttrDef_DenyAll, but this is faster!
+ $result = false;
+ } else {
+ // validate according to the element's definition
+ $result = $defs[$attr_key]->validate(
+ $value,
+ $config,
+ $context
+ );
+ }
+ } elseif (isset($d_defs[$attr_key])) {
+ // there is a global definition defined, validate according
+ // to the global definition
+ $result = $d_defs[$attr_key]->validate(
+ $value,
+ $config,
+ $context
+ );
+ } else {
+ // system never heard of the attribute? DELETE!
+ $result = false;
+ }
+
+ // put the results into effect
+ if ($result === false || $result === null) {
+ // this is a generic error message that should replaced
+ // with more specific ones when possible
+ if ($e) {
+ $e->send(E_ERROR, 'AttrValidator: Attribute removed');
+ }
+
+ // remove the attribute
+ unset($attr[$attr_key]);
+ } elseif (is_string($result)) {
+ // generally, if a substitution is happening, there
+ // was some sort of implicit correction going on. We'll
+ // delegate it to the attribute classes to say exactly what.
+
+ // simple substitution
+ $attr[$attr_key] = $result;
+ } else {
+ // nothing happens
+ }
+
+ // we'd also want slightly more complicated substitution
+ // involving an array as the return value,
+ // although we're not sure how colliding attributes would
+ // resolve (certain ones would be completely overriden,
+ // others would prepend themselves).
+ }
+
+ $context->destroy('CurrentAttr');
+
+ // post transforms
+
+ // global (error reporting untested)
+ foreach ($definition->info_attr_transform_post as $transform) {
+ $attr = $transform->transform($o = $attr, $config, $context);
+ if ($e) {
+ if ($attr != $o) {
+ $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
+ }
+ }
+ }
+
+ // local (error reporting untested)
+ foreach ($definition->info[$token->name]->attr_transform_post as $transform) {
+ $attr = $transform->transform($o = $attr, $config, $context);
+ if ($e) {
+ if ($attr != $o) {
+ $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
+ }
+ }
+ }
+
+ $token->attr = $attr;
+
+ // destroy CurrentToken if we made it ourselves
+ if (!$current_token) {
+ $context->destroy('CurrentToken');
+ }
+
+ }
+
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Bootstrap.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Bootstrap.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Bootstrap.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Bootstrap.php
index 0ab0e34..707122b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Bootstrap.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Bootstrap.php
@@ -1,124 +1,124 @@
-<?php
-
-// constants are slow, so we use as few as possible
-if (!defined('HTMLPURIFIER_PREFIX')) {
- define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__) . '/..'));
-}
-
-// accomodations for versions earlier than 5.0.2
-// borrowed from PHP_Compat, LGPL licensed, by Aidan Lister <aidan@php.net>
-if (!defined('PHP_EOL')) {
- switch (strtoupper(substr(PHP_OS, 0, 3))) {
- case 'WIN':
- define('PHP_EOL', "\r\n");
- break;
- case 'DAR':
- define('PHP_EOL', "\r");
- break;
- default:
- define('PHP_EOL', "\n");
- }
-}
-
-/**
- * Bootstrap class that contains meta-functionality for HTML Purifier such as
- * the autoload function.
- *
- * @note
- * This class may be used without any other files from HTML Purifier.
- */
-class HTMLPurifier_Bootstrap
-{
-
- /**
- * Autoload function for HTML Purifier
- * @param string $class Class to load
- * @return bool
- */
- public static function autoload($class)
- {
- $file = HTMLPurifier_Bootstrap::getPath($class);
- if (!$file) {
- return false;
- }
- // Technically speaking, it should be ok and more efficient to
- // just do 'require', but Antonio Parraga reports that with
- // Zend extensions such as Zend debugger and APC, this invariant
- // may be broken. Since we have efficient alternatives, pay
- // the cost here and avoid the bug.
- require_once HTMLPURIFIER_PREFIX . '/' . $file;
- return true;
- }
-
- /**
- * Returns the path for a specific class.
- * @param string $class Class path to get
- * @return string
- */
- public static function getPath($class)
- {
- if (strncmp('HTMLPurifier', $class, 12) !== 0) {
- return false;
- }
- // Custom implementations
- if (strncmp('HTMLPurifier_Language_', $class, 22) === 0) {
- $code = str_replace('_', '-', substr($class, 22));
- $file = 'HTMLPurifier/Language/classes/' . $code . '.php';
- } else {
- $file = str_replace('_', '/', $class) . '.php';
- }
- if (!file_exists(HTMLPURIFIER_PREFIX . '/' . $file)) {
- return false;
- }
- return $file;
- }
-
- /**
- * "Pre-registers" our autoloader on the SPL stack.
- */
- public static function registerAutoload()
- {
- $autoload = array('HTMLPurifier_Bootstrap', 'autoload');
- if (($funcs = spl_autoload_functions()) === false) {
- spl_autoload_register($autoload);
- } elseif (function_exists('spl_autoload_unregister')) {
- if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
- // prepend flag exists, no need for shenanigans
- spl_autoload_register($autoload, true, true);
- } else {
- $buggy = version_compare(PHP_VERSION, '5.2.11', '<');
- $compat = version_compare(PHP_VERSION, '5.1.2', '<=') &&
- version_compare(PHP_VERSION, '5.1.0', '>=');
- foreach ($funcs as $func) {
- if ($buggy && is_array($func)) {
- // :TRICKY: There are some compatibility issues and some
- // places where we need to error out
- $reflector = new ReflectionMethod($func[0], $func[1]);
- if (!$reflector->isStatic()) {
- throw new Exception(
- 'HTML Purifier autoloader registrar is not compatible
- with non-static object methods due to PHP Bug #44144;
- Please do not use HTMLPurifier.autoload.php (or any
- file that includes this file); instead, place the code:
- spl_autoload_register(array(\'HTMLPurifier_Bootstrap\', \'autoload\'))
- after your own autoloaders.'
- );
- }
- // Suprisingly, spl_autoload_register supports the
- // Class::staticMethod callback format, although call_user_func doesn't
- if ($compat) {
- $func = implode('::', $func);
- }
- }
- spl_autoload_unregister($func);
- }
- spl_autoload_register($autoload);
- foreach ($funcs as $func) {
- spl_autoload_register($func);
- }
- }
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+// constants are slow, so we use as few as possible
+if (!defined('HTMLPURIFIER_PREFIX')) {
+ define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__) . '/..'));
+}
+
+// accomodations for versions earlier than 5.0.2
+// borrowed from PHP_Compat, LGPL licensed, by Aidan Lister <aidan@php.net>
+if (!defined('PHP_EOL')) {
+ switch (strtoupper(substr(PHP_OS, 0, 3))) {
+ case 'WIN':
+ define('PHP_EOL', "\r\n");
+ break;
+ case 'DAR':
+ define('PHP_EOL', "\r");
+ break;
+ default:
+ define('PHP_EOL', "\n");
+ }
+}
+
+/**
+ * Bootstrap class that contains meta-functionality for HTML Purifier such as
+ * the autoload function.
+ *
+ * @note
+ * This class may be used without any other files from HTML Purifier.
+ */
+class HTMLPurifier_Bootstrap
+{
+
+ /**
+ * Autoload function for HTML Purifier
+ * @param string $class Class to load
+ * @return bool
+ */
+ public static function autoload($class)
+ {
+ $file = HTMLPurifier_Bootstrap::getPath($class);
+ if (!$file) {
+ return false;
+ }
+ // Technically speaking, it should be ok and more efficient to
+ // just do 'require', but Antonio Parraga reports that with
+ // Zend extensions such as Zend debugger and APC, this invariant
+ // may be broken. Since we have efficient alternatives, pay
+ // the cost here and avoid the bug.
+ require_once HTMLPURIFIER_PREFIX . '/' . $file;
+ return true;
+ }
+
+ /**
+ * Returns the path for a specific class.
+ * @param string $class Class path to get
+ * @return string
+ */
+ public static function getPath($class)
+ {
+ if (strncmp('HTMLPurifier', $class, 12) !== 0) {
+ return false;
+ }
+ // Custom implementations
+ if (strncmp('HTMLPurifier_Language_', $class, 22) === 0) {
+ $code = str_replace('_', '-', substr($class, 22));
+ $file = 'HTMLPurifier/Language/classes/' . $code . '.php';
+ } else {
+ $file = str_replace('_', '/', $class) . '.php';
+ }
+ if (!file_exists(HTMLPURIFIER_PREFIX . '/' . $file)) {
+ return false;
+ }
+ return $file;
+ }
+
+ /**
+ * "Pre-registers" our autoloader on the SPL stack.
+ */
+ public static function registerAutoload()
+ {
+ $autoload = array('HTMLPurifier_Bootstrap', 'autoload');
+ if (($funcs = spl_autoload_functions()) === false) {
+ spl_autoload_register($autoload);
+ } elseif (function_exists('spl_autoload_unregister')) {
+ if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+ // prepend flag exists, no need for shenanigans
+ spl_autoload_register($autoload, true, true);
+ } else {
+ $buggy = version_compare(PHP_VERSION, '5.2.11', '<');
+ $compat = version_compare(PHP_VERSION, '5.1.2', '<=') &&
+ version_compare(PHP_VERSION, '5.1.0', '>=');
+ foreach ($funcs as $func) {
+ if ($buggy && is_array($func)) {
+ // :TRICKY: There are some compatibility issues and some
+ // places where we need to error out
+ $reflector = new ReflectionMethod($func[0], $func[1]);
+ if (!$reflector->isStatic()) {
+ throw new Exception(
+ 'HTML Purifier autoloader registrar is not compatible
+ with non-static object methods due to PHP Bug #44144;
+ Please do not use HTMLPurifier.autoload.php (or any
+ file that includes this file); instead, place the code:
+ spl_autoload_register(array(\'HTMLPurifier_Bootstrap\', \'autoload\'))
+ after your own autoloaders.'
+ );
+ }
+ // Suprisingly, spl_autoload_register supports the
+ // Class::staticMethod callback format, although call_user_func doesn't
+ if ($compat) {
+ $func = implode('::', $func);
+ }
+ }
+ spl_autoload_unregister($func);
+ }
+ spl_autoload_register($autoload);
+ foreach ($funcs as $func) {
+ spl_autoload_register($func);
+ }
+ }
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/CSSDefinition.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/CSSDefinition.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/CSSDefinition.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/CSSDefinition.php
index 18b05f3..a99172d 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/CSSDefinition.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/CSSDefinition.php
@@ -1,474 +1,487 @@
-<?php
-
-/**
- * Defines allowed CSS attributes and what their values are.
- * @see HTMLPurifier_HTMLDefinition
- */
-class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
-{
-
- public $type = 'CSS';
-
- /**
- * Assoc array of attribute name to definition object.
- * @type HTMLPurifier_AttrDef[]
- */
- public $info = array();
-
- /**
- * Constructs the info array. The meat of this class.
- * @param HTMLPurifier_Config $config
- */
- protected function doSetup($config)
- {
- $this->info['text-align'] = new HTMLPurifier_AttrDef_Enum(
- array('left', 'right', 'center', 'justify'),
- false
- );
-
- $border_style =
- $this->info['border-bottom-style'] =
- $this->info['border-right-style'] =
- $this->info['border-left-style'] =
- $this->info['border-top-style'] = new HTMLPurifier_AttrDef_Enum(
- array(
- 'none',
- 'hidden',
- 'dotted',
- 'dashed',
- 'solid',
- 'double',
- 'groove',
- 'ridge',
- 'inset',
- 'outset'
- ),
- false
- );
-
- $this->info['border-style'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_style);
-
- $this->info['clear'] = new HTMLPurifier_AttrDef_Enum(
- array('none', 'left', 'right', 'both'),
- false
- );
- $this->info['float'] = new HTMLPurifier_AttrDef_Enum(
- array('none', 'left', 'right'),
- false
- );
- $this->info['font-style'] = new HTMLPurifier_AttrDef_Enum(
- array('normal', 'italic', 'oblique'),
- false
- );
- $this->info['font-variant'] = new HTMLPurifier_AttrDef_Enum(
- array('normal', 'small-caps'),
- false
- );
-
- $uri_or_none = new HTMLPurifier_AttrDef_CSS_Composite(
- array(
- new HTMLPurifier_AttrDef_Enum(array('none')),
- new HTMLPurifier_AttrDef_CSS_URI()
- )
- );
-
- $this->info['list-style-position'] = new HTMLPurifier_AttrDef_Enum(
- array('inside', 'outside'),
- false
- );
- $this->info['list-style-type'] = new HTMLPurifier_AttrDef_Enum(
- array(
- 'disc',
- 'circle',
- 'square',
- 'decimal',
- 'lower-roman',
- 'upper-roman',
- 'lower-alpha',
- 'upper-alpha',
- 'none'
- ),
- false
- );
- $this->info['list-style-image'] = $uri_or_none;
-
- $this->info['list-style'] = new HTMLPurifier_AttrDef_CSS_ListStyle($config);
-
- $this->info['text-transform'] = new HTMLPurifier_AttrDef_Enum(
- array('capitalize', 'uppercase', 'lowercase', 'none'),
- false
- );
- $this->info['color'] = new HTMLPurifier_AttrDef_CSS_Color();
-
- $this->info['background-image'] = $uri_or_none;
- $this->info['background-repeat'] = new HTMLPurifier_AttrDef_Enum(
- array('repeat', 'repeat-x', 'repeat-y', 'no-repeat')
- );
- $this->info['background-attachment'] = new HTMLPurifier_AttrDef_Enum(
- array('scroll', 'fixed')
- );
- $this->info['background-position'] = new HTMLPurifier_AttrDef_CSS_BackgroundPosition();
-
- $border_color =
- $this->info['border-top-color'] =
- $this->info['border-bottom-color'] =
- $this->info['border-left-color'] =
- $this->info['border-right-color'] =
- $this->info['background-color'] = new HTMLPurifier_AttrDef_CSS_Composite(
- array(
- new HTMLPurifier_AttrDef_Enum(array('transparent')),
- new HTMLPurifier_AttrDef_CSS_Color()
- )
- );
-
- $this->info['background'] = new HTMLPurifier_AttrDef_CSS_Background($config);
-
- $this->info['border-color'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_color);
-
- $border_width =
- $this->info['border-top-width'] =
- $this->info['border-bottom-width'] =
- $this->info['border-left-width'] =
- $this->info['border-right-width'] = new HTMLPurifier_AttrDef_CSS_Composite(
- array(
- new HTMLPurifier_AttrDef_Enum(array('thin', 'medium', 'thick')),
- new HTMLPurifier_AttrDef_CSS_Length('0') //disallow negative
- )
- );
-
- $this->info['border-width'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_width);
-
- $this->info['letter-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(
- array(
- new HTMLPurifier_AttrDef_Enum(array('normal')),
- new HTMLPurifier_AttrDef_CSS_Length()
- )
- );
-
- $this->info['word-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(
- array(
- new HTMLPurifier_AttrDef_Enum(array('normal')),
- new HTMLPurifier_AttrDef_CSS_Length()
- )
- );
-
- $this->info['font-size'] = new HTMLPurifier_AttrDef_CSS_Composite(
- array(
- new HTMLPurifier_AttrDef_Enum(
- array(
- 'xx-small',
- 'x-small',
- 'small',
- 'medium',
- 'large',
- 'x-large',
- 'xx-large',
- 'larger',
- 'smaller'
- )
- ),
- new HTMLPurifier_AttrDef_CSS_Percentage(),
- new HTMLPurifier_AttrDef_CSS_Length()
- )
- );
-
- $this->info['line-height'] = new HTMLPurifier_AttrDef_CSS_Composite(
- array(
- new HTMLPurifier_AttrDef_Enum(array('normal')),
- new HTMLPurifier_AttrDef_CSS_Number(true), // no negatives
- new HTMLPurifier_AttrDef_CSS_Length('0'),
- new HTMLPurifier_AttrDef_CSS_Percentage(true)
- )
- );
-
- $margin =
- $this->info['margin-top'] =
- $this->info['margin-bottom'] =
- $this->info['margin-left'] =
- $this->info['margin-right'] = new HTMLPurifier_AttrDef_CSS_Composite(
- array(
- new HTMLPurifier_AttrDef_CSS_Length(),
- new HTMLPurifier_AttrDef_CSS_Percentage(),
- new HTMLPurifier_AttrDef_Enum(array('auto'))
- )
- );
-
- $this->info['margin'] = new HTMLPurifier_AttrDef_CSS_Multiple($margin);
-
- // non-negative
- $padding =
- $this->info['padding-top'] =
- $this->info['padding-bottom'] =
- $this->info['padding-left'] =
- $this->info['padding-right'] = new HTMLPurifier_AttrDef_CSS_Composite(
- array(
- new HTMLPurifier_AttrDef_CSS_Length('0'),
- new HTMLPurifier_AttrDef_CSS_Percentage(true)
- )
- );
-
- $this->info['padding'] = new HTMLPurifier_AttrDef_CSS_Multiple($padding);
-
- $this->info['text-indent'] = new HTMLPurifier_AttrDef_CSS_Composite(
- array(
- new HTMLPurifier_AttrDef_CSS_Length(),
- new HTMLPurifier_AttrDef_CSS_Percentage()
- )
- );
-
- $trusted_wh = new HTMLPurifier_AttrDef_CSS_Composite(
- array(
- new HTMLPurifier_AttrDef_CSS_Length('0'),
- new HTMLPurifier_AttrDef_CSS_Percentage(true),
- new HTMLPurifier_AttrDef_Enum(array('auto'))
- )
- );
- $max = $config->get('CSS.MaxImgLength');
-
- $this->info['width'] =
- $this->info['height'] =
- $max === null ?
- $trusted_wh :
- new HTMLPurifier_AttrDef_Switch(
- 'img',
- // For img tags:
- new HTMLPurifier_AttrDef_CSS_Composite(
- array(
- new HTMLPurifier_AttrDef_CSS_Length('0', $max),
- new HTMLPurifier_AttrDef_Enum(array('auto'))
- )
- ),
- // For everyone else:
- $trusted_wh
- );
-
- $this->info['text-decoration'] = new HTMLPurifier_AttrDef_CSS_TextDecoration();
-
- $this->info['font-family'] = new HTMLPurifier_AttrDef_CSS_FontFamily();
-
- // this could use specialized code
- $this->info['font-weight'] = new HTMLPurifier_AttrDef_Enum(
- array(
- 'normal',
- 'bold',
- 'bolder',
- 'lighter',
- '100',
- '200',
- '300',
- '400',
- '500',
- '600',
- '700',
- '800',
- '900'
- ),
- false
- );
-
- // MUST be called after other font properties, as it references
- // a CSSDefinition object
- $this->info['font'] = new HTMLPurifier_AttrDef_CSS_Font($config);
-
- // same here
- $this->info['border'] =
- $this->info['border-bottom'] =
- $this->info['border-top'] =
- $this->info['border-left'] =
- $this->info['border-right'] = new HTMLPurifier_AttrDef_CSS_Border($config);
-
- $this->info['border-collapse'] = new HTMLPurifier_AttrDef_Enum(
- array('collapse', 'separate')
- );
-
- $this->info['caption-side'] = new HTMLPurifier_AttrDef_Enum(
- array('top', 'bottom')
- );
-
- $this->info['table-layout'] = new HTMLPurifier_AttrDef_Enum(
- array('auto', 'fixed')
- );
-
- $this->info['vertical-align'] = new HTMLPurifier_AttrDef_CSS_Composite(
- array(
- new HTMLPurifier_AttrDef_Enum(
- array(
- 'baseline',
- 'sub',
- 'super',
- 'top',
- 'text-top',
- 'middle',
- 'bottom',
- 'text-bottom'
- )
- ),
- new HTMLPurifier_AttrDef_CSS_Length(),
- new HTMLPurifier_AttrDef_CSS_Percentage()
- )
- );
-
- $this->info['border-spacing'] = new HTMLPurifier_AttrDef_CSS_Multiple(new HTMLPurifier_AttrDef_CSS_Length(), 2);
-
- // These CSS properties don't work on many browsers, but we live
- // in THE FUTURE!
- $this->info['white-space'] = new HTMLPurifier_AttrDef_Enum(
- array('nowrap', 'normal', 'pre', 'pre-wrap', 'pre-line')
- );
-
- if ($config->get('CSS.Proprietary')) {
- $this->doSetupProprietary($config);
- }
-
- if ($config->get('CSS.AllowTricky')) {
- $this->doSetupTricky($config);
- }
-
- if ($config->get('CSS.Trusted')) {
- $this->doSetupTrusted($config);
- }
-
- $allow_important = $config->get('CSS.AllowImportant');
- // wrap all attr-defs with decorator that handles !important
- foreach ($this->info as $k => $v) {
- $this->info[$k] = new HTMLPurifier_AttrDef_CSS_ImportantDecorator($v, $allow_important);
- }
-
- $this->setupConfigStuff($config);
- }
-
- /**
- * @param HTMLPurifier_Config $config
- */
- protected function doSetupProprietary($config)
- {
- // Internet Explorer only scrollbar colors
- $this->info['scrollbar-arrow-color'] = new HTMLPurifier_AttrDef_CSS_Color();
- $this->info['scrollbar-base-color'] = new HTMLPurifier_AttrDef_CSS_Color();
- $this->info['scrollbar-darkshadow-color'] = new HTMLPurifier_AttrDef_CSS_Color();
- $this->info['scrollbar-face-color'] = new HTMLPurifier_AttrDef_CSS_Color();
- $this->info['scrollbar-highlight-color'] = new HTMLPurifier_AttrDef_CSS_Color();
- $this->info['scrollbar-shadow-color'] = new HTMLPurifier_AttrDef_CSS_Color();
-
- // technically not proprietary, but CSS3, and no one supports it
- $this->info['opacity'] = new HTMLPurifier_AttrDef_CSS_AlphaValue();
- $this->info['-moz-opacity'] = new HTMLPurifier_AttrDef_CSS_AlphaValue();
- $this->info['-khtml-opacity'] = new HTMLPurifier_AttrDef_CSS_AlphaValue();
-
- // only opacity, for now
- $this->info['filter'] = new HTMLPurifier_AttrDef_CSS_Filter();
-
- // more CSS3
- $this->info['page-break-after'] =
- $this->info['page-break-before'] = new HTMLPurifier_AttrDef_Enum(
- array(
- 'auto',
- 'always',
- 'avoid',
- 'left',
- 'right'
- )
- );
- $this->info['page-break-inside'] = new HTMLPurifier_AttrDef_Enum(array('auto', 'avoid'));
-
- }
-
- /**
- * @param HTMLPurifier_Config $config
- */
- protected function doSetupTricky($config)
- {
- $this->info['display'] = new HTMLPurifier_AttrDef_Enum(
- array(
- 'inline',
- 'block',
- 'list-item',
- 'run-in',
- 'compact',
- 'marker',
- 'table',
- 'inline-block',
- 'inline-table',
- 'table-row-group',
- 'table-header-group',
- 'table-footer-group',
- 'table-row',
- 'table-column-group',
- 'table-column',
- 'table-cell',
- 'table-caption',
- 'none'
- )
- );
- $this->info['visibility'] = new HTMLPurifier_AttrDef_Enum(
- array('visible', 'hidden', 'collapse')
- );
- $this->info['overflow'] = new HTMLPurifier_AttrDef_Enum(array('visible', 'hidden', 'auto', 'scroll'));
- }
-
- /**
- * @param HTMLPurifier_Config $config
- */
- protected function doSetupTrusted($config)
- {
- $this->info['position'] = new HTMLPurifier_AttrDef_Enum(
- array('static', 'relative', 'absolute', 'fixed')
- );
- $this->info['top'] =
- $this->info['left'] =
- $this->info['right'] =
- $this->info['bottom'] = new HTMLPurifier_AttrDef_CSS_Composite(
- array(
- new HTMLPurifier_AttrDef_CSS_Length(),
- new HTMLPurifier_AttrDef_CSS_Percentage(),
- new HTMLPurifier_AttrDef_Enum(array('auto')),
- )
- );
- $this->info['z-index'] = new HTMLPurifier_AttrDef_CSS_Composite(
- array(
- new HTMLPurifier_AttrDef_Integer(),
- new HTMLPurifier_AttrDef_Enum(array('auto')),
- )
- );
- }
-
- /**
- * Performs extra config-based processing. Based off of
- * HTMLPurifier_HTMLDefinition.
- * @param HTMLPurifier_Config $config
- * @todo Refactor duplicate elements into common class (probably using
- * composition, not inheritance).
- */
- protected function setupConfigStuff($config)
- {
- // setup allowed elements
- $support = "(for information on implementing this, see the " .
- "support forums) ";
- $allowed_properties = $config->get('CSS.AllowedProperties');
- if ($allowed_properties !== null) {
- foreach ($this->info as $name => $d) {
- if (!isset($allowed_properties[$name])) {
- unset($this->info[$name]);
- }
- unset($allowed_properties[$name]);
- }
- // emit errors
- foreach ($allowed_properties as $name => $d) {
- // :TODO: Is this htmlspecialchars() call really necessary?
- $name = htmlspecialchars($name);
- trigger_error("Style attribute '$name' is not supported $support", E_USER_WARNING);
- }
- }
-
- $forbidden_properties = $config->get('CSS.ForbiddenProperties');
- if ($forbidden_properties !== null) {
- foreach ($this->info as $name => $d) {
- if (isset($forbidden_properties[$name])) {
- unset($this->info[$name]);
- }
- }
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Defines allowed CSS attributes and what their values are.
+ * @see HTMLPurifier_HTMLDefinition
+ */
+class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
+{
+
+ public $type = 'CSS';
+
+ /**
+ * Assoc array of attribute name to definition object.
+ * @type HTMLPurifier_AttrDef[]
+ */
+ public $info = array();
+
+ /**
+ * Constructs the info array. The meat of this class.
+ * @param HTMLPurifier_Config $config
+ */
+ protected function doSetup($config)
+ {
+ $this->info['text-align'] = new HTMLPurifier_AttrDef_Enum(
+ array('left', 'right', 'center', 'justify'),
+ false
+ );
+
+ $border_style =
+ $this->info['border-bottom-style'] =
+ $this->info['border-right-style'] =
+ $this->info['border-left-style'] =
+ $this->info['border-top-style'] = new HTMLPurifier_AttrDef_Enum(
+ array(
+ 'none',
+ 'hidden',
+ 'dotted',
+ 'dashed',
+ 'solid',
+ 'double',
+ 'groove',
+ 'ridge',
+ 'inset',
+ 'outset'
+ ),
+ false
+ );
+
+ $this->info['border-style'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_style);
+
+ $this->info['clear'] = new HTMLPurifier_AttrDef_Enum(
+ array('none', 'left', 'right', 'both'),
+ false
+ );
+ $this->info['float'] = new HTMLPurifier_AttrDef_Enum(
+ array('none', 'left', 'right'),
+ false
+ );
+ $this->info['font-style'] = new HTMLPurifier_AttrDef_Enum(
+ array('normal', 'italic', 'oblique'),
+ false
+ );
+ $this->info['font-variant'] = new HTMLPurifier_AttrDef_Enum(
+ array('normal', 'small-caps'),
+ false
+ );
+
+ $uri_or_none = new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_Enum(array('none')),
+ new HTMLPurifier_AttrDef_CSS_URI()
+ )
+ );
+
+ $this->info['list-style-position'] = new HTMLPurifier_AttrDef_Enum(
+ array('inside', 'outside'),
+ false
+ );
+ $this->info['list-style-type'] = new HTMLPurifier_AttrDef_Enum(
+ array(
+ 'disc',
+ 'circle',
+ 'square',
+ 'decimal',
+ 'lower-roman',
+ 'upper-roman',
+ 'lower-alpha',
+ 'upper-alpha',
+ 'none'
+ ),
+ false
+ );
+ $this->info['list-style-image'] = $uri_or_none;
+
+ $this->info['list-style'] = new HTMLPurifier_AttrDef_CSS_ListStyle($config);
+
+ $this->info['text-transform'] = new HTMLPurifier_AttrDef_Enum(
+ array('capitalize', 'uppercase', 'lowercase', 'none'),
+ false
+ );
+ $this->info['color'] = new HTMLPurifier_AttrDef_CSS_Color();
+
+ $this->info['background-image'] = $uri_or_none;
+ $this->info['background-repeat'] = new HTMLPurifier_AttrDef_Enum(
+ array('repeat', 'repeat-x', 'repeat-y', 'no-repeat')
+ );
+ $this->info['background-attachment'] = new HTMLPurifier_AttrDef_Enum(
+ array('scroll', 'fixed')
+ );
+ $this->info['background-position'] = new HTMLPurifier_AttrDef_CSS_BackgroundPosition();
+
+ $border_color =
+ $this->info['border-top-color'] =
+ $this->info['border-bottom-color'] =
+ $this->info['border-left-color'] =
+ $this->info['border-right-color'] =
+ $this->info['background-color'] = new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_Enum(array('transparent')),
+ new HTMLPurifier_AttrDef_CSS_Color()
+ )
+ );
+
+ $this->info['background'] = new HTMLPurifier_AttrDef_CSS_Background($config);
+
+ $this->info['border-color'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_color);
+
+ $border_width =
+ $this->info['border-top-width'] =
+ $this->info['border-bottom-width'] =
+ $this->info['border-left-width'] =
+ $this->info['border-right-width'] = new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_Enum(array('thin', 'medium', 'thick')),
+ new HTMLPurifier_AttrDef_CSS_Length('0') //disallow negative
+ )
+ );
+
+ $this->info['border-width'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_width);
+
+ $this->info['letter-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_Enum(array('normal')),
+ new HTMLPurifier_AttrDef_CSS_Length()
+ )
+ );
+
+ $this->info['word-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_Enum(array('normal')),
+ new HTMLPurifier_AttrDef_CSS_Length()
+ )
+ );
+
+ $this->info['font-size'] = new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_Enum(
+ array(
+ 'xx-small',
+ 'x-small',
+ 'small',
+ 'medium',
+ 'large',
+ 'x-large',
+ 'xx-large',
+ 'larger',
+ 'smaller'
+ )
+ ),
+ new HTMLPurifier_AttrDef_CSS_Percentage(),
+ new HTMLPurifier_AttrDef_CSS_Length()
+ )
+ );
+
+ $this->info['line-height'] = new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_Enum(array('normal')),
+ new HTMLPurifier_AttrDef_CSS_Number(true), // no negatives
+ new HTMLPurifier_AttrDef_CSS_Length('0'),
+ new HTMLPurifier_AttrDef_CSS_Percentage(true)
+ )
+ );
+
+ $margin =
+ $this->info['margin-top'] =
+ $this->info['margin-bottom'] =
+ $this->info['margin-left'] =
+ $this->info['margin-right'] = new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_CSS_Length(),
+ new HTMLPurifier_AttrDef_CSS_Percentage(),
+ new HTMLPurifier_AttrDef_Enum(array('auto'))
+ )
+ );
+
+ $this->info['margin'] = new HTMLPurifier_AttrDef_CSS_Multiple($margin);
+
+ // non-negative
+ $padding =
+ $this->info['padding-top'] =
+ $this->info['padding-bottom'] =
+ $this->info['padding-left'] =
+ $this->info['padding-right'] = new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_CSS_Length('0'),
+ new HTMLPurifier_AttrDef_CSS_Percentage(true)
+ )
+ );
+
+ $this->info['padding'] = new HTMLPurifier_AttrDef_CSS_Multiple($padding);
+
+ $this->info['text-indent'] = new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_CSS_Length(),
+ new HTMLPurifier_AttrDef_CSS_Percentage()
+ )
+ );
+
+ $trusted_wh = new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_CSS_Length('0'),
+ new HTMLPurifier_AttrDef_CSS_Percentage(true),
+ new HTMLPurifier_AttrDef_Enum(array('auto'))
+ )
+ );
+ $max = $config->get('CSS.MaxImgLength');
+
+ $this->info['width'] =
+ $this->info['height'] =
+ $max === null ?
+ $trusted_wh :
+ new HTMLPurifier_AttrDef_Switch(
+ 'img',
+ // For img tags:
+ new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_CSS_Length('0', $max),
+ new HTMLPurifier_AttrDef_Enum(array('auto'))
+ )
+ ),
+ // For everyone else:
+ $trusted_wh
+ );
+
+ $this->info['text-decoration'] = new HTMLPurifier_AttrDef_CSS_TextDecoration();
+
+ $this->info['font-family'] = new HTMLPurifier_AttrDef_CSS_FontFamily();
+
+ // this could use specialized code
+ $this->info['font-weight'] = new HTMLPurifier_AttrDef_Enum(
+ array(
+ 'normal',
+ 'bold',
+ 'bolder',
+ 'lighter',
+ '100',
+ '200',
+ '300',
+ '400',
+ '500',
+ '600',
+ '700',
+ '800',
+ '900'
+ ),
+ false
+ );
+
+ // MUST be called after other font properties, as it references
+ // a CSSDefinition object
+ $this->info['font'] = new HTMLPurifier_AttrDef_CSS_Font($config);
+
+ // same here
+ $this->info['border'] =
+ $this->info['border-bottom'] =
+ $this->info['border-top'] =
+ $this->info['border-left'] =
+ $this->info['border-right'] = new HTMLPurifier_AttrDef_CSS_Border($config);
+
+ $this->info['border-collapse'] = new HTMLPurifier_AttrDef_Enum(
+ array('collapse', 'separate')
+ );
+
+ $this->info['caption-side'] = new HTMLPurifier_AttrDef_Enum(
+ array('top', 'bottom')
+ );
+
+ $this->info['table-layout'] = new HTMLPurifier_AttrDef_Enum(
+ array('auto', 'fixed')
+ );
+
+ $this->info['vertical-align'] = new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_Enum(
+ array(
+ 'baseline',
+ 'sub',
+ 'super',
+ 'top',
+ 'text-top',
+ 'middle',
+ 'bottom',
+ 'text-bottom'
+ )
+ ),
+ new HTMLPurifier_AttrDef_CSS_Length(),
+ new HTMLPurifier_AttrDef_CSS_Percentage()
+ )
+ );
+
+ $this->info['border-spacing'] = new HTMLPurifier_AttrDef_CSS_Multiple(new HTMLPurifier_AttrDef_CSS_Length(), 2);
+
+ // These CSS properties don't work on many browsers, but we live
+ // in THE FUTURE!
+ $this->info['white-space'] = new HTMLPurifier_AttrDef_Enum(
+ array('nowrap', 'normal', 'pre', 'pre-wrap', 'pre-line')
+ );
+
+ if ($config->get('CSS.Proprietary')) {
+ $this->doSetupProprietary($config);
+ }
+
+ if ($config->get('CSS.AllowTricky')) {
+ $this->doSetupTricky($config);
+ }
+
+ if ($config->get('CSS.Trusted')) {
+ $this->doSetupTrusted($config);
+ }
+
+ $allow_important = $config->get('CSS.AllowImportant');
+ // wrap all attr-defs with decorator that handles !important
+ foreach ($this->info as $k => $v) {
+ $this->info[$k] = new HTMLPurifier_AttrDef_CSS_ImportantDecorator($v, $allow_important);
+ }
+
+ $this->setupConfigStuff($config);
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ protected function doSetupProprietary($config)
+ {
+ // Internet Explorer only scrollbar colors
+ $this->info['scrollbar-arrow-color'] = new HTMLPurifier_AttrDef_CSS_Color();
+ $this->info['scrollbar-base-color'] = new HTMLPurifier_AttrDef_CSS_Color();
+ $this->info['scrollbar-darkshadow-color'] = new HTMLPurifier_AttrDef_CSS_Color();
+ $this->info['scrollbar-face-color'] = new HTMLPurifier_AttrDef_CSS_Color();
+ $this->info['scrollbar-highlight-color'] = new HTMLPurifier_AttrDef_CSS_Color();
+ $this->info['scrollbar-shadow-color'] = new HTMLPurifier_AttrDef_CSS_Color();
+
+ // vendor specific prefixes of opacity
+ $this->info['-moz-opacity'] = new HTMLPurifier_AttrDef_CSS_AlphaValue();
+ $this->info['-khtml-opacity'] = new HTMLPurifier_AttrDef_CSS_AlphaValue();
+
+ // only opacity, for now
+ $this->info['filter'] = new HTMLPurifier_AttrDef_CSS_Filter();
+
+ // more CSS3
+ $this->info['page-break-after'] =
+ $this->info['page-break-before'] = new HTMLPurifier_AttrDef_Enum(
+ array(
+ 'auto',
+ 'always',
+ 'avoid',
+ 'left',
+ 'right'
+ )
+ );
+ $this->info['page-break-inside'] = new HTMLPurifier_AttrDef_Enum(array('auto', 'avoid'));
+
+ $border_radius = new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_CSS_Percentage(true), // disallow negative
+ new HTMLPurifier_AttrDef_CSS_Length('0') // disallow negative
+ ));
+
+ $this->info['border-top-left-radius'] =
+ $this->info['border-top-right-radius'] =
+ $this->info['border-bottom-right-radius'] =
+ $this->info['border-bottom-left-radius'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_radius, 2);
+ // TODO: support SLASH syntax
+ $this->info['border-radius'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_radius, 4);
+
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ protected function doSetupTricky($config)
+ {
+ $this->info['display'] = new HTMLPurifier_AttrDef_Enum(
+ array(
+ 'inline',
+ 'block',
+ 'list-item',
+ 'run-in',
+ 'compact',
+ 'marker',
+ 'table',
+ 'inline-block',
+ 'inline-table',
+ 'table-row-group',
+ 'table-header-group',
+ 'table-footer-group',
+ 'table-row',
+ 'table-column-group',
+ 'table-column',
+ 'table-cell',
+ 'table-caption',
+ 'none'
+ )
+ );
+ $this->info['visibility'] = new HTMLPurifier_AttrDef_Enum(
+ array('visible', 'hidden', 'collapse')
+ );
+ $this->info['overflow'] = new HTMLPurifier_AttrDef_Enum(array('visible', 'hidden', 'auto', 'scroll'));
+ $this->info['opacity'] = new HTMLPurifier_AttrDef_CSS_AlphaValue();
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ protected function doSetupTrusted($config)
+ {
+ $this->info['position'] = new HTMLPurifier_AttrDef_Enum(
+ array('static', 'relative', 'absolute', 'fixed')
+ );
+ $this->info['top'] =
+ $this->info['left'] =
+ $this->info['right'] =
+ $this->info['bottom'] = new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_CSS_Length(),
+ new HTMLPurifier_AttrDef_CSS_Percentage(),
+ new HTMLPurifier_AttrDef_Enum(array('auto')),
+ )
+ );
+ $this->info['z-index'] = new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_Integer(),
+ new HTMLPurifier_AttrDef_Enum(array('auto')),
+ )
+ );
+ }
+
+ /**
+ * Performs extra config-based processing. Based off of
+ * HTMLPurifier_HTMLDefinition.
+ * @param HTMLPurifier_Config $config
+ * @todo Refactor duplicate elements into common class (probably using
+ * composition, not inheritance).
+ */
+ protected function setupConfigStuff($config)
+ {
+ // setup allowed elements
+ $support = "(for information on implementing this, see the " .
+ "support forums) ";
+ $allowed_properties = $config->get('CSS.AllowedProperties');
+ if ($allowed_properties !== null) {
+ foreach ($this->info as $name => $d) {
+ if (!isset($allowed_properties[$name])) {
+ unset($this->info[$name]);
+ }
+ unset($allowed_properties[$name]);
+ }
+ // emit errors
+ foreach ($allowed_properties as $name => $d) {
+ // :TODO: Is this htmlspecialchars() call really necessary?
+ $name = htmlspecialchars($name);
+ trigger_error("Style attribute '$name' is not supported $support", E_USER_WARNING);
+ }
+ }
+
+ $forbidden_properties = $config->get('CSS.ForbiddenProperties');
+ if ($forbidden_properties !== null) {
+ foreach ($this->info as $name => $d) {
+ if (isset($forbidden_properties[$name])) {
+ unset($this->info[$name]);
+ }
+ }
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef.php
index 5d64cd4..8eb17b8 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef.php
@@ -1,52 +1,52 @@
-<?php
-
-/**
- * Defines allowed child nodes and validates nodes against it.
- */
-abstract class HTMLPurifier_ChildDef
-{
- /**
- * Type of child definition, usually right-most part of class name lowercase.
- * Used occasionally in terms of context.
- * @type string
- */
- public $type;
-
- /**
- * Indicates whether or not an empty array of children is okay.
- *
- * This is necessary for redundant checking when changes affecting
- * a child node may cause a parent node to now be disallowed.
- * @type bool
- */
- public $allow_empty;
-
- /**
- * Lookup array of all elements that this definition could possibly allow.
- * @type array
- */
- public $elements = array();
-
- /**
- * Get lookup of tag names that should not close this element automatically.
- * All other elements will do so.
- * @param HTMLPurifier_Config $config HTMLPurifier_Config object
- * @return array
- */
- public function getAllowedElements($config)
- {
- return $this->elements;
- }
-
- /**
- * Validates nodes according to definition and returns modification.
- *
- * @param HTMLPurifier_Node[] $children Array of HTMLPurifier_Node
- * @param HTMLPurifier_Config $config HTMLPurifier_Config object
- * @param HTMLPurifier_Context $context HTMLPurifier_Context object
- * @return bool|array true to leave nodes as is, false to remove parent node, array of replacement children
- */
- abstract public function validateChildren($children, $config, $context);
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Defines allowed child nodes and validates nodes against it.
+ */
+abstract class HTMLPurifier_ChildDef
+{
+ /**
+ * Type of child definition, usually right-most part of class name lowercase.
+ * Used occasionally in terms of context.
+ * @type string
+ */
+ public $type;
+
+ /**
+ * Indicates whether or not an empty array of children is okay.
+ *
+ * This is necessary for redundant checking when changes affecting
+ * a child node may cause a parent node to now be disallowed.
+ * @type bool
+ */
+ public $allow_empty;
+
+ /**
+ * Lookup array of all elements that this definition could possibly allow.
+ * @type array
+ */
+ public $elements = array();
+
+ /**
+ * Get lookup of tag names that should not close this element automatically.
+ * All other elements will do so.
+ * @param HTMLPurifier_Config $config HTMLPurifier_Config object
+ * @return array
+ */
+ public function getAllowedElements($config)
+ {
+ return $this->elements;
+ }
+
+ /**
+ * Validates nodes according to definition and returns modification.
+ *
+ * @param HTMLPurifier_Node[] $children Array of HTMLPurifier_Node
+ * @param HTMLPurifier_Config $config HTMLPurifier_Config object
+ * @param HTMLPurifier_Context $context HTMLPurifier_Context object
+ * @return bool|array true to leave nodes as is, false to remove parent node, array of replacement children
+ */
+ abstract public function validateChildren($children, $config, $context);
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Chameleon.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Chameleon.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Chameleon.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Chameleon.php
index f6b2f22..7439be2 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Chameleon.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Chameleon.php
@@ -1,67 +1,67 @@
-<?php
-
-/**
- * Definition that uses different definitions depending on context.
- *
- * The del and ins tags are notable because they allow different types of
- * elements depending on whether or not they're in a block or inline context.
- * Chameleon allows this behavior to happen by using two different
- * definitions depending on context. While this somewhat generalized,
- * it is specifically intended for those two tags.
- */
-class HTMLPurifier_ChildDef_Chameleon extends HTMLPurifier_ChildDef
-{
-
- /**
- * Instance of the definition object to use when inline. Usually stricter.
- * @type HTMLPurifier_ChildDef_Optional
- */
- public $inline;
-
- /**
- * Instance of the definition object to use when block.
- * @type HTMLPurifier_ChildDef_Optional
- */
- public $block;
-
- /**
- * @type string
- */
- public $type = 'chameleon';
-
- /**
- * @param array $inline List of elements to allow when inline.
- * @param array $block List of elements to allow when block.
- */
- public function __construct($inline, $block)
- {
- $this->inline = new HTMLPurifier_ChildDef_Optional($inline);
- $this->block = new HTMLPurifier_ChildDef_Optional($block);
- $this->elements = $this->block->elements;
- }
-
- /**
- * @param HTMLPurifier_Node[] $children
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function validateChildren($children, $config, $context)
- {
- if ($context->get('IsInline') === false) {
- return $this->block->validateChildren(
- $children,
- $config,
- $context
- );
- } else {
- return $this->inline->validateChildren(
- $children,
- $config,
- $context
- );
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Definition that uses different definitions depending on context.
+ *
+ * The del and ins tags are notable because they allow different types of
+ * elements depending on whether or not they're in a block or inline context.
+ * Chameleon allows this behavior to happen by using two different
+ * definitions depending on context. While this somewhat generalized,
+ * it is specifically intended for those two tags.
+ */
+class HTMLPurifier_ChildDef_Chameleon extends HTMLPurifier_ChildDef
+{
+
+ /**
+ * Instance of the definition object to use when inline. Usually stricter.
+ * @type HTMLPurifier_ChildDef_Optional
+ */
+ public $inline;
+
+ /**
+ * Instance of the definition object to use when block.
+ * @type HTMLPurifier_ChildDef_Optional
+ */
+ public $block;
+
+ /**
+ * @type string
+ */
+ public $type = 'chameleon';
+
+ /**
+ * @param array $inline List of elements to allow when inline.
+ * @param array $block List of elements to allow when block.
+ */
+ public function __construct($inline, $block)
+ {
+ $this->inline = new HTMLPurifier_ChildDef_Optional($inline);
+ $this->block = new HTMLPurifier_ChildDef_Optional($block);
+ $this->elements = $this->block->elements;
+ }
+
+ /**
+ * @param HTMLPurifier_Node[] $children
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function validateChildren($children, $config, $context)
+ {
+ if ($context->get('IsInline') === false) {
+ return $this->block->validateChildren(
+ $children,
+ $config,
+ $context
+ );
+ } else {
+ return $this->inline->validateChildren(
+ $children,
+ $config,
+ $context
+ );
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Custom.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Custom.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Custom.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Custom.php
index 1047cd8..128132e 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Custom.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Custom.php
@@ -1,102 +1,102 @@
-<?php
-
-/**
- * Custom validation class, accepts DTD child definitions
- *
- * @warning Currently this class is an all or nothing proposition, that is,
- * it will only give a bool return value.
- */
-class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef
-{
- /**
- * @type string
- */
- public $type = 'custom';
-
- /**
- * @type bool
- */
- public $allow_empty = false;
-
- /**
- * Allowed child pattern as defined by the DTD.
- * @type string
- */
- public $dtd_regex;
-
- /**
- * PCRE regex derived from $dtd_regex.
- * @type string
- */
- private $_pcre_regex;
-
- /**
- * @param $dtd_regex Allowed child pattern from the DTD
- */
- public function __construct($dtd_regex)
- {
- $this->dtd_regex = $dtd_regex;
- $this->_compileRegex();
- }
-
- /**
- * Compiles the PCRE regex from a DTD regex ($dtd_regex to $_pcre_regex)
- */
- protected function _compileRegex()
- {
- $raw = str_replace(' ', '', $this->dtd_regex);
- if ($raw{0} != '(') {
- $raw = "($raw)";
- }
- $el = '[#a-zA-Z0-9_.-]+';
- $reg = $raw;
-
- // COMPLICATED! AND MIGHT BE BUGGY! I HAVE NO CLUE WHAT I'M
- // DOING! Seriously: if there's problems, please report them.
-
- // collect all elements into the $elements array
- preg_match_all("/$el/", $reg, $matches);
- foreach ($matches[0] as $match) {
- $this->elements[$match] = true;
- }
-
- // setup all elements as parentheticals with leading commas
- $reg = preg_replace("/$el/", '(,\\0)', $reg);
-
- // remove commas when they were not solicited
- $reg = preg_replace("/([^,(|]\(+),/", '\\1', $reg);
-
- // remove all non-paranthetical commas: they are handled by first regex
- $reg = preg_replace("/,\(/", '(', $reg);
-
- $this->_pcre_regex = $reg;
- }
-
- /**
- * @param HTMLPurifier_Node[] $children
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function validateChildren($children, $config, $context)
- {
- $list_of_children = '';
- $nesting = 0; // depth into the nest
- foreach ($children as $node) {
- if (!empty($node->is_whitespace)) {
- continue;
- }
- $list_of_children .= $node->name . ',';
- }
- // add leading comma to deal with stray comma declarations
- $list_of_children = ',' . rtrim($list_of_children, ',');
- $okay =
- preg_match(
- '/^,?' . $this->_pcre_regex . '$/',
- $list_of_children
- );
- return (bool)$okay;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Custom validation class, accepts DTD child definitions
+ *
+ * @warning Currently this class is an all or nothing proposition, that is,
+ * it will only give a bool return value.
+ */
+class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef
+{
+ /**
+ * @type string
+ */
+ public $type = 'custom';
+
+ /**
+ * @type bool
+ */
+ public $allow_empty = false;
+
+ /**
+ * Allowed child pattern as defined by the DTD.
+ * @type string
+ */
+ public $dtd_regex;
+
+ /**
+ * PCRE regex derived from $dtd_regex.
+ * @type string
+ */
+ private $_pcre_regex;
+
+ /**
+ * @param $dtd_regex Allowed child pattern from the DTD
+ */
+ public function __construct($dtd_regex)
+ {
+ $this->dtd_regex = $dtd_regex;
+ $this->_compileRegex();
+ }
+
+ /**
+ * Compiles the PCRE regex from a DTD regex ($dtd_regex to $_pcre_regex)
+ */
+ protected function _compileRegex()
+ {
+ $raw = str_replace(' ', '', $this->dtd_regex);
+ if ($raw{0} != '(') {
+ $raw = "($raw)";
+ }
+ $el = '[#a-zA-Z0-9_.-]+';
+ $reg = $raw;
+
+ // COMPLICATED! AND MIGHT BE BUGGY! I HAVE NO CLUE WHAT I'M
+ // DOING! Seriously: if there's problems, please report them.
+
+ // collect all elements into the $elements array
+ preg_match_all("/$el/", $reg, $matches);
+ foreach ($matches[0] as $match) {
+ $this->elements[$match] = true;
+ }
+
+ // setup all elements as parentheticals with leading commas
+ $reg = preg_replace("/$el/", '(,\\0)', $reg);
+
+ // remove commas when they were not solicited
+ $reg = preg_replace("/([^,(|]\(+),/", '\\1', $reg);
+
+ // remove all non-paranthetical commas: they are handled by first regex
+ $reg = preg_replace("/,\(/", '(', $reg);
+
+ $this->_pcre_regex = $reg;
+ }
+
+ /**
+ * @param HTMLPurifier_Node[] $children
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function validateChildren($children, $config, $context)
+ {
+ $list_of_children = '';
+ $nesting = 0; // depth into the nest
+ foreach ($children as $node) {
+ if (!empty($node->is_whitespace)) {
+ continue;
+ }
+ $list_of_children .= $node->name . ',';
+ }
+ // add leading comma to deal with stray comma declarations
+ $list_of_children = ',' . rtrim($list_of_children, ',');
+ $okay =
+ preg_match(
+ '/^,?' . $this->_pcre_regex . '$/',
+ $list_of_children
+ );
+ return (bool)$okay;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Empty.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Empty.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Empty.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Empty.php
index bbcde56..a8a6cbd 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Empty.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Empty.php
@@ -1,38 +1,38 @@
-<?php
-
-/**
- * Definition that disallows all elements.
- * @warning validateChildren() in this class is actually never called, because
- * empty elements are corrected in HTMLPurifier_Strategy_MakeWellFormed
- * before child definitions are parsed in earnest by
- * HTMLPurifier_Strategy_FixNesting.
- */
-class HTMLPurifier_ChildDef_Empty extends HTMLPurifier_ChildDef
-{
- /**
- * @type bool
- */
- public $allow_empty = true;
-
- /**
- * @type string
- */
- public $type = 'empty';
-
- public function __construct()
- {
- }
-
- /**
- * @param HTMLPurifier_Node[] $children
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function validateChildren($children, $config, $context)
- {
- return array();
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Definition that disallows all elements.
+ * @warning validateChildren() in this class is actually never called, because
+ * empty elements are corrected in HTMLPurifier_Strategy_MakeWellFormed
+ * before child definitions are parsed in earnest by
+ * HTMLPurifier_Strategy_FixNesting.
+ */
+class HTMLPurifier_ChildDef_Empty extends HTMLPurifier_ChildDef
+{
+ /**
+ * @type bool
+ */
+ public $allow_empty = true;
+
+ /**
+ * @type string
+ */
+ public $type = 'empty';
+
+ public function __construct()
+ {
+ }
+
+ /**
+ * @param HTMLPurifier_Node[] $children
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function validateChildren($children, $config, $context)
+ {
+ return array();
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/List.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/List.php
similarity index 92%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/List.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/List.php
index 5cd76a1..5a53a4b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/List.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/List.php
@@ -1,86 +1,92 @@
-<?php
-
-/**
- * Definition for list containers ul and ol.
- *
- * What does this do? The big thing is to handle ol/ul at the top
- * level of list nodes, which should be handled specially by /folding/
- * them into the previous list node. We generally shouldn't ever
- * see other disallowed elements, because the autoclose behavior
- * in MakeWellFormed handles it.
- */
-class HTMLPurifier_ChildDef_List extends HTMLPurifier_ChildDef
-{
- /**
- * @type string
- */
- public $type = 'list';
- /**
- * @type array
- */
- // lying a little bit, so that we can handle ul and ol ourselves
- // XXX: This whole business with 'wrap' is all a bit unsatisfactory
- public $elements = array('li' => true, 'ul' => true, 'ol' => true);
-
- /**
- * @param array $children
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function validateChildren($children, $config, $context)
- {
- // Flag for subclasses
- $this->whitespace = false;
-
- // if there are no tokens, delete parent node
- if (empty($children)) {
- return false;
- }
-
- // the new set of children
- $result = array();
-
- // a little sanity check to make sure it's not ALL whitespace
- $all_whitespace = true;
-
- $current_li = false;
-
- foreach ($children as $node) {
- if (!empty($node->is_whitespace)) {
- $result[] = $node;
- continue;
- }
- $all_whitespace = false; // phew, we're not talking about whitespace
-
- if ($node->name === 'li') {
- // good
- $current_li = $node;
- $result[] = $node;
- } else {
- // we want to tuck this into the previous li
- // Invariant: we expect the node to be ol/ul
- // ToDo: Make this more robust in the case of not ol/ul
- // by distinguishing between existing li and li created
- // to handle non-list elements; non-list elements should
- // not be appended to an existing li; only li created
- // for non-list. This distinction is not currently made.
- if ($current_li === false) {
- $current_li = new HTMLPurifier_Node_Element('li');
- $result[] = $current_li;
- }
- $current_li->children[] = $node;
- $current_li->empty = false; // XXX fascinating! Check for this error elsewhere ToDo
- }
- }
- if (empty($result)) {
- return false;
- }
- if ($all_whitespace) {
- return false;
- }
- return $result;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Definition for list containers ul and ol.
+ *
+ * What does this do? The big thing is to handle ol/ul at the top
+ * level of list nodes, which should be handled specially by /folding/
+ * them into the previous list node. We generally shouldn't ever
+ * see other disallowed elements, because the autoclose behavior
+ * in MakeWellFormed handles it.
+ */
+class HTMLPurifier_ChildDef_List extends HTMLPurifier_ChildDef
+{
+ /**
+ * @type string
+ */
+ public $type = 'list';
+ /**
+ * @type array
+ */
+ // lying a little bit, so that we can handle ul and ol ourselves
+ // XXX: This whole business with 'wrap' is all a bit unsatisfactory
+ public $elements = array('li' => true, 'ul' => true, 'ol' => true);
+
+ /**
+ * @param array $children
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function validateChildren($children, $config, $context)
+ {
+ // Flag for subclasses
+ $this->whitespace = false;
+
+ // if there are no tokens, delete parent node
+ if (empty($children)) {
+ return false;
+ }
+
+ // if li is not allowed, delete parent node
+ if (!isset($config->getHTMLDefinition()->info['li'])) {
+ trigger_error("Cannot allow ul/ol without allowing li", E_USER_WARNING);
+ return false;
+ }
+
+ // the new set of children
+ $result = array();
+
+ // a little sanity check to make sure it's not ALL whitespace
+ $all_whitespace = true;
+
+ $current_li = false;
+
+ foreach ($children as $node) {
+ if (!empty($node->is_whitespace)) {
+ $result[] = $node;
+ continue;
+ }
+ $all_whitespace = false; // phew, we're not talking about whitespace
+
+ if ($node->name === 'li') {
+ // good
+ $current_li = $node;
+ $result[] = $node;
+ } else {
+ // we want to tuck this into the previous li
+ // Invariant: we expect the node to be ol/ul
+ // ToDo: Make this more robust in the case of not ol/ul
+ // by distinguishing between existing li and li created
+ // to handle non-list elements; non-list elements should
+ // not be appended to an existing li; only li created
+ // for non-list. This distinction is not currently made.
+ if ($current_li === false) {
+ $current_li = new HTMLPurifier_Node_Element('li');
+ $result[] = $current_li;
+ }
+ $current_li->children[] = $node;
+ $current_li->empty = false; // XXX fascinating! Check for this error elsewhere ToDo
+ }
+ }
+ if (empty($result)) {
+ return false;
+ }
+ if ($all_whitespace) {
+ return false;
+ }
+ return $result;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Optional.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Optional.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Optional.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Optional.php
index 1db864d..b946806 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Optional.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Optional.php
@@ -1,45 +1,45 @@
-<?php
-
-/**
- * Definition that allows a set of elements, and allows no children.
- * @note This is a hack to reuse code from HTMLPurifier_ChildDef_Required,
- * really, one shouldn't inherit from the other. Only altered behavior
- * is to overload a returned false with an array. Thus, it will never
- * return false.
- */
-class HTMLPurifier_ChildDef_Optional extends HTMLPurifier_ChildDef_Required
-{
- /**
- * @type bool
- */
- public $allow_empty = true;
-
- /**
- * @type string
- */
- public $type = 'optional';
-
- /**
- * @param array $children
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function validateChildren($children, $config, $context)
- {
- $result = parent::validateChildren($children, $config, $context);
- // we assume that $children is not modified
- if ($result === false) {
- if (empty($children)) {
- return true;
- } elseif ($this->whitespace) {
- return $children;
- } else {
- return array();
- }
- }
- return $result;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Definition that allows a set of elements, and allows no children.
+ * @note This is a hack to reuse code from HTMLPurifier_ChildDef_Required,
+ * really, one shouldn't inherit from the other. Only altered behavior
+ * is to overload a returned false with an array. Thus, it will never
+ * return false.
+ */
+class HTMLPurifier_ChildDef_Optional extends HTMLPurifier_ChildDef_Required
+{
+ /**
+ * @type bool
+ */
+ public $allow_empty = true;
+
+ /**
+ * @type string
+ */
+ public $type = 'optional';
+
+ /**
+ * @param array $children
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function validateChildren($children, $config, $context)
+ {
+ $result = parent::validateChildren($children, $config, $context);
+ // we assume that $children is not modified
+ if ($result === false) {
+ if (empty($children)) {
+ return true;
+ } elseif ($this->whitespace) {
+ return $children;
+ } else {
+ return array();
+ }
+ }
+ return $result;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Required.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Required.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Required.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Required.php
index f6b8e8a..0d1c8f5 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Required.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Required.php
@@ -1,118 +1,118 @@
-<?php
-
-/**
- * Definition that allows a set of elements, but disallows empty children.
- */
-class HTMLPurifier_ChildDef_Required extends HTMLPurifier_ChildDef
-{
- /**
- * Lookup table of allowed elements.
- * @type array
- */
- public $elements = array();
-
- /**
- * Whether or not the last passed node was all whitespace.
- * @type bool
- */
- protected $whitespace = false;
-
- /**
- * @param array|string $elements List of allowed element names (lowercase).
- */
- public function __construct($elements)
- {
- if (is_string($elements)) {
- $elements = str_replace(' ', '', $elements);
- $elements = explode('|', $elements);
- }
- $keys = array_keys($elements);
- if ($keys == array_keys($keys)) {
- $elements = array_flip($elements);
- foreach ($elements as $i => $x) {
- $elements[$i] = true;
- if (empty($i)) {
- unset($elements[$i]);
- } // remove blank
- }
- }
- $this->elements = $elements;
- }
-
- /**
- * @type bool
- */
- public $allow_empty = false;
-
- /**
- * @type string
- */
- public $type = 'required';
-
- /**
- * @param array $children
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function validateChildren($children, $config, $context)
- {
- // Flag for subclasses
- $this->whitespace = false;
-
- // if there are no tokens, delete parent node
- if (empty($children)) {
- return false;
- }
-
- // the new set of children
- $result = array();
-
- // whether or not parsed character data is allowed
- // this controls whether or not we silently drop a tag
- // or generate escaped HTML from it
- $pcdata_allowed = isset($this->elements['#PCDATA']);
-
- // a little sanity check to make sure it's not ALL whitespace
- $all_whitespace = true;
-
- $stack = array_reverse($children);
- while (!empty($stack)) {
- $node = array_pop($stack);
- if (!empty($node->is_whitespace)) {
- $result[] = $node;
- continue;
- }
- $all_whitespace = false; // phew, we're not talking about whitespace
-
- if (!isset($this->elements[$node->name])) {
- // special case text
- // XXX One of these ought to be redundant or something
- if ($pcdata_allowed && $node instanceof HTMLPurifier_Node_Text) {
- $result[] = $node;
- continue;
- }
- // spill the child contents in
- // ToDo: Make configurable
- if ($node instanceof HTMLPurifier_Node_Element) {
- for ($i = count($node->children) - 1; $i >= 0; $i--) {
- $stack[] = $node->children[$i];
- }
- continue;
- }
- continue;
- }
- $result[] = $node;
- }
- if (empty($result)) {
- return false;
- }
- if ($all_whitespace) {
- $this->whitespace = true;
- return false;
- }
- return $result;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Definition that allows a set of elements, but disallows empty children.
+ */
+class HTMLPurifier_ChildDef_Required extends HTMLPurifier_ChildDef
+{
+ /**
+ * Lookup table of allowed elements.
+ * @type array
+ */
+ public $elements = array();
+
+ /**
+ * Whether or not the last passed node was all whitespace.
+ * @type bool
+ */
+ protected $whitespace = false;
+
+ /**
+ * @param array|string $elements List of allowed element names (lowercase).
+ */
+ public function __construct($elements)
+ {
+ if (is_string($elements)) {
+ $elements = str_replace(' ', '', $elements);
+ $elements = explode('|', $elements);
+ }
+ $keys = array_keys($elements);
+ if ($keys == array_keys($keys)) {
+ $elements = array_flip($elements);
+ foreach ($elements as $i => $x) {
+ $elements[$i] = true;
+ if (empty($i)) {
+ unset($elements[$i]);
+ } // remove blank
+ }
+ }
+ $this->elements = $elements;
+ }
+
+ /**
+ * @type bool
+ */
+ public $allow_empty = false;
+
+ /**
+ * @type string
+ */
+ public $type = 'required';
+
+ /**
+ * @param array $children
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function validateChildren($children, $config, $context)
+ {
+ // Flag for subclasses
+ $this->whitespace = false;
+
+ // if there are no tokens, delete parent node
+ if (empty($children)) {
+ return false;
+ }
+
+ // the new set of children
+ $result = array();
+
+ // whether or not parsed character data is allowed
+ // this controls whether or not we silently drop a tag
+ // or generate escaped HTML from it
+ $pcdata_allowed = isset($this->elements['#PCDATA']);
+
+ // a little sanity check to make sure it's not ALL whitespace
+ $all_whitespace = true;
+
+ $stack = array_reverse($children);
+ while (!empty($stack)) {
+ $node = array_pop($stack);
+ if (!empty($node->is_whitespace)) {
+ $result[] = $node;
+ continue;
+ }
+ $all_whitespace = false; // phew, we're not talking about whitespace
+
+ if (!isset($this->elements[$node->name])) {
+ // special case text
+ // XXX One of these ought to be redundant or something
+ if ($pcdata_allowed && $node instanceof HTMLPurifier_Node_Text) {
+ $result[] = $node;
+ continue;
+ }
+ // spill the child contents in
+ // ToDo: Make configurable
+ if ($node instanceof HTMLPurifier_Node_Element) {
+ for ($i = count($node->children) - 1; $i >= 0; $i--) {
+ $stack[] = $node->children[$i];
+ }
+ continue;
+ }
+ continue;
+ }
+ $result[] = $node;
+ }
+ if (empty($result)) {
+ return false;
+ }
+ if ($all_whitespace) {
+ $this->whitespace = true;
+ return false;
+ }
+ return $result;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/StrictBlockquote.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/StrictBlockquote.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/StrictBlockquote.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/StrictBlockquote.php
index 38bf953..3270a46 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/StrictBlockquote.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/StrictBlockquote.php
@@ -1,110 +1,110 @@
-<?php
-
-/**
- * Takes the contents of blockquote when in strict and reformats for validation.
- */
-class HTMLPurifier_ChildDef_StrictBlockquote extends HTMLPurifier_ChildDef_Required
-{
- /**
- * @type array
- */
- protected $real_elements;
-
- /**
- * @type array
- */
- protected $fake_elements;
-
- /**
- * @type bool
- */
- public $allow_empty = true;
-
- /**
- * @type string
- */
- public $type = 'strictblockquote';
-
- /**
- * @type bool
- */
- protected $init = false;
-
- /**
- * @param HTMLPurifier_Config $config
- * @return array
- * @note We don't want MakeWellFormed to auto-close inline elements since
- * they might be allowed.
- */
- public function getAllowedElements($config)
- {
- $this->init($config);
- return $this->fake_elements;
- }
-
- /**
- * @param array $children
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function validateChildren($children, $config, $context)
- {
- $this->init($config);
-
- // trick the parent class into thinking it allows more
- $this->elements = $this->fake_elements;
- $result = parent::validateChildren($children, $config, $context);
- $this->elements = $this->real_elements;
-
- if ($result === false) {
- return array();
- }
- if ($result === true) {
- $result = $children;
- }
-
- $def = $config->getHTMLDefinition();
- $block_wrap_name = $def->info_block_wrapper;
- $block_wrap = false;
- $ret = array();
-
- foreach ($result as $node) {
- if ($block_wrap === false) {
- if (($node instanceof HTMLPurifier_Node_Text && !$node->is_whitespace) ||
- ($node instanceof HTMLPurifier_Node_Element && !isset($this->elements[$node->name]))) {
- $block_wrap = new HTMLPurifier_Node_Element($def->info_block_wrapper);
- $ret[] = $block_wrap;
- }
- } else {
- if ($node instanceof HTMLPurifier_Node_Element && isset($this->elements[$node->name])) {
- $block_wrap = false;
-
- }
- }
- if ($block_wrap) {
- $block_wrap->children[] = $node;
- } else {
- $ret[] = $node;
- }
- }
- return $ret;
- }
-
- /**
- * @param HTMLPurifier_Config $config
- */
- private function init($config)
- {
- if (!$this->init) {
- $def = $config->getHTMLDefinition();
- // allow all inline elements
- $this->real_elements = $this->elements;
- $this->fake_elements = $def->info_content_sets['Flow'];
- $this->fake_elements['#PCDATA'] = true;
- $this->init = true;
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Takes the contents of blockquote when in strict and reformats for validation.
+ */
+class HTMLPurifier_ChildDef_StrictBlockquote extends HTMLPurifier_ChildDef_Required
+{
+ /**
+ * @type array
+ */
+ protected $real_elements;
+
+ /**
+ * @type array
+ */
+ protected $fake_elements;
+
+ /**
+ * @type bool
+ */
+ public $allow_empty = true;
+
+ /**
+ * @type string
+ */
+ public $type = 'strictblockquote';
+
+ /**
+ * @type bool
+ */
+ protected $init = false;
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return array
+ * @note We don't want MakeWellFormed to auto-close inline elements since
+ * they might be allowed.
+ */
+ public function getAllowedElements($config)
+ {
+ $this->init($config);
+ return $this->fake_elements;
+ }
+
+ /**
+ * @param array $children
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function validateChildren($children, $config, $context)
+ {
+ $this->init($config);
+
+ // trick the parent class into thinking it allows more
+ $this->elements = $this->fake_elements;
+ $result = parent::validateChildren($children, $config, $context);
+ $this->elements = $this->real_elements;
+
+ if ($result === false) {
+ return array();
+ }
+ if ($result === true) {
+ $result = $children;
+ }
+
+ $def = $config->getHTMLDefinition();
+ $block_wrap_name = $def->info_block_wrapper;
+ $block_wrap = false;
+ $ret = array();
+
+ foreach ($result as $node) {
+ if ($block_wrap === false) {
+ if (($node instanceof HTMLPurifier_Node_Text && !$node->is_whitespace) ||
+ ($node instanceof HTMLPurifier_Node_Element && !isset($this->elements[$node->name]))) {
+ $block_wrap = new HTMLPurifier_Node_Element($def->info_block_wrapper);
+ $ret[] = $block_wrap;
+ }
+ } else {
+ if ($node instanceof HTMLPurifier_Node_Element && isset($this->elements[$node->name])) {
+ $block_wrap = false;
+
+ }
+ }
+ if ($block_wrap) {
+ $block_wrap->children[] = $node;
+ } else {
+ $ret[] = $node;
+ }
+ }
+ return $ret;
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ private function init($config)
+ {
+ if (!$this->init) {
+ $def = $config->getHTMLDefinition();
+ // allow all inline elements
+ $this->real_elements = $this->elements;
+ $this->fake_elements = $def->info_content_sets['Flow'];
+ $this->fake_elements['#PCDATA'] = true;
+ $this->init = true;
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Table.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Table.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Table.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Table.php
index 0570c8b..3e4a0f2 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ChildDef/Table.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ChildDef/Table.php
@@ -1,224 +1,224 @@
-<?php
-
-/**
- * Definition for tables. The general idea is to extract out all of the
- * essential bits, and then reconstruct it later.
- *
- * This is a bit confusing, because the DTDs and the W3C
- * validators seem to disagree on the appropriate definition. The
- * DTD claims:
- *
- * (CAPTION?, (COL*|COLGROUP*), THEAD?, TFOOT?, TBODY+)
- *
- * But actually, the HTML4 spec then has this to say:
- *
- * The TBODY start tag is always required except when the table
- * contains only one table body and no table head or foot sections.
- * The TBODY end tag may always be safely omitted.
- *
- * So the DTD is kind of wrong. The validator is, unfortunately, kind
- * of on crack.
- *
- * The definition changed again in XHTML1.1; and in my opinion, this
- * formulation makes the most sense.
- *
- * caption?, ( col* | colgroup* ), (( thead?, tfoot?, tbody+ ) | ( tr+ ))
- *
- * Essentially, we have two modes: thead/tfoot/tbody mode, and tr mode.
- * If we encounter a thead, tfoot or tbody, we are placed in the former
- * mode, and we *must* wrap any stray tr segments with a tbody. But if
- * we don't run into any of them, just have tr tags is OK.
- */
-class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
-{
- /**
- * @type bool
- */
- public $allow_empty = false;
-
- /**
- * @type string
- */
- public $type = 'table';
-
- /**
- * @type array
- */
- public $elements = array(
- 'tr' => true,
- 'tbody' => true,
- 'thead' => true,
- 'tfoot' => true,
- 'caption' => true,
- 'colgroup' => true,
- 'col' => true
- );
-
- public function __construct()
- {
- }
-
- /**
- * @param array $children
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array
- */
- public function validateChildren($children, $config, $context)
- {
- if (empty($children)) {
- return false;
- }
-
- // only one of these elements is allowed in a table
- $caption = false;
- $thead = false;
- $tfoot = false;
-
- // whitespace
- $initial_ws = array();
- $after_caption_ws = array();
- $after_thead_ws = array();
- $after_tfoot_ws = array();
-
- // as many of these as you want
- $cols = array();
- $content = array();
-
- $tbody_mode = false; // if true, then we need to wrap any stray
- // <tr>s with a <tbody>.
-
- $ws_accum =& $initial_ws;
-
- foreach ($children as $node) {
- if ($node instanceof HTMLPurifier_Node_Comment) {
- $ws_accum[] = $node;
- continue;
- }
- switch ($node->name) {
- case 'tbody':
- $tbody_mode = true;
- // fall through
- case 'tr':
- $content[] = $node;
- $ws_accum =& $content;
- break;
- case 'caption':
- // there can only be one caption!
- if ($caption !== false) break;
- $caption = $node;
- $ws_accum =& $after_caption_ws;
- break;
- case 'thead':
- $tbody_mode = true;
- // XXX This breaks rendering properties with
- // Firefox, which never floats a <thead> to
- // the top. Ever. (Our scheme will float the
- // first <thead> to the top.) So maybe
- // <thead>s that are not first should be
- // turned into <tbody>? Very tricky, indeed.
- if ($thead === false) {
- $thead = $node;
- $ws_accum =& $after_thead_ws;
- } else {
- // Oops, there's a second one! What
- // should we do? Current behavior is to
- // transmutate the first and last entries into
- // tbody tags, and then put into content.
- // Maybe a better idea is to *attach
- // it* to the existing thead or tfoot?
- // We don't do this, because Firefox
- // doesn't float an extra tfoot to the
- // bottom like it does for the first one.
- $node->name = 'tbody';
- $content[] = $node;
- $ws_accum =& $content;
- }
- break;
- case 'tfoot':
- // see above for some aveats
- $tbody_mode = true;
- if ($tfoot === false) {
- $tfoot = $node;
- $ws_accum =& $after_tfoot_ws;
- } else {
- $node->name = 'tbody';
- $content[] = $node;
- $ws_accum =& $content;
- }
- break;
- case 'colgroup':
- case 'col':
- $cols[] = $node;
- $ws_accum =& $cols;
- break;
- case '#PCDATA':
- // How is whitespace handled? We treat is as sticky to
- // the *end* of the previous element. So all of the
- // nonsense we have worked on is to keep things
- // together.
- if (!empty($node->is_whitespace)) {
- $ws_accum[] = $node;
- }
- break;
- }
- }
-
- if (empty($content)) {
- return false;
- }
-
- $ret = $initial_ws;
- if ($caption !== false) {
- $ret[] = $caption;
- $ret = array_merge($ret, $after_caption_ws);
- }
- if ($cols !== false) {
- $ret = array_merge($ret, $cols);
- }
- if ($thead !== false) {
- $ret[] = $thead;
- $ret = array_merge($ret, $after_thead_ws);
- }
- if ($tfoot !== false) {
- $ret[] = $tfoot;
- $ret = array_merge($ret, $after_tfoot_ws);
- }
-
- if ($tbody_mode) {
- // we have to shuffle tr into tbody
- $current_tr_tbody = null;
-
- foreach($content as $node) {
- switch ($node->name) {
- case 'tbody':
- $current_tr_tbody = null;
- $ret[] = $node;
- break;
- case 'tr':
- if ($current_tr_tbody === null) {
- $current_tr_tbody = new HTMLPurifier_Node_Element('tbody');
- $ret[] = $current_tr_tbody;
- }
- $current_tr_tbody->children[] = $node;
- break;
- case '#PCDATA':
- assert($node->is_whitespace);
- if ($current_tr_tbody === null) {
- $ret[] = $node;
- } else {
- $current_tr_tbody->children[] = $node;
- }
- break;
- }
- }
- } else {
- $ret = array_merge($ret, $content);
- }
-
- return $ret;
-
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Definition for tables. The general idea is to extract out all of the
+ * essential bits, and then reconstruct it later.
+ *
+ * This is a bit confusing, because the DTDs and the W3C
+ * validators seem to disagree on the appropriate definition. The
+ * DTD claims:
+ *
+ * (CAPTION?, (COL*|COLGROUP*), THEAD?, TFOOT?, TBODY+)
+ *
+ * But actually, the HTML4 spec then has this to say:
+ *
+ * The TBODY start tag is always required except when the table
+ * contains only one table body and no table head or foot sections.
+ * The TBODY end tag may always be safely omitted.
+ *
+ * So the DTD is kind of wrong. The validator is, unfortunately, kind
+ * of on crack.
+ *
+ * The definition changed again in XHTML1.1; and in my opinion, this
+ * formulation makes the most sense.
+ *
+ * caption?, ( col* | colgroup* ), (( thead?, tfoot?, tbody+ ) | ( tr+ ))
+ *
+ * Essentially, we have two modes: thead/tfoot/tbody mode, and tr mode.
+ * If we encounter a thead, tfoot or tbody, we are placed in the former
+ * mode, and we *must* wrap any stray tr segments with a tbody. But if
+ * we don't run into any of them, just have tr tags is OK.
+ */
+class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
+{
+ /**
+ * @type bool
+ */
+ public $allow_empty = false;
+
+ /**
+ * @type string
+ */
+ public $type = 'table';
+
+ /**
+ * @type array
+ */
+ public $elements = array(
+ 'tr' => true,
+ 'tbody' => true,
+ 'thead' => true,
+ 'tfoot' => true,
+ 'caption' => true,
+ 'colgroup' => true,
+ 'col' => true
+ );
+
+ public function __construct()
+ {
+ }
+
+ /**
+ * @param array $children
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array
+ */
+ public function validateChildren($children, $config, $context)
+ {
+ if (empty($children)) {
+ return false;
+ }
+
+ // only one of these elements is allowed in a table
+ $caption = false;
+ $thead = false;
+ $tfoot = false;
+
+ // whitespace
+ $initial_ws = array();
+ $after_caption_ws = array();
+ $after_thead_ws = array();
+ $after_tfoot_ws = array();
+
+ // as many of these as you want
+ $cols = array();
+ $content = array();
+
+ $tbody_mode = false; // if true, then we need to wrap any stray
+ // <tr>s with a <tbody>.
+
+ $ws_accum =& $initial_ws;
+
+ foreach ($children as $node) {
+ if ($node instanceof HTMLPurifier_Node_Comment) {
+ $ws_accum[] = $node;
+ continue;
+ }
+ switch ($node->name) {
+ case 'tbody':
+ $tbody_mode = true;
+ // fall through
+ case 'tr':
+ $content[] = $node;
+ $ws_accum =& $content;
+ break;
+ case 'caption':
+ // there can only be one caption!
+ if ($caption !== false) break;
+ $caption = $node;
+ $ws_accum =& $after_caption_ws;
+ break;
+ case 'thead':
+ $tbody_mode = true;
+ // XXX This breaks rendering properties with
+ // Firefox, which never floats a <thead> to
+ // the top. Ever. (Our scheme will float the
+ // first <thead> to the top.) So maybe
+ // <thead>s that are not first should be
+ // turned into <tbody>? Very tricky, indeed.
+ if ($thead === false) {
+ $thead = $node;
+ $ws_accum =& $after_thead_ws;
+ } else {
+ // Oops, there's a second one! What
+ // should we do? Current behavior is to
+ // transmutate the first and last entries into
+ // tbody tags, and then put into content.
+ // Maybe a better idea is to *attach
+ // it* to the existing thead or tfoot?
+ // We don't do this, because Firefox
+ // doesn't float an extra tfoot to the
+ // bottom like it does for the first one.
+ $node->name = 'tbody';
+ $content[] = $node;
+ $ws_accum =& $content;
+ }
+ break;
+ case 'tfoot':
+ // see above for some aveats
+ $tbody_mode = true;
+ if ($tfoot === false) {
+ $tfoot = $node;
+ $ws_accum =& $after_tfoot_ws;
+ } else {
+ $node->name = 'tbody';
+ $content[] = $node;
+ $ws_accum =& $content;
+ }
+ break;
+ case 'colgroup':
+ case 'col':
+ $cols[] = $node;
+ $ws_accum =& $cols;
+ break;
+ case '#PCDATA':
+ // How is whitespace handled? We treat is as sticky to
+ // the *end* of the previous element. So all of the
+ // nonsense we have worked on is to keep things
+ // together.
+ if (!empty($node->is_whitespace)) {
+ $ws_accum[] = $node;
+ }
+ break;
+ }
+ }
+
+ if (empty($content)) {
+ return false;
+ }
+
+ $ret = $initial_ws;
+ if ($caption !== false) {
+ $ret[] = $caption;
+ $ret = array_merge($ret, $after_caption_ws);
+ }
+ if ($cols !== false) {
+ $ret = array_merge($ret, $cols);
+ }
+ if ($thead !== false) {
+ $ret[] = $thead;
+ $ret = array_merge($ret, $after_thead_ws);
+ }
+ if ($tfoot !== false) {
+ $ret[] = $tfoot;
+ $ret = array_merge($ret, $after_tfoot_ws);
+ }
+
+ if ($tbody_mode) {
+ // we have to shuffle tr into tbody
+ $current_tr_tbody = null;
+
+ foreach($content as $node) {
+ switch ($node->name) {
+ case 'tbody':
+ $current_tr_tbody = null;
+ $ret[] = $node;
+ break;
+ case 'tr':
+ if ($current_tr_tbody === null) {
+ $current_tr_tbody = new HTMLPurifier_Node_Element('tbody');
+ $ret[] = $current_tr_tbody;
+ }
+ $current_tr_tbody->children[] = $node;
+ break;
+ case '#PCDATA':
+ assert($node->is_whitespace);
+ if ($current_tr_tbody === null) {
+ $ret[] = $node;
+ } else {
+ $current_tr_tbody->children[] = $node;
+ }
+ break;
+ }
+ }
+ } else {
+ $ret = array_merge($ret, $content);
+ }
+
+ return $ret;
+
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Config.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Config.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Config.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Config.php
index a0ef546..7b9dcf0 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Config.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Config.php
@@ -1,911 +1,920 @@
-<?php
-
-/**
- * Configuration object that triggers customizable behavior.
- *
- * @warning This class is strongly defined: that means that the class
- * will fail if an undefined directive is retrieved or set.
- *
- * @note Many classes that could (although many times don't) use the
- * configuration object make it a mandatory parameter. This is
- * because a configuration object should always be forwarded,
- * otherwise, you run the risk of missing a parameter and then
- * being stumped when a configuration directive doesn't work.
- *
- * @todo Reconsider some of the public member variables
- */
-class HTMLPurifier_Config
-{
-
- /**
- * HTML Purifier's version
- * @type string
- */
- public $version = '4.6.0';
-
- /**
- * Whether or not to automatically finalize
- * the object if a read operation is done.
- * @type bool
- */
- public $autoFinalize = true;
-
- // protected member variables
-
- /**
- * Namespace indexed array of serials for specific namespaces.
- * @see getSerial() for more info.
- * @type string[]
- */
- protected $serials = array();
-
- /**
- * Serial for entire configuration object.
- * @type string
- */
- protected $serial;
-
- /**
- * Parser for variables.
- * @type HTMLPurifier_VarParser_Flexible
- */
- protected $parser = null;
-
- /**
- * Reference HTMLPurifier_ConfigSchema for value checking.
- * @type HTMLPurifier_ConfigSchema
- * @note This is public for introspective purposes. Please don't
- * abuse!
- */
- public $def;
-
- /**
- * Indexed array of definitions.
- * @type HTMLPurifier_Definition[]
- */
- protected $definitions;
-
- /**
- * Whether or not config is finalized.
- * @type bool
- */
- protected $finalized = false;
-
- /**
- * Property list containing configuration directives.
- * @type array
- */
- protected $plist;
-
- /**
- * Whether or not a set is taking place due to an alias lookup.
- * @type bool
- */
- private $aliasMode;
-
- /**
- * Set to false if you do not want line and file numbers in errors.
- * (useful when unit testing). This will also compress some errors
- * and exceptions.
- * @type bool
- */
- public $chatty = true;
-
- /**
- * Current lock; only gets to this namespace are allowed.
- * @type string
- */
- private $lock;
-
- /**
- * Constructor
- * @param HTMLPurifier_ConfigSchema $definition ConfigSchema that defines
- * what directives are allowed.
- * @param HTMLPurifier_PropertyList $parent
- */
- public function __construct($definition, $parent = null)
- {
- $parent = $parent ? $parent : $definition->defaultPlist;
- $this->plist = new HTMLPurifier_PropertyList($parent);
- $this->def = $definition; // keep a copy around for checking
- $this->parser = new HTMLPurifier_VarParser_Flexible();
- }
-
- /**
- * Convenience constructor that creates a config object based on a mixed var
- * @param mixed $config Variable that defines the state of the config
- * object. Can be: a HTMLPurifier_Config() object,
- * an array of directives based on loadArray(),
- * or a string filename of an ini file.
- * @param HTMLPurifier_ConfigSchema $schema Schema object
- * @return HTMLPurifier_Config Configured object
- */
- public static function create($config, $schema = null)
- {
- if ($config instanceof HTMLPurifier_Config) {
- // pass-through
- return $config;
- }
- if (!$schema) {
- $ret = HTMLPurifier_Config::createDefault();
- } else {
- $ret = new HTMLPurifier_Config($schema);
- }
- if (is_string($config)) {
- $ret->loadIni($config);
- } elseif (is_array($config)) $ret->loadArray($config);
- return $ret;
- }
-
- /**
- * Creates a new config object that inherits from a previous one.
- * @param HTMLPurifier_Config $config Configuration object to inherit from.
- * @return HTMLPurifier_Config object with $config as its parent.
- */
- public static function inherit(HTMLPurifier_Config $config)
- {
- return new HTMLPurifier_Config($config->def, $config->plist);
- }
-
- /**
- * Convenience constructor that creates a default configuration object.
- * @return HTMLPurifier_Config default object.
- */
- public static function createDefault()
- {
- $definition = HTMLPurifier_ConfigSchema::instance();
- $config = new HTMLPurifier_Config($definition);
- return $config;
- }
-
- /**
- * Retrieves a value from the configuration.
- *
- * @param string $key String key
- * @param mixed $a
- *
- * @return mixed
- */
- public function get($key, $a = null)
- {
- if ($a !== null) {
- $this->triggerError(
- "Using deprecated API: use \$config->get('$key.$a') instead",
- E_USER_WARNING
- );
- $key = "$key.$a";
- }
- if (!$this->finalized) {
- $this->autoFinalize();
- }
- if (!isset($this->def->info[$key])) {
- // can't add % due to SimpleTest bug
- $this->triggerError(
- 'Cannot retrieve value of undefined directive ' . htmlspecialchars($key),
- E_USER_WARNING
- );
- return;
- }
- if (isset($this->def->info[$key]->isAlias)) {
- $d = $this->def->info[$key];
- $this->triggerError(
- 'Cannot get value from aliased directive, use real name ' . $d->key,
- E_USER_ERROR
- );
- return;
- }
- if ($this->lock) {
- list($ns) = explode('.', $key);
- if ($ns !== $this->lock) {
- $this->triggerError(
- 'Cannot get value of namespace ' . $ns . ' when lock for ' .
- $this->lock .
- ' is active, this probably indicates a Definition setup method ' .
- 'is accessing directives that are not within its namespace',
- E_USER_ERROR
- );
- return;
- }
- }
- return $this->plist->get($key);
- }
-
- /**
- * Retrieves an array of directives to values from a given namespace
- *
- * @param string $namespace String namespace
- *
- * @return array
- */
- public function getBatch($namespace)
- {
- if (!$this->finalized) {
- $this->autoFinalize();
- }
- $full = $this->getAll();
- if (!isset($full[$namespace])) {
- $this->triggerError(
- 'Cannot retrieve undefined namespace ' .
- htmlspecialchars($namespace),
- E_USER_WARNING
- );
- return;
- }
- return $full[$namespace];
- }
-
- /**
- * Returns a SHA-1 signature of a segment of the configuration object
- * that uniquely identifies that particular configuration
- *
- * @param string $namespace Namespace to get serial for
- *
- * @return string
- * @note Revision is handled specially and is removed from the batch
- * before processing!
- */
- public function getBatchSerial($namespace)
- {
- if (empty($this->serials[$namespace])) {
- $batch = $this->getBatch($namespace);
- unset($batch['DefinitionRev']);
- $this->serials[$namespace] = sha1(serialize($batch));
- }
- return $this->serials[$namespace];
- }
-
- /**
- * Returns a SHA-1 signature for the entire configuration object
- * that uniquely identifies that particular configuration
- *
- * @return string
- */
- public function getSerial()
- {
- if (empty($this->serial)) {
- $this->serial = sha1(serialize($this->getAll()));
- }
- return $this->serial;
- }
-
- /**
- * Retrieves all directives, organized by namespace
- *
- * @warning This is a pretty inefficient function, avoid if you can
- */
- public function getAll()
- {
- if (!$this->finalized) {
- $this->autoFinalize();
- }
- $ret = array();
- foreach ($this->plist->squash() as $name => $value) {
- list($ns, $key) = explode('.', $name, 2);
- $ret[$ns][$key] = $value;
- }
- return $ret;
- }
-
- /**
- * Sets a value to configuration.
- *
- * @param string $key key
- * @param mixed $value value
- * @param mixed $a
- */
- public function set($key, $value, $a = null)
- {
- if (strpos($key, '.') === false) {
- $namespace = $key;
- $directive = $value;
- $value = $a;
- $key = "$key.$directive";
- $this->triggerError("Using deprecated API: use \$config->set('$key', ...) instead", E_USER_NOTICE);
- } else {
- list($namespace) = explode('.', $key);
- }
- if ($this->isFinalized('Cannot set directive after finalization')) {
- return;
- }
- if (!isset($this->def->info[$key])) {
- $this->triggerError(
- 'Cannot set undefined directive ' . htmlspecialchars($key) . ' to value',
- E_USER_WARNING
- );
- return;
- }
- $def = $this->def->info[$key];
-
- if (isset($def->isAlias)) {
- if ($this->aliasMode) {
- $this->triggerError(
- 'Double-aliases not allowed, please fix '.
- 'ConfigSchema bug with' . $key,
- E_USER_ERROR
- );
- return;
- }
- $this->aliasMode = true;
- $this->set($def->key, $value);
- $this->aliasMode = false;
- $this->triggerError("$key is an alias, preferred directive name is {$def->key}", E_USER_NOTICE);
- return;
- }
-
- // Raw type might be negative when using the fully optimized form
- // of stdclass, which indicates allow_null == true
- $rtype = is_int($def) ? $def : $def->type;
- if ($rtype < 0) {
- $type = -$rtype;
- $allow_null = true;
- } else {
- $type = $rtype;
- $allow_null = isset($def->allow_null);
- }
-
- try {
- $value = $this->parser->parse($value, $type, $allow_null);
- } catch (HTMLPurifier_VarParserException $e) {
- $this->triggerError(
- 'Value for ' . $key . ' is of invalid type, should be ' .
- HTMLPurifier_VarParser::getTypeName($type),
- E_USER_WARNING
- );
- return;
- }
- if (is_string($value) && is_object($def)) {
- // resolve value alias if defined
- if (isset($def->aliases[$value])) {
- $value = $def->aliases[$value];
- }
- // check to see if the value is allowed
- if (isset($def->allowed) && !isset($def->allowed[$value])) {
- $this->triggerError(
- 'Value not supported, valid values are: ' .
- $this->_listify($def->allowed),
- E_USER_WARNING
- );
- return;
- }
- }
- $this->plist->set($key, $value);
-
- // reset definitions if the directives they depend on changed
- // this is a very costly process, so it's discouraged
- // with finalization
- if ($namespace == 'HTML' || $namespace == 'CSS' || $namespace == 'URI') {
- $this->definitions[$namespace] = null;
- }
-
- $this->serials[$namespace] = false;
- }
-
- /**
- * Convenience function for error reporting
- *
- * @param array $lookup
- *
- * @return string
- */
- private function _listify($lookup)
- {
- $list = array();
- foreach ($lookup as $name => $b) {
- $list[] = $name;
- }
- return implode(', ', $list);
- }
-
- /**
- * Retrieves object reference to the HTML definition.
- *
- * @param bool $raw Return a copy that has not been setup yet. Must be
- * called before it's been setup, otherwise won't work.
- * @param bool $optimized If true, this method may return null, to
- * indicate that a cached version of the modified
- * definition object is available and no further edits
- * are necessary. Consider using
- * maybeGetRawHTMLDefinition, which is more explicitly
- * named, instead.
- *
- * @return HTMLPurifier_HTMLDefinition
- */
- public function getHTMLDefinition($raw = false, $optimized = false)
- {
- return $this->getDefinition('HTML', $raw, $optimized);
- }
-
- /**
- * Retrieves object reference to the CSS definition
- *
- * @param bool $raw Return a copy that has not been setup yet. Must be
- * called before it's been setup, otherwise won't work.
- * @param bool $optimized If true, this method may return null, to
- * indicate that a cached version of the modified
- * definition object is available and no further edits
- * are necessary. Consider using
- * maybeGetRawCSSDefinition, which is more explicitly
- * named, instead.
- *
- * @return HTMLPurifier_CSSDefinition
- */
- public function getCSSDefinition($raw = false, $optimized = false)
- {
- return $this->getDefinition('CSS', $raw, $optimized);
- }
-
- /**
- * Retrieves object reference to the URI definition
- *
- * @param bool $raw Return a copy that has not been setup yet. Must be
- * called before it's been setup, otherwise won't work.
- * @param bool $optimized If true, this method may return null, to
- * indicate that a cached version of the modified
- * definition object is available and no further edits
- * are necessary. Consider using
- * maybeGetRawURIDefinition, which is more explicitly
- * named, instead.
- *
- * @return HTMLPurifier_URIDefinition
- */
- public function getURIDefinition($raw = false, $optimized = false)
- {
- return $this->getDefinition('URI', $raw, $optimized);
- }
-
- /**
- * Retrieves a definition
- *
- * @param string $type Type of definition: HTML, CSS, etc
- * @param bool $raw Whether or not definition should be returned raw
- * @param bool $optimized Only has an effect when $raw is true. Whether
- * or not to return null if the result is already present in
- * the cache. This is off by default for backwards
- * compatibility reasons, but you need to do things this
- * way in order to ensure that caching is done properly.
- * Check out enduser-customize.html for more details.
- * We probably won't ever change this default, as much as the
- * maybe semantics is the "right thing to do."
- *
- * @throws HTMLPurifier_Exception
- * @return HTMLPurifier_Definition
- */
- public function getDefinition($type, $raw = false, $optimized = false)
- {
- if ($optimized && !$raw) {
- throw new HTMLPurifier_Exception("Cannot set optimized = true when raw = false");
- }
- if (!$this->finalized) {
- $this->autoFinalize();
- }
- // temporarily suspend locks, so we can handle recursive definition calls
- $lock = $this->lock;
- $this->lock = null;
- $factory = HTMLPurifier_DefinitionCacheFactory::instance();
- $cache = $factory->create($type, $this);
- $this->lock = $lock;
- if (!$raw) {
- // full definition
- // ---------------
- // check if definition is in memory
- if (!empty($this->definitions[$type])) {
- $def = $this->definitions[$type];
- // check if the definition is setup
- if ($def->setup) {
- return $def;
- } else {
- $def->setup($this);
- if ($def->optimized) {
- $cache->add($def, $this);
- }
- return $def;
- }
- }
- // check if definition is in cache
- $def = $cache->get($this);
- if ($def) {
- // definition in cache, save to memory and return it
- $this->definitions[$type] = $def;
- return $def;
- }
- // initialize it
- $def = $this->initDefinition($type);
- // set it up
- $this->lock = $type;
- $def->setup($this);
- $this->lock = null;
- // save in cache
- $cache->add($def, $this);
- // return it
- return $def;
- } else {
- // raw definition
- // --------------
- // check preconditions
- $def = null;
- if ($optimized) {
- if (is_null($this->get($type . '.DefinitionID'))) {
- // fatally error out if definition ID not set
- throw new HTMLPurifier_Exception(
- "Cannot retrieve raw version without specifying %$type.DefinitionID"
- );
- }
- }
- if (!empty($this->definitions[$type])) {
- $def = $this->definitions[$type];
- if ($def->setup && !$optimized) {
- $extra = $this->chatty ?
- " (try moving this code block earlier in your initialization)" :
- "";
- throw new HTMLPurifier_Exception(
- "Cannot retrieve raw definition after it has already been setup" .
- $extra
- );
- }
- if ($def->optimized === null) {
- $extra = $this->chatty ? " (try flushing your cache)" : "";
- throw new HTMLPurifier_Exception(
- "Optimization status of definition is unknown" . $extra
- );
- }
- if ($def->optimized !== $optimized) {
- $msg = $optimized ? "optimized" : "unoptimized";
- $extra = $this->chatty ?
- " (this backtrace is for the first inconsistent call, which was for a $msg raw definition)"
- : "";
- throw new HTMLPurifier_Exception(
- "Inconsistent use of optimized and unoptimized raw definition retrievals" . $extra
- );
- }
- }
- // check if definition was in memory
- if ($def) {
- if ($def->setup) {
- // invariant: $optimized === true (checked above)
- return null;
- } else {
- return $def;
- }
- }
- // if optimized, check if definition was in cache
- // (because we do the memory check first, this formulation
- // is prone to cache slamming, but I think
- // guaranteeing that either /all/ of the raw
- // setup code or /none/ of it is run is more important.)
- if ($optimized) {
- // This code path only gets run once; once we put
- // something in $definitions (which is guaranteed by the
- // trailing code), we always short-circuit above.
- $def = $cache->get($this);
- if ($def) {
- // save the full definition for later, but don't
- // return it yet
- $this->definitions[$type] = $def;
- return null;
- }
- }
- // check invariants for creation
- if (!$optimized) {
- if (!is_null($this->get($type . '.DefinitionID'))) {
- if ($this->chatty) {
- $this->triggerError(
- 'Due to a documentation error in previous version of HTML Purifier, your ' .
- 'definitions are not being cached. If this is OK, you can remove the ' .
- '%$type.DefinitionRev and %$type.DefinitionID declaration. Otherwise, ' .
- 'modify your code to use maybeGetRawDefinition, and test if the returned ' .
- 'value is null before making any edits (if it is null, that means that a ' .
- 'cached version is available, and no raw operations are necessary). See ' .
- '<a href="http://htmlpurifier.org/docs/enduser-customize.html#optimized">' .
- 'Customize</a> for more details',
- E_USER_WARNING
- );
- } else {
- $this->triggerError(
- "Useless DefinitionID declaration",
- E_USER_WARNING
- );
- }
- }
- }
- // initialize it
- $def = $this->initDefinition($type);
- $def->optimized = $optimized;
- return $def;
- }
- throw new HTMLPurifier_Exception("The impossible happened!");
- }
-
- /**
- * Initialise definition
- *
- * @param string $type What type of definition to create
- *
- * @return HTMLPurifier_CSSDefinition|HTMLPurifier_HTMLDefinition|HTMLPurifier_URIDefinition
- * @throws HTMLPurifier_Exception
- */
- private function initDefinition($type)
- {
- // quick checks failed, let's create the object
- if ($type == 'HTML') {
- $def = new HTMLPurifier_HTMLDefinition();
- } elseif ($type == 'CSS') {
- $def = new HTMLPurifier_CSSDefinition();
- } elseif ($type == 'URI') {
- $def = new HTMLPurifier_URIDefinition();
- } else {
- throw new HTMLPurifier_Exception(
- "Definition of $type type not supported"
- );
- }
- $this->definitions[$type] = $def;
- return $def;
- }
-
- public function maybeGetRawDefinition($name)
- {
- return $this->getDefinition($name, true, true);
- }
-
- public function maybeGetRawHTMLDefinition()
- {
- return $this->getDefinition('HTML', true, true);
- }
-
- public function maybeGetRawCSSDefinition()
- {
- return $this->getDefinition('CSS', true, true);
- }
-
- public function maybeGetRawURIDefinition()
- {
- return $this->getDefinition('URI', true, true);
- }
-
- /**
- * Loads configuration values from an array with the following structure:
- * Namespace.Directive => Value
- *
- * @param array $config_array Configuration associative array
- */
- public function loadArray($config_array)
- {
- if ($this->isFinalized('Cannot load directives after finalization')) {
- return;
- }
- foreach ($config_array as $key => $value) {
- $key = str_replace('_', '.', $key);
- if (strpos($key, '.') !== false) {
- $this->set($key, $value);
- } else {
- $namespace = $key;
- $namespace_values = $value;
- foreach ($namespace_values as $directive => $value2) {
- $this->set($namespace .'.'. $directive, $value2);
- }
- }
- }
- }
-
- /**
- * Returns a list of array(namespace, directive) for all directives
- * that are allowed in a web-form context as per an allowed
- * namespaces/directives list.
- *
- * @param array $allowed List of allowed namespaces/directives
- * @param HTMLPurifier_ConfigSchema $schema Schema to use, if not global copy
- *
- * @return array
- */
- public static function getAllowedDirectivesForForm($allowed, $schema = null)
- {
- if (!$schema) {
- $schema = HTMLPurifier_ConfigSchema::instance();
- }
- if ($allowed !== true) {
- if (is_string($allowed)) {
- $allowed = array($allowed);
- }
- $allowed_ns = array();
- $allowed_directives = array();
- $blacklisted_directives = array();
- foreach ($allowed as $ns_or_directive) {
- if (strpos($ns_or_directive, '.') !== false) {
- // directive
- if ($ns_or_directive[0] == '-') {
- $blacklisted_directives[substr($ns_or_directive, 1)] = true;
- } else {
- $allowed_directives[$ns_or_directive] = true;
- }
- } else {
- // namespace
- $allowed_ns[$ns_or_directive] = true;
- }
- }
- }
- $ret = array();
- foreach ($schema->info as $key => $def) {
- list($ns, $directive) = explode('.', $key, 2);
- if ($allowed !== true) {
- if (isset($blacklisted_directives["$ns.$directive"])) {
- continue;
- }
- if (!isset($allowed_directives["$ns.$directive"]) && !isset($allowed_ns[$ns])) {
- continue;
- }
- }
- if (isset($def->isAlias)) {
- continue;
- }
- if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') {
- continue;
- }
- $ret[] = array($ns, $directive);
- }
- return $ret;
- }
-
- /**
- * Loads configuration values from $_GET/$_POST that were posted
- * via ConfigForm
- *
- * @param array $array $_GET or $_POST array to import
- * @param string|bool $index Index/name that the config variables are in
- * @param array|bool $allowed List of allowed namespaces/directives
- * @param bool $mq_fix Boolean whether or not to enable magic quotes fix
- * @param HTMLPurifier_ConfigSchema $schema Schema to use, if not global copy
- *
- * @return mixed
- */
- public static function loadArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null)
- {
- $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $schema);
- $config = HTMLPurifier_Config::create($ret, $schema);
- return $config;
- }
-
- /**
- * Merges in configuration values from $_GET/$_POST to object. NOT STATIC.
- *
- * @param array $array $_GET or $_POST array to import
- * @param string|bool $index Index/name that the config variables are in
- * @param array|bool $allowed List of allowed namespaces/directives
- * @param bool $mq_fix Boolean whether or not to enable magic quotes fix
- */
- public function mergeArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true)
- {
- $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $this->def);
- $this->loadArray($ret);
- }
-
- /**
- * Prepares an array from a form into something usable for the more
- * strict parts of HTMLPurifier_Config
- *
- * @param array $array $_GET or $_POST array to import
- * @param string|bool $index Index/name that the config variables are in
- * @param array|bool $allowed List of allowed namespaces/directives
- * @param bool $mq_fix Boolean whether or not to enable magic quotes fix
- * @param HTMLPurifier_ConfigSchema $schema Schema to use, if not global copy
- *
- * @return array
- */
- public static function prepareArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null)
- {
- if ($index !== false) {
- $array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
- }
- $mq = $mq_fix && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
-
- $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $schema);
- $ret = array();
- foreach ($allowed as $key) {
- list($ns, $directive) = $key;
- $skey = "$ns.$directive";
- if (!empty($array["Null_$skey"])) {
- $ret[$ns][$directive] = null;
- continue;
- }
- if (!isset($array[$skey])) {
- continue;
- }
- $value = $mq ? stripslashes($array[$skey]) : $array[$skey];
- $ret[$ns][$directive] = $value;
- }
- return $ret;
- }
-
- /**
- * Loads configuration values from an ini file
- *
- * @param string $filename Name of ini file
- */
- public function loadIni($filename)
- {
- if ($this->isFinalized('Cannot load directives after finalization')) {
- return;
- }
- $array = parse_ini_file($filename, true);
- $this->loadArray($array);
- }
-
- /**
- * Checks whether or not the configuration object is finalized.
- *
- * @param string|bool $error String error message, or false for no error
- *
- * @return bool
- */
- public function isFinalized($error = false)
- {
- if ($this->finalized && $error) {
- $this->triggerError($error, E_USER_ERROR);
- }
- return $this->finalized;
- }
-
- /**
- * Finalizes configuration only if auto finalize is on and not
- * already finalized
- */
- public function autoFinalize()
- {
- if ($this->autoFinalize) {
- $this->finalize();
- } else {
- $this->plist->squash(true);
- }
- }
-
- /**
- * Finalizes a configuration object, prohibiting further change
- */
- public function finalize()
- {
- $this->finalized = true;
- $this->parser = null;
- }
-
- /**
- * Produces a nicely formatted error message by supplying the
- * stack frame information OUTSIDE of HTMLPurifier_Config.
- *
- * @param string $msg An error message
- * @param int $no An error number
- */
- protected function triggerError($msg, $no)
- {
- // determine previous stack frame
- $extra = '';
- if ($this->chatty) {
- $trace = debug_backtrace();
- // zip(tail(trace), trace) -- but PHP is not Haskell har har
- for ($i = 0, $c = count($trace); $i < $c - 1; $i++) {
- // XXX this is not correct on some versions of HTML Purifier
- if ($trace[$i + 1]['class'] === 'HTMLPurifier_Config') {
- continue;
- }
- $frame = $trace[$i];
- $extra = " invoked on line {$frame['line']} in file {$frame['file']}";
- break;
- }
- }
- trigger_error($msg . $extra, $no);
- }
-
- /**
- * Returns a serialized form of the configuration object that can
- * be reconstituted.
- *
- * @return string
- */
- public function serialize()
- {
- $this->getDefinition('HTML');
- $this->getDefinition('CSS');
- $this->getDefinition('URI');
- return serialize($this);
- }
-
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Configuration object that triggers customizable behavior.
+ *
+ * @warning This class is strongly defined: that means that the class
+ * will fail if an undefined directive is retrieved or set.
+ *
+ * @note Many classes that could (although many times don't) use the
+ * configuration object make it a mandatory parameter. This is
+ * because a configuration object should always be forwarded,
+ * otherwise, you run the risk of missing a parameter and then
+ * being stumped when a configuration directive doesn't work.
+ *
+ * @todo Reconsider some of the public member variables
+ */
+class HTMLPurifier_Config
+{
+
+ /**
+ * HTML Purifier's version
+ * @type string
+ */
+ public $version = '4.8.0';
+
+ /**
+ * Whether or not to automatically finalize
+ * the object if a read operation is done.
+ * @type bool
+ */
+ public $autoFinalize = true;
+
+ // protected member variables
+
+ /**
+ * Namespace indexed array of serials for specific namespaces.
+ * @see getSerial() for more info.
+ * @type string[]
+ */
+ protected $serials = array();
+
+ /**
+ * Serial for entire configuration object.
+ * @type string
+ */
+ protected $serial;
+
+ /**
+ * Parser for variables.
+ * @type HTMLPurifier_VarParser_Flexible
+ */
+ protected $parser = null;
+
+ /**
+ * Reference HTMLPurifier_ConfigSchema for value checking.
+ * @type HTMLPurifier_ConfigSchema
+ * @note This is public for introspective purposes. Please don't
+ * abuse!
+ */
+ public $def;
+
+ /**
+ * Indexed array of definitions.
+ * @type HTMLPurifier_Definition[]
+ */
+ protected $definitions;
+
+ /**
+ * Whether or not config is finalized.
+ * @type bool
+ */
+ protected $finalized = false;
+
+ /**
+ * Property list containing configuration directives.
+ * @type array
+ */
+ protected $plist;
+
+ /**
+ * Whether or not a set is taking place due to an alias lookup.
+ * @type bool
+ */
+ private $aliasMode;
+
+ /**
+ * Set to false if you do not want line and file numbers in errors.
+ * (useful when unit testing). This will also compress some errors
+ * and exceptions.
+ * @type bool
+ */
+ public $chatty = true;
+
+ /**
+ * Current lock; only gets to this namespace are allowed.
+ * @type string
+ */
+ private $lock;
+
+ /**
+ * Constructor
+ * @param HTMLPurifier_ConfigSchema $definition ConfigSchema that defines
+ * what directives are allowed.
+ * @param HTMLPurifier_PropertyList $parent
+ */
+ public function __construct($definition, $parent = null)
+ {
+ $parent = $parent ? $parent : $definition->defaultPlist;
+ $this->plist = new HTMLPurifier_PropertyList($parent);
+ $this->def = $definition; // keep a copy around for checking
+ $this->parser = new HTMLPurifier_VarParser_Flexible();
+ }
+
+ /**
+ * Convenience constructor that creates a config object based on a mixed var
+ * @param mixed $config Variable that defines the state of the config
+ * object. Can be: a HTMLPurifier_Config() object,
+ * an array of directives based on loadArray(),
+ * or a string filename of an ini file.
+ * @param HTMLPurifier_ConfigSchema $schema Schema object
+ * @return HTMLPurifier_Config Configured object
+ */
+ public static function create($config, $schema = null)
+ {
+ if ($config instanceof HTMLPurifier_Config) {
+ // pass-through
+ return $config;
+ }
+ if (!$schema) {
+ $ret = HTMLPurifier_Config::createDefault();
+ } else {
+ $ret = new HTMLPurifier_Config($schema);
+ }
+ if (is_string($config)) {
+ $ret->loadIni($config);
+ } elseif (is_array($config)) $ret->loadArray($config);
+ return $ret;
+ }
+
+ /**
+ * Creates a new config object that inherits from a previous one.
+ * @param HTMLPurifier_Config $config Configuration object to inherit from.
+ * @return HTMLPurifier_Config object with $config as its parent.
+ */
+ public static function inherit(HTMLPurifier_Config $config)
+ {
+ return new HTMLPurifier_Config($config->def, $config->plist);
+ }
+
+ /**
+ * Convenience constructor that creates a default configuration object.
+ * @return HTMLPurifier_Config default object.
+ */
+ public static function createDefault()
+ {
+ $definition = HTMLPurifier_ConfigSchema::instance();
+ $config = new HTMLPurifier_Config($definition);
+ return $config;
+ }
+
+ /**
+ * Retrieves a value from the configuration.
+ *
+ * @param string $key String key
+ * @param mixed $a
+ *
+ * @return mixed
+ */
+ public function get($key, $a = null)
+ {
+ if ($a !== null) {
+ $this->triggerError(
+ "Using deprecated API: use \$config->get('$key.$a') instead",
+ E_USER_WARNING
+ );
+ $key = "$key.$a";
+ }
+ if (!$this->finalized) {
+ $this->autoFinalize();
+ }
+ if (!isset($this->def->info[$key])) {
+ // can't add % due to SimpleTest bug
+ $this->triggerError(
+ 'Cannot retrieve value of undefined directive ' . htmlspecialchars($key),
+ E_USER_WARNING
+ );
+ return;
+ }
+ if (isset($this->def->info[$key]->isAlias)) {
+ $d = $this->def->info[$key];
+ $this->triggerError(
+ 'Cannot get value from aliased directive, use real name ' . $d->key,
+ E_USER_ERROR
+ );
+ return;
+ }
+ if ($this->lock) {
+ list($ns) = explode('.', $key);
+ if ($ns !== $this->lock) {
+ $this->triggerError(
+ 'Cannot get value of namespace ' . $ns . ' when lock for ' .
+ $this->lock .
+ ' is active, this probably indicates a Definition setup method ' .
+ 'is accessing directives that are not within its namespace',
+ E_USER_ERROR
+ );
+ return;
+ }
+ }
+ return $this->plist->get($key);
+ }
+
+ /**
+ * Retrieves an array of directives to values from a given namespace
+ *
+ * @param string $namespace String namespace
+ *
+ * @return array
+ */
+ public function getBatch($namespace)
+ {
+ if (!$this->finalized) {
+ $this->autoFinalize();
+ }
+ $full = $this->getAll();
+ if (!isset($full[$namespace])) {
+ $this->triggerError(
+ 'Cannot retrieve undefined namespace ' .
+ htmlspecialchars($namespace),
+ E_USER_WARNING
+ );
+ return;
+ }
+ return $full[$namespace];
+ }
+
+ /**
+ * Returns a SHA-1 signature of a segment of the configuration object
+ * that uniquely identifies that particular configuration
+ *
+ * @param string $namespace Namespace to get serial for
+ *
+ * @return string
+ * @note Revision is handled specially and is removed from the batch
+ * before processing!
+ */
+ public function getBatchSerial($namespace)
+ {
+ if (empty($this->serials[$namespace])) {
+ $batch = $this->getBatch($namespace);
+ unset($batch['DefinitionRev']);
+ $this->serials[$namespace] = sha1(serialize($batch));
+ }
+ return $this->serials[$namespace];
+ }
+
+ /**
+ * Returns a SHA-1 signature for the entire configuration object
+ * that uniquely identifies that particular configuration
+ *
+ * @return string
+ */
+ public function getSerial()
+ {
+ if (empty($this->serial)) {
+ $this->serial = sha1(serialize($this->getAll()));
+ }
+ return $this->serial;
+ }
+
+ /**
+ * Retrieves all directives, organized by namespace
+ *
+ * @warning This is a pretty inefficient function, avoid if you can
+ */
+ public function getAll()
+ {
+ if (!$this->finalized) {
+ $this->autoFinalize();
+ }
+ $ret = array();
+ foreach ($this->plist->squash() as $name => $value) {
+ list($ns, $key) = explode('.', $name, 2);
+ $ret[$ns][$key] = $value;
+ }
+ return $ret;
+ }
+
+ /**
+ * Sets a value to configuration.
+ *
+ * @param string $key key
+ * @param mixed $value value
+ * @param mixed $a
+ */
+ public function set($key, $value, $a = null)
+ {
+ if (strpos($key, '.') === false) {
+ $namespace = $key;
+ $directive = $value;
+ $value = $a;
+ $key = "$key.$directive";
+ $this->triggerError("Using deprecated API: use \$config->set('$key', ...) instead", E_USER_NOTICE);
+ } else {
+ list($namespace) = explode('.', $key);
+ }
+ if ($this->isFinalized('Cannot set directive after finalization')) {
+ return;
+ }
+ if (!isset($this->def->info[$key])) {
+ $this->triggerError(
+ 'Cannot set undefined directive ' . htmlspecialchars($key) . ' to value',
+ E_USER_WARNING
+ );
+ return;
+ }
+ $def = $this->def->info[$key];
+
+ if (isset($def->isAlias)) {
+ if ($this->aliasMode) {
+ $this->triggerError(
+ 'Double-aliases not allowed, please fix '.
+ 'ConfigSchema bug with' . $key,
+ E_USER_ERROR
+ );
+ return;
+ }
+ $this->aliasMode = true;
+ $this->set($def->key, $value);
+ $this->aliasMode = false;
+ $this->triggerError("$key is an alias, preferred directive name is {$def->key}", E_USER_NOTICE);
+ return;
+ }
+
+ // Raw type might be negative when using the fully optimized form
+ // of stdclass, which indicates allow_null == true
+ $rtype = is_int($def) ? $def : $def->type;
+ if ($rtype < 0) {
+ $type = -$rtype;
+ $allow_null = true;
+ } else {
+ $type = $rtype;
+ $allow_null = isset($def->allow_null);
+ }
+
+ try {
+ $value = $this->parser->parse($value, $type, $allow_null);
+ } catch (HTMLPurifier_VarParserException $e) {
+ $this->triggerError(
+ 'Value for ' . $key . ' is of invalid type, should be ' .
+ HTMLPurifier_VarParser::getTypeName($type),
+ E_USER_WARNING
+ );
+ return;
+ }
+ if (is_string($value) && is_object($def)) {
+ // resolve value alias if defined
+ if (isset($def->aliases[$value])) {
+ $value = $def->aliases[$value];
+ }
+ // check to see if the value is allowed
+ if (isset($def->allowed) && !isset($def->allowed[$value])) {
+ $this->triggerError(
+ 'Value not supported, valid values are: ' .
+ $this->_listify($def->allowed),
+ E_USER_WARNING
+ );
+ return;
+ }
+ }
+ $this->plist->set($key, $value);
+
+ // reset definitions if the directives they depend on changed
+ // this is a very costly process, so it's discouraged
+ // with finalization
+ if ($namespace == 'HTML' || $namespace == 'CSS' || $namespace == 'URI') {
+ $this->definitions[$namespace] = null;
+ }
+
+ $this->serials[$namespace] = false;
+ }
+
+ /**
+ * Convenience function for error reporting
+ *
+ * @param array $lookup
+ *
+ * @return string
+ */
+ private function _listify($lookup)
+ {
+ $list = array();
+ foreach ($lookup as $name => $b) {
+ $list[] = $name;
+ }
+ return implode(', ', $list);
+ }
+
+ /**
+ * Retrieves object reference to the HTML definition.
+ *
+ * @param bool $raw Return a copy that has not been setup yet. Must be
+ * called before it's been setup, otherwise won't work.
+ * @param bool $optimized If true, this method may return null, to
+ * indicate that a cached version of the modified
+ * definition object is available and no further edits
+ * are necessary. Consider using
+ * maybeGetRawHTMLDefinition, which is more explicitly
+ * named, instead.
+ *
+ * @return HTMLPurifier_HTMLDefinition
+ */
+ public function getHTMLDefinition($raw = false, $optimized = false)
+ {
+ return $this->getDefinition('HTML', $raw, $optimized);
+ }
+
+ /**
+ * Retrieves object reference to the CSS definition
+ *
+ * @param bool $raw Return a copy that has not been setup yet. Must be
+ * called before it's been setup, otherwise won't work.
+ * @param bool $optimized If true, this method may return null, to
+ * indicate that a cached version of the modified
+ * definition object is available and no further edits
+ * are necessary. Consider using
+ * maybeGetRawCSSDefinition, which is more explicitly
+ * named, instead.
+ *
+ * @return HTMLPurifier_CSSDefinition
+ */
+ public function getCSSDefinition($raw = false, $optimized = false)
+ {
+ return $this->getDefinition('CSS', $raw, $optimized);
+ }
+
+ /**
+ * Retrieves object reference to the URI definition
+ *
+ * @param bool $raw Return a copy that has not been setup yet. Must be
+ * called before it's been setup, otherwise won't work.
+ * @param bool $optimized If true, this method may return null, to
+ * indicate that a cached version of the modified
+ * definition object is available and no further edits
+ * are necessary. Consider using
+ * maybeGetRawURIDefinition, which is more explicitly
+ * named, instead.
+ *
+ * @return HTMLPurifier_URIDefinition
+ */
+ public function getURIDefinition($raw = false, $optimized = false)
+ {
+ return $this->getDefinition('URI', $raw, $optimized);
+ }
+
+ /**
+ * Retrieves a definition
+ *
+ * @param string $type Type of definition: HTML, CSS, etc
+ * @param bool $raw Whether or not definition should be returned raw
+ * @param bool $optimized Only has an effect when $raw is true. Whether
+ * or not to return null if the result is already present in
+ * the cache. This is off by default for backwards
+ * compatibility reasons, but you need to do things this
+ * way in order to ensure that caching is done properly.
+ * Check out enduser-customize.html for more details.
+ * We probably won't ever change this default, as much as the
+ * maybe semantics is the "right thing to do."
+ *
+ * @throws HTMLPurifier_Exception
+ * @return HTMLPurifier_Definition
+ */
+ public function getDefinition($type, $raw = false, $optimized = false)
+ {
+ if ($optimized && !$raw) {
+ throw new HTMLPurifier_Exception("Cannot set optimized = true when raw = false");
+ }
+ if (!$this->finalized) {
+ $this->autoFinalize();
+ }
+ // temporarily suspend locks, so we can handle recursive definition calls
+ $lock = $this->lock;
+ $this->lock = null;
+ $factory = HTMLPurifier_DefinitionCacheFactory::instance();
+ $cache = $factory->create($type, $this);
+ $this->lock = $lock;
+ if (!$raw) {
+ // full definition
+ // ---------------
+ // check if definition is in memory
+ if (!empty($this->definitions[$type])) {
+ $def = $this->definitions[$type];
+ // check if the definition is setup
+ if ($def->setup) {
+ return $def;
+ } else {
+ $def->setup($this);
+ if ($def->optimized) {
+ $cache->add($def, $this);
+ }
+ return $def;
+ }
+ }
+ // check if definition is in cache
+ $def = $cache->get($this);
+ if ($def) {
+ // definition in cache, save to memory and return it
+ $this->definitions[$type] = $def;
+ return $def;
+ }
+ // initialize it
+ $def = $this->initDefinition($type);
+ // set it up
+ $this->lock = $type;
+ $def->setup($this);
+ $this->lock = null;
+ // save in cache
+ $cache->add($def, $this);
+ // return it
+ return $def;
+ } else {
+ // raw definition
+ // --------------
+ // check preconditions
+ $def = null;
+ if ($optimized) {
+ if (is_null($this->get($type . '.DefinitionID'))) {
+ // fatally error out if definition ID not set
+ throw new HTMLPurifier_Exception(
+ "Cannot retrieve raw version without specifying %$type.DefinitionID"
+ );
+ }
+ }
+ if (!empty($this->definitions[$type])) {
+ $def = $this->definitions[$type];
+ if ($def->setup && !$optimized) {
+ $extra = $this->chatty ?
+ " (try moving this code block earlier in your initialization)" :
+ "";
+ throw new HTMLPurifier_Exception(
+ "Cannot retrieve raw definition after it has already been setup" .
+ $extra
+ );
+ }
+ if ($def->optimized === null) {
+ $extra = $this->chatty ? " (try flushing your cache)" : "";
+ throw new HTMLPurifier_Exception(
+ "Optimization status of definition is unknown" . $extra
+ );
+ }
+ if ($def->optimized !== $optimized) {
+ $msg = $optimized ? "optimized" : "unoptimized";
+ $extra = $this->chatty ?
+ " (this backtrace is for the first inconsistent call, which was for a $msg raw definition)"
+ : "";
+ throw new HTMLPurifier_Exception(
+ "Inconsistent use of optimized and unoptimized raw definition retrievals" . $extra
+ );
+ }
+ }
+ // check if definition was in memory
+ if ($def) {
+ if ($def->setup) {
+ // invariant: $optimized === true (checked above)
+ return null;
+ } else {
+ return $def;
+ }
+ }
+ // if optimized, check if definition was in cache
+ // (because we do the memory check first, this formulation
+ // is prone to cache slamming, but I think
+ // guaranteeing that either /all/ of the raw
+ // setup code or /none/ of it is run is more important.)
+ if ($optimized) {
+ // This code path only gets run once; once we put
+ // something in $definitions (which is guaranteed by the
+ // trailing code), we always short-circuit above.
+ $def = $cache->get($this);
+ if ($def) {
+ // save the full definition for later, but don't
+ // return it yet
+ $this->definitions[$type] = $def;
+ return null;
+ }
+ }
+ // check invariants for creation
+ if (!$optimized) {
+ if (!is_null($this->get($type . '.DefinitionID'))) {
+ if ($this->chatty) {
+ $this->triggerError(
+ 'Due to a documentation error in previous version of HTML Purifier, your ' .
+ 'definitions are not being cached. If this is OK, you can remove the ' .
+ '%$type.DefinitionRev and %$type.DefinitionID declaration. Otherwise, ' .
+ 'modify your code to use maybeGetRawDefinition, and test if the returned ' .
+ 'value is null before making any edits (if it is null, that means that a ' .
+ 'cached version is available, and no raw operations are necessary). See ' .
+ '<a href="http://htmlpurifier.org/docs/enduser-customize.html#optimized">' .
+ 'Customize</a> for more details',
+ E_USER_WARNING
+ );
+ } else {
+ $this->triggerError(
+ "Useless DefinitionID declaration",
+ E_USER_WARNING
+ );
+ }
+ }
+ }
+ // initialize it
+ $def = $this->initDefinition($type);
+ $def->optimized = $optimized;
+ return $def;
+ }
+ throw new HTMLPurifier_Exception("The impossible happened!");
+ }
+
+ /**
+ * Initialise definition
+ *
+ * @param string $type What type of definition to create
+ *
+ * @return HTMLPurifier_CSSDefinition|HTMLPurifier_HTMLDefinition|HTMLPurifier_URIDefinition
+ * @throws HTMLPurifier_Exception
+ */
+ private function initDefinition($type)
+ {
+ // quick checks failed, let's create the object
+ if ($type == 'HTML') {
+ $def = new HTMLPurifier_HTMLDefinition();
+ } elseif ($type == 'CSS') {
+ $def = new HTMLPurifier_CSSDefinition();
+ } elseif ($type == 'URI') {
+ $def = new HTMLPurifier_URIDefinition();
+ } else {
+ throw new HTMLPurifier_Exception(
+ "Definition of $type type not supported"
+ );
+ }
+ $this->definitions[$type] = $def;
+ return $def;
+ }
+
+ public function maybeGetRawDefinition($name)
+ {
+ return $this->getDefinition($name, true, true);
+ }
+
+ /**
+ * @return HTMLPurifier_HTMLDefinition
+ */
+ public function maybeGetRawHTMLDefinition()
+ {
+ return $this->getDefinition('HTML', true, true);
+ }
+
+ /**
+ * @return HTMLPurifier_CSSDefinition
+ */
+ public function maybeGetRawCSSDefinition()
+ {
+ return $this->getDefinition('CSS', true, true);
+ }
+
+ /**
+ * @return HTMLPurifier_URIDefinition
+ */
+ public function maybeGetRawURIDefinition()
+ {
+ return $this->getDefinition('URI', true, true);
+ }
+
+ /**
+ * Loads configuration values from an array with the following structure:
+ * Namespace.Directive => Value
+ *
+ * @param array $config_array Configuration associative array
+ */
+ public function loadArray($config_array)
+ {
+ if ($this->isFinalized('Cannot load directives after finalization')) {
+ return;
+ }
+ foreach ($config_array as $key => $value) {
+ $key = str_replace('_', '.', $key);
+ if (strpos($key, '.') !== false) {
+ $this->set($key, $value);
+ } else {
+ $namespace = $key;
+ $namespace_values = $value;
+ foreach ($namespace_values as $directive => $value2) {
+ $this->set($namespace .'.'. $directive, $value2);
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns a list of array(namespace, directive) for all directives
+ * that are allowed in a web-form context as per an allowed
+ * namespaces/directives list.
+ *
+ * @param array $allowed List of allowed namespaces/directives
+ * @param HTMLPurifier_ConfigSchema $schema Schema to use, if not global copy
+ *
+ * @return array
+ */
+ public static function getAllowedDirectivesForForm($allowed, $schema = null)
+ {
+ if (!$schema) {
+ $schema = HTMLPurifier_ConfigSchema::instance();
+ }
+ if ($allowed !== true) {
+ if (is_string($allowed)) {
+ $allowed = array($allowed);
+ }
+ $allowed_ns = array();
+ $allowed_directives = array();
+ $blacklisted_directives = array();
+ foreach ($allowed as $ns_or_directive) {
+ if (strpos($ns_or_directive, '.') !== false) {
+ // directive
+ if ($ns_or_directive[0] == '-') {
+ $blacklisted_directives[substr($ns_or_directive, 1)] = true;
+ } else {
+ $allowed_directives[$ns_or_directive] = true;
+ }
+ } else {
+ // namespace
+ $allowed_ns[$ns_or_directive] = true;
+ }
+ }
+ }
+ $ret = array();
+ foreach ($schema->info as $key => $def) {
+ list($ns, $directive) = explode('.', $key, 2);
+ if ($allowed !== true) {
+ if (isset($blacklisted_directives["$ns.$directive"])) {
+ continue;
+ }
+ if (!isset($allowed_directives["$ns.$directive"]) && !isset($allowed_ns[$ns])) {
+ continue;
+ }
+ }
+ if (isset($def->isAlias)) {
+ continue;
+ }
+ if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') {
+ continue;
+ }
+ $ret[] = array($ns, $directive);
+ }
+ return $ret;
+ }
+
+ /**
+ * Loads configuration values from $_GET/$_POST that were posted
+ * via ConfigForm
+ *
+ * @param array $array $_GET or $_POST array to import
+ * @param string|bool $index Index/name that the config variables are in
+ * @param array|bool $allowed List of allowed namespaces/directives
+ * @param bool $mq_fix Boolean whether or not to enable magic quotes fix
+ * @param HTMLPurifier_ConfigSchema $schema Schema to use, if not global copy
+ *
+ * @return mixed
+ */
+ public static function loadArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null)
+ {
+ $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $schema);
+ $config = HTMLPurifier_Config::create($ret, $schema);
+ return $config;
+ }
+
+ /**
+ * Merges in configuration values from $_GET/$_POST to object. NOT STATIC.
+ *
+ * @param array $array $_GET or $_POST array to import
+ * @param string|bool $index Index/name that the config variables are in
+ * @param array|bool $allowed List of allowed namespaces/directives
+ * @param bool $mq_fix Boolean whether or not to enable magic quotes fix
+ */
+ public function mergeArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true)
+ {
+ $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $this->def);
+ $this->loadArray($ret);
+ }
+
+ /**
+ * Prepares an array from a form into something usable for the more
+ * strict parts of HTMLPurifier_Config
+ *
+ * @param array $array $_GET or $_POST array to import
+ * @param string|bool $index Index/name that the config variables are in
+ * @param array|bool $allowed List of allowed namespaces/directives
+ * @param bool $mq_fix Boolean whether or not to enable magic quotes fix
+ * @param HTMLPurifier_ConfigSchema $schema Schema to use, if not global copy
+ *
+ * @return array
+ */
+ public static function prepareArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null)
+ {
+ if ($index !== false) {
+ $array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
+ }
+ $mq = $mq_fix && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
+
+ $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $schema);
+ $ret = array();
+ foreach ($allowed as $key) {
+ list($ns, $directive) = $key;
+ $skey = "$ns.$directive";
+ if (!empty($array["Null_$skey"])) {
+ $ret[$ns][$directive] = null;
+ continue;
+ }
+ if (!isset($array[$skey])) {
+ continue;
+ }
+ $value = $mq ? stripslashes($array[$skey]) : $array[$skey];
+ $ret[$ns][$directive] = $value;
+ }
+ return $ret;
+ }
+
+ /**
+ * Loads configuration values from an ini file
+ *
+ * @param string $filename Name of ini file
+ */
+ public function loadIni($filename)
+ {
+ if ($this->isFinalized('Cannot load directives after finalization')) {
+ return;
+ }
+ $array = parse_ini_file($filename, true);
+ $this->loadArray($array);
+ }
+
+ /**
+ * Checks whether or not the configuration object is finalized.
+ *
+ * @param string|bool $error String error message, or false for no error
+ *
+ * @return bool
+ */
+ public function isFinalized($error = false)
+ {
+ if ($this->finalized && $error) {
+ $this->triggerError($error, E_USER_ERROR);
+ }
+ return $this->finalized;
+ }
+
+ /**
+ * Finalizes configuration only if auto finalize is on and not
+ * already finalized
+ */
+ public function autoFinalize()
+ {
+ if ($this->autoFinalize) {
+ $this->finalize();
+ } else {
+ $this->plist->squash(true);
+ }
+ }
+
+ /**
+ * Finalizes a configuration object, prohibiting further change
+ */
+ public function finalize()
+ {
+ $this->finalized = true;
+ $this->parser = null;
+ }
+
+ /**
+ * Produces a nicely formatted error message by supplying the
+ * stack frame information OUTSIDE of HTMLPurifier_Config.
+ *
+ * @param string $msg An error message
+ * @param int $no An error number
+ */
+ protected function triggerError($msg, $no)
+ {
+ // determine previous stack frame
+ $extra = '';
+ if ($this->chatty) {
+ $trace = debug_backtrace();
+ // zip(tail(trace), trace) -- but PHP is not Haskell har har
+ for ($i = 0, $c = count($trace); $i < $c - 1; $i++) {
+ // XXX this is not correct on some versions of HTML Purifier
+ if ($trace[$i + 1]['class'] === 'HTMLPurifier_Config') {
+ continue;
+ }
+ $frame = $trace[$i];
+ $extra = " invoked on line {$frame['line']} in file {$frame['file']}";
+ break;
+ }
+ }
+ trigger_error($msg . $extra, $no);
+ }
+
+ /**
+ * Returns a serialized form of the configuration object that can
+ * be reconstituted.
+ *
+ * @return string
+ */
+ public function serialize()
+ {
+ $this->getDefinition('HTML');
+ $this->getDefinition('CSS');
+ $this->getDefinition('URI');
+ return serialize($this);
+ }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema.php
index ab7e7c0..bfbb0f9 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema.php
@@ -1,176 +1,176 @@
-<?php
-
-/**
- * Configuration definition, defines directives and their defaults.
- */
-class HTMLPurifier_ConfigSchema
-{
- /**
- * Defaults of the directives and namespaces.
- * @type array
- * @note This shares the exact same structure as HTMLPurifier_Config::$conf
- */
- public $defaults = array();
-
- /**
- * The default property list. Do not edit this property list.
- * @type array
- */
- public $defaultPlist;
-
- /**
- * Definition of the directives.
- * The structure of this is:
- *
- * array(
- * 'Namespace' => array(
- * 'Directive' => new stdclass(),
- * )
- * )
- *
- * The stdclass may have the following properties:
- *
- * - If isAlias isn't set:
- * - type: Integer type of directive, see HTMLPurifier_VarParser for definitions
- * - allow_null: If set, this directive allows null values
- * - aliases: If set, an associative array of value aliases to real values
- * - allowed: If set, a lookup array of allowed (string) values
- * - If isAlias is set:
- * - namespace: Namespace this directive aliases to
- * - name: Directive name this directive aliases to
- *
- * In certain degenerate cases, stdclass will actually be an integer. In
- * that case, the value is equivalent to an stdclass with the type
- * property set to the integer. If the integer is negative, type is
- * equal to the absolute value of integer, and allow_null is true.
- *
- * This class is friendly with HTMLPurifier_Config. If you need introspection
- * about the schema, you're better of using the ConfigSchema_Interchange,
- * which uses more memory but has much richer information.
- * @type array
- */
- public $info = array();
-
- /**
- * Application-wide singleton
- * @type HTMLPurifier_ConfigSchema
- */
- protected static $singleton;
-
- public function __construct()
- {
- $this->defaultPlist = new HTMLPurifier_PropertyList();
- }
-
- /**
- * Unserializes the default ConfigSchema.
- * @return HTMLPurifier_ConfigSchema
- */
- public static function makeFromSerial()
- {
- $contents = file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema.ser');
- $r = unserialize($contents);
- if (!$r) {
- $hash = sha1($contents);
- trigger_error("Unserialization of configuration schema failed, sha1 of file was $hash", E_USER_ERROR);
- }
- return $r;
- }
-
- /**
- * Retrieves an instance of the application-wide configuration definition.
- * @param HTMLPurifier_ConfigSchema $prototype
- * @return HTMLPurifier_ConfigSchema
- */
- public static function instance($prototype = null)
- {
- if ($prototype !== null) {
- HTMLPurifier_ConfigSchema::$singleton = $prototype;
- } elseif (HTMLPurifier_ConfigSchema::$singleton === null || $prototype === true) {
- HTMLPurifier_ConfigSchema::$singleton = HTMLPurifier_ConfigSchema::makeFromSerial();
- }
- return HTMLPurifier_ConfigSchema::$singleton;
- }
-
- /**
- * Defines a directive for configuration
- * @warning Will fail of directive's namespace is defined.
- * @warning This method's signature is slightly different from the legacy
- * define() static method! Beware!
- * @param string $key Name of directive
- * @param mixed $default Default value of directive
- * @param string $type Allowed type of the directive. See
- * HTMLPurifier_DirectiveDef::$type for allowed values
- * @param bool $allow_null Whether or not to allow null values
- */
- public function add($key, $default, $type, $allow_null)
- {
- $obj = new stdclass();
- $obj->type = is_int($type) ? $type : HTMLPurifier_VarParser::$types[$type];
- if ($allow_null) {
- $obj->allow_null = true;
- }
- $this->info[$key] = $obj;
- $this->defaults[$key] = $default;
- $this->defaultPlist->set($key, $default);
- }
-
- /**
- * Defines a directive value alias.
- *
- * Directive value aliases are convenient for developers because it lets
- * them set a directive to several values and get the same result.
- * @param string $key Name of Directive
- * @param array $aliases Hash of aliased values to the real alias
- */
- public function addValueAliases($key, $aliases)
- {
- if (!isset($this->info[$key]->aliases)) {
- $this->info[$key]->aliases = array();
- }
- foreach ($aliases as $alias => $real) {
- $this->info[$key]->aliases[$alias] = $real;
- }
- }
-
- /**
- * Defines a set of allowed values for a directive.
- * @warning This is slightly different from the corresponding static
- * method definition.
- * @param string $key Name of directive
- * @param array $allowed Lookup array of allowed values
- */
- public function addAllowedValues($key, $allowed)
- {
- $this->info[$key]->allowed = $allowed;
- }
-
- /**
- * Defines a directive alias for backwards compatibility
- * @param string $key Directive that will be aliased
- * @param string $new_key Directive that the alias will be to
- */
- public function addAlias($key, $new_key)
- {
- $obj = new stdclass;
- $obj->key = $new_key;
- $obj->isAlias = true;
- $this->info[$key] = $obj;
- }
-
- /**
- * Replaces any stdclass that only has the type property with type integer.
- */
- public function postProcess()
- {
- foreach ($this->info as $key => $v) {
- if (count((array) $v) == 1) {
- $this->info[$key] = $v->type;
- } elseif (count((array) $v) == 2 && isset($v->allow_null)) {
- $this->info[$key] = -$v->type;
- }
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Configuration definition, defines directives and their defaults.
+ */
+class HTMLPurifier_ConfigSchema
+{
+ /**
+ * Defaults of the directives and namespaces.
+ * @type array
+ * @note This shares the exact same structure as HTMLPurifier_Config::$conf
+ */
+ public $defaults = array();
+
+ /**
+ * The default property list. Do not edit this property list.
+ * @type array
+ */
+ public $defaultPlist;
+
+ /**
+ * Definition of the directives.
+ * The structure of this is:
+ *
+ * array(
+ * 'Namespace' => array(
+ * 'Directive' => new stdclass(),
+ * )
+ * )
+ *
+ * The stdclass may have the following properties:
+ *
+ * - If isAlias isn't set:
+ * - type: Integer type of directive, see HTMLPurifier_VarParser for definitions
+ * - allow_null: If set, this directive allows null values
+ * - aliases: If set, an associative array of value aliases to real values
+ * - allowed: If set, a lookup array of allowed (string) values
+ * - If isAlias is set:
+ * - namespace: Namespace this directive aliases to
+ * - name: Directive name this directive aliases to
+ *
+ * In certain degenerate cases, stdclass will actually be an integer. In
+ * that case, the value is equivalent to an stdclass with the type
+ * property set to the integer. If the integer is negative, type is
+ * equal to the absolute value of integer, and allow_null is true.
+ *
+ * This class is friendly with HTMLPurifier_Config. If you need introspection
+ * about the schema, you're better of using the ConfigSchema_Interchange,
+ * which uses more memory but has much richer information.
+ * @type array
+ */
+ public $info = array();
+
+ /**
+ * Application-wide singleton
+ * @type HTMLPurifier_ConfigSchema
+ */
+ protected static $singleton;
+
+ public function __construct()
+ {
+ $this->defaultPlist = new HTMLPurifier_PropertyList();
+ }
+
+ /**
+ * Unserializes the default ConfigSchema.
+ * @return HTMLPurifier_ConfigSchema
+ */
+ public static function makeFromSerial()
+ {
+ $contents = file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema.ser');
+ $r = unserialize($contents);
+ if (!$r) {
+ $hash = sha1($contents);
+ trigger_error("Unserialization of configuration schema failed, sha1 of file was $hash", E_USER_ERROR);
+ }
+ return $r;
+ }
+
+ /**
+ * Retrieves an instance of the application-wide configuration definition.
+ * @param HTMLPurifier_ConfigSchema $prototype
+ * @return HTMLPurifier_ConfigSchema
+ */
+ public static function instance($prototype = null)
+ {
+ if ($prototype !== null) {
+ HTMLPurifier_ConfigSchema::$singleton = $prototype;
+ } elseif (HTMLPurifier_ConfigSchema::$singleton === null || $prototype === true) {
+ HTMLPurifier_ConfigSchema::$singleton = HTMLPurifier_ConfigSchema::makeFromSerial();
+ }
+ return HTMLPurifier_ConfigSchema::$singleton;
+ }
+
+ /**
+ * Defines a directive for configuration
+ * @warning Will fail of directive's namespace is defined.
+ * @warning This method's signature is slightly different from the legacy
+ * define() static method! Beware!
+ * @param string $key Name of directive
+ * @param mixed $default Default value of directive
+ * @param string $type Allowed type of the directive. See
+ * HTMLPurifier_DirectiveDef::$type for allowed values
+ * @param bool $allow_null Whether or not to allow null values
+ */
+ public function add($key, $default, $type, $allow_null)
+ {
+ $obj = new stdclass();
+ $obj->type = is_int($type) ? $type : HTMLPurifier_VarParser::$types[$type];
+ if ($allow_null) {
+ $obj->allow_null = true;
+ }
+ $this->info[$key] = $obj;
+ $this->defaults[$key] = $default;
+ $this->defaultPlist->set($key, $default);
+ }
+
+ /**
+ * Defines a directive value alias.
+ *
+ * Directive value aliases are convenient for developers because it lets
+ * them set a directive to several values and get the same result.
+ * @param string $key Name of Directive
+ * @param array $aliases Hash of aliased values to the real alias
+ */
+ public function addValueAliases($key, $aliases)
+ {
+ if (!isset($this->info[$key]->aliases)) {
+ $this->info[$key]->aliases = array();
+ }
+ foreach ($aliases as $alias => $real) {
+ $this->info[$key]->aliases[$alias] = $real;
+ }
+ }
+
+ /**
+ * Defines a set of allowed values for a directive.
+ * @warning This is slightly different from the corresponding static
+ * method definition.
+ * @param string $key Name of directive
+ * @param array $allowed Lookup array of allowed values
+ */
+ public function addAllowedValues($key, $allowed)
+ {
+ $this->info[$key]->allowed = $allowed;
+ }
+
+ /**
+ * Defines a directive alias for backwards compatibility
+ * @param string $key Directive that will be aliased
+ * @param string $new_key Directive that the alias will be to
+ */
+ public function addAlias($key, $new_key)
+ {
+ $obj = new stdclass;
+ $obj->key = $new_key;
+ $obj->isAlias = true;
+ $this->info[$key] = $obj;
+ }
+
+ /**
+ * Replaces any stdclass that only has the type property with type integer.
+ */
+ public function postProcess()
+ {
+ foreach ($this->info as $key => $v) {
+ if (count((array) $v) == 1) {
+ $this->info[$key] = $v->type;
+ } elseif (count((array) $v) == 2 && isset($v->allow_null)) {
+ $this->info[$key] = -$v->type;
+ }
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
index 1174575..d5906cd 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
@@ -1,48 +1,48 @@
-<?php
-
-/**
- * Converts HTMLPurifier_ConfigSchema_Interchange to our runtime
- * representation used to perform checks on user configuration.
- */
-class HTMLPurifier_ConfigSchema_Builder_ConfigSchema
-{
-
- /**
- * @param HTMLPurifier_ConfigSchema_Interchange $interchange
- * @return HTMLPurifier_ConfigSchema
- */
- public function build($interchange)
- {
- $schema = new HTMLPurifier_ConfigSchema();
- foreach ($interchange->directives as $d) {
- $schema->add(
- $d->id->key,
- $d->default,
- $d->type,
- $d->typeAllowsNull
- );
- if ($d->allowed !== null) {
- $schema->addAllowedValues(
- $d->id->key,
- $d->allowed
- );
- }
- foreach ($d->aliases as $alias) {
- $schema->addAlias(
- $alias->key,
- $d->id->key
- );
- }
- if ($d->valueAliases !== null) {
- $schema->addValueAliases(
- $d->id->key,
- $d->valueAliases
- );
- }
- }
- $schema->postProcess();
- return $schema;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Converts HTMLPurifier_ConfigSchema_Interchange to our runtime
+ * representation used to perform checks on user configuration.
+ */
+class HTMLPurifier_ConfigSchema_Builder_ConfigSchema
+{
+
+ /**
+ * @param HTMLPurifier_ConfigSchema_Interchange $interchange
+ * @return HTMLPurifier_ConfigSchema
+ */
+ public function build($interchange)
+ {
+ $schema = new HTMLPurifier_ConfigSchema();
+ foreach ($interchange->directives as $d) {
+ $schema->add(
+ $d->id->key,
+ $d->default,
+ $d->type,
+ $d->typeAllowsNull
+ );
+ if ($d->allowed !== null) {
+ $schema->addAllowedValues(
+ $d->id->key,
+ $d->allowed
+ );
+ }
+ foreach ($d->aliases as $alias) {
+ $schema->addAlias(
+ $alias->key,
+ $d->id->key
+ );
+ }
+ if ($d->valueAliases !== null) {
+ $schema->addValueAliases(
+ $d->id->key,
+ $d->valueAliases
+ );
+ }
+ }
+ $schema->postProcess();
+ return $schema;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Builder/Xml.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
index 0d00bf1..5fa56f7 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
@@ -1,144 +1,144 @@
-<?php
-
-/**
- * Converts HTMLPurifier_ConfigSchema_Interchange to an XML format,
- * which can be further processed to generate documentation.
- */
-class HTMLPurifier_ConfigSchema_Builder_Xml extends XMLWriter
-{
-
- /**
- * @type HTMLPurifier_ConfigSchema_Interchange
- */
- protected $interchange;
-
- /**
- * @type string
- */
- private $namespace;
-
- /**
- * @param string $html
- */
- protected function writeHTMLDiv($html)
- {
- $this->startElement('div');
-
- $purifier = HTMLPurifier::getInstance();
- $html = $purifier->purify($html);
- $this->writeAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
- $this->writeRaw($html);
-
- $this->endElement(); // div
- }
-
- /**
- * @param mixed $var
- * @return string
- */
- protected function export($var)
- {
- if ($var === array()) {
- return 'array()';
- }
- return var_export($var, true);
- }
-
- /**
- * @param HTMLPurifier_ConfigSchema_Interchange $interchange
- */
- public function build($interchange)
- {
- // global access, only use as last resort
- $this->interchange = $interchange;
-
- $this->setIndent(true);
- $this->startDocument('1.0', 'UTF-8');
- $this->startElement('configdoc');
- $this->writeElement('title', $interchange->name);
-
- foreach ($interchange->directives as $directive) {
- $this->buildDirective($directive);
- }
-
- if ($this->namespace) {
- $this->endElement();
- } // namespace
-
- $this->endElement(); // configdoc
- $this->flush();
- }
-
- /**
- * @param HTMLPurifier_ConfigSchema_Interchange_Directive $directive
- */
- public function buildDirective($directive)
- {
- // Kludge, although I suppose having a notion of a "root namespace"
- // certainly makes things look nicer when documentation is built.
- // Depends on things being sorted.
- if (!$this->namespace || $this->namespace !== $directive->id->getRootNamespace()) {
- if ($this->namespace) {
- $this->endElement();
- } // namespace
- $this->namespace = $directive->id->getRootNamespace();
- $this->startElement('namespace');
- $this->writeAttribute('id', $this->namespace);
- $this->writeElement('name', $this->namespace);
- }
-
- $this->startElement('directive');
- $this->writeAttribute('id', $directive->id->toString());
-
- $this->writeElement('name', $directive->id->getDirective());
-
- $this->startElement('aliases');
- foreach ($directive->aliases as $alias) {
- $this->writeElement('alias', $alias->toString());
- }
- $this->endElement(); // aliases
-
- $this->startElement('constraints');
- if ($directive->version) {
- $this->writeElement('version', $directive->version);
- }
- $this->startElement('type');
- if ($directive->typeAllowsNull) {
- $this->writeAttribute('allow-null', 'yes');
- }
- $this->text($directive->type);
- $this->endElement(); // type
- if ($directive->allowed) {
- $this->startElement('allowed');
- foreach ($directive->allowed as $value => $x) {
- $this->writeElement('value', $value);
- }
- $this->endElement(); // allowed
- }
- $this->writeElement('default', $this->export($directive->default));
- $this->writeAttribute('xml:space', 'preserve');
- if ($directive->external) {
- $this->startElement('external');
- foreach ($directive->external as $project) {
- $this->writeElement('project', $project);
- }
- $this->endElement();
- }
- $this->endElement(); // constraints
-
- if ($directive->deprecatedVersion) {
- $this->startElement('deprecated');
- $this->writeElement('version', $directive->deprecatedVersion);
- $this->writeElement('use', $directive->deprecatedUse->toString());
- $this->endElement(); // deprecated
- }
-
- $this->startElement('description');
- $this->writeHTMLDiv($directive->description);
- $this->endElement(); // description
-
- $this->endElement(); // directive
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Converts HTMLPurifier_ConfigSchema_Interchange to an XML format,
+ * which can be further processed to generate documentation.
+ */
+class HTMLPurifier_ConfigSchema_Builder_Xml extends XMLWriter
+{
+
+ /**
+ * @type HTMLPurifier_ConfigSchema_Interchange
+ */
+ protected $interchange;
+
+ /**
+ * @type string
+ */
+ private $namespace;
+
+ /**
+ * @param string $html
+ */
+ protected function writeHTMLDiv($html)
+ {
+ $this->startElement('div');
+
+ $purifier = HTMLPurifier::getInstance();
+ $html = $purifier->purify($html);
+ $this->writeAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
+ $this->writeRaw($html);
+
+ $this->endElement(); // div
+ }
+
+ /**
+ * @param mixed $var
+ * @return string
+ */
+ protected function export($var)
+ {
+ if ($var === array()) {
+ return 'array()';
+ }
+ return var_export($var, true);
+ }
+
+ /**
+ * @param HTMLPurifier_ConfigSchema_Interchange $interchange
+ */
+ public function build($interchange)
+ {
+ // global access, only use as last resort
+ $this->interchange = $interchange;
+
+ $this->setIndent(true);
+ $this->startDocument('1.0', 'UTF-8');
+ $this->startElement('configdoc');
+ $this->writeElement('title', $interchange->name);
+
+ foreach ($interchange->directives as $directive) {
+ $this->buildDirective($directive);
+ }
+
+ if ($this->namespace) {
+ $this->endElement();
+ } // namespace
+
+ $this->endElement(); // configdoc
+ $this->flush();
+ }
+
+ /**
+ * @param HTMLPurifier_ConfigSchema_Interchange_Directive $directive
+ */
+ public function buildDirective($directive)
+ {
+ // Kludge, although I suppose having a notion of a "root namespace"
+ // certainly makes things look nicer when documentation is built.
+ // Depends on things being sorted.
+ if (!$this->namespace || $this->namespace !== $directive->id->getRootNamespace()) {
+ if ($this->namespace) {
+ $this->endElement();
+ } // namespace
+ $this->namespace = $directive->id->getRootNamespace();
+ $this->startElement('namespace');
+ $this->writeAttribute('id', $this->namespace);
+ $this->writeElement('name', $this->namespace);
+ }
+
+ $this->startElement('directive');
+ $this->writeAttribute('id', $directive->id->toString());
+
+ $this->writeElement('name', $directive->id->getDirective());
+
+ $this->startElement('aliases');
+ foreach ($directive->aliases as $alias) {
+ $this->writeElement('alias', $alias->toString());
+ }
+ $this->endElement(); // aliases
+
+ $this->startElement('constraints');
+ if ($directive->version) {
+ $this->writeElement('version', $directive->version);
+ }
+ $this->startElement('type');
+ if ($directive->typeAllowsNull) {
+ $this->writeAttribute('allow-null', 'yes');
+ }
+ $this->text($directive->type);
+ $this->endElement(); // type
+ if ($directive->allowed) {
+ $this->startElement('allowed');
+ foreach ($directive->allowed as $value => $x) {
+ $this->writeElement('value', $value);
+ }
+ $this->endElement(); // allowed
+ }
+ $this->writeElement('default', $this->export($directive->default));
+ $this->writeAttribute('xml:space', 'preserve');
+ if ($directive->external) {
+ $this->startElement('external');
+ foreach ($directive->external as $project) {
+ $this->writeElement('project', $project);
+ }
+ $this->endElement();
+ }
+ $this->endElement(); // constraints
+
+ if ($directive->deprecatedVersion) {
+ $this->startElement('deprecated');
+ $this->writeElement('version', $directive->deprecatedVersion);
+ $this->writeElement('use', $directive->deprecatedUse->toString());
+ $this->endElement(); // deprecated
+ }
+
+ $this->startElement('description');
+ $this->writeHTMLDiv($directive->description);
+ $this->endElement(); // description
+
+ $this->endElement(); // directive
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Exception.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Exception.php
similarity index 93%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Exception.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Exception.php
index 1abdcfc..2671516 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Exception.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Exception.php
@@ -1,11 +1,11 @@
-<?php
-
-/**
- * Exceptions related to configuration schema
- */
-class HTMLPurifier_ConfigSchema_Exception extends HTMLPurifier_Exception
-{
-
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Exceptions related to configuration schema
+ */
+class HTMLPurifier_ConfigSchema_Exception extends HTMLPurifier_Exception
+{
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Interchange.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Interchange.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Interchange.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Interchange.php
index c094fa0..0e08ae8 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Interchange.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Interchange.php
@@ -1,47 +1,47 @@
-<?php
-
-/**
- * Generic schema interchange format that can be converted to a runtime
- * representation (HTMLPurifier_ConfigSchema) or HTML documentation. Members
- * are completely validated.
- */
-class HTMLPurifier_ConfigSchema_Interchange
-{
-
- /**
- * Name of the application this schema is describing.
- * @type string
- */
- public $name;
-
- /**
- * Array of Directive ID => array(directive info)
- * @type HTMLPurifier_ConfigSchema_Interchange_Directive[]
- */
- public $directives = array();
-
- /**
- * Adds a directive array to $directives
- * @param HTMLPurifier_ConfigSchema_Interchange_Directive $directive
- * @throws HTMLPurifier_ConfigSchema_Exception
- */
- public function addDirective($directive)
- {
- if (isset($this->directives[$i = $directive->id->toString()])) {
- throw new HTMLPurifier_ConfigSchema_Exception("Cannot redefine directive '$i'");
- }
- $this->directives[$i] = $directive;
- }
-
- /**
- * Convenience function to perform standard validation. Throws exception
- * on failed validation.
- */
- public function validate()
- {
- $validator = new HTMLPurifier_ConfigSchema_Validator();
- return $validator->validate($this);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Generic schema interchange format that can be converted to a runtime
+ * representation (HTMLPurifier_ConfigSchema) or HTML documentation. Members
+ * are completely validated.
+ */
+class HTMLPurifier_ConfigSchema_Interchange
+{
+
+ /**
+ * Name of the application this schema is describing.
+ * @type string
+ */
+ public $name;
+
+ /**
+ * Array of Directive ID => array(directive info)
+ * @type HTMLPurifier_ConfigSchema_Interchange_Directive[]
+ */
+ public $directives = array();
+
+ /**
+ * Adds a directive array to $directives
+ * @param HTMLPurifier_ConfigSchema_Interchange_Directive $directive
+ * @throws HTMLPurifier_ConfigSchema_Exception
+ */
+ public function addDirective($directive)
+ {
+ if (isset($this->directives[$i = $directive->id->toString()])) {
+ throw new HTMLPurifier_ConfigSchema_Exception("Cannot redefine directive '$i'");
+ }
+ $this->directives[$i] = $directive;
+ }
+
+ /**
+ * Convenience function to perform standard validation. Throws exception
+ * on failed validation.
+ */
+ public function validate()
+ {
+ $validator = new HTMLPurifier_ConfigSchema_Validator();
+ return $validator->validate($this);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
index 4c39c5c..127a39a 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
@@ -1,89 +1,89 @@
-<?php
-
-/**
- * Interchange component class describing configuration directives.
- */
-class HTMLPurifier_ConfigSchema_Interchange_Directive
-{
-
- /**
- * ID of directive.
- * @type HTMLPurifier_ConfigSchema_Interchange_Id
- */
- public $id;
-
- /**
- * Type, e.g. 'integer' or 'istring'.
- * @type string
- */
- public $type;
-
- /**
- * Default value, e.g. 3 or 'DefaultVal'.
- * @type mixed
- */
- public $default;
-
- /**
- * HTML description.
- * @type string
- */
- public $description;
-
- /**
- * Whether or not null is allowed as a value.
- * @type bool
- */
- public $typeAllowsNull = false;
-
- /**
- * Lookup table of allowed scalar values.
- * e.g. array('allowed' => true).
- * Null if all values are allowed.
- * @type array
- */
- public $allowed;
-
- /**
- * List of aliases for the directive.
- * e.g. array(new HTMLPurifier_ConfigSchema_Interchange_Id('Ns', 'Dir'))).
- * @type HTMLPurifier_ConfigSchema_Interchange_Id[]
- */
- public $aliases = array();
-
- /**
- * Hash of value aliases, e.g. array('alt' => 'real'). Null if value
- * aliasing is disabled (necessary for non-scalar types).
- * @type array
- */
- public $valueAliases;
-
- /**
- * Version of HTML Purifier the directive was introduced, e.g. '1.3.1'.
- * Null if the directive has always existed.
- * @type string
- */
- public $version;
-
- /**
- * ID of directive that supercedes this old directive.
- * Null if not deprecated.
- * @type HTMLPurifier_ConfigSchema_Interchange_Id
- */
- public $deprecatedUse;
-
- /**
- * Version of HTML Purifier this directive was deprecated. Null if not
- * deprecated.
- * @type string
- */
- public $deprecatedVersion;
-
- /**
- * List of external projects this directive depends on, e.g. array('CSSTidy').
- * @type array
- */
- public $external = array();
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Interchange component class describing configuration directives.
+ */
+class HTMLPurifier_ConfigSchema_Interchange_Directive
+{
+
+ /**
+ * ID of directive.
+ * @type HTMLPurifier_ConfigSchema_Interchange_Id
+ */
+ public $id;
+
+ /**
+ * Type, e.g. 'integer' or 'istring'.
+ * @type string
+ */
+ public $type;
+
+ /**
+ * Default value, e.g. 3 or 'DefaultVal'.
+ * @type mixed
+ */
+ public $default;
+
+ /**
+ * HTML description.
+ * @type string
+ */
+ public $description;
+
+ /**
+ * Whether or not null is allowed as a value.
+ * @type bool
+ */
+ public $typeAllowsNull = false;
+
+ /**
+ * Lookup table of allowed scalar values.
+ * e.g. array('allowed' => true).
+ * Null if all values are allowed.
+ * @type array
+ */
+ public $allowed;
+
+ /**
+ * List of aliases for the directive.
+ * e.g. array(new HTMLPurifier_ConfigSchema_Interchange_Id('Ns', 'Dir'))).
+ * @type HTMLPurifier_ConfigSchema_Interchange_Id[]
+ */
+ public $aliases = array();
+
+ /**
+ * Hash of value aliases, e.g. array('alt' => 'real'). Null if value
+ * aliasing is disabled (necessary for non-scalar types).
+ * @type array
+ */
+ public $valueAliases;
+
+ /**
+ * Version of HTML Purifier the directive was introduced, e.g. '1.3.1'.
+ * Null if the directive has always existed.
+ * @type string
+ */
+ public $version;
+
+ /**
+ * ID of directive that supercedes this old directive.
+ * Null if not deprecated.
+ * @type HTMLPurifier_ConfigSchema_Interchange_Id
+ */
+ public $deprecatedUse;
+
+ /**
+ * Version of HTML Purifier this directive was deprecated. Null if not
+ * deprecated.
+ * @type string
+ */
+ public $deprecatedVersion;
+
+ /**
+ * List of external projects this directive depends on, e.g. array('CSSTidy').
+ * @type array
+ */
+ public $external = array();
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Interchange/Id.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
similarity index 94%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
index 3ee8171..126f09d 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
@@ -1,58 +1,58 @@
-<?php
-
-/**
- * Represents a directive ID in the interchange format.
- */
-class HTMLPurifier_ConfigSchema_Interchange_Id
-{
-
- /**
- * @type string
- */
- public $key;
-
- /**
- * @param string $key
- */
- public function __construct($key)
- {
- $this->key = $key;
- }
-
- /**
- * @return string
- * @warning This is NOT magic, to ensure that people don't abuse SPL and
- * cause problems for PHP 5.0 support.
- */
- public function toString()
- {
- return $this->key;
- }
-
- /**
- * @return string
- */
- public function getRootNamespace()
- {
- return substr($this->key, 0, strpos($this->key, "."));
- }
-
- /**
- * @return string
- */
- public function getDirective()
- {
- return substr($this->key, strpos($this->key, ".") + 1);
- }
-
- /**
- * @param string $id
- * @return HTMLPurifier_ConfigSchema_Interchange_Id
- */
- public static function make($id)
- {
- return new HTMLPurifier_ConfigSchema_Interchange_Id($id);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Represents a directive ID in the interchange format.
+ */
+class HTMLPurifier_ConfigSchema_Interchange_Id
+{
+
+ /**
+ * @type string
+ */
+ public $key;
+
+ /**
+ * @param string $key
+ */
+ public function __construct($key)
+ {
+ $this->key = $key;
+ }
+
+ /**
+ * @return string
+ * @warning This is NOT magic, to ensure that people don't abuse SPL and
+ * cause problems for PHP 5.0 support.
+ */
+ public function toString()
+ {
+ return $this->key;
+ }
+
+ /**
+ * @return string
+ */
+ public function getRootNamespace()
+ {
+ return substr($this->key, 0, strpos($this->key, "."));
+ }
+
+ /**
+ * @return string
+ */
+ public function getDirective()
+ {
+ return substr($this->key, strpos($this->key, ".") + 1);
+ }
+
+ /**
+ * @param string $id
+ * @return HTMLPurifier_ConfigSchema_Interchange_Id
+ */
+ public static function make($id)
+ {
+ return new HTMLPurifier_ConfigSchema_Interchange_Id($id);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
index fe9b326..655e6dd 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
@@ -1,226 +1,226 @@
-<?php
-
-class HTMLPurifier_ConfigSchema_InterchangeBuilder
-{
-
- /**
- * Used for processing DEFAULT, nothing else.
- * @type HTMLPurifier_VarParser
- */
- protected $varParser;
-
- /**
- * @param HTMLPurifier_VarParser $varParser
- */
- public function __construct($varParser = null)
- {
- $this->varParser = $varParser ? $varParser : new HTMLPurifier_VarParser_Native();
- }
-
- /**
- * @param string $dir
- * @return HTMLPurifier_ConfigSchema_Interchange
- */
- public static function buildFromDirectory($dir = null)
- {
- $builder = new HTMLPurifier_ConfigSchema_InterchangeBuilder();
- $interchange = new HTMLPurifier_ConfigSchema_Interchange();
- return $builder->buildDir($interchange, $dir);
- }
-
- /**
- * @param HTMLPurifier_ConfigSchema_Interchange $interchange
- * @param string $dir
- * @return HTMLPurifier_ConfigSchema_Interchange
- */
- public function buildDir($interchange, $dir = null)
- {
- if (!$dir) {
- $dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema';
- }
- if (file_exists($dir . '/info.ini')) {
- $info = parse_ini_file($dir . '/info.ini');
- $interchange->name = $info['name'];
- }
-
- $files = array();
- $dh = opendir($dir);
- while (false !== ($file = readdir($dh))) {
- if (!$file || $file[0] == '.' || strrchr($file, '.') !== '.txt') {
- continue;
- }
- $files[] = $file;
- }
- closedir($dh);
-
- sort($files);
- foreach ($files as $file) {
- $this->buildFile($interchange, $dir . '/' . $file);
- }
- return $interchange;
- }
-
- /**
- * @param HTMLPurifier_ConfigSchema_Interchange $interchange
- * @param string $file
- */
- public function buildFile($interchange, $file)
- {
- $parser = new HTMLPurifier_StringHashParser();
- $this->build(
- $interchange,
- new HTMLPurifier_StringHash($parser->parseFile($file))
- );
- }
-
- /**
- * Builds an interchange object based on a hash.
- * @param HTMLPurifier_ConfigSchema_Interchange $interchange HTMLPurifier_ConfigSchema_Interchange object to build
- * @param HTMLPurifier_StringHash $hash source data
- * @throws HTMLPurifier_ConfigSchema_Exception
- */
- public function build($interchange, $hash)
- {
- if (!$hash instanceof HTMLPurifier_StringHash) {
- $hash = new HTMLPurifier_StringHash($hash);
- }
- if (!isset($hash['ID'])) {
- throw new HTMLPurifier_ConfigSchema_Exception('Hash does not have any ID');
- }
- if (strpos($hash['ID'], '.') === false) {
- if (count($hash) == 2 && isset($hash['DESCRIPTION'])) {
- $hash->offsetGet('DESCRIPTION'); // prevent complaining
- } else {
- throw new HTMLPurifier_ConfigSchema_Exception('All directives must have a namespace');
- }
- } else {
- $this->buildDirective($interchange, $hash);
- }
- $this->_findUnused($hash);
- }
-
- /**
- * @param HTMLPurifier_ConfigSchema_Interchange $interchange
- * @param HTMLPurifier_StringHash $hash
- * @throws HTMLPurifier_ConfigSchema_Exception
- */
- public function buildDirective($interchange, $hash)
- {
- $directive = new HTMLPurifier_ConfigSchema_Interchange_Directive();
-
- // These are required elements:
- $directive->id = $this->id($hash->offsetGet('ID'));
- $id = $directive->id->toString(); // convenience
-
- if (isset($hash['TYPE'])) {
- $type = explode('/', $hash->offsetGet('TYPE'));
- if (isset($type[1])) {
- $directive->typeAllowsNull = true;
- }
- $directive->type = $type[0];
- } else {
- throw new HTMLPurifier_ConfigSchema_Exception("TYPE in directive hash '$id' not defined");
- }
-
- if (isset($hash['DEFAULT'])) {
- try {
- $directive->default = $this->varParser->parse(
- $hash->offsetGet('DEFAULT'),
- $directive->type,
- $directive->typeAllowsNull
- );
- } catch (HTMLPurifier_VarParserException $e) {
- throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in DEFAULT in directive hash '$id'");
- }
- }
-
- if (isset($hash['DESCRIPTION'])) {
- $directive->description = $hash->offsetGet('DESCRIPTION');
- }
-
- if (isset($hash['ALLOWED'])) {
- $directive->allowed = $this->lookup($this->evalArray($hash->offsetGet('ALLOWED')));
- }
-
- if (isset($hash['VALUE-ALIASES'])) {
- $directive->valueAliases = $this->evalArray($hash->offsetGet('VALUE-ALIASES'));
- }
-
- if (isset($hash['ALIASES'])) {
- $raw_aliases = trim($hash->offsetGet('ALIASES'));
- $aliases = preg_split('/\s*,\s*/', $raw_aliases);
- foreach ($aliases as $alias) {
- $directive->aliases[] = $this->id($alias);
- }
- }
-
- if (isset($hash['VERSION'])) {
- $directive->version = $hash->offsetGet('VERSION');
- }
-
- if (isset($hash['DEPRECATED-USE'])) {
- $directive->deprecatedUse = $this->id($hash->offsetGet('DEPRECATED-USE'));
- }
-
- if (isset($hash['DEPRECATED-VERSION'])) {
- $directive->deprecatedVersion = $hash->offsetGet('DEPRECATED-VERSION');
- }
-
- if (isset($hash['EXTERNAL'])) {
- $directive->external = preg_split('/\s*,\s*/', trim($hash->offsetGet('EXTERNAL')));
- }
-
- $interchange->addDirective($directive);
- }
-
- /**
- * Evaluates an array PHP code string without array() wrapper
- * @param string $contents
- */
- protected function evalArray($contents)
- {
- return eval('return array(' . $contents . ');');
- }
-
- /**
- * Converts an array list into a lookup array.
- * @param array $array
- * @return array
- */
- protected function lookup($array)
- {
- $ret = array();
- foreach ($array as $val) {
- $ret[$val] = true;
- }
- return $ret;
- }
-
- /**
- * Convenience function that creates an HTMLPurifier_ConfigSchema_Interchange_Id
- * object based on a string Id.
- * @param string $id
- * @return HTMLPurifier_ConfigSchema_Interchange_Id
- */
- protected function id($id)
- {
- return HTMLPurifier_ConfigSchema_Interchange_Id::make($id);
- }
-
- /**
- * Triggers errors for any unused keys passed in the hash; such keys
- * may indicate typos, missing values, etc.
- * @param HTMLPurifier_StringHash $hash Hash to check.
- */
- protected function _findUnused($hash)
- {
- $accessed = $hash->getAccessed();
- foreach ($hash as $k => $v) {
- if (!isset($accessed[$k])) {
- trigger_error("String hash key '$k' not used by builder", E_USER_NOTICE);
- }
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_ConfigSchema_InterchangeBuilder
+{
+
+ /**
+ * Used for processing DEFAULT, nothing else.
+ * @type HTMLPurifier_VarParser
+ */
+ protected $varParser;
+
+ /**
+ * @param HTMLPurifier_VarParser $varParser
+ */
+ public function __construct($varParser = null)
+ {
+ $this->varParser = $varParser ? $varParser : new HTMLPurifier_VarParser_Native();
+ }
+
+ /**
+ * @param string $dir
+ * @return HTMLPurifier_ConfigSchema_Interchange
+ */
+ public static function buildFromDirectory($dir = null)
+ {
+ $builder = new HTMLPurifier_ConfigSchema_InterchangeBuilder();
+ $interchange = new HTMLPurifier_ConfigSchema_Interchange();
+ return $builder->buildDir($interchange, $dir);
+ }
+
+ /**
+ * @param HTMLPurifier_ConfigSchema_Interchange $interchange
+ * @param string $dir
+ * @return HTMLPurifier_ConfigSchema_Interchange
+ */
+ public function buildDir($interchange, $dir = null)
+ {
+ if (!$dir) {
+ $dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema';
+ }
+ if (file_exists($dir . '/info.ini')) {
+ $info = parse_ini_file($dir . '/info.ini');
+ $interchange->name = $info['name'];
+ }
+
+ $files = array();
+ $dh = opendir($dir);
+ while (false !== ($file = readdir($dh))) {
+ if (!$file || $file[0] == '.' || strrchr($file, '.') !== '.txt') {
+ continue;
+ }
+ $files[] = $file;
+ }
+ closedir($dh);
+
+ sort($files);
+ foreach ($files as $file) {
+ $this->buildFile($interchange, $dir . '/' . $file);
+ }
+ return $interchange;
+ }
+
+ /**
+ * @param HTMLPurifier_ConfigSchema_Interchange $interchange
+ * @param string $file
+ */
+ public function buildFile($interchange, $file)
+ {
+ $parser = new HTMLPurifier_StringHashParser();
+ $this->build(
+ $interchange,
+ new HTMLPurifier_StringHash($parser->parseFile($file))
+ );
+ }
+
+ /**
+ * Builds an interchange object based on a hash.
+ * @param HTMLPurifier_ConfigSchema_Interchange $interchange HTMLPurifier_ConfigSchema_Interchange object to build
+ * @param HTMLPurifier_StringHash $hash source data
+ * @throws HTMLPurifier_ConfigSchema_Exception
+ */
+ public function build($interchange, $hash)
+ {
+ if (!$hash instanceof HTMLPurifier_StringHash) {
+ $hash = new HTMLPurifier_StringHash($hash);
+ }
+ if (!isset($hash['ID'])) {
+ throw new HTMLPurifier_ConfigSchema_Exception('Hash does not have any ID');
+ }
+ if (strpos($hash['ID'], '.') === false) {
+ if (count($hash) == 2 && isset($hash['DESCRIPTION'])) {
+ $hash->offsetGet('DESCRIPTION'); // prevent complaining
+ } else {
+ throw new HTMLPurifier_ConfigSchema_Exception('All directives must have a namespace');
+ }
+ } else {
+ $this->buildDirective($interchange, $hash);
+ }
+ $this->_findUnused($hash);
+ }
+
+ /**
+ * @param HTMLPurifier_ConfigSchema_Interchange $interchange
+ * @param HTMLPurifier_StringHash $hash
+ * @throws HTMLPurifier_ConfigSchema_Exception
+ */
+ public function buildDirective($interchange, $hash)
+ {
+ $directive = new HTMLPurifier_ConfigSchema_Interchange_Directive();
+
+ // These are required elements:
+ $directive->id = $this->id($hash->offsetGet('ID'));
+ $id = $directive->id->toString(); // convenience
+
+ if (isset($hash['TYPE'])) {
+ $type = explode('/', $hash->offsetGet('TYPE'));
+ if (isset($type[1])) {
+ $directive->typeAllowsNull = true;
+ }
+ $directive->type = $type[0];
+ } else {
+ throw new HTMLPurifier_ConfigSchema_Exception("TYPE in directive hash '$id' not defined");
+ }
+
+ if (isset($hash['DEFAULT'])) {
+ try {
+ $directive->default = $this->varParser->parse(
+ $hash->offsetGet('DEFAULT'),
+ $directive->type,
+ $directive->typeAllowsNull
+ );
+ } catch (HTMLPurifier_VarParserException $e) {
+ throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in DEFAULT in directive hash '$id'");
+ }
+ }
+
+ if (isset($hash['DESCRIPTION'])) {
+ $directive->description = $hash->offsetGet('DESCRIPTION');
+ }
+
+ if (isset($hash['ALLOWED'])) {
+ $directive->allowed = $this->lookup($this->evalArray($hash->offsetGet('ALLOWED')));
+ }
+
+ if (isset($hash['VALUE-ALIASES'])) {
+ $directive->valueAliases = $this->evalArray($hash->offsetGet('VALUE-ALIASES'));
+ }
+
+ if (isset($hash['ALIASES'])) {
+ $raw_aliases = trim($hash->offsetGet('ALIASES'));
+ $aliases = preg_split('/\s*,\s*/', $raw_aliases);
+ foreach ($aliases as $alias) {
+ $directive->aliases[] = $this->id($alias);
+ }
+ }
+
+ if (isset($hash['VERSION'])) {
+ $directive->version = $hash->offsetGet('VERSION');
+ }
+
+ if (isset($hash['DEPRECATED-USE'])) {
+ $directive->deprecatedUse = $this->id($hash->offsetGet('DEPRECATED-USE'));
+ }
+
+ if (isset($hash['DEPRECATED-VERSION'])) {
+ $directive->deprecatedVersion = $hash->offsetGet('DEPRECATED-VERSION');
+ }
+
+ if (isset($hash['EXTERNAL'])) {
+ $directive->external = preg_split('/\s*,\s*/', trim($hash->offsetGet('EXTERNAL')));
+ }
+
+ $interchange->addDirective($directive);
+ }
+
+ /**
+ * Evaluates an array PHP code string without array() wrapper
+ * @param string $contents
+ */
+ protected function evalArray($contents)
+ {
+ return eval('return array(' . $contents . ');');
+ }
+
+ /**
+ * Converts an array list into a lookup array.
+ * @param array $array
+ * @return array
+ */
+ protected function lookup($array)
+ {
+ $ret = array();
+ foreach ($array as $val) {
+ $ret[$val] = true;
+ }
+ return $ret;
+ }
+
+ /**
+ * Convenience function that creates an HTMLPurifier_ConfigSchema_Interchange_Id
+ * object based on a string Id.
+ * @param string $id
+ * @return HTMLPurifier_ConfigSchema_Interchange_Id
+ */
+ protected function id($id)
+ {
+ return HTMLPurifier_ConfigSchema_Interchange_Id::make($id);
+ }
+
+ /**
+ * Triggers errors for any unused keys passed in the hash; such keys
+ * may indicate typos, missing values, etc.
+ * @param HTMLPurifier_StringHash $hash Hash to check.
+ */
+ protected function _findUnused($hash)
+ {
+ $accessed = $hash->getAccessed();
+ foreach ($hash as $k => $v) {
+ if (!isset($accessed[$k])) {
+ trigger_error("String hash key '$k' not used by builder", E_USER_NOTICE);
+ }
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Validator.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Validator.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Validator.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Validator.php
index 9f14444..fb31277 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/Validator.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/Validator.php
@@ -1,248 +1,248 @@
-<?php
-
-/**
- * Performs validations on HTMLPurifier_ConfigSchema_Interchange
- *
- * @note If you see '// handled by InterchangeBuilder', that means a
- * design decision in that class would prevent this validation from
- * ever being necessary. We have them anyway, however, for
- * redundancy.
- */
-class HTMLPurifier_ConfigSchema_Validator
-{
-
- /**
- * @type HTMLPurifier_ConfigSchema_Interchange
- */
- protected $interchange;
-
- /**
- * @type array
- */
- protected $aliases;
-
- /**
- * Context-stack to provide easy to read error messages.
- * @type array
- */
- protected $context = array();
-
- /**
- * to test default's type.
- * @type HTMLPurifier_VarParser
- */
- protected $parser;
-
- public function __construct()
- {
- $this->parser = new HTMLPurifier_VarParser();
- }
-
- /**
- * Validates a fully-formed interchange object.
- * @param HTMLPurifier_ConfigSchema_Interchange $interchange
- * @return bool
- */
- public function validate($interchange)
- {
- $this->interchange = $interchange;
- $this->aliases = array();
- // PHP is a bit lax with integer <=> string conversions in
- // arrays, so we don't use the identical !== comparison
- foreach ($interchange->directives as $i => $directive) {
- $id = $directive->id->toString();
- if ($i != $id) {
- $this->error(false, "Integrity violation: key '$i' does not match internal id '$id'");
- }
- $this->validateDirective($directive);
- }
- return true;
- }
-
- /**
- * Validates a HTMLPurifier_ConfigSchema_Interchange_Id object.
- * @param HTMLPurifier_ConfigSchema_Interchange_Id $id
- */
- public function validateId($id)
- {
- $id_string = $id->toString();
- $this->context[] = "id '$id_string'";
- if (!$id instanceof HTMLPurifier_ConfigSchema_Interchange_Id) {
- // handled by InterchangeBuilder
- $this->error(false, 'is not an instance of HTMLPurifier_ConfigSchema_Interchange_Id');
- }
- // keys are now unconstrained (we might want to narrow down to A-Za-z0-9.)
- // we probably should check that it has at least one namespace
- $this->with($id, 'key')
- ->assertNotEmpty()
- ->assertIsString(); // implicit assertIsString handled by InterchangeBuilder
- array_pop($this->context);
- }
-
- /**
- * Validates a HTMLPurifier_ConfigSchema_Interchange_Directive object.
- * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
- */
- public function validateDirective($d)
- {
- $id = $d->id->toString();
- $this->context[] = "directive '$id'";
- $this->validateId($d->id);
-
- $this->with($d, 'description')
- ->assertNotEmpty();
-
- // BEGIN - handled by InterchangeBuilder
- $this->with($d, 'type')
- ->assertNotEmpty();
- $this->with($d, 'typeAllowsNull')
- ->assertIsBool();
- try {
- // This also tests validity of $d->type
- $this->parser->parse($d->default, $d->type, $d->typeAllowsNull);
- } catch (HTMLPurifier_VarParserException $e) {
- $this->error('default', 'had error: ' . $e->getMessage());
- }
- // END - handled by InterchangeBuilder
-
- if (!is_null($d->allowed) || !empty($d->valueAliases)) {
- // allowed and valueAliases require that we be dealing with
- // strings, so check for that early.
- $d_int = HTMLPurifier_VarParser::$types[$d->type];
- if (!isset(HTMLPurifier_VarParser::$stringTypes[$d_int])) {
- $this->error('type', 'must be a string type when used with allowed or value aliases');
- }
- }
-
- $this->validateDirectiveAllowed($d);
- $this->validateDirectiveValueAliases($d);
- $this->validateDirectiveAliases($d);
-
- array_pop($this->context);
- }
-
- /**
- * Extra validation if $allowed member variable of
- * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
- * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
- */
- public function validateDirectiveAllowed($d)
- {
- if (is_null($d->allowed)) {
- return;
- }
- $this->with($d, 'allowed')
- ->assertNotEmpty()
- ->assertIsLookup(); // handled by InterchangeBuilder
- if (is_string($d->default) && !isset($d->allowed[$d->default])) {
- $this->error('default', 'must be an allowed value');
- }
- $this->context[] = 'allowed';
- foreach ($d->allowed as $val => $x) {
- if (!is_string($val)) {
- $this->error("value $val", 'must be a string');
- }
- }
- array_pop($this->context);
- }
-
- /**
- * Extra validation if $valueAliases member variable of
- * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
- * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
- */
- public function validateDirectiveValueAliases($d)
- {
- if (is_null($d->valueAliases)) {
- return;
- }
- $this->with($d, 'valueAliases')
- ->assertIsArray(); // handled by InterchangeBuilder
- $this->context[] = 'valueAliases';
- foreach ($d->valueAliases as $alias => $real) {
- if (!is_string($alias)) {
- $this->error("alias $alias", 'must be a string');
- }
- if (!is_string($real)) {
- $this->error("alias target $real from alias '$alias'", 'must be a string');
- }
- if ($alias === $real) {
- $this->error("alias '$alias'", "must not be an alias to itself");
- }
- }
- if (!is_null($d->allowed)) {
- foreach ($d->valueAliases as $alias => $real) {
- if (isset($d->allowed[$alias])) {
- $this->error("alias '$alias'", 'must not be an allowed value');
- } elseif (!isset($d->allowed[$real])) {
- $this->error("alias '$alias'", 'must be an alias to an allowed value');
- }
- }
- }
- array_pop($this->context);
- }
-
- /**
- * Extra validation if $aliases member variable of
- * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
- * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
- */
- public function validateDirectiveAliases($d)
- {
- $this->with($d, 'aliases')
- ->assertIsArray(); // handled by InterchangeBuilder
- $this->context[] = 'aliases';
- foreach ($d->aliases as $alias) {
- $this->validateId($alias);
- $s = $alias->toString();
- if (isset($this->interchange->directives[$s])) {
- $this->error("alias '$s'", 'collides with another directive');
- }
- if (isset($this->aliases[$s])) {
- $other_directive = $this->aliases[$s];
- $this->error("alias '$s'", "collides with alias for directive '$other_directive'");
- }
- $this->aliases[$s] = $d->id->toString();
- }
- array_pop($this->context);
- }
-
- // protected helper functions
-
- /**
- * Convenience function for generating HTMLPurifier_ConfigSchema_ValidatorAtom
- * for validating simple member variables of objects.
- * @param $obj
- * @param $member
- * @return HTMLPurifier_ConfigSchema_ValidatorAtom
- */
- protected function with($obj, $member)
- {
- return new HTMLPurifier_ConfigSchema_ValidatorAtom($this->getFormattedContext(), $obj, $member);
- }
-
- /**
- * Emits an error, providing helpful context.
- * @throws HTMLPurifier_ConfigSchema_Exception
- */
- protected function error($target, $msg)
- {
- if ($target !== false) {
- $prefix = ucfirst($target) . ' in ' . $this->getFormattedContext();
- } else {
- $prefix = ucfirst($this->getFormattedContext());
- }
- throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix . ' ' . $msg));
- }
-
- /**
- * Returns a formatted context string.
- * @return string
- */
- protected function getFormattedContext()
- {
- return implode(' in ', array_reverse($this->context));
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Performs validations on HTMLPurifier_ConfigSchema_Interchange
+ *
+ * @note If you see '// handled by InterchangeBuilder', that means a
+ * design decision in that class would prevent this validation from
+ * ever being necessary. We have them anyway, however, for
+ * redundancy.
+ */
+class HTMLPurifier_ConfigSchema_Validator
+{
+
+ /**
+ * @type HTMLPurifier_ConfigSchema_Interchange
+ */
+ protected $interchange;
+
+ /**
+ * @type array
+ */
+ protected $aliases;
+
+ /**
+ * Context-stack to provide easy to read error messages.
+ * @type array
+ */
+ protected $context = array();
+
+ /**
+ * to test default's type.
+ * @type HTMLPurifier_VarParser
+ */
+ protected $parser;
+
+ public function __construct()
+ {
+ $this->parser = new HTMLPurifier_VarParser();
+ }
+
+ /**
+ * Validates a fully-formed interchange object.
+ * @param HTMLPurifier_ConfigSchema_Interchange $interchange
+ * @return bool
+ */
+ public function validate($interchange)
+ {
+ $this->interchange = $interchange;
+ $this->aliases = array();
+ // PHP is a bit lax with integer <=> string conversions in
+ // arrays, so we don't use the identical !== comparison
+ foreach ($interchange->directives as $i => $directive) {
+ $id = $directive->id->toString();
+ if ($i != $id) {
+ $this->error(false, "Integrity violation: key '$i' does not match internal id '$id'");
+ }
+ $this->validateDirective($directive);
+ }
+ return true;
+ }
+
+ /**
+ * Validates a HTMLPurifier_ConfigSchema_Interchange_Id object.
+ * @param HTMLPurifier_ConfigSchema_Interchange_Id $id
+ */
+ public function validateId($id)
+ {
+ $id_string = $id->toString();
+ $this->context[] = "id '$id_string'";
+ if (!$id instanceof HTMLPurifier_ConfigSchema_Interchange_Id) {
+ // handled by InterchangeBuilder
+ $this->error(false, 'is not an instance of HTMLPurifier_ConfigSchema_Interchange_Id');
+ }
+ // keys are now unconstrained (we might want to narrow down to A-Za-z0-9.)
+ // we probably should check that it has at least one namespace
+ $this->with($id, 'key')
+ ->assertNotEmpty()
+ ->assertIsString(); // implicit assertIsString handled by InterchangeBuilder
+ array_pop($this->context);
+ }
+
+ /**
+ * Validates a HTMLPurifier_ConfigSchema_Interchange_Directive object.
+ * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
+ */
+ public function validateDirective($d)
+ {
+ $id = $d->id->toString();
+ $this->context[] = "directive '$id'";
+ $this->validateId($d->id);
+
+ $this->with($d, 'description')
+ ->assertNotEmpty();
+
+ // BEGIN - handled by InterchangeBuilder
+ $this->with($d, 'type')
+ ->assertNotEmpty();
+ $this->with($d, 'typeAllowsNull')
+ ->assertIsBool();
+ try {
+ // This also tests validity of $d->type
+ $this->parser->parse($d->default, $d->type, $d->typeAllowsNull);
+ } catch (HTMLPurifier_VarParserException $e) {
+ $this->error('default', 'had error: ' . $e->getMessage());
+ }
+ // END - handled by InterchangeBuilder
+
+ if (!is_null($d->allowed) || !empty($d->valueAliases)) {
+ // allowed and valueAliases require that we be dealing with
+ // strings, so check for that early.
+ $d_int = HTMLPurifier_VarParser::$types[$d->type];
+ if (!isset(HTMLPurifier_VarParser::$stringTypes[$d_int])) {
+ $this->error('type', 'must be a string type when used with allowed or value aliases');
+ }
+ }
+
+ $this->validateDirectiveAllowed($d);
+ $this->validateDirectiveValueAliases($d);
+ $this->validateDirectiveAliases($d);
+
+ array_pop($this->context);
+ }
+
+ /**
+ * Extra validation if $allowed member variable of
+ * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
+ * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
+ */
+ public function validateDirectiveAllowed($d)
+ {
+ if (is_null($d->allowed)) {
+ return;
+ }
+ $this->with($d, 'allowed')
+ ->assertNotEmpty()
+ ->assertIsLookup(); // handled by InterchangeBuilder
+ if (is_string($d->default) && !isset($d->allowed[$d->default])) {
+ $this->error('default', 'must be an allowed value');
+ }
+ $this->context[] = 'allowed';
+ foreach ($d->allowed as $val => $x) {
+ if (!is_string($val)) {
+ $this->error("value $val", 'must be a string');
+ }
+ }
+ array_pop($this->context);
+ }
+
+ /**
+ * Extra validation if $valueAliases member variable of
+ * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
+ * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
+ */
+ public function validateDirectiveValueAliases($d)
+ {
+ if (is_null($d->valueAliases)) {
+ return;
+ }
+ $this->with($d, 'valueAliases')
+ ->assertIsArray(); // handled by InterchangeBuilder
+ $this->context[] = 'valueAliases';
+ foreach ($d->valueAliases as $alias => $real) {
+ if (!is_string($alias)) {
+ $this->error("alias $alias", 'must be a string');
+ }
+ if (!is_string($real)) {
+ $this->error("alias target $real from alias '$alias'", 'must be a string');
+ }
+ if ($alias === $real) {
+ $this->error("alias '$alias'", "must not be an alias to itself");
+ }
+ }
+ if (!is_null($d->allowed)) {
+ foreach ($d->valueAliases as $alias => $real) {
+ if (isset($d->allowed[$alias])) {
+ $this->error("alias '$alias'", 'must not be an allowed value');
+ } elseif (!isset($d->allowed[$real])) {
+ $this->error("alias '$alias'", 'must be an alias to an allowed value');
+ }
+ }
+ }
+ array_pop($this->context);
+ }
+
+ /**
+ * Extra validation if $aliases member variable of
+ * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
+ * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
+ */
+ public function validateDirectiveAliases($d)
+ {
+ $this->with($d, 'aliases')
+ ->assertIsArray(); // handled by InterchangeBuilder
+ $this->context[] = 'aliases';
+ foreach ($d->aliases as $alias) {
+ $this->validateId($alias);
+ $s = $alias->toString();
+ if (isset($this->interchange->directives[$s])) {
+ $this->error("alias '$s'", 'collides with another directive');
+ }
+ if (isset($this->aliases[$s])) {
+ $other_directive = $this->aliases[$s];
+ $this->error("alias '$s'", "collides with alias for directive '$other_directive'");
+ }
+ $this->aliases[$s] = $d->id->toString();
+ }
+ array_pop($this->context);
+ }
+
+ // protected helper functions
+
+ /**
+ * Convenience function for generating HTMLPurifier_ConfigSchema_ValidatorAtom
+ * for validating simple member variables of objects.
+ * @param $obj
+ * @param $member
+ * @return HTMLPurifier_ConfigSchema_ValidatorAtom
+ */
+ protected function with($obj, $member)
+ {
+ return new HTMLPurifier_ConfigSchema_ValidatorAtom($this->getFormattedContext(), $obj, $member);
+ }
+
+ /**
+ * Emits an error, providing helpful context.
+ * @throws HTMLPurifier_ConfigSchema_Exception
+ */
+ protected function error($target, $msg)
+ {
+ if ($target !== false) {
+ $prefix = ucfirst($target) . ' in ' . $this->getFormattedContext();
+ } else {
+ $prefix = ucfirst($this->getFormattedContext());
+ }
+ throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix . ' ' . $msg));
+ }
+
+ /**
+ * Returns a formatted context string.
+ * @return string
+ */
+ protected function getFormattedContext()
+ {
+ return implode(' in ', array_reverse($this->context));
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
index a2e0b4a..c9aa364 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
@@ -1,130 +1,130 @@
-<?php
-
-/**
- * Fluent interface for validating the contents of member variables.
- * This should be immutable. See HTMLPurifier_ConfigSchema_Validator for
- * use-cases. We name this an 'atom' because it's ONLY for validations that
- * are independent and usually scalar.
- */
-class HTMLPurifier_ConfigSchema_ValidatorAtom
-{
- /**
- * @type string
- */
- protected $context;
-
- /**
- * @type object
- */
- protected $obj;
-
- /**
- * @type string
- */
- protected $member;
-
- /**
- * @type mixed
- */
- protected $contents;
-
- public function __construct($context, $obj, $member)
- {
- $this->context = $context;
- $this->obj = $obj;
- $this->member = $member;
- $this->contents =& $obj->$member;
- }
-
- /**
- * @return HTMLPurifier_ConfigSchema_ValidatorAtom
- */
- public function assertIsString()
- {
- if (!is_string($this->contents)) {
- $this->error('must be a string');
- }
- return $this;
- }
-
- /**
- * @return HTMLPurifier_ConfigSchema_ValidatorAtom
- */
- public function assertIsBool()
- {
- if (!is_bool($this->contents)) {
- $this->error('must be a boolean');
- }
- return $this;
- }
-
- /**
- * @return HTMLPurifier_ConfigSchema_ValidatorAtom
- */
- public function assertIsArray()
- {
- if (!is_array($this->contents)) {
- $this->error('must be an array');
- }
- return $this;
- }
-
- /**
- * @return HTMLPurifier_ConfigSchema_ValidatorAtom
- */
- public function assertNotNull()
- {
- if ($this->contents === null) {
- $this->error('must not be null');
- }
- return $this;
- }
-
- /**
- * @return HTMLPurifier_ConfigSchema_ValidatorAtom
- */
- public function assertAlnum()
- {
- $this->assertIsString();
- if (!ctype_alnum($this->contents)) {
- $this->error('must be alphanumeric');
- }
- return $this;
- }
-
- /**
- * @return HTMLPurifier_ConfigSchema_ValidatorAtom
- */
- public function assertNotEmpty()
- {
- if (empty($this->contents)) {
- $this->error('must not be empty');
- }
- return $this;
- }
-
- /**
- * @return HTMLPurifier_ConfigSchema_ValidatorAtom
- */
- public function assertIsLookup()
- {
- $this->assertIsArray();
- foreach ($this->contents as $v) {
- if ($v !== true) {
- $this->error('must be a lookup array');
- }
- }
- return $this;
- }
-
- /**
- * @param string $msg
- * @throws HTMLPurifier_ConfigSchema_Exception
- */
- protected function error($msg)
- {
- throw new HTMLPurifier_ConfigSchema_Exception(ucfirst($this->member) . ' in ' . $this->context . ' ' . $msg);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Fluent interface for validating the contents of member variables.
+ * This should be immutable. See HTMLPurifier_ConfigSchema_Validator for
+ * use-cases. We name this an 'atom' because it's ONLY for validations that
+ * are independent and usually scalar.
+ */
+class HTMLPurifier_ConfigSchema_ValidatorAtom
+{
+ /**
+ * @type string
+ */
+ protected $context;
+
+ /**
+ * @type object
+ */
+ protected $obj;
+
+ /**
+ * @type string
+ */
+ protected $member;
+
+ /**
+ * @type mixed
+ */
+ protected $contents;
+
+ public function __construct($context, $obj, $member)
+ {
+ $this->context = $context;
+ $this->obj = $obj;
+ $this->member = $member;
+ $this->contents =& $obj->$member;
+ }
+
+ /**
+ * @return HTMLPurifier_ConfigSchema_ValidatorAtom
+ */
+ public function assertIsString()
+ {
+ if (!is_string($this->contents)) {
+ $this->error('must be a string');
+ }
+ return $this;
+ }
+
+ /**
+ * @return HTMLPurifier_ConfigSchema_ValidatorAtom
+ */
+ public function assertIsBool()
+ {
+ if (!is_bool($this->contents)) {
+ $this->error('must be a boolean');
+ }
+ return $this;
+ }
+
+ /**
+ * @return HTMLPurifier_ConfigSchema_ValidatorAtom
+ */
+ public function assertIsArray()
+ {
+ if (!is_array($this->contents)) {
+ $this->error('must be an array');
+ }
+ return $this;
+ }
+
+ /**
+ * @return HTMLPurifier_ConfigSchema_ValidatorAtom
+ */
+ public function assertNotNull()
+ {
+ if ($this->contents === null) {
+ $this->error('must not be null');
+ }
+ return $this;
+ }
+
+ /**
+ * @return HTMLPurifier_ConfigSchema_ValidatorAtom
+ */
+ public function assertAlnum()
+ {
+ $this->assertIsString();
+ if (!ctype_alnum($this->contents)) {
+ $this->error('must be alphanumeric');
+ }
+ return $this;
+ }
+
+ /**
+ * @return HTMLPurifier_ConfigSchema_ValidatorAtom
+ */
+ public function assertNotEmpty()
+ {
+ if (empty($this->contents)) {
+ $this->error('must not be empty');
+ }
+ return $this;
+ }
+
+ /**
+ * @return HTMLPurifier_ConfigSchema_ValidatorAtom
+ */
+ public function assertIsLookup()
+ {
+ $this->assertIsArray();
+ foreach ($this->contents as $v) {
+ if ($v !== true) {
+ $this->error('must be a lookup array');
+ }
+ }
+ return $this;
+ }
+
+ /**
+ * @param string $msg
+ * @throws HTMLPurifier_ConfigSchema_Exception
+ */
+ protected function error($msg)
+ {
+ throw new HTMLPurifier_ConfigSchema_Exception(ucfirst($this->member) . ' in ' . $this->context . ' ' . $msg);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema.ser b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema.ser
new file mode 100755
index 0000000..0a7a406
Binary files /dev/null and b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema.ser differ
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
index 4a42382..0517fed 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
@@ -1,8 +1,8 @@
-Attr.AllowedClasses
-TYPE: lookup/null
-VERSION: 4.0.0
-DEFAULT: null
---DESCRIPTION--
-List of allowed class values in the class attribute. By default, this is null,
-which means all classes are allowed.
---# vim: et sw=4 sts=4
+Attr.AllowedClasses
+TYPE: lookup/null
+VERSION: 4.0.0
+DEFAULT: null
+--DESCRIPTION--
+List of allowed class values in the class attribute. By default, this is null,
+which means all classes are allowed.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
index b033eb5..249edd6 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
@@ -1,12 +1,12 @@
-Attr.AllowedFrameTargets
-TYPE: lookup
-DEFAULT: array()
---DESCRIPTION--
-Lookup table of all allowed link frame targets. Some commonly used link
-targets include _blank, _self, _parent and _top. Values should be
-lowercase, as validation will be done in a case-sensitive manner despite
-W3C's recommendation. XHTML 1.0 Strict does not permit the target attribute
-so this directive will have no effect in that doctype. XHTML 1.1 does not
-enable the Target module by default, you will have to manually enable it
-(see the module documentation for more details.)
---# vim: et sw=4 sts=4
+Attr.AllowedFrameTargets
+TYPE: lookup
+DEFAULT: array()
+--DESCRIPTION--
+Lookup table of all allowed link frame targets. Some commonly used link
+targets include _blank, _self, _parent and _top. Values should be
+lowercase, as validation will be done in a case-sensitive manner despite
+W3C's recommendation. XHTML 1.0 Strict does not permit the target attribute
+so this directive will have no effect in that doctype. XHTML 1.1 does not
+enable the Target module by default, you will have to manually enable it
+(see the module documentation for more details.)
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
index ed72a9d..9a8fa6a 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
@@ -1,9 +1,9 @@
-Attr.AllowedRel
-TYPE: lookup
-VERSION: 1.6.0
-DEFAULT: array()
---DESCRIPTION--
-List of allowed forward document relationships in the rel attribute. Common
-values may be nofollow or print. By default, this is empty, meaning that no
-document relationships are allowed.
---# vim: et sw=4 sts=4
+Attr.AllowedRel
+TYPE: lookup
+VERSION: 1.6.0
+DEFAULT: array()
+--DESCRIPTION--
+List of allowed forward document relationships in the rel attribute. Common
+values may be nofollow or print. By default, this is empty, meaning that no
+document relationships are allowed.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
index 1ae672d..b017883 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
@@ -1,9 +1,9 @@
-Attr.AllowedRev
-TYPE: lookup
-VERSION: 1.6.0
-DEFAULT: array()
---DESCRIPTION--
-List of allowed reverse document relationships in the rev attribute. This
-attribute is a bit of an edge-case; if you don't know what it is for, stay
-away.
---# vim: et sw=4 sts=4
+Attr.AllowedRev
+TYPE: lookup
+VERSION: 1.6.0
+DEFAULT: array()
+--DESCRIPTION--
+List of allowed reverse document relationships in the rev attribute. This
+attribute is a bit of an edge-case; if you don't know what it is for, stay
+away.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
index 119a9d2..e774b82 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
@@ -1,19 +1,19 @@
-Attr.ClassUseCDATA
-TYPE: bool/null
-DEFAULT: null
-VERSION: 4.0.0
---DESCRIPTION--
-If null, class will auto-detect the doctype and, if matching XHTML 1.1 or
-XHTML 2.0, will use the restrictive NMTOKENS specification of class. Otherwise,
-it will use a relaxed CDATA definition. If true, the relaxed CDATA definition
-is forced; if false, the NMTOKENS definition is forced. To get behavior
-of HTML Purifier prior to 4.0.0, set this directive to false.
-
-Some rational behind the auto-detection:
-in previous versions of HTML Purifier, it was assumed that the form of
-class was NMTOKENS, as specified by the XHTML Modularization (representing
-XHTML 1.1 and XHTML 2.0). The DTDs for HTML 4.01 and XHTML 1.0, however
-specify class as CDATA. HTML 5 effectively defines it as CDATA, but
-with the additional constraint that each name should be unique (this is not
-explicitly outlined in previous specifications).
---# vim: et sw=4 sts=4
+Attr.ClassUseCDATA
+TYPE: bool/null
+DEFAULT: null
+VERSION: 4.0.0
+--DESCRIPTION--
+If null, class will auto-detect the doctype and, if matching XHTML 1.1 or
+XHTML 2.0, will use the restrictive NMTOKENS specification of class. Otherwise,
+it will use a relaxed CDATA definition. If true, the relaxed CDATA definition
+is forced; if false, the NMTOKENS definition is forced. To get behavior
+of HTML Purifier prior to 4.0.0, set this directive to false.
+
+Some rational behind the auto-detection:
+in previous versions of HTML Purifier, it was assumed that the form of
+class was NMTOKENS, as specified by the XHTML Modularization (representing
+XHTML 1.1 and XHTML 2.0). The DTDs for HTML 4.01 and XHTML 1.0, however
+specify class as CDATA. HTML 5 effectively defines it as CDATA, but
+with the additional constraint that each name should be unique (this is not
+explicitly outlined in previous specifications).
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
index 80b1431..533165e 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
@@ -1,11 +1,11 @@
-Attr.DefaultImageAlt
-TYPE: string/null
-DEFAULT: null
-VERSION: 3.2.0
---DESCRIPTION--
-This is the content of the alt tag of an image if the user had not
-previously specified an alt attribute. This applies to all images without
-a valid alt attribute, as opposed to %Attr.DefaultInvalidImageAlt, which
-only applies to invalid images, and overrides in the case of an invalid image.
-Default behavior with null is to use the basename of the src tag for the alt.
---# vim: et sw=4 sts=4
+Attr.DefaultImageAlt
+TYPE: string/null
+DEFAULT: null
+VERSION: 3.2.0
+--DESCRIPTION--
+This is the content of the alt tag of an image if the user had not
+previously specified an alt attribute. This applies to all images without
+a valid alt attribute, as opposed to %Attr.DefaultInvalidImageAlt, which
+only applies to invalid images, and overrides in the case of an invalid image.
+Default behavior with null is to use the basename of the src tag for the alt.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
index c51000d..9eb7e38 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
@@ -1,9 +1,9 @@
-Attr.DefaultInvalidImage
-TYPE: string
-DEFAULT: ''
---DESCRIPTION--
-This is the default image an img tag will be pointed to if it does not have
-a valid src attribute. In future versions, we may allow the image tag to
-be removed completely, but due to design issues, this is not possible right
-now.
---# vim: et sw=4 sts=4
+Attr.DefaultInvalidImage
+TYPE: string
+DEFAULT: ''
+--DESCRIPTION--
+This is the default image an img tag will be pointed to if it does not have
+a valid src attribute. In future versions, we may allow the image tag to
+be removed completely, but due to design issues, this is not possible right
+now.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
index c1ec4b0..2f17bf4 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
@@ -1,8 +1,8 @@
-Attr.DefaultInvalidImageAlt
-TYPE: string
-DEFAULT: 'Invalid image'
---DESCRIPTION--
-This is the content of the alt tag of an invalid image if the user had not
-previously specified an alt attribute. It has no effect when the image is
-valid but there was no alt attribute present.
---# vim: et sw=4 sts=4
+Attr.DefaultInvalidImageAlt
+TYPE: string
+DEFAULT: 'Invalid image'
+--DESCRIPTION--
+This is the content of the alt tag of an invalid image if the user had not
+previously specified an alt attribute. It has no effect when the image is
+valid but there was no alt attribute present.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
index f57dcc4..52654b5 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
@@ -1,10 +1,10 @@
-Attr.DefaultTextDir
-TYPE: string
-DEFAULT: 'ltr'
---DESCRIPTION--
-Defines the default text direction (ltr or rtl) of the document being
-parsed. This generally is the same as the value of the dir attribute in
-HTML, or ltr if that is not specified.
---ALLOWED--
-'ltr', 'rtl'
---# vim: et sw=4 sts=4
+Attr.DefaultTextDir
+TYPE: string
+DEFAULT: 'ltr'
+--DESCRIPTION--
+Defines the default text direction (ltr or rtl) of the document being
+parsed. This generally is the same as the value of the dir attribute in
+HTML, or ltr if that is not specified.
+--ALLOWED--
+'ltr', 'rtl'
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
index 9b93a55..6440d21 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
@@ -1,16 +1,16 @@
-Attr.EnableID
-TYPE: bool
-DEFAULT: false
-VERSION: 1.2.0
---DESCRIPTION--
-Allows the ID attribute in HTML. This is disabled by default due to the
-fact that without proper configuration user input can easily break the
-validation of a webpage by specifying an ID that is already on the
-surrounding HTML. If you don't mind throwing caution to the wind, enable
-this directive, but I strongly recommend you also consider blacklisting IDs
-you use (%Attr.IDBlacklist) or prefixing all user supplied IDs
-(%Attr.IDPrefix). When set to true HTML Purifier reverts to the behavior of
-pre-1.2.0 versions.
---ALIASES--
-HTML.EnableAttrID
---# vim: et sw=4 sts=4
+Attr.EnableID
+TYPE: bool
+DEFAULT: false
+VERSION: 1.2.0
+--DESCRIPTION--
+Allows the ID attribute in HTML. This is disabled by default due to the
+fact that without proper configuration user input can easily break the
+validation of a webpage by specifying an ID that is already on the
+surrounding HTML. If you don't mind throwing caution to the wind, enable
+this directive, but I strongly recommend you also consider blacklisting IDs
+you use (%Attr.IDBlacklist) or prefixing all user supplied IDs
+(%Attr.IDPrefix). When set to true HTML Purifier reverts to the behavior of
+pre-1.2.0 versions.
+--ALIASES--
+HTML.EnableAttrID
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
index fed8954..f31d226 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
@@ -1,8 +1,8 @@
-Attr.ForbiddenClasses
-TYPE: lookup
-VERSION: 4.0.0
-DEFAULT: array()
---DESCRIPTION--
-List of forbidden class values in the class attribute. By default, this is
-empty, which means that no classes are forbidden. See also %Attr.AllowedClasses.
---# vim: et sw=4 sts=4
+Attr.ForbiddenClasses
+TYPE: lookup
+VERSION: 4.0.0
+DEFAULT: array()
+--DESCRIPTION--
+List of forbidden class values in the class attribute. By default, this is
+empty, which means that no classes are forbidden. See also %Attr.AllowedClasses.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.ID.HTML5.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.ID.HTML5.txt
new file mode 100755
index 0000000..735d4b7
--- /dev/null
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.ID.HTML5.txt
@@ -0,0 +1,10 @@
+Attr.ID.HTML5
+TYPE: bool/null
+DEFAULT: null
+VERSION: 4.8.0
+--DESCRIPTION--
+In HTML5, restrictions on the format of the id attribute have been significantly
+relaxed, such that any string is valid so long as it contains no spaces and
+is at least one character. In lieu of a general HTML5 compatibility flag,
+set this configuration directive to true to use the relaxed rules.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
index 52168bb..5f2b5e3 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
@@ -1,5 +1,5 @@
-Attr.IDBlacklist
-TYPE: list
-DEFAULT: array()
-DESCRIPTION: Array of IDs not allowed in the document.
---# vim: et sw=4 sts=4
+Attr.IDBlacklist
+TYPE: list
+DEFAULT: array()
+DESCRIPTION: Array of IDs not allowed in the document.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
index 7b85043..6f58245 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
@@ -1,9 +1,9 @@
-Attr.IDBlacklistRegexp
-TYPE: string/null
-VERSION: 1.6.0
-DEFAULT: NULL
---DESCRIPTION--
-PCRE regular expression to be matched against all IDs. If the expression is
-matches, the ID is rejected. Use this with care: may cause significant
-degradation. ID matching is done after all other validation.
---# vim: et sw=4 sts=4
+Attr.IDBlacklistRegexp
+TYPE: string/null
+VERSION: 1.6.0
+DEFAULT: NULL
+--DESCRIPTION--
+PCRE regular expression to be matched against all IDs. If the expression is
+matches, the ID is rejected. Use this with care: may cause significant
+degradation. ID matching is done after all other validation.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
index 5781382..cc49d43 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
@@ -1,12 +1,12 @@
-Attr.IDPrefix
-TYPE: string
-VERSION: 1.2.0
-DEFAULT: ''
---DESCRIPTION--
-String to prefix to IDs. If you have no idea what IDs your pages may use,
-you may opt to simply add a prefix to all user-submitted ID attributes so
-that they are still usable, but will not conflict with core page IDs.
-Example: setting the directive to 'user_' will result in a user submitted
-'foo' to become 'user_foo' Be sure to set %HTML.EnableAttrID to true
-before using this.
---# vim: et sw=4 sts=4
+Attr.IDPrefix
+TYPE: string
+VERSION: 1.2.0
+DEFAULT: ''
+--DESCRIPTION--
+String to prefix to IDs. If you have no idea what IDs your pages may use,
+you may opt to simply add a prefix to all user-submitted ID attributes so
+that they are still usable, but will not conflict with core page IDs.
+Example: setting the directive to 'user_' will result in a user submitted
+'foo' to become 'user_foo' Be sure to set %HTML.EnableAttrID to true
+before using this.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
index f91fcd6..2c5924a 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
@@ -1,14 +1,14 @@
-Attr.IDPrefixLocal
-TYPE: string
-VERSION: 1.2.0
-DEFAULT: ''
---DESCRIPTION--
-Temporary prefix for IDs used in conjunction with %Attr.IDPrefix. If you
-need to allow multiple sets of user content on web page, you may need to
-have a seperate prefix that changes with each iteration. This way,
-seperately submitted user content displayed on the same page doesn't
-clobber each other. Ideal values are unique identifiers for the content it
-represents (i.e. the id of the row in the database). Be sure to add a
-seperator (like an underscore) at the end. Warning: this directive will
-not work unless %Attr.IDPrefix is set to a non-empty value!
---# vim: et sw=4 sts=4
+Attr.IDPrefixLocal
+TYPE: string
+VERSION: 1.2.0
+DEFAULT: ''
+--DESCRIPTION--
+Temporary prefix for IDs used in conjunction with %Attr.IDPrefix. If you
+need to allow multiple sets of user content on web page, you may need to
+have a seperate prefix that changes with each iteration. This way,
+seperately submitted user content displayed on the same page doesn't
+clobber each other. Ideal values are unique identifiers for the content it
+represents (i.e. the id of the row in the database). Be sure to add a
+seperator (like an underscore) at the end. Warning: this directive will
+not work unless %Attr.IDPrefix is set to a non-empty value!
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
index 2d7f94e..d5caa1b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
@@ -1,31 +1,31 @@
-AutoFormat.AutoParagraph
-TYPE: bool
-VERSION: 2.0.1
-DEFAULT: false
---DESCRIPTION--
-
-<p>
- This directive turns on auto-paragraphing, where double newlines are
- converted in to paragraphs whenever possible. Auto-paragraphing:
-</p>
-<ul>
- <li>Always applies to inline elements or text in the root node,</li>
- <li>Applies to inline elements or text with double newlines in nodes
- that allow paragraph tags,</li>
- <li>Applies to double newlines in paragraph tags</li>
-</ul>
-<p>
- <code>p</code> tags must be allowed for this directive to take effect.
- We do not use <code>br</code> tags for paragraphing, as that is
- semantically incorrect.
-</p>
-<p>
- To prevent auto-paragraphing as a content-producer, refrain from using
- double-newlines except to specify a new paragraph or in contexts where
- it has special meaning (whitespace usually has no meaning except in
- tags like <code>pre</code>, so this should not be difficult.) To prevent
- the paragraphing of inline text adjacent to block elements, wrap them
- in <code>div</code> tags (the behavior is slightly different outside of
- the root node.)
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.AutoParagraph
+TYPE: bool
+VERSION: 2.0.1
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+ This directive turns on auto-paragraphing, where double newlines are
+ converted in to paragraphs whenever possible. Auto-paragraphing:
+</p>
+<ul>
+ <li>Always applies to inline elements or text in the root node,</li>
+ <li>Applies to inline elements or text with double newlines in nodes
+ that allow paragraph tags,</li>
+ <li>Applies to double newlines in paragraph tags</li>
+</ul>
+<p>
+ <code>p</code> tags must be allowed for this directive to take effect.
+ We do not use <code>br</code> tags for paragraphing, as that is
+ semantically incorrect.
+</p>
+<p>
+ To prevent auto-paragraphing as a content-producer, refrain from using
+ double-newlines except to specify a new paragraph or in contexts where
+ it has special meaning (whitespace usually has no meaning except in
+ tags like <code>pre</code>, so this should not be difficult.) To prevent
+ the paragraphing of inline text adjacent to block elements, wrap them
+ in <code>div</code> tags (the behavior is slightly different outside of
+ the root node.)
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
index 2eb1974..2a47648 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
@@ -1,12 +1,12 @@
-AutoFormat.Custom
-TYPE: list
-VERSION: 2.0.1
-DEFAULT: array()
---DESCRIPTION--
-
-<p>
- This directive can be used to add custom auto-format injectors.
- Specify an array of injector names (class name minus the prefix)
- or concrete implementations. Injector class must exist.
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.Custom
+TYPE: list
+VERSION: 2.0.1
+DEFAULT: array()
+--DESCRIPTION--
+
+<p>
+ This directive can be used to add custom auto-format injectors.
+ Specify an array of injector names (class name minus the prefix)
+ or concrete implementations. Injector class must exist.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
index c955de7..663064a 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
@@ -1,11 +1,11 @@
-AutoFormat.DisplayLinkURI
-TYPE: bool
-VERSION: 3.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- This directive turns on the in-text display of URIs in <a> tags, and disables
- those links. For example, <a href="http://example.com">example</a> becomes
- example (<a>http://example.com</a>).
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.DisplayLinkURI
+TYPE: bool
+VERSION: 3.2.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+ This directive turns on the in-text display of URIs in <a> tags, and disables
+ those links. For example, <a href="http://example.com">example</a> becomes
+ example (<a>http://example.com</a>).
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
index 328b2b2..3a48ba9 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
@@ -1,12 +1,12 @@
-AutoFormat.Linkify
-TYPE: bool
-VERSION: 2.0.1
-DEFAULT: false
---DESCRIPTION--
-
-<p>
- This directive turns on linkification, auto-linking http, ftp and
- https URLs. <code>a</code> tags with the <code>href</code> attribute
- must be allowed.
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.Linkify
+TYPE: bool
+VERSION: 2.0.1
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+ This directive turns on linkification, auto-linking http, ftp and
+ https URLs. <code>a</code> tags with the <code>href</code> attribute
+ must be allowed.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
index d0532b6..db58b13 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
@@ -1,12 +1,12 @@
-AutoFormat.PurifierLinkify.DocURL
-TYPE: string
-VERSION: 2.0.1
-DEFAULT: '#%s'
-ALIASES: AutoFormatParam.PurifierLinkifyDocURL
---DESCRIPTION--
-<p>
- Location of configuration documentation to link to, let %s substitute
- into the configuration's namespace and directive names sans the percent
- sign.
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.PurifierLinkify.DocURL
+TYPE: string
+VERSION: 2.0.1
+DEFAULT: '#%s'
+ALIASES: AutoFormatParam.PurifierLinkifyDocURL
+--DESCRIPTION--
+<p>
+ Location of configuration documentation to link to, let %s substitute
+ into the configuration's namespace and directive names sans the percent
+ sign.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
index f3ab259..7996488 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
@@ -1,12 +1,12 @@
-AutoFormat.PurifierLinkify
-TYPE: bool
-VERSION: 2.0.1
-DEFAULT: false
---DESCRIPTION--
-
-<p>
- Internal auto-formatter that converts configuration directives in
- syntax <a>%Namespace.Directive</a> to links. <code>a</code> tags
- with the <code>href</code> attribute must be allowed.
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.PurifierLinkify
+TYPE: bool
+VERSION: 2.0.1
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+ Internal auto-formatter that converts configuration directives in
+ syntax <a>%Namespace.Directive</a> to links. <code>a</code> tags
+ with the <code>href</code> attribute must be allowed.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
new file mode 100755
index 0000000..6367fe2
--- /dev/null
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
@@ -0,0 +1,14 @@
+AutoFormat.RemoveEmpty.Predicate
+TYPE: hash
+VERSION: 4.7.0
+DEFAULT: array('colgroup' => array(), 'th' => array(), 'td' => array(), 'iframe' => array('src'))
+--DESCRIPTION--
+<p>
+ Given that an element has no contents, it will be removed by default, unless
+ this predicate dictates otherwise. The predicate can either be an associative
+ map from tag name to list of attributes that must be present for the element
+ to be considered preserved: thus, the default always preserves <code>colgroup</code>,
+ <code>th</code> and <code>td</code>, and also <code>iframe</code> if it
+ has a <code>src</code>.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
index 219d04a..35c393b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
@@ -1,11 +1,11 @@
-AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions
-TYPE: lookup
-VERSION: 4.0.0
-DEFAULT: array('td' => true, 'th' => true)
---DESCRIPTION--
-<p>
- When %AutoFormat.RemoveEmpty and %AutoFormat.RemoveEmpty.RemoveNbsp
- are enabled, this directive defines what HTML elements should not be
- removede if they have only a non-breaking space in them.
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions
+TYPE: lookup
+VERSION: 4.0.0
+DEFAULT: array('td' => true, 'th' => true)
+--DESCRIPTION--
+<p>
+ When %AutoFormat.RemoveEmpty and %AutoFormat.RemoveEmpty.RemoveNbsp
+ are enabled, this directive defines what HTML elements should not be
+ removede if they have only a non-breaking space in them.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
index 5f355d6..ca17eb1 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
@@ -1,15 +1,15 @@
-AutoFormat.RemoveEmpty.RemoveNbsp
-TYPE: bool
-VERSION: 4.0.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- When enabled, HTML Purifier will treat any elements that contain only
- non-breaking spaces as well as regular whitespace as empty, and remove
- them when %AutoForamt.RemoveEmpty is enabled.
-</p>
-<p>
- See %AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions for a list of elements
- that don't have this behavior applied to them.
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.RemoveEmpty.RemoveNbsp
+TYPE: bool
+VERSION: 4.0.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+ When enabled, HTML Purifier will treat any elements that contain only
+ non-breaking spaces as well as regular whitespace as empty, and remove
+ them when %AutoForamt.RemoveEmpty is enabled.
+</p>
+<p>
+ See %AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions for a list of elements
+ that don't have this behavior applied to them.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
index 6b5a7a5..34657ba 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
@@ -1,46 +1,46 @@
-AutoFormat.RemoveEmpty
-TYPE: bool
-VERSION: 3.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- When enabled, HTML Purifier will attempt to remove empty elements that
- contribute no semantic information to the document. The following types
- of nodes will be removed:
-</p>
-<ul><li>
- Tags with no attributes and no content, and that are not empty
- elements (remove <code><a></a></code> but not
- <code><br /></code>), and
- </li>
- <li>
- Tags with no content, except for:<ul>
- <li>The <code>colgroup</code> element, or</li>
- <li>
- Elements with the <code>id</code> or <code>name</code> attribute,
- when those attributes are permitted on those elements.
- </li>
- </ul></li>
-</ul>
-<p>
- Please be very careful when using this functionality; while it may not
- seem that empty elements contain useful information, they can alter the
- layout of a document given appropriate styling. This directive is most
- useful when you are processing machine-generated HTML, please avoid using
- it on regular user HTML.
-</p>
-<p>
- Elements that contain only whitespace will be treated as empty. Non-breaking
- spaces, however, do not count as whitespace. See
- %AutoFormat.RemoveEmpty.RemoveNbsp for alternate behavior.
-</p>
-<p>
- This algorithm is not perfect; you may still notice some empty tags,
- particularly if a node had elements, but those elements were later removed
- because they were not permitted in that context, or tags that, after
- being auto-closed by another tag, where empty. This is for safety reasons
- to prevent clever code from breaking validation. The general rule of thumb:
- if a tag looked empty on the way in, it will get removed; if HTML Purifier
- made it empty, it will stay.
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.RemoveEmpty
+TYPE: bool
+VERSION: 3.2.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+ When enabled, HTML Purifier will attempt to remove empty elements that
+ contribute no semantic information to the document. The following types
+ of nodes will be removed:
+</p>
+<ul><li>
+ Tags with no attributes and no content, and that are not empty
+ elements (remove <code><a></a></code> but not
+ <code><br /></code>), and
+ </li>
+ <li>
+ Tags with no content, except for:<ul>
+ <li>The <code>colgroup</code> element, or</li>
+ <li>
+ Elements with the <code>id</code> or <code>name</code> attribute,
+ when those attributes are permitted on those elements.
+ </li>
+ </ul></li>
+</ul>
+<p>
+ Please be very careful when using this functionality; while it may not
+ seem that empty elements contain useful information, they can alter the
+ layout of a document given appropriate styling. This directive is most
+ useful when you are processing machine-generated HTML, please avoid using
+ it on regular user HTML.
+</p>
+<p>
+ Elements that contain only whitespace will be treated as empty. Non-breaking
+ spaces, however, do not count as whitespace. See
+ %AutoFormat.RemoveEmpty.RemoveNbsp for alternate behavior.
+</p>
+<p>
+ This algorithm is not perfect; you may still notice some empty tags,
+ particularly if a node had elements, but those elements were later removed
+ because they were not permitted in that context, or tags that, after
+ being auto-closed by another tag, where empty. This is for safety reasons
+ to prevent clever code from breaking validation. The general rule of thumb:
+ if a tag looked empty on the way in, it will get removed; if HTML Purifier
+ made it empty, it will stay.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
index a448770..dde990a 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
@@ -1,11 +1,11 @@
-AutoFormat.RemoveSpansWithoutAttributes
-TYPE: bool
-VERSION: 4.0.1
-DEFAULT: false
---DESCRIPTION--
-<p>
- This directive causes <code>span</code> tags without any attributes
- to be removed. It will also remove spans that had all attributes
- removed during processing.
-</p>
---# vim: et sw=4 sts=4
+AutoFormat.RemoveSpansWithoutAttributes
+TYPE: bool
+VERSION: 4.0.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+ This directive causes <code>span</code> tags without any attributes
+ to be removed. It will also remove spans that had all attributes
+ removed during processing.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowDuplicates.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowDuplicates.txt
new file mode 100755
index 0000000..4d054b1
--- /dev/null
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowDuplicates.txt
@@ -0,0 +1,11 @@
+CSS.AllowDuplicates
+TYPE: bool
+DEFAULT: false
+VERSION: 4.8.0
+--DESCRIPTION--
+<p>
+ By default, HTML Purifier removes duplicate CSS properties,
+ like <code>color:red; color:blue</code>. If this is set to
+ true, duplicate properties are allowed.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
index 8096eb0..b324608 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
@@ -1,8 +1,8 @@
-CSS.AllowImportant
-TYPE: bool
-DEFAULT: false
-VERSION: 3.1.0
---DESCRIPTION--
-This parameter determines whether or not !important cascade modifiers should
-be allowed in user CSS. If false, !important will stripped.
---# vim: et sw=4 sts=4
+CSS.AllowImportant
+TYPE: bool
+DEFAULT: false
+VERSION: 3.1.0
+--DESCRIPTION--
+This parameter determines whether or not !important cascade modifiers should
+be allowed in user CSS. If false, !important will stripped.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
index 9d34deb..748be0e 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
@@ -1,11 +1,11 @@
-CSS.AllowTricky
-TYPE: bool
-DEFAULT: false
-VERSION: 3.1.0
---DESCRIPTION--
-This parameter determines whether or not to allow "tricky" CSS properties and
-values. Tricky CSS properties/values can drastically modify page layout or
-be used for deceptive practices but do not directly constitute a security risk.
-For example, <code>display:none;</code> is considered a tricky property that
-will only be allowed if this directive is set to true.
---# vim: et sw=4 sts=4
+CSS.AllowTricky
+TYPE: bool
+DEFAULT: false
+VERSION: 3.1.0
+--DESCRIPTION--
+This parameter determines whether or not to allow "tricky" CSS properties and
+values. Tricky CSS properties/values can drastically modify page layout or
+be used for deceptive practices but do not directly constitute a security risk.
+For example, <code>display:none;</code> is considered a tricky property that
+will only be allowed if this directive is set to true.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt
index 7c2b547..3fd4654 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt
@@ -1,12 +1,12 @@
-CSS.AllowedFonts
-TYPE: lookup/null
-VERSION: 4.3.0
-DEFAULT: NULL
---DESCRIPTION--
-<p>
- Allows you to manually specify a set of allowed fonts. If
- <code>NULL</code>, all fonts are allowed. This directive
- affects generic names (serif, sans-serif, monospace, cursive,
- fantasy) as well as specific font families.
-</p>
---# vim: et sw=4 sts=4
+CSS.AllowedFonts
+TYPE: lookup/null
+VERSION: 4.3.0
+DEFAULT: NULL
+--DESCRIPTION--
+<p>
+ Allows you to manually specify a set of allowed fonts. If
+ <code>NULL</code>, all fonts are allowed. This directive
+ affects generic names (serif, sans-serif, monospace, cursive,
+ fantasy) as well as specific font families.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
index f1ba513..460112e 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
@@ -1,18 +1,18 @@
-CSS.AllowedProperties
-TYPE: lookup/null
-VERSION: 3.1.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- If HTML Purifier's style attributes set is unsatisfactory for your needs,
- you can overload it with your own list of tags to allow. Note that this
- method is subtractive: it does its job by taking away from HTML Purifier
- usual feature set, so you cannot add an attribute that HTML Purifier never
- supported in the first place.
-</p>
-<p>
- <strong>Warning:</strong> If another directive conflicts with the
- elements here, <em>that</em> directive will win and override.
-</p>
---# vim: et sw=4 sts=4
+CSS.AllowedProperties
+TYPE: lookup/null
+VERSION: 3.1.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+ If HTML Purifier's style attributes set is unsatisfactory for your needs,
+ you can overload it with your own list of tags to allow. Note that this
+ method is subtractive: it does its job by taking away from HTML Purifier
+ usual feature set, so you cannot add an attribute that HTML Purifier never
+ supported in the first place.
+</p>
+<p>
+ <strong>Warning:</strong> If another directive conflicts with the
+ elements here, <em>that</em> directive will win and override.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
similarity index 94%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
index 96b4108..5cb7dda 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
@@ -1,11 +1,11 @@
-CSS.DefinitionRev
-TYPE: int
-VERSION: 2.0.0
-DEFAULT: 1
---DESCRIPTION--
-
-<p>
- Revision identifier for your custom definition. See
- %HTML.DefinitionRev for details.
-</p>
---# vim: et sw=4 sts=4
+CSS.DefinitionRev
+TYPE: int
+VERSION: 2.0.0
+DEFAULT: 1
+--DESCRIPTION--
+
+<p>
+ Revision identifier for your custom definition. See
+ %HTML.DefinitionRev for details.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
index 923e8e9..f1f5c5f 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
@@ -1,13 +1,13 @@
-CSS.ForbiddenProperties
-TYPE: lookup
-VERSION: 4.2.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
- This is the logical inverse of %CSS.AllowedProperties, and it will
- override that directive or any other directive. If possible,
- %CSS.AllowedProperties is recommended over this directive,
- because it can sometimes be difficult to tell whether or not you've
- forbidden all of the CSS properties you truly would like to disallow.
-</p>
---# vim: et sw=4 sts=4
+CSS.ForbiddenProperties
+TYPE: lookup
+VERSION: 4.2.0
+DEFAULT: array()
+--DESCRIPTION--
+<p>
+ This is the logical inverse of %CSS.AllowedProperties, and it will
+ override that directive or any other directive. If possible,
+ %CSS.AllowedProperties is recommended over this directive,
+ because it can sometimes be difficult to tell whether or not you've
+ forbidden all of the CSS properties you truly would like to disallow.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
index 3808581..7a32914 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
@@ -1,16 +1,16 @@
-CSS.MaxImgLength
-TYPE: string/null
-DEFAULT: '1200px'
-VERSION: 3.1.1
---DESCRIPTION--
-<p>
- This parameter sets the maximum allowed length on <code>img</code> tags,
- effectively the <code>width</code> and <code>height</code> properties.
- Only absolute units of measurement (in, pt, pc, mm, cm) and pixels (px) are allowed. This is
- in place to prevent imagecrash attacks, disable with null at your own risk.
- This directive is similar to %HTML.MaxImgLength, and both should be
- concurrently edited, although there are
- subtle differences in the input format (the CSS max is a number with
- a unit).
-</p>
---# vim: et sw=4 sts=4
+CSS.MaxImgLength
+TYPE: string/null
+DEFAULT: '1200px'
+VERSION: 3.1.1
+--DESCRIPTION--
+<p>
+ This parameter sets the maximum allowed length on <code>img</code> tags,
+ effectively the <code>width</code> and <code>height</code> properties.
+ Only absolute units of measurement (in, pt, pc, mm, cm) and pixels (px) are allowed. This is
+ in place to prevent imagecrash attacks, disable with null at your own risk.
+ This directive is similar to %HTML.MaxImgLength, and both should be
+ concurrently edited, although there are
+ subtle differences in the input format (the CSS max is a number with
+ a unit).
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
similarity index 94%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
index 8a26f22..148eedb 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
@@ -1,10 +1,10 @@
-CSS.Proprietary
-TYPE: bool
-VERSION: 3.0.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
- Whether or not to allow safe, proprietary CSS values.
-</p>
---# vim: et sw=4 sts=4
+CSS.Proprietary
+TYPE: bool
+VERSION: 3.0.0
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+ Whether or not to allow safe, proprietary CSS values.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt
index 917ec42..e733a61 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt
@@ -1,9 +1,9 @@
-CSS.Trusted
-TYPE: bool
-VERSION: 4.2.1
-DEFAULT: false
---DESCRIPTION--
-Indicates whether or not the user's CSS input is trusted or not. If the
-input is trusted, a more expansive set of allowed properties. See
-also %HTML.Trusted.
---# vim: et sw=4 sts=4
+CSS.Trusted
+TYPE: bool
+VERSION: 4.2.1
+DEFAULT: false
+--DESCRIPTION--
+Indicates whether or not the user's CSS input is trusted or not. If the
+input is trusted, a more expansive set of allowed properties. See
+also %HTML.Trusted.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
index afc6a87..c486724 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
@@ -1,14 +1,14 @@
-Cache.DefinitionImpl
-TYPE: string/null
-VERSION: 2.0.0
-DEFAULT: 'Serializer'
---DESCRIPTION--
-
-This directive defines which method to use when caching definitions,
-the complex data-type that makes HTML Purifier tick. Set to null
-to disable caching (not recommended, as you will see a definite
-performance degradation).
-
---ALIASES--
-Core.DefinitionCache
---# vim: et sw=4 sts=4
+Cache.DefinitionImpl
+TYPE: string/null
+VERSION: 2.0.0
+DEFAULT: 'Serializer'
+--DESCRIPTION--
+
+This directive defines which method to use when caching definitions,
+the complex data-type that makes HTML Purifier tick. Set to null
+to disable caching (not recommended, as you will see a definite
+performance degradation).
+
+--ALIASES--
+Core.DefinitionCache
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
index 668f248..5403650 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
@@ -1,13 +1,13 @@
-Cache.SerializerPath
-TYPE: string/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- Absolute path with no trailing slash to store serialized definitions in.
- Default is within the
- HTML Purifier library inside DefinitionCache/Serializer. This
- path must be writable by the webserver.
-</p>
---# vim: et sw=4 sts=4
+Cache.SerializerPath
+TYPE: string/null
+VERSION: 2.0.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+ Absolute path with no trailing slash to store serialized definitions in.
+ Default is within the
+ HTML Purifier library inside DefinitionCache/Serializer. This
+ path must be writable by the webserver.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt
similarity index 59%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt
index 9c27b0a..2e0cc81 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt
@@ -1,11 +1,16 @@
-Cache.SerializerPermissions
-TYPE: int
-VERSION: 4.3.0
-DEFAULT: 0755
---DESCRIPTION--
-
-<p>
- Directory permissions of the files and directories created inside
- the DefinitionCache/Serializer or other custom serializer path.
-</p>
---# vim: et sw=4 sts=4
+Cache.SerializerPermissions
+TYPE: int/null
+VERSION: 4.3.0
+DEFAULT: 0755
+--DESCRIPTION--
+
+<p>
+ Directory permissions of the files and directories created inside
+ the DefinitionCache/Serializer or other custom serializer path.
+</p>
+<p>
+ In HTML Purifier 4.8.0, this also supports <code>NULL</code>,
+ which means that no chmod'ing or directory creation shall
+ occur.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
index e0fa378..568cbf3 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
@@ -1,18 +1,18 @@
-Core.AggressivelyFixLt
-TYPE: bool
-VERSION: 2.1.0
-DEFAULT: true
---DESCRIPTION--
-<p>
- This directive enables aggressive pre-filter fixes HTML Purifier can
- perform in order to ensure that open angled-brackets do not get killed
- during parsing stage. Enabling this will result in two preg_replace_callback
- calls and at least two preg_replace calls for every HTML document parsed;
- if your users make very well-formed HTML, you can set this directive false.
- This has no effect when DirectLex is used.
-</p>
-<p>
- <strong>Notice:</strong> This directive's default turned from false to true
- in HTML Purifier 3.2.0.
-</p>
---# vim: et sw=4 sts=4
+Core.AggressivelyFixLt
+TYPE: bool
+VERSION: 2.1.0
+DEFAULT: true
+--DESCRIPTION--
+<p>
+ This directive enables aggressive pre-filter fixes HTML Purifier can
+ perform in order to ensure that open angled-brackets do not get killed
+ during parsing stage. Enabling this will result in two preg_replace_callback
+ calls and at least two preg_replace calls for every HTML document parsed;
+ if your users make very well-formed HTML, you can set this directive false.
+ This has no effect when DirectLex is used.
+</p>
+<p>
+ <strong>Notice:</strong> This directive's default turned from false to true
+ in HTML Purifier 3.2.0.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
index 405d36f..2c910cc 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
@@ -1,16 +1,16 @@
-Core.AllowHostnameUnderscore
-TYPE: bool
-VERSION: 4.6.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- By RFC 1123, underscores are not permitted in host names.
- (This is in contrast to the specification for DNS, RFC
- 2181, which allows underscores.)
- However, most browsers do the right thing when faced with
- an underscore in the host name, and so some poorly written
- websites are written with the expectation this should work.
- Setting this parameter to true relaxes our allowed character
- check so that underscores are permitted.
-</p>
---# vim: et sw=4 sts=4
+Core.AllowHostnameUnderscore
+TYPE: bool
+VERSION: 4.6.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+ By RFC 1123, underscores are not permitted in host names.
+ (This is in contrast to the specification for DNS, RFC
+ 2181, which allows underscores.)
+ However, most browsers do the right thing when faced with
+ an underscore in the host name, and so some poorly written
+ websites are written with the expectation this should work.
+ Setting this parameter to true relaxes our allowed character
+ check so that underscores are permitted.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
index c6ea069..d731791 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
@@ -1,12 +1,12 @@
-Core.CollectErrors
-TYPE: bool
-VERSION: 2.0.0
-DEFAULT: false
---DESCRIPTION--
-
-Whether or not to collect errors found while filtering the document. This
-is a useful way to give feedback to your users. <strong>Warning:</strong>
-Currently this feature is very patchy and experimental, with lots of
-possible error messages not yet implemented. It will not cause any
-problems, but it may not help your users either.
---# vim: et sw=4 sts=4
+Core.CollectErrors
+TYPE: bool
+VERSION: 2.0.0
+DEFAULT: false
+--DESCRIPTION--
+
+Whether or not to collect errors found while filtering the document. This
+is a useful way to give feedback to your users. <strong>Warning:</strong>
+Currently this feature is very patchy and experimental, with lots of
+possible error messages not yet implemented. It will not cause any
+problems, but it may not help your users either.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
index f782398..c572c14 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
@@ -1,29 +1,29 @@
-Core.ColorKeywords
-TYPE: hash
-VERSION: 2.0.0
---DEFAULT--
-array (
- 'maroon' => '#800000',
- 'red' => '#FF0000',
- 'orange' => '#FFA500',
- 'yellow' => '#FFFF00',
- 'olive' => '#808000',
- 'purple' => '#800080',
- 'fuchsia' => '#FF00FF',
- 'white' => '#FFFFFF',
- 'lime' => '#00FF00',
- 'green' => '#008000',
- 'navy' => '#000080',
- 'blue' => '#0000FF',
- 'aqua' => '#00FFFF',
- 'teal' => '#008080',
- 'black' => '#000000',
- 'silver' => '#C0C0C0',
- 'gray' => '#808080',
-)
---DESCRIPTION--
-
-Lookup array of color names to six digit hexadecimal number corresponding
-to color, with preceding hash mark. Used when parsing colors. The lookup
-is done in a case-insensitive manner.
---# vim: et sw=4 sts=4
+Core.ColorKeywords
+TYPE: hash
+VERSION: 2.0.0
+--DEFAULT--
+array (
+ 'maroon' => '#800000',
+ 'red' => '#FF0000',
+ 'orange' => '#FFA500',
+ 'yellow' => '#FFFF00',
+ 'olive' => '#808000',
+ 'purple' => '#800080',
+ 'fuchsia' => '#FF00FF',
+ 'white' => '#FFFFFF',
+ 'lime' => '#00FF00',
+ 'green' => '#008000',
+ 'navy' => '#000080',
+ 'blue' => '#0000FF',
+ 'aqua' => '#00FFFF',
+ 'teal' => '#008080',
+ 'black' => '#000000',
+ 'silver' => '#C0C0C0',
+ 'gray' => '#808080',
+)
+--DESCRIPTION--
+
+Lookup array of color names to six digit hexadecimal number corresponding
+to color, with preceding hash mark. Used when parsing colors. The lookup
+is done in a case-insensitive manner.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
index 656d378..64b114f 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
@@ -1,14 +1,14 @@
-Core.ConvertDocumentToFragment
-TYPE: bool
-DEFAULT: true
---DESCRIPTION--
-
-This parameter determines whether or not the filter should convert
-input that is a full document with html and body tags to a fragment
-of just the contents of a body tag. This parameter is simply something
-HTML Purifier can do during an edge-case: for most inputs, this
-processing is not necessary.
-
---ALIASES--
-Core.AcceptFullDocuments
---# vim: et sw=4 sts=4
+Core.ConvertDocumentToFragment
+TYPE: bool
+DEFAULT: true
+--DESCRIPTION--
+
+This parameter determines whether or not the filter should convert
+input that is a full document with html and body tags to a fragment
+of just the contents of a body tag. This parameter is simply something
+HTML Purifier can do during an edge-case: for most inputs, this
+processing is not necessary.
+
+--ALIASES--
+Core.AcceptFullDocuments
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
index 2f54e46..36f16e0 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
@@ -1,17 +1,17 @@
-Core.DirectLexLineNumberSyncInterval
-TYPE: int
-VERSION: 2.0.0
-DEFAULT: 0
---DESCRIPTION--
-
-<p>
- Specifies the number of tokens the DirectLex line number tracking
- implementations should process before attempting to resyncronize the
- current line count by manually counting all previous new-lines. When
- at 0, this functionality is disabled. Lower values will decrease
- performance, and this is only strictly necessary if the counting
- algorithm is buggy (in which case you should report it as a bug).
- This has no effect when %Core.MaintainLineNumbers is disabled or DirectLex is
- not being used.
-</p>
---# vim: et sw=4 sts=4
+Core.DirectLexLineNumberSyncInterval
+TYPE: int
+VERSION: 2.0.0
+DEFAULT: 0
+--DESCRIPTION--
+
+<p>
+ Specifies the number of tokens the DirectLex line number tracking
+ implementations should process before attempting to resyncronize the
+ current line count by manually counting all previous new-lines. When
+ at 0, this functionality is disabled. Lower values will decrease
+ performance, and this is only strictly necessary if the counting
+ algorithm is buggy (in which case you should report it as a bug).
+ This has no effect when %Core.MaintainLineNumbers is disabled or DirectLex is
+ not being used.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt
index 3c63c92..1cd4c2c 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt
@@ -1,14 +1,14 @@
-Core.DisableExcludes
-TYPE: bool
-DEFAULT: false
-VERSION: 4.5.0
---DESCRIPTION--
-<p>
- This directive disables SGML-style exclusions, e.g. the exclusion of
- <code><object></code> in any descendant of a
- <code><pre></code> tag. Disabling excludes will allow some
- invalid documents to pass through HTML Purifier, but HTML Purifier
- will also be less likely to accidentally remove large documents during
- processing.
-</p>
---# vim: et sw=4 sts=4
+Core.DisableExcludes
+TYPE: bool
+DEFAULT: false
+VERSION: 4.5.0
+--DESCRIPTION--
+<p>
+ This directive disables SGML-style exclusions, e.g. the exclusion of
+ <code><object></code> in any descendant of a
+ <code><pre></code> tag. Disabling excludes will allow some
+ invalid documents to pass through HTML Purifier, but HTML Purifier
+ will also be less likely to accidentally remove large documents during
+ processing.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt
index 7f498e7..ce243c3 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt
@@ -1,9 +1,9 @@
-Core.EnableIDNA
-TYPE: bool
-DEFAULT: false
-VERSION: 4.4.0
---DESCRIPTION--
-Allows international domain names in URLs. This configuration option
-requires the PEAR Net_IDNA2 module to be installed. It operates by
-punycoding any internationalized host names for maximum portability.
---# vim: et sw=4 sts=4
+Core.EnableIDNA
+TYPE: bool
+DEFAULT: false
+VERSION: 4.4.0
+--DESCRIPTION--
+Allows international domain names in URLs. This configuration option
+requires the PEAR Net_IDNA2 module to be installed. It operates by
+punycoding any internationalized host names for maximum portability.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
similarity index 98%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
index 89e2ae3..8bfb47c 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
@@ -1,15 +1,15 @@
-Core.Encoding
-TYPE: istring
-DEFAULT: 'utf-8'
---DESCRIPTION--
-If for some reason you are unable to convert all webpages to UTF-8, you can
-use this directive as a stop-gap compatibility change to let HTML Purifier
-deal with non UTF-8 input. This technique has notable deficiencies:
-absolutely no characters outside of the selected character encoding will be
-preserved, not even the ones that have been ampersand escaped (this is due
-to a UTF-8 specific <em>feature</em> that automatically resolves all
-entities), making it pretty useless for anything except the most I18N-blind
-applications, although %Core.EscapeNonASCIICharacters offers fixes this
-trouble with another tradeoff. This directive only accepts ISO-8859-1 if
-iconv is not enabled.
---# vim: et sw=4 sts=4
+Core.Encoding
+TYPE: istring
+DEFAULT: 'utf-8'
+--DESCRIPTION--
+If for some reason you are unable to convert all webpages to UTF-8, you can
+use this directive as a stop-gap compatibility change to let HTML Purifier
+deal with non UTF-8 input. This technique has notable deficiencies:
+absolutely no characters outside of the selected character encoding will be
+preserved, not even the ones that have been ampersand escaped (this is due
+to a UTF-8 specific <em>feature</em> that automatically resolves all
+entities), making it pretty useless for anything except the most I18N-blind
+applications, although %Core.EscapeNonASCIICharacters offers fixes this
+trouble with another tradeoff. This directive only accepts ISO-8859-1 if
+iconv is not enabled.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
index 1cc3fcd..a3881be 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
@@ -1,12 +1,12 @@
-Core.EscapeInvalidChildren
-TYPE: bool
-DEFAULT: false
---DESCRIPTION--
-<p><strong>Warning:</strong> this configuration option is no longer does anything as of 4.6.0.</p>
-
-<p>When true, a child is found that is not allowed in the context of the
-parent element will be transformed into text as if it were ASCII. When
-false, that element and all internal tags will be dropped, though text will
-be preserved. There is no option for dropping the element but preserving
-child nodes.</p>
---# vim: et sw=4 sts=4
+Core.EscapeInvalidChildren
+TYPE: bool
+DEFAULT: false
+--DESCRIPTION--
+<p><strong>Warning:</strong> this configuration option is no longer does anything as of 4.6.0.</p>
+
+<p>When true, a child is found that is not allowed in the context of the
+parent element will be transformed into text as if it were ASCII. When
+false, that element and all internal tags will be dropped, though text will
+be preserved. There is no option for dropping the element but preserving
+child nodes.</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
index 299775f..a7a5b24 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
@@ -1,7 +1,7 @@
-Core.EscapeInvalidTags
-TYPE: bool
-DEFAULT: false
---DESCRIPTION--
-When true, invalid tags will be written back to the document as plain text.
-Otherwise, they are silently dropped.
---# vim: et sw=4 sts=4
+Core.EscapeInvalidTags
+TYPE: bool
+DEFAULT: false
+--DESCRIPTION--
+When true, invalid tags will be written back to the document as plain text.
+Otherwise, they are silently dropped.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
index f50db2f..abb4999 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
@@ -1,13 +1,13 @@
-Core.EscapeNonASCIICharacters
-TYPE: bool
-VERSION: 1.4.0
-DEFAULT: false
---DESCRIPTION--
-This directive overcomes a deficiency in %Core.Encoding by blindly
-converting all non-ASCII characters into decimal numeric entities before
-converting it to its native encoding. This means that even characters that
-can be expressed in the non-UTF-8 encoding will be entity-ized, which can
-be a real downer for encodings like Big5. It also assumes that the ASCII
-repetoire is available, although this is the case for almost all encodings.
-Anyway, use UTF-8!
---# vim: et sw=4 sts=4
+Core.EscapeNonASCIICharacters
+TYPE: bool
+VERSION: 1.4.0
+DEFAULT: false
+--DESCRIPTION--
+This directive overcomes a deficiency in %Core.Encoding by blindly
+converting all non-ASCII characters into decimal numeric entities before
+converting it to its native encoding. This means that even characters that
+can be expressed in the non-UTF-8 encoding will be entity-ized, which can
+be a real downer for encodings like Big5. It also assumes that the ASCII
+repetoire is available, although this is the case for almost all encodings.
+Anyway, use UTF-8!
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
index c337e47..915391e 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
@@ -1,19 +1,19 @@
-Core.HiddenElements
-TYPE: lookup
---DEFAULT--
-array (
- 'script' => true,
- 'style' => true,
-)
---DESCRIPTION--
-
-<p>
- This directive is a lookup array of elements which should have their
- contents removed when they are not allowed by the HTML definition.
- For example, the contents of a <code>script</code> tag are not
- normally shown in a document, so if script tags are to be removed,
- their contents should be removed to. This is opposed to a <code>b</code>
- tag, which defines some presentational changes but does not hide its
- contents.
-</p>
---# vim: et sw=4 sts=4
+Core.HiddenElements
+TYPE: lookup
+--DEFAULT--
+array (
+ 'script' => true,
+ 'style' => true,
+)
+--DESCRIPTION--
+
+<p>
+ This directive is a lookup array of elements which should have their
+ contents removed when they are not allowed by the HTML definition.
+ For example, the contents of a <code>script</code> tag are not
+ normally shown in a document, so if script tags are to be removed,
+ their contents should be removed to. This is opposed to a <code>b</code>
+ tag, which defines some presentational changes but does not hide its
+ contents.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
index ed1f39b..233fca1 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
@@ -1,10 +1,10 @@
-Core.Language
-TYPE: string
-VERSION: 2.0.0
-DEFAULT: 'en'
---DESCRIPTION--
-
-ISO 639 language code for localizable things in HTML Purifier to use,
-which is mainly error reporting. There is currently only an English (en)
-translation, so this directive is currently useless.
---# vim: et sw=4 sts=4
+Core.Language
+TYPE: string
+VERSION: 2.0.0
+DEFAULT: 'en'
+--DESCRIPTION--
+
+ISO 639 language code for localizable things in HTML Purifier to use,
+which is mainly error reporting. There is currently only an English (en)
+translation, so this directive is currently useless.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
index e11c015..8983e2c 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
@@ -1,34 +1,34 @@
-Core.LexerImpl
-TYPE: mixed/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- This parameter determines what lexer implementation can be used. The
- valid values are:
-</p>
-<dl>
- <dt><em>null</em></dt>
- <dd>
- Recommended, the lexer implementation will be auto-detected based on
- your PHP-version and configuration.
- </dd>
- <dt><em>string</em> lexer identifier</dt>
- <dd>
- This is a slim way of manually overridding the implementation.
- Currently recognized values are: DOMLex (the default PHP5
-implementation)
- and DirectLex (the default PHP4 implementation). Only use this if
- you know what you are doing: usually, the auto-detection will
- manage things for cases you aren't even aware of.
- </dd>
- <dt><em>object</em> lexer instance</dt>
- <dd>
- Super-advanced: you can specify your own, custom, implementation that
- implements the interface defined by <code>HTMLPurifier_Lexer</code>.
- I may remove this option simply because I don't expect anyone
- to use it.
- </dd>
-</dl>
---# vim: et sw=4 sts=4
+Core.LexerImpl
+TYPE: mixed/null
+VERSION: 2.0.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+ This parameter determines what lexer implementation can be used. The
+ valid values are:
+</p>
+<dl>
+ <dt><em>null</em></dt>
+ <dd>
+ Recommended, the lexer implementation will be auto-detected based on
+ your PHP-version and configuration.
+ </dd>
+ <dt><em>string</em> lexer identifier</dt>
+ <dd>
+ This is a slim way of manually overridding the implementation.
+ Currently recognized values are: DOMLex (the default PHP5
+implementation)
+ and DirectLex (the default PHP4 implementation). Only use this if
+ you know what you are doing: usually, the auto-detection will
+ manage things for cases you aren't even aware of.
+ </dd>
+ <dt><em>object</em> lexer instance</dt>
+ <dd>
+ Super-advanced: you can specify your own, custom, implementation that
+ implements the interface defined by <code>HTMLPurifier_Lexer</code>.
+ I may remove this option simply because I don't expect anyone
+ to use it.
+ </dd>
+</dl>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
index 838f10f..eb841a7 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
@@ -1,16 +1,16 @@
-Core.MaintainLineNumbers
-TYPE: bool/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- If true, HTML Purifier will add line number information to all tokens.
- This is useful when error reporting is turned on, but can result in
- significant performance degradation and should not be used when
- unnecessary. This directive must be used with the DirectLex lexer,
- as the DOMLex lexer does not (yet) support this functionality.
- If the value is null, an appropriate value will be selected based
- on other configuration.
-</p>
---# vim: et sw=4 sts=4
+Core.MaintainLineNumbers
+TYPE: bool/null
+VERSION: 2.0.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+ If true, HTML Purifier will add line number information to all tokens.
+ This is useful when error reporting is turned on, but can result in
+ significant performance degradation and should not be used when
+ unnecessary. This directive must be used with the DirectLex lexer,
+ as the DOMLex lexer does not (yet) support this functionality.
+ If the value is null, an appropriate value will be selected based
+ on other configuration.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
index 94a8860..d77f536 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
@@ -1,11 +1,11 @@
-Core.NormalizeNewlines
-TYPE: bool
-VERSION: 4.2.0
-DEFAULT: true
---DESCRIPTION--
-<p>
- Whether or not to normalize newlines to the operating
- system default. When <code>false</code>, HTML Purifier
- will attempt to preserve mixed newline files.
-</p>
---# vim: et sw=4 sts=4
+Core.NormalizeNewlines
+TYPE: bool
+VERSION: 4.2.0
+DEFAULT: true
+--DESCRIPTION--
+<p>
+ Whether or not to normalize newlines to the operating
+ system default. When <code>false</code>, HTML Purifier
+ will attempt to preserve mixed newline files.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
index 704ac56..4070c2a 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
@@ -1,12 +1,12 @@
-Core.RemoveInvalidImg
-TYPE: bool
-DEFAULT: true
-VERSION: 1.3.0
---DESCRIPTION--
-
-<p>
- This directive enables pre-emptive URI checking in <code>img</code>
- tags, as the attribute validation strategy is not authorized to
- remove elements from the document. Revert to pre-1.3.0 behavior by setting to false.
-</p>
---# vim: et sw=4 sts=4
+Core.RemoveInvalidImg
+TYPE: bool
+DEFAULT: true
+VERSION: 1.3.0
+--DESCRIPTION--
+
+<p>
+ This directive enables pre-emptive URI checking in <code>img</code>
+ tags, as the attribute validation strategy is not authorized to
+ remove elements from the document. Revert to pre-1.3.0 behavior by setting to false.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
index ed6f134..3397d9f 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
@@ -1,11 +1,11 @@
-Core.RemoveProcessingInstructions
-TYPE: bool
-VERSION: 4.2.0
-DEFAULT: false
---DESCRIPTION--
-Instead of escaping processing instructions in the form <code><? ...
-?></code>, remove it out-right. This may be useful if the HTML
-you are validating contains XML processing instruction gunk, however,
-it can also be user-unfriendly for people attempting to post PHP
-snippets.
---# vim: et sw=4 sts=4
+Core.RemoveProcessingInstructions
+TYPE: bool
+VERSION: 4.2.0
+DEFAULT: false
+--DESCRIPTION--
+Instead of escaping processing instructions in the form <code><? ...
+?></code>, remove it out-right. This may be useful if the HTML
+you are validating contains XML processing instruction gunk, however,
+it can also be user-unfriendly for people attempting to post PHP
+snippets.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
index efbe994..a4cd966 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
@@ -1,12 +1,12 @@
-Core.RemoveScriptContents
-TYPE: bool/null
-DEFAULT: NULL
-VERSION: 2.0.0
-DEPRECATED-VERSION: 2.1.0
-DEPRECATED-USE: Core.HiddenElements
---DESCRIPTION--
-<p>
- This directive enables HTML Purifier to remove not only script tags
- but all of their contents.
-</p>
---# vim: et sw=4 sts=4
+Core.RemoveScriptContents
+TYPE: bool/null
+DEFAULT: NULL
+VERSION: 2.0.0
+DEPRECATED-VERSION: 2.1.0
+DEPRECATED-USE: Core.HiddenElements
+--DESCRIPTION--
+<p>
+ This directive enables HTML Purifier to remove not only script tags
+ but all of their contents.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
index 861ae66..3db50ef 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
@@ -1,11 +1,11 @@
-Filter.Custom
-TYPE: list
-VERSION: 3.1.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
- This directive can be used to add custom filters; it is nearly the
- equivalent of the now deprecated <code>HTMLPurifier->addFilter()</code>
- method. Specify an array of concrete implementations.
-</p>
---# vim: et sw=4 sts=4
+Filter.Custom
+TYPE: list
+VERSION: 3.1.0
+DEFAULT: array()
+--DESCRIPTION--
+<p>
+ This directive can be used to add custom filters; it is nearly the
+ equivalent of the now deprecated <code>HTMLPurifier->addFilter()</code>
+ method. Specify an array of concrete implementations.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
index 6960263..16829bc 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
@@ -1,14 +1,14 @@
-Filter.ExtractStyleBlocks.Escaping
-TYPE: bool
-VERSION: 3.0.0
-DEFAULT: true
-ALIASES: Filter.ExtractStyleBlocksEscaping, FilterParam.ExtractStyleBlocksEscaping
---DESCRIPTION--
-
-<p>
- Whether or not to escape the dangerous characters <, > and &
- as \3C, \3E and \26, respectively. This is can be safely set to false
- if the contents of StyleBlocks will be placed in an external stylesheet,
- where there is no risk of it being interpreted as HTML.
-</p>
---# vim: et sw=4 sts=4
+Filter.ExtractStyleBlocks.Escaping
+TYPE: bool
+VERSION: 3.0.0
+DEFAULT: true
+ALIASES: Filter.ExtractStyleBlocksEscaping, FilterParam.ExtractStyleBlocksEscaping
+--DESCRIPTION--
+
+<p>
+ Whether or not to escape the dangerous characters <, > and &
+ as \3C, \3E and \26, respectively. This is can be safely set to false
+ if the contents of StyleBlocks will be placed in an external stylesheet,
+ where there is no risk of it being interpreted as HTML.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
index baa81ae..7f95f54 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
@@ -1,29 +1,29 @@
-Filter.ExtractStyleBlocks.Scope
-TYPE: string/null
-VERSION: 3.0.0
-DEFAULT: NULL
-ALIASES: Filter.ExtractStyleBlocksScope, FilterParam.ExtractStyleBlocksScope
---DESCRIPTION--
-
-<p>
- If you would like users to be able to define external stylesheets, but
- only allow them to specify CSS declarations for a specific node and
- prevent them from fiddling with other elements, use this directive.
- It accepts any valid CSS selector, and will prepend this to any
- CSS declaration extracted from the document. For example, if this
- directive is set to <code>#user-content</code> and a user uses the
- selector <code>a:hover</code>, the final selector will be
- <code>#user-content a:hover</code>.
-</p>
-<p>
- The comma shorthand may be used; consider the above example, with
- <code>#user-content, #user-content2</code>, the final selector will
- be <code>#user-content a:hover, #user-content2 a:hover</code>.
-</p>
-<p>
- <strong>Warning:</strong> It is possible for users to bypass this measure
- using a naughty + selector. This is a bug in CSS Tidy 1.3, not HTML
- Purifier, and I am working to get it fixed. Until then, HTML Purifier
- performs a basic check to prevent this.
-</p>
---# vim: et sw=4 sts=4
+Filter.ExtractStyleBlocks.Scope
+TYPE: string/null
+VERSION: 3.0.0
+DEFAULT: NULL
+ALIASES: Filter.ExtractStyleBlocksScope, FilterParam.ExtractStyleBlocksScope
+--DESCRIPTION--
+
+<p>
+ If you would like users to be able to define external stylesheets, but
+ only allow them to specify CSS declarations for a specific node and
+ prevent them from fiddling with other elements, use this directive.
+ It accepts any valid CSS selector, and will prepend this to any
+ CSS declaration extracted from the document. For example, if this
+ directive is set to <code>#user-content</code> and a user uses the
+ selector <code>a:hover</code>, the final selector will be
+ <code>#user-content a:hover</code>.
+</p>
+<p>
+ The comma shorthand may be used; consider the above example, with
+ <code>#user-content, #user-content2</code>, the final selector will
+ be <code>#user-content a:hover, #user-content2 a:hover</code>.
+</p>
+<p>
+ <strong>Warning:</strong> It is possible for users to bypass this measure
+ using a naughty + selector. This is a bug in CSS Tidy 1.3, not HTML
+ Purifier, and I am working to get it fixed. Until then, HTML Purifier
+ performs a basic check to prevent this.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
index 3b70189..6c231b2 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
@@ -1,16 +1,16 @@
-Filter.ExtractStyleBlocks.TidyImpl
-TYPE: mixed/null
-VERSION: 3.1.0
-DEFAULT: NULL
-ALIASES: FilterParam.ExtractStyleBlocksTidyImpl
---DESCRIPTION--
-<p>
- If left NULL, HTML Purifier will attempt to instantiate a <code>csstidy</code>
- class to use for internal cleaning. This will usually be good enough.
-</p>
-<p>
- However, for trusted user input, you can set this to <code>false</code> to
- disable cleaning. In addition, you can supply your own concrete implementation
- of Tidy's interface to use, although I don't know why you'd want to do that.
-</p>
---# vim: et sw=4 sts=4
+Filter.ExtractStyleBlocks.TidyImpl
+TYPE: mixed/null
+VERSION: 3.1.0
+DEFAULT: NULL
+ALIASES: FilterParam.ExtractStyleBlocksTidyImpl
+--DESCRIPTION--
+<p>
+ If left NULL, HTML Purifier will attempt to instantiate a <code>csstidy</code>
+ class to use for internal cleaning. This will usually be good enough.
+</p>
+<p>
+ However, for trusted user input, you can set this to <code>false</code> to
+ disable cleaning. In addition, you can supply your own concrete implementation
+ of Tidy's interface to use, although I don't know why you'd want to do that.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
index be0177d..078d087 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
@@ -1,74 +1,74 @@
-Filter.ExtractStyleBlocks
-TYPE: bool
-VERSION: 3.1.0
-DEFAULT: false
-EXTERNAL: CSSTidy
---DESCRIPTION--
-<p>
- This directive turns on the style block extraction filter, which removes
- <code>style</code> blocks from input HTML, cleans them up with CSSTidy,
- and places them in the <code>StyleBlocks</code> context variable, for further
- use by you, usually to be placed in an external stylesheet, or a
- <code>style</code> block in the <code>head</code> of your document.
-</p>
-<p>
- Sample usage:
-</p>
-<pre><![CDATA[
-<?php
- header('Content-type: text/html; charset=utf-8');
- echo '<?xml version="1.0" encoding="UTF-8"?>';
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
- <title>Filter.ExtractStyleBlocks</title>
-<?php
- require_once '/path/to/library/HTMLPurifier.auto.php';
- require_once '/path/to/csstidy.class.php';
-
- $dirty = '<style>body {color:#F00;}</style> Some text';
-
- $config = HTMLPurifier_Config::createDefault();
- $config->set('Filter', 'ExtractStyleBlocks', true);
- $purifier = new HTMLPurifier($config);
-
- $html = $purifier->purify($dirty);
-
- // This implementation writes the stylesheets to the styles/ directory.
- // You can also echo the styles inside the document, but it's a bit
- // more difficult to make sure they get interpreted properly by
- // browsers; try the usual CSS armoring techniques.
- $styles = $purifier->context->get('StyleBlocks');
- $dir = 'styles/';
- if (!is_dir($dir)) mkdir($dir);
- $hash = sha1($_GET['html']);
- foreach ($styles as $i => $style) {
- file_put_contents($name = $dir . $hash . "_$i");
- echo '<link rel="stylesheet" type="text/css" href="'.$name.'" />';
- }
-?>
-</head>
-<body>
- <div>
- <?php echo $html; ?>
- </div>
-</b]]><![CDATA[ody>
-</html>
-]]></pre>
-<p>
- <strong>Warning:</strong> It is possible for a user to mount an
- imagecrash attack using this CSS. Counter-measures are difficult;
- it is not simply enough to limit the range of CSS lengths (using
- relative lengths with many nesting levels allows for large values
- to be attained without actually specifying them in the stylesheet),
- and the flexible nature of selectors makes it difficult to selectively
- disable lengths on image tags (HTML Purifier, however, does disable
- CSS width and height in inline styling). There are probably two effective
- counter measures: an explicit width and height set to auto in all
- images in your document (unlikely) or the disabling of width and
- height (somewhat reasonable). Whether or not these measures should be
- used is left to the reader.
-</p>
---# vim: et sw=4 sts=4
+Filter.ExtractStyleBlocks
+TYPE: bool
+VERSION: 3.1.0
+DEFAULT: false
+EXTERNAL: CSSTidy
+--DESCRIPTION--
+<p>
+ This directive turns on the style block extraction filter, which removes
+ <code>style</code> blocks from input HTML, cleans them up with CSSTidy,
+ and places them in the <code>StyleBlocks</code> context variable, for further
+ use by you, usually to be placed in an external stylesheet, or a
+ <code>style</code> block in the <code>head</code> of your document.
+</p>
+<p>
+ Sample usage:
+</p>
+<pre><![CDATA[
+<?php
+ header('Content-type: text/html; charset=utf-8');
+ echo '<?xml version="1.0" encoding="UTF-8"?>';
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+ <title>Filter.ExtractStyleBlocks</title>
+<?php
+ require_once '/path/to/library/HTMLPurifier.auto.php';
+ require_once '/path/to/csstidy.class.php';
+
+ $dirty = '<style>body {color:#F00;}</style> Some text';
+
+ $config = HTMLPurifier_Config::createDefault();
+ $config->set('Filter', 'ExtractStyleBlocks', true);
+ $purifier = new HTMLPurifier($config);
+
+ $html = $purifier->purify($dirty);
+
+ // This implementation writes the stylesheets to the styles/ directory.
+ // You can also echo the styles inside the document, but it's a bit
+ // more difficult to make sure they get interpreted properly by
+ // browsers; try the usual CSS armoring techniques.
+ $styles = $purifier->context->get('StyleBlocks');
+ $dir = 'styles/';
+ if (!is_dir($dir)) mkdir($dir);
+ $hash = sha1($_GET['html']);
+ foreach ($styles as $i => $style) {
+ file_put_contents($name = $dir . $hash . "_$i");
+ echo '<link rel="stylesheet" type="text/css" href="'.$name.'" />';
+ }
+?>
+</head>
+<body>
+ <div>
+ <?php echo $html; ?>
+ </div>
+</b]]><![CDATA[ody>
+</html>
+]]></pre>
+<p>
+ <strong>Warning:</strong> It is possible for a user to mount an
+ imagecrash attack using this CSS. Counter-measures are difficult;
+ it is not simply enough to limit the range of CSS lengths (using
+ relative lengths with many nesting levels allows for large values
+ to be attained without actually specifying them in the stylesheet),
+ and the flexible nature of selectors makes it difficult to selectively
+ disable lengths on image tags (HTML Purifier, however, does disable
+ CSS width and height in inline styling). There are probably two effective
+ counter measures: an explicit width and height set to auto in all
+ images in your document (unlikely) or the disabling of width and
+ height (somewhat reasonable). Whether or not these measures should be
+ used is left to the reader.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
index 8822186..321eaa2 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
@@ -1,16 +1,16 @@
-Filter.YouTube
-TYPE: bool
-VERSION: 3.1.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- <strong>Warning:</strong> Deprecated in favor of %HTML.SafeObject and
- %Output.FlashCompat (turn both on to allow YouTube videos and other
- Flash content).
-</p>
-<p>
- This directive enables YouTube video embedding in HTML Purifier. Check
- <a href="http://htmlpurifier.org/docs/enduser-youtube.html">this document
- on embedding videos</a> for more information on what this filter does.
-</p>
---# vim: et sw=4 sts=4
+Filter.YouTube
+TYPE: bool
+VERSION: 3.1.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+ <strong>Warning:</strong> Deprecated in favor of %HTML.SafeObject and
+ %Output.FlashCompat (turn both on to allow YouTube videos and other
+ Flash content).
+</p>
+<p>
+ This directive enables YouTube video embedding in HTML Purifier. Check
+ <a href="http://htmlpurifier.org/docs/enduser-youtube.html">this document
+ on embedding videos</a> for more information on what this filter does.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
index afd48a0..0b2c106 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
@@ -1,25 +1,25 @@
-HTML.Allowed
-TYPE: itext/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- This is a preferred convenience directive that combines
- %HTML.AllowedElements and %HTML.AllowedAttributes.
- Specify elements and attributes that are allowed using:
- <code>element1[attr1|attr2],element2...</code>. For example,
- if you would like to only allow paragraphs and links, specify
- <code>a[href],p</code>. You can specify attributes that apply
- to all elements using an asterisk, e.g. <code>*[lang]</code>.
- You can also use newlines instead of commas to separate elements.
-</p>
-<p>
- <strong>Warning</strong>:
- All of the constraints on the component directives are still enforced.
- The syntax is a <em>subset</em> of TinyMCE's <code>valid_elements</code>
- whitelist: directly copy-pasting it here will probably result in
- broken whitelists. If %HTML.AllowedElements or %HTML.AllowedAttributes
- are set, this directive has no effect.
-</p>
---# vim: et sw=4 sts=4
+HTML.Allowed
+TYPE: itext/null
+VERSION: 2.0.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+ This is a preferred convenience directive that combines
+ %HTML.AllowedElements and %HTML.AllowedAttributes.
+ Specify elements and attributes that are allowed using:
+ <code>element1[attr1|attr2],element2...</code>. For example,
+ if you would like to only allow paragraphs and links, specify
+ <code>a[href],p</code>. You can specify attributes that apply
+ to all elements using an asterisk, e.g. <code>*[lang]</code>.
+ You can also use newlines instead of commas to separate elements.
+</p>
+<p>
+ <strong>Warning</strong>:
+ All of the constraints on the component directives are still enforced.
+ The syntax is a <em>subset</em> of TinyMCE's <code>valid_elements</code>
+ whitelist: directly copy-pasting it here will probably result in
+ broken whitelists. If %HTML.AllowedElements or %HTML.AllowedAttributes
+ are set, this directive has no effect.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
index 0e6ec54..fcf093f 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
@@ -1,19 +1,19 @@
-HTML.AllowedAttributes
-TYPE: lookup/null
-VERSION: 1.3.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- If HTML Purifier's attribute set is unsatisfactory, overload it!
- The syntax is "tag.attr" or "*.attr" for the global attributes
- (style, id, class, dir, lang, xml:lang).
-</p>
-<p>
- <strong>Warning:</strong> If another directive conflicts with the
- elements here, <em>that</em> directive will win and override. For
- example, %HTML.EnableAttrID will take precedence over *.id in this
- directive. You must set that directive to true before you can use
- IDs at all.
-</p>
---# vim: et sw=4 sts=4
+HTML.AllowedAttributes
+TYPE: lookup/null
+VERSION: 1.3.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+ If HTML Purifier's attribute set is unsatisfactory, overload it!
+ The syntax is "tag.attr" or "*.attr" for the global attributes
+ (style, id, class, dir, lang, xml:lang).
+</p>
+<p>
+ <strong>Warning:</strong> If another directive conflicts with the
+ elements here, <em>that</em> directive will win and override. For
+ example, %HTML.EnableAttrID will take precedence over *.id in this
+ directive. You must set that directive to true before you can use
+ IDs at all.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt
index 8440bc3..140e214 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt
@@ -1,10 +1,10 @@
-HTML.AllowedComments
-TYPE: lookup
-VERSION: 4.4.0
-DEFAULT: array()
---DESCRIPTION--
-A whitelist which indicates what explicit comment bodies should be
-allowed, modulo leading and trailing whitespace. See also %HTML.AllowedCommentsRegexp
-(these directives are union'ed together, so a comment is considered
-valid if any directive deems it valid.)
---# vim: et sw=4 sts=4
+HTML.AllowedComments
+TYPE: lookup
+VERSION: 4.4.0
+DEFAULT: array()
+--DESCRIPTION--
+A whitelist which indicates what explicit comment bodies should be
+allowed, modulo leading and trailing whitespace. See also %HTML.AllowedCommentsRegexp
+(these directives are union'ed together, so a comment is considered
+valid if any directive deems it valid.)
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt
index b1e65be..f22e977 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt
@@ -1,15 +1,15 @@
-HTML.AllowedCommentsRegexp
-TYPE: string/null
-VERSION: 4.4.0
-DEFAULT: NULL
---DESCRIPTION--
-A regexp, which if it matches the body of a comment, indicates that
-it should be allowed. Trailing and leading spaces are removed prior
-to running this regular expression.
-<strong>Warning:</strong> Make sure you specify
-correct anchor metacharacters <code>^regex$</code>, otherwise you may accept
-comments that you did not mean to! In particular, the regex <code>/foo|bar/</code>
-is probably not sufficiently strict, since it also allows <code>foobar</code>.
-See also %HTML.AllowedComments (these directives are union'ed together,
-so a comment is considered valid if any directive deems it valid.)
---# vim: et sw=4 sts=4
+HTML.AllowedCommentsRegexp
+TYPE: string/null
+VERSION: 4.4.0
+DEFAULT: NULL
+--DESCRIPTION--
+A regexp, which if it matches the body of a comment, indicates that
+it should be allowed. Trailing and leading spaces are removed prior
+to running this regular expression.
+<strong>Warning:</strong> Make sure you specify
+correct anchor metacharacters <code>^regex$</code>, otherwise you may accept
+comments that you did not mean to! In particular, the regex <code>/foo|bar/</code>
+is probably not sufficiently strict, since it also allows <code>foobar</code>.
+See also %HTML.AllowedComments (these directives are union'ed together,
+so a comment is considered valid if any directive deems it valid.)
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
index ca3c13d..1d3fa79 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
@@ -1,23 +1,23 @@
-HTML.AllowedElements
-TYPE: lookup/null
-VERSION: 1.3.0
-DEFAULT: NULL
---DESCRIPTION--
-<p>
- If HTML Purifier's tag set is unsatisfactory for your needs, you can
- overload it with your own list of tags to allow. If you change
- this, you probably also want to change %HTML.AllowedAttributes; see
- also %HTML.Allowed which lets you set allowed elements and
- attributes at the same time.
-</p>
-<p>
- If you attempt to allow an element that HTML Purifier does not know
- about, HTML Purifier will raise an error. You will need to manually
- tell HTML Purifier about this element by using the
- <a href="http://htmlpurifier.org/docs/enduser-customize.html">advanced customization features.</a>
-</p>
-<p>
- <strong>Warning:</strong> If another directive conflicts with the
- elements here, <em>that</em> directive will win and override.
-</p>
---# vim: et sw=4 sts=4
+HTML.AllowedElements
+TYPE: lookup/null
+VERSION: 1.3.0
+DEFAULT: NULL
+--DESCRIPTION--
+<p>
+ If HTML Purifier's tag set is unsatisfactory for your needs, you can
+ overload it with your own list of tags to allow. If you change
+ this, you probably also want to change %HTML.AllowedAttributes; see
+ also %HTML.Allowed which lets you set allowed elements and
+ attributes at the same time.
+</p>
+<p>
+ If you attempt to allow an element that HTML Purifier does not know
+ about, HTML Purifier will raise an error. You will need to manually
+ tell HTML Purifier about this element by using the
+ <a href="http://htmlpurifier.org/docs/enduser-customize.html">advanced customization features.</a>
+</p>
+<p>
+ <strong>Warning:</strong> If another directive conflicts with the
+ elements here, <em>that</em> directive will win and override.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
index e373791..5a59a55 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
@@ -1,20 +1,20 @@
-HTML.AllowedModules
-TYPE: lookup/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- A doctype comes with a set of usual modules to use. Without having
- to mucking about with the doctypes, you can quickly activate or
- disable these modules by specifying which modules you wish to allow
- with this directive. This is most useful for unit testing specific
- modules, although end users may find it useful for their own ends.
-</p>
-<p>
- If you specify a module that does not exist, the manager will silently
- fail to use it, so be careful! User-defined modules are not affected
- by this directive. Modules defined in %HTML.CoreModules are not
- affected by this directive.
-</p>
---# vim: et sw=4 sts=4
+HTML.AllowedModules
+TYPE: lookup/null
+VERSION: 2.0.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+ A doctype comes with a set of usual modules to use. Without having
+ to mucking about with the doctypes, you can quickly activate or
+ disable these modules by specifying which modules you wish to allow
+ with this directive. This is most useful for unit testing specific
+ modules, although end users may find it useful for their own ends.
+</p>
+<p>
+ If you specify a module that does not exist, the manager will silently
+ fail to use it, so be careful! User-defined modules are not affected
+ by this directive. Modules defined in %HTML.CoreModules are not
+ affected by this directive.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
index 75d680e..151fb7b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
@@ -1,11 +1,11 @@
-HTML.Attr.Name.UseCDATA
-TYPE: bool
-DEFAULT: false
-VERSION: 4.0.0
---DESCRIPTION--
-The W3C specification DTD defines the name attribute to be CDATA, not ID, due
-to limitations of DTD. In certain documents, this relaxed behavior is desired,
-whether it is to specify duplicate names, or to specify names that would be
-illegal IDs (for example, names that begin with a digit.) Set this configuration
-directive to true to use the relaxed parsing rules.
---# vim: et sw=4 sts=4
+HTML.Attr.Name.UseCDATA
+TYPE: bool
+DEFAULT: false
+VERSION: 4.0.0
+--DESCRIPTION--
+The W3C specification DTD defines the name attribute to be CDATA, not ID, due
+to limitations of DTD. In certain documents, this relaxed behavior is desired,
+whether it is to specify duplicate names, or to specify names that would be
+illegal IDs (for example, names that begin with a digit.) Set this configuration
+directive to true to use the relaxed parsing rules.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
index f32b802..45ae469 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
@@ -1,18 +1,18 @@
-HTML.BlockWrapper
-TYPE: string
-VERSION: 1.3.0
-DEFAULT: 'p'
---DESCRIPTION--
-
-<p>
- String name of element to wrap inline elements that are inside a block
- context. This only occurs in the children of blockquote in strict mode.
-</p>
-<p>
- Example: by default value,
- <code><blockquote>Foo</blockquote></code> would become
- <code><blockquote><p>Foo</p></blockquote></code>.
- The <code><p></code> tags can be replaced with whatever you desire,
- as long as it is a block level element.
-</p>
---# vim: et sw=4 sts=4
+HTML.BlockWrapper
+TYPE: string
+VERSION: 1.3.0
+DEFAULT: 'p'
+--DESCRIPTION--
+
+<p>
+ String name of element to wrap inline elements that are inside a block
+ context. This only occurs in the children of blockquote in strict mode.
+</p>
+<p>
+ Example: by default value,
+ <code><blockquote>Foo</blockquote></code> would become
+ <code><blockquote><p>Foo</p></blockquote></code>.
+ The <code><p></code> tags can be replaced with whatever you desire,
+ as long as it is a block level element.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
index fc8e402..5246188 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
@@ -1,23 +1,23 @@
-HTML.CoreModules
-TYPE: lookup
-VERSION: 2.0.0
---DEFAULT--
-array (
- 'Structure' => true,
- 'Text' => true,
- 'Hypertext' => true,
- 'List' => true,
- 'NonXMLCommonAttributes' => true,
- 'XMLCommonAttributes' => true,
- 'CommonAttributes' => true,
-)
---DESCRIPTION--
-
-<p>
- Certain modularized doctypes (XHTML, namely), have certain modules
- that must be included for the doctype to be an conforming document
- type: put those modules here. By default, XHTML's core modules
- are used. You can set this to a blank array to disable core module
- protection, but this is not recommended.
-</p>
---# vim: et sw=4 sts=4
+HTML.CoreModules
+TYPE: lookup
+VERSION: 2.0.0
+--DEFAULT--
+array (
+ 'Structure' => true,
+ 'Text' => true,
+ 'Hypertext' => true,
+ 'List' => true,
+ 'NonXMLCommonAttributes' => true,
+ 'XMLCommonAttributes' => true,
+ 'CommonAttributes' => true,
+)
+--DESCRIPTION--
+
+<p>
+ Certain modularized doctypes (XHTML, namely), have certain modules
+ that must be included for the doctype to be an conforming document
+ type: put those modules here. By default, XHTML's core modules
+ are used. You can set this to a blank array to disable core module
+ protection, but this is not recommended.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
similarity index 69%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
index a2bde5d..6ed70b5 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
@@ -1,9 +1,9 @@
-HTML.CustomDoctype
-TYPE: string/null
-VERSION: 2.0.1
-DEFAULT: NULL
---DESCRIPTION--
-
-A custom doctype for power-users who defined there own document
-type. This directive only applies when %HTML.Doctype is blank.
---# vim: et sw=4 sts=4
+HTML.CustomDoctype
+TYPE: string/null
+VERSION: 2.0.1
+DEFAULT: NULL
+--DESCRIPTION--
+
+A custom doctype for power-users who defined their own document
+type. This directive only applies when %HTML.Doctype is blank.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
index f5433e3..103db75 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
@@ -1,33 +1,33 @@
-HTML.DefinitionID
-TYPE: string/null
-DEFAULT: NULL
-VERSION: 2.0.0
---DESCRIPTION--
-
-<p>
- Unique identifier for a custom-built HTML definition. If you edit
- the raw version of the HTMLDefinition, introducing changes that the
- configuration object does not reflect, you must specify this variable.
- If you change your custom edits, you should change this directive, or
- clear your cache. Example:
-</p>
-<pre>
-$config = HTMLPurifier_Config::createDefault();
-$config->set('HTML', 'DefinitionID', '1');
-$def = $config->getHTMLDefinition();
-$def->addAttribute('a', 'tabindex', 'Number');
-</pre>
-<p>
- In the above example, the configuration is still at the defaults, but
- using the advanced API, an extra attribute has been added. The
- configuration object normally has no way of knowing that this change
- has taken place, so it needs an extra directive: %HTML.DefinitionID.
- If someone else attempts to use the default configuration, these two
- pieces of code will not clobber each other in the cache, since one has
- an extra directive attached to it.
-</p>
-<p>
- You <em>must</em> specify a value to this directive to use the
- advanced API features.
-</p>
---# vim: et sw=4 sts=4
+HTML.DefinitionID
+TYPE: string/null
+DEFAULT: NULL
+VERSION: 2.0.0
+--DESCRIPTION--
+
+<p>
+ Unique identifier for a custom-built HTML definition. If you edit
+ the raw version of the HTMLDefinition, introducing changes that the
+ configuration object does not reflect, you must specify this variable.
+ If you change your custom edits, you should change this directive, or
+ clear your cache. Example:
+</p>
+<pre>
+$config = HTMLPurifier_Config::createDefault();
+$config->set('HTML', 'DefinitionID', '1');
+$def = $config->getHTMLDefinition();
+$def->addAttribute('a', 'tabindex', 'Number');
+</pre>
+<p>
+ In the above example, the configuration is still at the defaults, but
+ using the advanced API, an extra attribute has been added. The
+ configuration object normally has no way of knowing that this change
+ has taken place, so it needs an extra directive: %HTML.DefinitionID.
+ If someone else attempts to use the default configuration, these two
+ pieces of code will not clobber each other in the cache, since one has
+ an extra directive attached to it.
+</p>
+<p>
+ You <em>must</em> specify a value to this directive to use the
+ advanced API features.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
index 0bb5a71..229ae02 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
@@ -1,16 +1,16 @@
-HTML.DefinitionRev
-TYPE: int
-VERSION: 2.0.0
-DEFAULT: 1
---DESCRIPTION--
-
-<p>
- Revision identifier for your custom definition specified in
- %HTML.DefinitionID. This serves the same purpose: uniquely identifying
- your custom definition, but this one does so in a chronological
- context: revision 3 is more up-to-date then revision 2. Thus, when
- this gets incremented, the cache handling is smart enough to clean
- up any older revisions of your definition as well as flush the
- cache.
-</p>
---# vim: et sw=4 sts=4
+HTML.DefinitionRev
+TYPE: int
+VERSION: 2.0.0
+DEFAULT: 1
+--DESCRIPTION--
+
+<p>
+ Revision identifier for your custom definition specified in
+ %HTML.DefinitionID. This serves the same purpose: uniquely identifying
+ your custom definition, but this one does so in a chronological
+ context: revision 3 is more up-to-date then revision 2. Thus, when
+ this gets incremented, the cache handling is smart enough to clean
+ up any older revisions of your definition as well as flush the
+ cache.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
index a6969b9..9dab497 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
@@ -1,11 +1,11 @@
-HTML.Doctype
-TYPE: string/null
-DEFAULT: NULL
---DESCRIPTION--
-Doctype to use during filtering. Technically speaking this is not actually
-a doctype (as it does not identify a corresponding DTD), but we are using
-this name for sake of simplicity. When non-blank, this will override any
-older directives like %HTML.XHTML or %HTML.Strict.
---ALLOWED--
-'HTML 4.01 Transitional', 'HTML 4.01 Strict', 'XHTML 1.0 Transitional', 'XHTML 1.0 Strict', 'XHTML 1.1'
---# vim: et sw=4 sts=4
+HTML.Doctype
+TYPE: string/null
+DEFAULT: NULL
+--DESCRIPTION--
+Doctype to use during filtering. Technically speaking this is not actually
+a doctype (as it does not identify a corresponding DTD), but we are using
+this name for sake of simplicity. When non-blank, this will override any
+older directives like %HTML.XHTML or %HTML.Strict.
+--ALLOWED--
+'HTML 4.01 Transitional', 'HTML 4.01 Strict', 'XHTML 1.0 Transitional', 'XHTML 1.0 Strict', 'XHTML 1.1'
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
index 08d641f..7878dc0 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
@@ -1,11 +1,11 @@
-HTML.FlashAllowFullScreen
-TYPE: bool
-VERSION: 4.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- Whether or not to permit embedded Flash content from
- %HTML.SafeObject to expand to the full screen. Corresponds to
- the <code>allowFullScreen</code> parameter.
-</p>
---# vim: et sw=4 sts=4
+HTML.FlashAllowFullScreen
+TYPE: bool
+VERSION: 4.2.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+ Whether or not to permit embedded Flash content from
+ %HTML.SafeObject to expand to the full screen. Corresponds to
+ the <code>allowFullScreen</code> parameter.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
index 2b8df97..57358f9 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
@@ -1,21 +1,21 @@
-HTML.ForbiddenAttributes
-TYPE: lookup
-VERSION: 3.1.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
- While this directive is similar to %HTML.AllowedAttributes, for
- forwards-compatibility with XML, this attribute has a different syntax. Instead of
- <code>tag.attr</code>, use <code>tag@attr</code>. To disallow <code>href</code>
- attributes in <code>a</code> tags, set this directive to
- <code>a@href</code>. You can also disallow an attribute globally with
- <code>attr</code> or <code>*@attr</code> (either syntax is fine; the latter
- is provided for consistency with %HTML.AllowedAttributes).
-</p>
-<p>
- <strong>Warning:</strong> This directive complements %HTML.ForbiddenElements,
- accordingly, check
- out that directive for a discussion of why you
- should think twice before using this directive.
-</p>
---# vim: et sw=4 sts=4
+HTML.ForbiddenAttributes
+TYPE: lookup
+VERSION: 3.1.0
+DEFAULT: array()
+--DESCRIPTION--
+<p>
+ While this directive is similar to %HTML.AllowedAttributes, for
+ forwards-compatibility with XML, this attribute has a different syntax. Instead of
+ <code>tag.attr</code>, use <code>tag@attr</code>. To disallow <code>href</code>
+ attributes in <code>a</code> tags, set this directive to
+ <code>a@href</code>. You can also disallow an attribute globally with
+ <code>attr</code> or <code>*@attr</code> (either syntax is fine; the latter
+ is provided for consistency with %HTML.AllowedAttributes).
+</p>
+<p>
+ <strong>Warning:</strong> This directive complements %HTML.ForbiddenElements,
+ accordingly, check
+ out that directive for a discussion of why you
+ should think twice before using this directive.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
index 40466c4..93a53e1 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
@@ -1,20 +1,20 @@
-HTML.ForbiddenElements
-TYPE: lookup
-VERSION: 3.1.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
- This was, perhaps, the most requested feature ever in HTML
- Purifier. Please don't abuse it! This is the logical inverse of
- %HTML.AllowedElements, and it will override that directive, or any
- other directive.
-</p>
-<p>
- If possible, %HTML.Allowed is recommended over this directive, because it
- can sometimes be difficult to tell whether or not you've forbidden all of
- the behavior you would like to disallow. If you forbid <code>img</code>
- with the expectation of preventing images on your site, you'll be in for
- a nasty surprise when people start using the <code>background-image</code>
- CSS property.
-</p>
---# vim: et sw=4 sts=4
+HTML.ForbiddenElements
+TYPE: lookup
+VERSION: 3.1.0
+DEFAULT: array()
+--DESCRIPTION--
+<p>
+ This was, perhaps, the most requested feature ever in HTML
+ Purifier. Please don't abuse it! This is the logical inverse of
+ %HTML.AllowedElements, and it will override that directive, or any
+ other directive.
+</p>
+<p>
+ If possible, %HTML.Allowed is recommended over this directive, because it
+ can sometimes be difficult to tell whether or not you've forbidden all of
+ the behavior you would like to disallow. If you forbid <code>img</code>
+ with the expectation of preventing images on your site, you'll be in for
+ a nasty surprise when people start using the <code>background-image</code>
+ CSS property.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
index 3197479..e424c38 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
@@ -1,14 +1,14 @@
-HTML.MaxImgLength
-TYPE: int/null
-DEFAULT: 1200
-VERSION: 3.1.1
---DESCRIPTION--
-<p>
- This directive controls the maximum number of pixels in the width and
- height attributes in <code>img</code> tags. This is
- in place to prevent imagecrash attacks, disable with null at your own risk.
- This directive is similar to %CSS.MaxImgLength, and both should be
- concurrently edited, although there are
- subtle differences in the input format (the HTML max is an integer).
-</p>
---# vim: et sw=4 sts=4
+HTML.MaxImgLength
+TYPE: int/null
+DEFAULT: 1200
+VERSION: 3.1.1
+--DESCRIPTION--
+<p>
+ This directive controls the maximum number of pixels in the width and
+ height attributes in <code>img</code> tags. This is
+ in place to prevent imagecrash attacks, disable with null at your own risk.
+ This directive is similar to %CSS.MaxImgLength, and both should be
+ concurrently edited, although there are
+ subtle differences in the input format (the HTML max is an integer).
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt
index 7aa3563..700b309 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt
@@ -1,7 +1,7 @@
-HTML.Nofollow
-TYPE: bool
-VERSION: 4.3.0
-DEFAULT: FALSE
---DESCRIPTION--
-If enabled, nofollow rel attributes are added to all outgoing links.
---# vim: et sw=4 sts=4
+HTML.Nofollow
+TYPE: bool
+VERSION: 4.3.0
+DEFAULT: FALSE
+--DESCRIPTION--
+If enabled, nofollow rel attributes are added to all outgoing links.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
index 2d2fbd1..62e8e16 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
@@ -1,12 +1,12 @@
-HTML.Parent
-TYPE: string
-VERSION: 1.3.0
-DEFAULT: 'div'
---DESCRIPTION--
-
-<p>
- String name of element that HTML fragment passed to library will be
- inserted in. An interesting variation would be using span as the
- parent element, meaning that only inline tags would be allowed.
-</p>
---# vim: et sw=4 sts=4
+HTML.Parent
+TYPE: string
+VERSION: 1.3.0
+DEFAULT: 'div'
+--DESCRIPTION--
+
+<p>
+ String name of element that HTML fragment passed to library will be
+ inserted in. An interesting variation would be using span as the
+ parent element, meaning that only inline tags would be allowed.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
index b3c45e1..dfb7204 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
@@ -1,12 +1,12 @@
-HTML.Proprietary
-TYPE: bool
-VERSION: 3.1.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- Whether or not to allow proprietary elements and attributes in your
- documents, as per <code>HTMLPurifier_HTMLModule_Proprietary</code>.
- <strong>Warning:</strong> This can cause your documents to stop
- validating!
-</p>
---# vim: et sw=4 sts=4
+HTML.Proprietary
+TYPE: bool
+VERSION: 3.1.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+ Whether or not to allow proprietary elements and attributes in your
+ documents, as per <code>HTMLPurifier_HTMLModule_Proprietary</code>.
+ <strong>Warning:</strong> This can cause your documents to stop
+ validating!
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
index 556fa67..cdda09a 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
@@ -1,13 +1,13 @@
-HTML.SafeEmbed
-TYPE: bool
-VERSION: 3.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
- Whether or not to permit embed tags in documents, with a number of extra
- security features added to prevent script execution. This is similar to
- what websites like MySpace do to embed tags. Embed is a proprietary
- element and will cause your website to stop validating; you should
- see if you can use %Output.FlashCompat with %HTML.SafeObject instead
- first.</p>
---# vim: et sw=4 sts=4
+HTML.SafeEmbed
+TYPE: bool
+VERSION: 3.1.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+ Whether or not to permit embed tags in documents, with a number of extra
+ security features added to prevent script execution. This is similar to
+ what websites like MySpace do to embed tags. Embed is a proprietary
+ element and will cause your website to stop validating; you should
+ see if you can use %Output.FlashCompat with %HTML.SafeObject instead
+ first.</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt
index 295a8cf..5eb6ec2 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt
@@ -1,13 +1,13 @@
-HTML.SafeIframe
-TYPE: bool
-VERSION: 4.4.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- Whether or not to permit iframe tags in untrusted documents. This
- directive must be accompanied by a whitelist of permitted iframes,
- such as %URI.SafeIframeRegexp, otherwise it will fatally error.
- This directive has no effect on strict doctypes, as iframes are not
- valid.
-</p>
---# vim: et sw=4 sts=4
+HTML.SafeIframe
+TYPE: bool
+VERSION: 4.4.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+ Whether or not to permit iframe tags in untrusted documents. This
+ directive must be accompanied by a whitelist of permitted iframes,
+ such as %URI.SafeIframeRegexp, otherwise it will fatally error.
+ This directive has no effect on strict doctypes, as iframes are not
+ valid.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
index 07f6e53..ceb342e 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
@@ -1,13 +1,13 @@
-HTML.SafeObject
-TYPE: bool
-VERSION: 3.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
- Whether or not to permit object tags in documents, with a number of extra
- security features added to prevent script execution. This is similar to
- what websites like MySpace do to object tags. You should also enable
- %Output.FlashCompat in order to generate Internet Explorer
- compatibility code for your object tags.
-</p>
---# vim: et sw=4 sts=4
+HTML.SafeObject
+TYPE: bool
+VERSION: 3.1.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+ Whether or not to permit object tags in documents, with a number of extra
+ security features added to prevent script execution. This is similar to
+ what websites like MySpace do to object tags. You should also enable
+ %Output.FlashCompat in order to generate Internet Explorer
+ compatibility code for your object tags.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt
index 641b4a8..5ebc7a1 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt
@@ -1,10 +1,10 @@
-HTML.SafeScripting
-TYPE: lookup
-VERSION: 4.5.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
- Whether or not to permit script tags to external scripts in documents.
- Inline scripting is not allowed, and the script must match an explicit whitelist.
-</p>
---# vim: et sw=4 sts=4
+HTML.SafeScripting
+TYPE: lookup
+VERSION: 4.5.0
+DEFAULT: array()
+--DESCRIPTION--
+<p>
+ Whether or not to permit script tags to external scripts in documents.
+ Inline scripting is not allowed, and the script must match an explicit whitelist.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
index d99663a..a8b1de5 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
@@ -1,9 +1,9 @@
-HTML.Strict
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
-DEPRECATED-VERSION: 1.7.0
-DEPRECATED-USE: HTML.Doctype
---DESCRIPTION--
-Determines whether or not to use Transitional (loose) or Strict rulesets.
---# vim: et sw=4 sts=4
+HTML.Strict
+TYPE: bool
+VERSION: 1.3.0
+DEFAULT: false
+DEPRECATED-VERSION: 1.7.0
+DEPRECATED-USE: HTML.Doctype
+--DESCRIPTION--
+Determines whether or not to use Transitional (loose) or Strict rulesets.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt
index d65f0d0..587a167 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt
@@ -1,8 +1,8 @@
-HTML.TargetBlank
-TYPE: bool
-VERSION: 4.4.0
-DEFAULT: FALSE
---DESCRIPTION--
-If enabled, <code>target=blank</code> attributes are added to all outgoing links.
-(This includes links from an HTTPS version of a page to an HTTP version.)
---# vim: et sw=4 sts=4
+HTML.TargetBlank
+TYPE: bool
+VERSION: 4.4.0
+DEFAULT: FALSE
+--DESCRIPTION--
+If enabled, <code>target=blank</code> attributes are added to all outgoing links.
+(This includes links from an HTTPS version of a page to an HTTP version.)
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoreferrer.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoreferrer.txt
new file mode 100755
index 0000000..cb5a0b0
--- /dev/null
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoreferrer.txt
@@ -0,0 +1,9 @@
+HTML.TargetNoreferrer
+TYPE: bool
+VERSION: 4.8.0
+DEFAULT: TRUE
+--DESCRIPTION--
+If enabled, noreferrer rel attributes are added to links which have
+a target attribute associated with them. This prevents malicious
+destinations from overwriting the original window.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
index 602453f..b4c271b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
@@ -1,8 +1,8 @@
-HTML.TidyAdd
-TYPE: lookup
-VERSION: 2.0.0
-DEFAULT: array()
---DESCRIPTION--
-
-Fixes to add to the default set of Tidy fixes as per your level.
---# vim: et sw=4 sts=4
+HTML.TidyAdd
+TYPE: lookup
+VERSION: 2.0.0
+DEFAULT: array()
+--DESCRIPTION--
+
+Fixes to add to the default set of Tidy fixes as per your level.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
index bf943e8..4186ccd 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
@@ -1,24 +1,24 @@
-HTML.TidyLevel
-TYPE: string
-VERSION: 2.0.0
-DEFAULT: 'medium'
---DESCRIPTION--
-
-<p>General level of cleanliness the Tidy module should enforce.
-There are four allowed values:</p>
-<dl>
- <dt>none</dt>
- <dd>No extra tidying should be done</dd>
- <dt>light</dt>
- <dd>Only fix elements that would be discarded otherwise due to
- lack of support in doctype</dd>
- <dt>medium</dt>
- <dd>Enforce best practices</dd>
- <dt>heavy</dt>
- <dd>Transform all deprecated elements and attributes to standards
- compliant equivalents</dd>
-</dl>
-
---ALLOWED--
-'none', 'light', 'medium', 'heavy'
---# vim: et sw=4 sts=4
+HTML.TidyLevel
+TYPE: string
+VERSION: 2.0.0
+DEFAULT: 'medium'
+--DESCRIPTION--
+
+<p>General level of cleanliness the Tidy module should enforce.
+There are four allowed values:</p>
+<dl>
+ <dt>none</dt>
+ <dd>No extra tidying should be done</dd>
+ <dt>light</dt>
+ <dd>Only fix elements that would be discarded otherwise due to
+ lack of support in doctype</dd>
+ <dt>medium</dt>
+ <dd>Enforce best practices</dd>
+ <dt>heavy</dt>
+ <dd>Transform all deprecated elements and attributes to standards
+ compliant equivalents</dd>
+</dl>
+
+--ALLOWED--
+'none', 'light', 'medium', 'heavy'
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
index 92cca2a..996762b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
@@ -1,8 +1,8 @@
-HTML.TidyRemove
-TYPE: lookup
-VERSION: 2.0.0
-DEFAULT: array()
---DESCRIPTION--
-
-Fixes to remove from the default set of Tidy fixes as per your level.
---# vim: et sw=4 sts=4
+HTML.TidyRemove
+TYPE: lookup
+VERSION: 2.0.0
+DEFAULT: array()
+--DESCRIPTION--
+
+Fixes to remove from the default set of Tidy fixes as per your level.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
index bc8e654..1db9237 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
@@ -1,9 +1,9 @@
-HTML.Trusted
-TYPE: bool
-VERSION: 2.0.0
-DEFAULT: false
---DESCRIPTION--
-Indicates whether or not the user input is trusted or not. If the input is
-trusted, a more expansive set of allowed tags and attributes will be used.
-See also %CSS.Trusted.
---# vim: et sw=4 sts=4
+HTML.Trusted
+TYPE: bool
+VERSION: 2.0.0
+DEFAULT: false
+--DESCRIPTION--
+Indicates whether or not the user input is trusted or not. If the input is
+trusted, a more expansive set of allowed tags and attributes will be used.
+See also %CSS.Trusted.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
index a3c2f42..2a47e38 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
@@ -1,11 +1,11 @@
-HTML.XHTML
-TYPE: bool
-DEFAULT: true
-VERSION: 1.1.0
-DEPRECATED-VERSION: 1.7.0
-DEPRECATED-USE: HTML.Doctype
---DESCRIPTION--
-Determines whether or not output is XHTML 1.0 or HTML 4.01 flavor.
---ALIASES--
-Core.XHTML
---# vim: et sw=4 sts=4
+HTML.XHTML
+TYPE: bool
+DEFAULT: true
+VERSION: 1.1.0
+DEPRECATED-VERSION: 1.7.0
+DEPRECATED-USE: HTML.Doctype
+--DESCRIPTION--
+Determines whether or not output is XHTML 1.0 or HTML 4.01 flavor.
+--ALIASES--
+Core.XHTML
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
index 2a13704..08921fd 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
@@ -1,10 +1,10 @@
-Output.CommentScriptContents
-TYPE: bool
-VERSION: 2.0.0
-DEFAULT: true
---DESCRIPTION--
-Determines whether or not HTML Purifier should attempt to fix up the
-contents of script tags for legacy browsers with comments.
---ALIASES--
-Core.CommentScriptContents
---# vim: et sw=4 sts=4
+Output.CommentScriptContents
+TYPE: bool
+VERSION: 2.0.0
+DEFAULT: true
+--DESCRIPTION--
+Determines whether or not HTML Purifier should attempt to fix up the
+contents of script tags for legacy browsers with comments.
+--ALIASES--
+Core.CommentScriptContents
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt
index d215ba2..d6f0d9f 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt
@@ -1,15 +1,15 @@
-Output.FixInnerHTML
-TYPE: bool
-VERSION: 4.3.0
-DEFAULT: true
---DESCRIPTION--
-<p>
- If true, HTML Purifier will protect against Internet Explorer's
- mishandling of the <code>innerHTML</code> attribute by appending
- a space to any attribute that does not contain angled brackets, spaces
- or quotes, but contains a backtick. This slightly changes the
- semantics of any given attribute, so if this is unacceptable and
- you do not use <code>innerHTML</code> on any of your pages, you can
- turn this directive off.
-</p>
---# vim: et sw=4 sts=4
+Output.FixInnerHTML
+TYPE: bool
+VERSION: 4.3.0
+DEFAULT: true
+--DESCRIPTION--
+<p>
+ If true, HTML Purifier will protect against Internet Explorer's
+ mishandling of the <code>innerHTML</code> attribute by appending
+ a space to any attribute that does not contain angled brackets, spaces
+ or quotes, but contains a backtick. This slightly changes the
+ semantics of any given attribute, so if this is unacceptable and
+ you do not use <code>innerHTML</code> on any of your pages, you can
+ turn this directive off.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
index e58f91a..93398e8 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
@@ -1,11 +1,11 @@
-Output.FlashCompat
-TYPE: bool
-VERSION: 4.1.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- If true, HTML Purifier will generate Internet Explorer compatibility
- code for all object code. This is highly recommended if you enable
- %HTML.SafeObject.
-</p>
---# vim: et sw=4 sts=4
+Output.FlashCompat
+TYPE: bool
+VERSION: 4.1.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+ If true, HTML Purifier will generate Internet Explorer compatibility
+ code for all object code. This is highly recommended if you enable
+ %HTML.SafeObject.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
index 4bb9025..79f8ad8 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
@@ -1,13 +1,13 @@
-Output.Newline
-TYPE: string/null
-VERSION: 2.0.1
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- Newline string to format final output with. If left null, HTML Purifier
- will auto-detect the default newline type of the system and use that;
- you can manually override it here. Remember, \r\n is Windows, \r
- is Mac, and \n is Unix.
-</p>
---# vim: et sw=4 sts=4
+Output.Newline
+TYPE: string/null
+VERSION: 2.0.1
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+ Newline string to format final output with. If left null, HTML Purifier
+ will auto-detect the default newline type of the system and use that;
+ you can manually override it here. Remember, \r\n is Windows, \r
+ is Mac, and \n is Unix.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
index 3223106..232b023 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
@@ -1,14 +1,14 @@
-Output.SortAttr
-TYPE: bool
-VERSION: 3.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- If true, HTML Purifier will sort attributes by name before writing them back
- to the document, converting a tag like: <code><el b="" a="" c="" /></code>
- to <code><el a="" b="" c="" /></code>. This is a workaround for
- a bug in FCKeditor which causes it to swap attributes order, adding noise
- to text diffs. If you're not seeing this bug, chances are, you don't need
- this directive.
-</p>
---# vim: et sw=4 sts=4
+Output.SortAttr
+TYPE: bool
+VERSION: 3.2.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+ If true, HTML Purifier will sort attributes by name before writing them back
+ to the document, converting a tag like: <code><el b="" a="" c="" /></code>
+ to <code><el a="" b="" c="" /></code>. This is a workaround for
+ a bug in FCKeditor which causes it to swap attributes order, adding noise
+ to text diffs. If you're not seeing this bug, chances are, you don't need
+ this directive.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
index 23dd4d3..06bab00 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
@@ -1,25 +1,25 @@
-Output.TidyFormat
-TYPE: bool
-VERSION: 1.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
- Determines whether or not to run Tidy on the final output for pretty
- formatting reasons, such as indentation and wrap.
-</p>
-<p>
- This can greatly improve readability for editors who are hand-editing
- the HTML, but is by no means necessary as HTML Purifier has already
- fixed all major errors the HTML may have had. Tidy is a non-default
- extension, and this directive will silently fail if Tidy is not
- available.
-</p>
-<p>
- If you are looking to make the overall look of your page's source
- better, I recommend running Tidy on the entire page rather than just
- user-content (after all, the indentation relative to the containing
- blocks will be incorrect).
-</p>
---ALIASES--
-Core.TidyFormat
---# vim: et sw=4 sts=4
+Output.TidyFormat
+TYPE: bool
+VERSION: 1.1.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+ Determines whether or not to run Tidy on the final output for pretty
+ formatting reasons, such as indentation and wrap.
+</p>
+<p>
+ This can greatly improve readability for editors who are hand-editing
+ the HTML, but is by no means necessary as HTML Purifier has already
+ fixed all major errors the HTML may have had. Tidy is a non-default
+ extension, and this directive will silently fail if Tidy is not
+ available.
+</p>
+<p>
+ If you are looking to make the overall look of your page's source
+ better, I recommend running Tidy on the entire page rather than just
+ user-content (after all, the indentation relative to the containing
+ blocks will be incorrect).
+</p>
+--ALIASES--
+Core.TidyFormat
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
index d1820cd..071bc02 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
@@ -1,7 +1,7 @@
-Test.ForceNoIconv
-TYPE: bool
-DEFAULT: false
---DESCRIPTION--
-When set to true, HTMLPurifier_Encoder will act as if iconv does not exist
-and use only pure PHP implementations.
---# vim: et sw=4 sts=4
+Test.ForceNoIconv
+TYPE: bool
+DEFAULT: false
+--DESCRIPTION--
+When set to true, HTMLPurifier_Encoder will act as if iconv does not exist
+and use only pure PHP implementations.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
index 47714f5..eb97307 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
@@ -1,17 +1,18 @@
-URI.AllowedSchemes
-TYPE: lookup
---DEFAULT--
-array (
- 'http' => true,
- 'https' => true,
- 'mailto' => true,
- 'ftp' => true,
- 'nntp' => true,
- 'news' => true,
-)
---DESCRIPTION--
-Whitelist that defines the schemes that a URI is allowed to have. This
-prevents XSS attacks from using pseudo-schemes like javascript or mocha.
-There is also support for the <code>data</code> and <code>file</code>
-URI schemes, but they are not enabled by default.
---# vim: et sw=4 sts=4
+URI.AllowedSchemes
+TYPE: lookup
+--DEFAULT--
+array (
+ 'http' => true,
+ 'https' => true,
+ 'mailto' => true,
+ 'ftp' => true,
+ 'nntp' => true,
+ 'news' => true,
+ 'tel' => true,
+)
+--DESCRIPTION--
+Whitelist that defines the schemes that a URI is allowed to have. This
+prevents XSS attacks from using pseudo-schemes like javascript or mocha.
+There is also support for the <code>data</code> and <code>file</code>
+URI schemes, but they are not enabled by default.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
index ba47308..876f068 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
@@ -1,17 +1,17 @@
-URI.Base
-TYPE: string/null
-VERSION: 2.1.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- The base URI is the URI of the document this purified HTML will be
- inserted into. This information is important if HTML Purifier needs
- to calculate absolute URIs from relative URIs, such as when %URI.MakeAbsolute
- is on. You may use a non-absolute URI for this value, but behavior
- may vary (%URI.MakeAbsolute deals nicely with both absolute and
- relative paths, but forwards-compatibility is not guaranteed).
- <strong>Warning:</strong> If set, the scheme on this URI
- overrides the one specified by %URI.DefaultScheme.
-</p>
---# vim: et sw=4 sts=4
+URI.Base
+TYPE: string/null
+VERSION: 2.1.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+ The base URI is the URI of the document this purified HTML will be
+ inserted into. This information is important if HTML Purifier needs
+ to calculate absolute URIs from relative URIs, such as when %URI.MakeAbsolute
+ is on. You may use a non-absolute URI for this value, but behavior
+ may vary (%URI.MakeAbsolute deals nicely with both absolute and
+ relative paths, but forwards-compatibility is not guaranteed).
+ <strong>Warning:</strong> If set, the scheme on this URI
+ overrides the one specified by %URI.DefaultScheme.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
index 0700e0b..728e378 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
@@ -1,10 +1,10 @@
-URI.DefaultScheme
-TYPE: string
-DEFAULT: 'http'
---DESCRIPTION--
-
-<p>
- Defines through what scheme the output will be served, in order to
- select the proper object validator when no scheme information is present.
-</p>
---# vim: et sw=4 sts=4
+URI.DefaultScheme
+TYPE: string
+DEFAULT: 'http'
+--DESCRIPTION--
+
+<p>
+ Defines through what scheme the output will be served, in order to
+ select the proper object validator when no scheme information is present.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
index 523204c..f05312b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
@@ -1,11 +1,11 @@
-URI.DefinitionID
-TYPE: string/null
-VERSION: 2.1.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- Unique identifier for a custom-built URI definition. If you want
- to add custom URIFilters, you must specify this value.
-</p>
---# vim: et sw=4 sts=4
+URI.DefinitionID
+TYPE: string/null
+VERSION: 2.1.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+ Unique identifier for a custom-built URI definition. If you want
+ to add custom URIFilters, you must specify this value.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
similarity index 94%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
index a9c07b1..80cfea9 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
@@ -1,11 +1,11 @@
-URI.DefinitionRev
-TYPE: int
-VERSION: 2.1.0
-DEFAULT: 1
---DESCRIPTION--
-
-<p>
- Revision identifier for your custom definition. See
- %HTML.DefinitionRev for details.
-</p>
---# vim: et sw=4 sts=4
+URI.DefinitionRev
+TYPE: int
+VERSION: 2.1.0
+DEFAULT: 1
+--DESCRIPTION--
+
+<p>
+ Revision identifier for your custom definition. See
+ %HTML.DefinitionRev for details.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
index b19ca1d..71ce025 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
@@ -1,14 +1,14 @@
-URI.Disable
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
- Disables all URIs in all forms. Not sure why you'd want to do that
- (after all, the Internet's founded on the notion of a hyperlink).
-</p>
-
---ALIASES--
-Attr.DisableURI
---# vim: et sw=4 sts=4
+URI.Disable
+TYPE: bool
+VERSION: 1.3.0
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+ Disables all URIs in all forms. Not sure why you'd want to do that
+ (after all, the Internet's founded on the notion of a hyperlink).
+</p>
+
+--ALIASES--
+Attr.DisableURI
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
index 9132ea4..13c122c 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
@@ -1,11 +1,11 @@
-URI.DisableExternal
-TYPE: bool
-VERSION: 1.2.0
-DEFAULT: false
---DESCRIPTION--
-Disables links to external websites. This is a highly effective anti-spam
-and anti-pagerank-leech measure, but comes at a hefty price: nolinks or
-images outside of your domain will be allowed. Non-linkified URIs will
-still be preserved. If you want to be able to link to subdomains or use
-absolute URIs, specify %URI.Host for your website.
---# vim: et sw=4 sts=4
+URI.DisableExternal
+TYPE: bool
+VERSION: 1.2.0
+DEFAULT: false
+--DESCRIPTION--
+Disables links to external websites. This is a highly effective anti-spam
+and anti-pagerank-leech measure, but comes at a hefty price: nolinks or
+images outside of your domain will be allowed. Non-linkified URIs will
+still be preserved. If you want to be able to link to subdomains or use
+absolute URIs, specify %URI.Host for your website.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
index d74bc1e..abcc1ef 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
@@ -1,13 +1,13 @@
-URI.DisableExternalResources
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
---DESCRIPTION--
-Disables the embedding of external resources, preventing users from
-embedding things like images from other hosts. This prevents access
-tracking (good for email viewers), bandwidth leeching, cross-site request
-forging, goatse.cx posting, and other nasties, but also results in a loss
-of end-user functionality (they can't directly post a pic they posted from
-Flickr anymore). Use it if you don't have a robust user-content moderation
-team.
---# vim: et sw=4 sts=4
+URI.DisableExternalResources
+TYPE: bool
+VERSION: 1.3.0
+DEFAULT: false
+--DESCRIPTION--
+Disables the embedding of external resources, preventing users from
+embedding things like images from other hosts. This prevents access
+tracking (good for email viewers), bandwidth leeching, cross-site request
+forging, goatse.cx posting, and other nasties, but also results in a loss
+of end-user functionality (they can't directly post a pic they posted from
+Flickr anymore). Use it if you don't have a robust user-content moderation
+team.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
index 6c10614..f891de4 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
@@ -1,15 +1,15 @@
-URI.DisableResources
-TYPE: bool
-VERSION: 4.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- Disables embedding resources, essentially meaning no pictures. You can
- still link to them though. See %URI.DisableExternalResources for why
- this might be a good idea.
-</p>
-<p>
- <em>Note:</em> While this directive has been available since 1.3.0,
- it didn't actually start doing anything until 4.2.0.
-</p>
---# vim: et sw=4 sts=4
+URI.DisableResources
+TYPE: bool
+VERSION: 4.2.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+ Disables embedding resources, essentially meaning no pictures. You can
+ still link to them though. See %URI.DisableExternalResources for why
+ this might be a good idea.
+</p>
+<p>
+ <em>Note:</em> While this directive has been available since 1.3.0,
+ it didn't actually start doing anything until 4.2.0.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
index ba0e6bc..ee83b12 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
@@ -1,19 +1,19 @@
-URI.Host
-TYPE: string/null
-VERSION: 1.2.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- Defines the domain name of the server, so we can determine whether or
- an absolute URI is from your website or not. Not strictly necessary,
- as users should be using relative URIs to reference resources on your
- website. It will, however, let you use absolute URIs to link to
- subdomains of the domain you post here: i.e. example.com will allow
- sub.example.com. However, higher up domains will still be excluded:
- if you set %URI.Host to sub.example.com, example.com will be blocked.
- <strong>Note:</strong> This directive overrides %URI.Base because
- a given page may be on a sub-domain, but you wish HTML Purifier to be
- more relaxed and allow some of the parent domains too.
-</p>
---# vim: et sw=4 sts=4
+URI.Host
+TYPE: string/null
+VERSION: 1.2.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+ Defines the domain name of the server, so we can determine whether or
+ an absolute URI is from your website or not. Not strictly necessary,
+ as users should be using relative URIs to reference resources on your
+ website. It will, however, let you use absolute URIs to link to
+ subdomains of the domain you post here: i.e. example.com will allow
+ sub.example.com. However, higher up domains will still be excluded:
+ if you set %URI.Host to sub.example.com, example.com will be blocked.
+ <strong>Note:</strong> This directive overrides %URI.Base because
+ a given page may be on a sub-domain, but you wish HTML Purifier to be
+ more relaxed and allow some of the parent domains too.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
index 825fef2..0b6df76 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
@@ -1,9 +1,9 @@
-URI.HostBlacklist
-TYPE: list
-VERSION: 1.3.0
-DEFAULT: array()
---DESCRIPTION--
-List of strings that are forbidden in the host of any URI. Use it to kill
-domain names of spam, etc. Note that it will catch anything in the domain,
-so <tt>moo.com</tt> will catch <tt>moo.com.example.com</tt>.
---# vim: et sw=4 sts=4
+URI.HostBlacklist
+TYPE: list
+VERSION: 1.3.0
+DEFAULT: array()
+--DESCRIPTION--
+List of strings that are forbidden in the host of any URI. Use it to kill
+domain names of spam, etc. Note that it will catch anything in the domain,
+so <tt>moo.com</tt> will catch <tt>moo.com.example.com</tt>.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
index eb58c7f..4214900 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
@@ -1,13 +1,13 @@
-URI.MakeAbsolute
-TYPE: bool
-VERSION: 2.1.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
- Converts all URIs into absolute forms. This is useful when the HTML
- being filtered assumes a specific base path, but will actually be
- viewed in a different context (and setting an alternate base URI is
- not possible). %URI.Base must be set for this directive to work.
-</p>
---# vim: et sw=4 sts=4
+URI.MakeAbsolute
+TYPE: bool
+VERSION: 2.1.0
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+ Converts all URIs into absolute forms. This is useful when the HTML
+ being filtered assumes a specific base path, but will actually be
+ viewed in a different context (and setting an alternate base URI is
+ not possible). %URI.Base must be set for this directive to work.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
index bedd610..58c81dc 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
@@ -1,83 +1,83 @@
-URI.Munge
-TYPE: string/null
-VERSION: 1.3.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- Munges all browsable (usually http, https and ftp)
- absolute URIs into another URI, usually a URI redirection service.
- This directive accepts a URI, formatted with a <code>%s</code> where
- the url-encoded original URI should be inserted (sample:
- <code>http://www.google.com/url?q=%s</code>).
-</p>
-<p>
- Uses for this directive:
-</p>
-<ul>
- <li>
- Prevent PageRank leaks, while being fairly transparent
- to users (you may also want to add some client side JavaScript to
- override the text in the statusbar). <strong>Notice</strong>:
- Many security experts believe that this form of protection does not deter spam-bots.
- </li>
- <li>
- Redirect users to a splash page telling them they are leaving your
- website. While this is poor usability practice, it is often mandated
- in corporate environments.
- </li>
-</ul>
-<p>
- Prior to HTML Purifier 3.1.1, this directive also enabled the munging
- of browsable external resources, which could break things if your redirection
- script was a splash page or used <code>meta</code> tags. To revert to
- previous behavior, please use %URI.MungeResources.
-</p>
-<p>
- You may want to also use %URI.MungeSecretKey along with this directive
- in order to enforce what URIs your redirector script allows. Open
- redirector scripts can be a security risk and negatively affect the
- reputation of your domain name.
-</p>
-<p>
- Starting with HTML Purifier 3.1.1, there is also these substitutions:
-</p>
-<table>
- <thead>
- <tr>
- <th>Key</th>
- <th>Description</th>
- <th>Example <code><a href=""></code></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>%r</td>
- <td>1 - The URI embeds a resource<br />(blank) - The URI is merely a link</td>
- <td></td>
- </tr>
- <tr>
- <td>%n</td>
- <td>The name of the tag this URI came from</td>
- <td>a</td>
- </tr>
- <tr>
- <td>%m</td>
- <td>The name of the attribute this URI came from</td>
- <td>href</td>
- </tr>
- <tr>
- <td>%p</td>
- <td>The name of the CSS property this URI came from, or blank if irrelevant</td>
- <td></td>
- </tr>
- </tbody>
-</table>
-<p>
- Admittedly, these letters are somewhat arbitrary; the only stipulation
- was that they couldn't be a through f. r is for resource (I would have preferred
- e, but you take what you can get), n is for name, m
- was picked because it came after n (and I couldn't use a), p is for
- property.
-</p>
---# vim: et sw=4 sts=4
+URI.Munge
+TYPE: string/null
+VERSION: 1.3.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+ Munges all browsable (usually http, https and ftp)
+ absolute URIs into another URI, usually a URI redirection service.
+ This directive accepts a URI, formatted with a <code>%s</code> where
+ the url-encoded original URI should be inserted (sample:
+ <code>http://www.google.com/url?q=%s</code>).
+</p>
+<p>
+ Uses for this directive:
+</p>
+<ul>
+ <li>
+ Prevent PageRank leaks, while being fairly transparent
+ to users (you may also want to add some client side JavaScript to
+ override the text in the statusbar). <strong>Notice</strong>:
+ Many security experts believe that this form of protection does not deter spam-bots.
+ </li>
+ <li>
+ Redirect users to a splash page telling them they are leaving your
+ website. While this is poor usability practice, it is often mandated
+ in corporate environments.
+ </li>
+</ul>
+<p>
+ Prior to HTML Purifier 3.1.1, this directive also enabled the munging
+ of browsable external resources, which could break things if your redirection
+ script was a splash page or used <code>meta</code> tags. To revert to
+ previous behavior, please use %URI.MungeResources.
+</p>
+<p>
+ You may want to also use %URI.MungeSecretKey along with this directive
+ in order to enforce what URIs your redirector script allows. Open
+ redirector scripts can be a security risk and negatively affect the
+ reputation of your domain name.
+</p>
+<p>
+ Starting with HTML Purifier 3.1.1, there is also these substitutions:
+</p>
+<table>
+ <thead>
+ <tr>
+ <th>Key</th>
+ <th>Description</th>
+ <th>Example <code><a href=""></code></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>%r</td>
+ <td>1 - The URI embeds a resource<br />(blank) - The URI is merely a link</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>%n</td>
+ <td>The name of the tag this URI came from</td>
+ <td>a</td>
+ </tr>
+ <tr>
+ <td>%m</td>
+ <td>The name of the attribute this URI came from</td>
+ <td>href</td>
+ </tr>
+ <tr>
+ <td>%p</td>
+ <td>The name of the CSS property this URI came from, or blank if irrelevant</td>
+ <td></td>
+ </tr>
+ </tbody>
+</table>
+<p>
+ Admittedly, these letters are somewhat arbitrary; the only stipulation
+ was that they couldn't be a through f. r is for resource (I would have preferred
+ e, but you take what you can get), n is for name, m
+ was picked because it came after n (and I couldn't use a), p is for
+ property.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
index ed4b5b0..6fce0fd 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
@@ -1,17 +1,17 @@
-URI.MungeResources
-TYPE: bool
-VERSION: 3.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
- If true, any URI munging directives like %URI.Munge
- will also apply to embedded resources, such as <code><img src=""></code>.
- Be careful enabling this directive if you have a redirector script
- that does not use the <code>Location</code> HTTP header; all of your images
- and other embedded resources will break.
-</p>
-<p>
- <strong>Warning:</strong> It is strongly advised you use this in conjunction
- %URI.MungeSecretKey to mitigate the security risk of an open redirector.
-</p>
---# vim: et sw=4 sts=4
+URI.MungeResources
+TYPE: bool
+VERSION: 3.1.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+ If true, any URI munging directives like %URI.Munge
+ will also apply to embedded resources, such as <code><img src=""></code>.
+ Be careful enabling this directive if you have a redirector script
+ that does not use the <code>Location</code> HTTP header; all of your images
+ and other embedded resources will break.
+</p>
+<p>
+ <strong>Warning:</strong> It is strongly advised you use this in conjunction
+ %URI.MungeSecretKey to mitigate the security risk of an open redirector.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
index 123b6e2..1e17c1d 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
@@ -1,30 +1,30 @@
-URI.MungeSecretKey
-TYPE: string/null
-VERSION: 3.1.1
-DEFAULT: NULL
---DESCRIPTION--
-<p>
- This directive enables secure checksum generation along with %URI.Munge.
- It should be set to a secure key that is not shared with anyone else.
- The checksum can be placed in the URI using %t. Use of this checksum
- affords an additional level of protection by allowing a redirector
- to check if a URI has passed through HTML Purifier with this line:
-</p>
-
-<pre>$checksum === hash_hmac("sha256", $url, $secret_key)</pre>
-
-<p>
- If the output is TRUE, the redirector script should accept the URI.
-</p>
-
-<p>
- Please note that it would still be possible for an attacker to procure
- secure hashes en-mass by abusing your website's Preview feature or the
- like, but this service affords an additional level of protection
- that should be combined with website blacklisting.
-</p>
-
-<p>
- Remember this has no effect if %URI.Munge is not on.
-</p>
---# vim: et sw=4 sts=4
+URI.MungeSecretKey
+TYPE: string/null
+VERSION: 3.1.1
+DEFAULT: NULL
+--DESCRIPTION--
+<p>
+ This directive enables secure checksum generation along with %URI.Munge.
+ It should be set to a secure key that is not shared with anyone else.
+ The checksum can be placed in the URI using %t. Use of this checksum
+ affords an additional level of protection by allowing a redirector
+ to check if a URI has passed through HTML Purifier with this line:
+</p>
+
+<pre>$checksum === hash_hmac("sha256", $url, $secret_key)</pre>
+
+<p>
+ If the output is TRUE, the redirector script should accept the URI.
+</p>
+
+<p>
+ Please note that it would still be possible for an attacker to procure
+ secure hashes en-mass by abusing your website's Preview feature or the
+ like, but this service affords an additional level of protection
+ that should be combined with website blacklisting.
+</p>
+
+<p>
+ Remember this has no effect if %URI.Munge is not on.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
index 8b387de..23331a4 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
@@ -1,9 +1,9 @@
-URI.OverrideAllowedSchemes
-TYPE: bool
-DEFAULT: true
---DESCRIPTION--
-If this is set to true (which it is by default), you can override
-%URI.AllowedSchemes by simply registering a HTMLPurifier_URIScheme to the
-registry. If false, you will also have to update that directive in order
-to add more schemes.
---# vim: et sw=4 sts=4
+URI.OverrideAllowedSchemes
+TYPE: bool
+DEFAULT: true
+--DESCRIPTION--
+If this is set to true (which it is by default), you can override
+%URI.AllowedSchemes by simply registering a HTMLPurifier_URIScheme to the
+registry. If false, you will also have to update that directive in order
+to add more schemes.
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt
index 7e1f227..7908483 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt
@@ -1,22 +1,22 @@
-URI.SafeIframeRegexp
-TYPE: string/null
-VERSION: 4.4.0
-DEFAULT: NULL
---DESCRIPTION--
-<p>
- A PCRE regular expression that will be matched against an iframe URI. This is
- a relatively inflexible scheme, but works well enough for the most common
- use-case of iframes: embedded video. This directive only has an effect if
- %HTML.SafeIframe is enabled. Here are some example values:
-</p>
-<ul>
- <li><code>%^http://www.youtube.com/embed/%</code> - Allow YouTube videos</li>
- <li><code>%^http://player.vimeo.com/video/%</code> - Allow Vimeo videos</li>
- <li><code>%^http://(www.youtube.com/embed/|player.vimeo.com/video/)%</code> - Allow both</li>
-</ul>
-<p>
- Note that this directive does not give you enough granularity to, say, disable
- all <code>autoplay</code> videos. Pipe up on the HTML Purifier forums if this
- is a capability you want.
-</p>
---# vim: et sw=4 sts=4
+URI.SafeIframeRegexp
+TYPE: string/null
+VERSION: 4.4.0
+DEFAULT: NULL
+--DESCRIPTION--
+<p>
+ A PCRE regular expression that will be matched against an iframe URI. This is
+ a relatively inflexible scheme, but works well enough for the most common
+ use-case of iframes: embedded video. This directive only has an effect if
+ %HTML.SafeIframe is enabled. Here are some example values:
+</p>
+<ul>
+ <li><code>%^http://www.youtube.com/embed/%</code> - Allow YouTube videos</li>
+ <li><code>%^http://player.vimeo.com/video/%</code> - Allow Vimeo videos</li>
+ <li><code>%^http://(www.youtube.com/embed/|player.vimeo.com/video/)%</code> - Allow both</li>
+</ul>
+<p>
+ Note that this directive does not give you enough granularity to, say, disable
+ all <code>autoplay</code> videos. Pipe up on the HTML Purifier forums if this
+ is a capability you want.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/info.ini b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/info.ini
similarity index 93%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/info.ini
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/info.ini
index 58e0ce4..5de4505 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ConfigSchema/schema/info.ini
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ConfigSchema/schema/info.ini
@@ -1,3 +1,3 @@
-name = "HTML Purifier"
-
-; vim: et sw=4 sts=4
+name = "HTML Purifier"
+
+; vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ContentSets.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ContentSets.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ContentSets.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ContentSets.php
index f68b196..543e3f8 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ContentSets.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ContentSets.php
@@ -1,170 +1,170 @@
-<?php
-
-/**
- * @todo Unit test
- */
-class HTMLPurifier_ContentSets
-{
-
- /**
- * List of content set strings (pipe separators) indexed by name.
- * @type array
- */
- public $info = array();
-
- /**
- * List of content set lookups (element => true) indexed by name.
- * @type array
- * @note This is in HTMLPurifier_HTMLDefinition->info_content_sets
- */
- public $lookup = array();
-
- /**
- * Synchronized list of defined content sets (keys of info).
- * @type array
- */
- protected $keys = array();
- /**
- * Synchronized list of defined content values (values of info).
- * @type array
- */
- protected $values = array();
-
- /**
- * Merges in module's content sets, expands identifiers in the content
- * sets and populates the keys, values and lookup member variables.
- * @param HTMLPurifier_HTMLModule[] $modules List of HTMLPurifier_HTMLModule
- */
- public function __construct($modules)
- {
- if (!is_array($modules)) {
- $modules = array($modules);
- }
- // populate content_sets based on module hints
- // sorry, no way of overloading
- foreach ($modules as $module) {
- foreach ($module->content_sets as $key => $value) {
- $temp = $this->convertToLookup($value);
- if (isset($this->lookup[$key])) {
- // add it into the existing content set
- $this->lookup[$key] = array_merge($this->lookup[$key], $temp);
- } else {
- $this->lookup[$key] = $temp;
- }
- }
- }
- $old_lookup = false;
- while ($old_lookup !== $this->lookup) {
- $old_lookup = $this->lookup;
- foreach ($this->lookup as $i => $set) {
- $add = array();
- foreach ($set as $element => $x) {
- if (isset($this->lookup[$element])) {
- $add += $this->lookup[$element];
- unset($this->lookup[$i][$element]);
- }
- }
- $this->lookup[$i] += $add;
- }
- }
-
- foreach ($this->lookup as $key => $lookup) {
- $this->info[$key] = implode(' | ', array_keys($lookup));
- }
- $this->keys = array_keys($this->info);
- $this->values = array_values($this->info);
- }
-
- /**
- * Accepts a definition; generates and assigns a ChildDef for it
- * @param HTMLPurifier_ElementDef $def HTMLPurifier_ElementDef reference
- * @param HTMLPurifier_HTMLModule $module Module that defined the ElementDef
- */
- public function generateChildDef(&$def, $module)
- {
- if (!empty($def->child)) { // already done!
- return;
- }
- $content_model = $def->content_model;
- if (is_string($content_model)) {
- // Assume that $this->keys is alphanumeric
- $def->content_model = preg_replace_callback(
- '/\b(' . implode('|', $this->keys) . ')\b/',
- array($this, 'generateChildDefCallback'),
- $content_model
- );
- //$def->content_model = str_replace(
- // $this->keys, $this->values, $content_model);
- }
- $def->child = $this->getChildDef($def, $module);
- }
-
- public function generateChildDefCallback($matches)
- {
- return $this->info[$matches[0]];
- }
-
- /**
- * Instantiates a ChildDef based on content_model and content_model_type
- * member variables in HTMLPurifier_ElementDef
- * @note This will also defer to modules for custom HTMLPurifier_ChildDef
- * subclasses that need content set expansion
- * @param HTMLPurifier_ElementDef $def HTMLPurifier_ElementDef to have ChildDef extracted
- * @param HTMLPurifier_HTMLModule $module Module that defined the ElementDef
- * @return HTMLPurifier_ChildDef corresponding to ElementDef
- */
- public function getChildDef($def, $module)
- {
- $value = $def->content_model;
- if (is_object($value)) {
- trigger_error(
- 'Literal object child definitions should be stored in '.
- 'ElementDef->child not ElementDef->content_model',
- E_USER_NOTICE
- );
- return $value;
- }
- switch ($def->content_model_type) {
- case 'required':
- return new HTMLPurifier_ChildDef_Required($value);
- case 'optional':
- return new HTMLPurifier_ChildDef_Optional($value);
- case 'empty':
- return new HTMLPurifier_ChildDef_Empty();
- case 'custom':
- return new HTMLPurifier_ChildDef_Custom($value);
- }
- // defer to its module
- $return = false;
- if ($module->defines_child_def) { // save a func call
- $return = $module->getChildDef($def);
- }
- if ($return !== false) {
- return $return;
- }
- // error-out
- trigger_error(
- 'Could not determine which ChildDef class to instantiate',
- E_USER_ERROR
- );
- return false;
- }
-
- /**
- * Converts a string list of elements separated by pipes into
- * a lookup array.
- * @param string $string List of elements
- * @return array Lookup array of elements
- */
- protected function convertToLookup($string)
- {
- $array = explode('|', str_replace(' ', '', $string));
- $ret = array();
- foreach ($array as $k) {
- $ret[$k] = true;
- }
- return $ret;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * @todo Unit test
+ */
+class HTMLPurifier_ContentSets
+{
+
+ /**
+ * List of content set strings (pipe separators) indexed by name.
+ * @type array
+ */
+ public $info = array();
+
+ /**
+ * List of content set lookups (element => true) indexed by name.
+ * @type array
+ * @note This is in HTMLPurifier_HTMLDefinition->info_content_sets
+ */
+ public $lookup = array();
+
+ /**
+ * Synchronized list of defined content sets (keys of info).
+ * @type array
+ */
+ protected $keys = array();
+ /**
+ * Synchronized list of defined content values (values of info).
+ * @type array
+ */
+ protected $values = array();
+
+ /**
+ * Merges in module's content sets, expands identifiers in the content
+ * sets and populates the keys, values and lookup member variables.
+ * @param HTMLPurifier_HTMLModule[] $modules List of HTMLPurifier_HTMLModule
+ */
+ public function __construct($modules)
+ {
+ if (!is_array($modules)) {
+ $modules = array($modules);
+ }
+ // populate content_sets based on module hints
+ // sorry, no way of overloading
+ foreach ($modules as $module) {
+ foreach ($module->content_sets as $key => $value) {
+ $temp = $this->convertToLookup($value);
+ if (isset($this->lookup[$key])) {
+ // add it into the existing content set
+ $this->lookup[$key] = array_merge($this->lookup[$key], $temp);
+ } else {
+ $this->lookup[$key] = $temp;
+ }
+ }
+ }
+ $old_lookup = false;
+ while ($old_lookup !== $this->lookup) {
+ $old_lookup = $this->lookup;
+ foreach ($this->lookup as $i => $set) {
+ $add = array();
+ foreach ($set as $element => $x) {
+ if (isset($this->lookup[$element])) {
+ $add += $this->lookup[$element];
+ unset($this->lookup[$i][$element]);
+ }
+ }
+ $this->lookup[$i] += $add;
+ }
+ }
+
+ foreach ($this->lookup as $key => $lookup) {
+ $this->info[$key] = implode(' | ', array_keys($lookup));
+ }
+ $this->keys = array_keys($this->info);
+ $this->values = array_values($this->info);
+ }
+
+ /**
+ * Accepts a definition; generates and assigns a ChildDef for it
+ * @param HTMLPurifier_ElementDef $def HTMLPurifier_ElementDef reference
+ * @param HTMLPurifier_HTMLModule $module Module that defined the ElementDef
+ */
+ public function generateChildDef(&$def, $module)
+ {
+ if (!empty($def->child)) { // already done!
+ return;
+ }
+ $content_model = $def->content_model;
+ if (is_string($content_model)) {
+ // Assume that $this->keys is alphanumeric
+ $def->content_model = preg_replace_callback(
+ '/\b(' . implode('|', $this->keys) . ')\b/',
+ array($this, 'generateChildDefCallback'),
+ $content_model
+ );
+ //$def->content_model = str_replace(
+ // $this->keys, $this->values, $content_model);
+ }
+ $def->child = $this->getChildDef($def, $module);
+ }
+
+ public function generateChildDefCallback($matches)
+ {
+ return $this->info[$matches[0]];
+ }
+
+ /**
+ * Instantiates a ChildDef based on content_model and content_model_type
+ * member variables in HTMLPurifier_ElementDef
+ * @note This will also defer to modules for custom HTMLPurifier_ChildDef
+ * subclasses that need content set expansion
+ * @param HTMLPurifier_ElementDef $def HTMLPurifier_ElementDef to have ChildDef extracted
+ * @param HTMLPurifier_HTMLModule $module Module that defined the ElementDef
+ * @return HTMLPurifier_ChildDef corresponding to ElementDef
+ */
+ public function getChildDef($def, $module)
+ {
+ $value = $def->content_model;
+ if (is_object($value)) {
+ trigger_error(
+ 'Literal object child definitions should be stored in '.
+ 'ElementDef->child not ElementDef->content_model',
+ E_USER_NOTICE
+ );
+ return $value;
+ }
+ switch ($def->content_model_type) {
+ case 'required':
+ return new HTMLPurifier_ChildDef_Required($value);
+ case 'optional':
+ return new HTMLPurifier_ChildDef_Optional($value);
+ case 'empty':
+ return new HTMLPurifier_ChildDef_Empty();
+ case 'custom':
+ return new HTMLPurifier_ChildDef_Custom($value);
+ }
+ // defer to its module
+ $return = false;
+ if ($module->defines_child_def) { // save a func call
+ $return = $module->getChildDef($def);
+ }
+ if ($return !== false) {
+ return $return;
+ }
+ // error-out
+ trigger_error(
+ 'Could not determine which ChildDef class to instantiate',
+ E_USER_ERROR
+ );
+ return false;
+ }
+
+ /**
+ * Converts a string list of elements separated by pipes into
+ * a lookup array.
+ * @param string $string List of elements
+ * @return array Lookup array of elements
+ */
+ protected function convertToLookup($string)
+ {
+ $array = explode('|', str_replace(' ', '', $string));
+ $ret = array();
+ foreach ($array as $k) {
+ $ret[$k] = true;
+ }
+ return $ret;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Context.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Context.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Context.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Context.php
index 5ad536d..00e509c 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Context.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Context.php
@@ -1,95 +1,95 @@
-<?php
-
-/**
- * Registry object that contains information about the current context.
- * @warning Is a bit buggy when variables are set to null: it thinks
- * they don't exist! So use false instead, please.
- * @note Since the variables Context deals with may not be objects,
- * references are very important here! Do not remove!
- */
-class HTMLPurifier_Context
-{
-
- /**
- * Private array that stores the references.
- * @type array
- */
- private $_storage = array();
-
- /**
- * Registers a variable into the context.
- * @param string $name String name
- * @param mixed $ref Reference to variable to be registered
- */
- public function register($name, &$ref)
- {
- if (array_key_exists($name, $this->_storage)) {
- trigger_error(
- "Name $name produces collision, cannot re-register",
- E_USER_ERROR
- );
- return;
- }
- $this->_storage[$name] =& $ref;
- }
-
- /**
- * Retrieves a variable reference from the context.
- * @param string $name String name
- * @param bool $ignore_error Boolean whether or not to ignore error
- * @return mixed
- */
- public function &get($name, $ignore_error = false)
- {
- if (!array_key_exists($name, $this->_storage)) {
- if (!$ignore_error) {
- trigger_error(
- "Attempted to retrieve non-existent variable $name",
- E_USER_ERROR
- );
- }
- $var = null; // so we can return by reference
- return $var;
- }
- return $this->_storage[$name];
- }
-
- /**
- * Destroys a variable in the context.
- * @param string $name String name
- */
- public function destroy($name)
- {
- if (!array_key_exists($name, $this->_storage)) {
- trigger_error(
- "Attempted to destroy non-existent variable $name",
- E_USER_ERROR
- );
- return;
- }
- unset($this->_storage[$name]);
- }
-
- /**
- * Checks whether or not the variable exists.
- * @param string $name String name
- * @return bool
- */
- public function exists($name)
- {
- return array_key_exists($name, $this->_storage);
- }
-
- /**
- * Loads a series of variables from an associative array
- * @param array $context_array Assoc array of variables to load
- */
- public function loadArray($context_array)
- {
- foreach ($context_array as $key => $discard) {
- $this->register($key, $context_array[$key]);
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Registry object that contains information about the current context.
+ * @warning Is a bit buggy when variables are set to null: it thinks
+ * they don't exist! So use false instead, please.
+ * @note Since the variables Context deals with may not be objects,
+ * references are very important here! Do not remove!
+ */
+class HTMLPurifier_Context
+{
+
+ /**
+ * Private array that stores the references.
+ * @type array
+ */
+ private $_storage = array();
+
+ /**
+ * Registers a variable into the context.
+ * @param string $name String name
+ * @param mixed $ref Reference to variable to be registered
+ */
+ public function register($name, &$ref)
+ {
+ if (array_key_exists($name, $this->_storage)) {
+ trigger_error(
+ "Name $name produces collision, cannot re-register",
+ E_USER_ERROR
+ );
+ return;
+ }
+ $this->_storage[$name] =& $ref;
+ }
+
+ /**
+ * Retrieves a variable reference from the context.
+ * @param string $name String name
+ * @param bool $ignore_error Boolean whether or not to ignore error
+ * @return mixed
+ */
+ public function &get($name, $ignore_error = false)
+ {
+ if (!array_key_exists($name, $this->_storage)) {
+ if (!$ignore_error) {
+ trigger_error(
+ "Attempted to retrieve non-existent variable $name",
+ E_USER_ERROR
+ );
+ }
+ $var = null; // so we can return by reference
+ return $var;
+ }
+ return $this->_storage[$name];
+ }
+
+ /**
+ * Destroys a variable in the context.
+ * @param string $name String name
+ */
+ public function destroy($name)
+ {
+ if (!array_key_exists($name, $this->_storage)) {
+ trigger_error(
+ "Attempted to destroy non-existent variable $name",
+ E_USER_ERROR
+ );
+ return;
+ }
+ unset($this->_storage[$name]);
+ }
+
+ /**
+ * Checks whether or not the variable exists.
+ * @param string $name String name
+ * @return bool
+ */
+ public function exists($name)
+ {
+ return array_key_exists($name, $this->_storage);
+ }
+
+ /**
+ * Loads a series of variables from an associative array
+ * @param array $context_array Assoc array of variables to load
+ */
+ public function loadArray($context_array)
+ {
+ foreach ($context_array as $key => $discard) {
+ $this->register($key, $context_array[$key]);
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Definition.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Definition.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Definition.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Definition.php
index f987e60..bc6d433 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Definition.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Definition.php
@@ -1,55 +1,55 @@
-<?php
-
-/**
- * Super-class for definition datatype objects, implements serialization
- * functions for the class.
- */
-abstract class HTMLPurifier_Definition
-{
-
- /**
- * Has setup() been called yet?
- * @type bool
- */
- public $setup = false;
-
- /**
- * If true, write out the final definition object to the cache after
- * setup. This will be true only if all invocations to get a raw
- * definition object are also optimized. This does not cause file
- * system thrashing because on subsequent calls the cached object
- * is used and any writes to the raw definition object are short
- * circuited. See enduser-customize.html for the high-level
- * picture.
- * @type bool
- */
- public $optimized = null;
-
- /**
- * What type of definition is it?
- * @type string
- */
- public $type;
-
- /**
- * Sets up the definition object into the final form, something
- * not done by the constructor
- * @param HTMLPurifier_Config $config
- */
- abstract protected function doSetup($config);
-
- /**
- * Setup function that aborts if already setup
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- if ($this->setup) {
- return;
- }
- $this->setup = true;
- $this->doSetup($config);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Super-class for definition datatype objects, implements serialization
+ * functions for the class.
+ */
+abstract class HTMLPurifier_Definition
+{
+
+ /**
+ * Has setup() been called yet?
+ * @type bool
+ */
+ public $setup = false;
+
+ /**
+ * If true, write out the final definition object to the cache after
+ * setup. This will be true only if all invocations to get a raw
+ * definition object are also optimized. This does not cause file
+ * system thrashing because on subsequent calls the cached object
+ * is used and any writes to the raw definition object are short
+ * circuited. See enduser-customize.html for the high-level
+ * picture.
+ * @type bool
+ */
+ public $optimized = null;
+
+ /**
+ * What type of definition is it?
+ * @type string
+ */
+ public $type;
+
+ /**
+ * Sets up the definition object into the final form, something
+ * not done by the constructor
+ * @param HTMLPurifier_Config $config
+ */
+ abstract protected function doSetup($config);
+
+ /**
+ * Setup function that aborts if already setup
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ if ($this->setup) {
+ return;
+ }
+ $this->setup = true;
+ $this->doSetup($config);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache.php
index d7f0bb1..9aa8ff3 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache.php
@@ -1,129 +1,129 @@
-<?php
-
-/**
- * Abstract class representing Definition cache managers that implements
- * useful common methods and is a factory.
- * @todo Create a separate maintenance file advanced users can use to
- * cache their custom HTMLDefinition, which can be loaded
- * via a configuration directive
- * @todo Implement memcached
- */
-abstract class HTMLPurifier_DefinitionCache
-{
- /**
- * @type string
- */
- public $type;
-
- /**
- * @param string $type Type of definition objects this instance of the
- * cache will handle.
- */
- public function __construct($type)
- {
- $this->type = $type;
- }
-
- /**
- * Generates a unique identifier for a particular configuration
- * @param HTMLPurifier_Config $config Instance of HTMLPurifier_Config
- * @return string
- */
- public function generateKey($config)
- {
- return $config->version . ',' . // possibly replace with function calls
- $config->getBatchSerial($this->type) . ',' .
- $config->get($this->type . '.DefinitionRev');
- }
-
- /**
- * Tests whether or not a key is old with respect to the configuration's
- * version and revision number.
- * @param string $key Key to test
- * @param HTMLPurifier_Config $config Instance of HTMLPurifier_Config to test against
- * @return bool
- */
- public function isOld($key, $config)
- {
- if (substr_count($key, ',') < 2) {
- return true;
- }
- list($version, $hash, $revision) = explode(',', $key, 3);
- $compare = version_compare($version, $config->version);
- // version mismatch, is always old
- if ($compare != 0) {
- return true;
- }
- // versions match, ids match, check revision number
- if ($hash == $config->getBatchSerial($this->type) &&
- $revision < $config->get($this->type . '.DefinitionRev')) {
- return true;
- }
- return false;
- }
-
- /**
- * Checks if a definition's type jives with the cache's type
- * @note Throws an error on failure
- * @param HTMLPurifier_Definition $def Definition object to check
- * @return bool true if good, false if not
- */
- public function checkDefType($def)
- {
- if ($def->type !== $this->type) {
- trigger_error("Cannot use definition of type {$def->type} in cache for {$this->type}");
- return false;
- }
- return true;
- }
-
- /**
- * Adds a definition object to the cache
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- */
- abstract public function add($def, $config);
-
- /**
- * Unconditionally saves a definition object to the cache
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- */
- abstract public function set($def, $config);
-
- /**
- * Replace an object in the cache
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- */
- abstract public function replace($def, $config);
-
- /**
- * Retrieves a definition object from the cache
- * @param HTMLPurifier_Config $config
- */
- abstract public function get($config);
-
- /**
- * Removes a definition object to the cache
- * @param HTMLPurifier_Config $config
- */
- abstract public function remove($config);
-
- /**
- * Clears all objects from cache
- * @param HTMLPurifier_Config $config
- */
- abstract public function flush($config);
-
- /**
- * Clears all expired (older version or revision) objects from cache
- * @note Be carefuly implementing this method as flush. Flush must
- * not interfere with other Definition types, and cleanup()
- * should not be repeatedly called by userland code.
- * @param HTMLPurifier_Config $config
- */
- abstract public function cleanup($config);
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Abstract class representing Definition cache managers that implements
+ * useful common methods and is a factory.
+ * @todo Create a separate maintenance file advanced users can use to
+ * cache their custom HTMLDefinition, which can be loaded
+ * via a configuration directive
+ * @todo Implement memcached
+ */
+abstract class HTMLPurifier_DefinitionCache
+{
+ /**
+ * @type string
+ */
+ public $type;
+
+ /**
+ * @param string $type Type of definition objects this instance of the
+ * cache will handle.
+ */
+ public function __construct($type)
+ {
+ $this->type = $type;
+ }
+
+ /**
+ * Generates a unique identifier for a particular configuration
+ * @param HTMLPurifier_Config $config Instance of HTMLPurifier_Config
+ * @return string
+ */
+ public function generateKey($config)
+ {
+ return $config->version . ',' . // possibly replace with function calls
+ $config->getBatchSerial($this->type) . ',' .
+ $config->get($this->type . '.DefinitionRev');
+ }
+
+ /**
+ * Tests whether or not a key is old with respect to the configuration's
+ * version and revision number.
+ * @param string $key Key to test
+ * @param HTMLPurifier_Config $config Instance of HTMLPurifier_Config to test against
+ * @return bool
+ */
+ public function isOld($key, $config)
+ {
+ if (substr_count($key, ',') < 2) {
+ return true;
+ }
+ list($version, $hash, $revision) = explode(',', $key, 3);
+ $compare = version_compare($version, $config->version);
+ // version mismatch, is always old
+ if ($compare != 0) {
+ return true;
+ }
+ // versions match, ids match, check revision number
+ if ($hash == $config->getBatchSerial($this->type) &&
+ $revision < $config->get($this->type . '.DefinitionRev')) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Checks if a definition's type jives with the cache's type
+ * @note Throws an error on failure
+ * @param HTMLPurifier_Definition $def Definition object to check
+ * @return bool true if good, false if not
+ */
+ public function checkDefType($def)
+ {
+ if ($def->type !== $this->type) {
+ trigger_error("Cannot use definition of type {$def->type} in cache for {$this->type}");
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Adds a definition object to the cache
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ */
+ abstract public function add($def, $config);
+
+ /**
+ * Unconditionally saves a definition object to the cache
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ */
+ abstract public function set($def, $config);
+
+ /**
+ * Replace an object in the cache
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ */
+ abstract public function replace($def, $config);
+
+ /**
+ * Retrieves a definition object from the cache
+ * @param HTMLPurifier_Config $config
+ */
+ abstract public function get($config);
+
+ /**
+ * Removes a definition object to the cache
+ * @param HTMLPurifier_Config $config
+ */
+ abstract public function remove($config);
+
+ /**
+ * Clears all objects from cache
+ * @param HTMLPurifier_Config $config
+ */
+ abstract public function flush($config);
+
+ /**
+ * Clears all expired (older version or revision) objects from cache
+ * @note Be careful implementing this method as flush. Flush must
+ * not interfere with other Definition types, and cleanup()
+ * should not be repeatedly called by userland code.
+ * @param HTMLPurifier_Config $config
+ */
+ abstract public function cleanup($config);
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Decorator.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Decorator.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Decorator.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Decorator.php
index 09cdc1c..b57a51b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Decorator.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Decorator.php
@@ -1,112 +1,112 @@
-<?php
-
-class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCache
-{
-
- /**
- * Cache object we are decorating
- * @type HTMLPurifier_DefinitionCache
- */
- public $cache;
-
- /**
- * The name of the decorator
- * @var string
- */
- public $name;
-
- public function __construct()
- {
- }
-
- /**
- * Lazy decorator function
- * @param HTMLPurifier_DefinitionCache $cache Reference to cache object to decorate
- * @return HTMLPurifier_DefinitionCache_Decorator
- */
- public function decorate(&$cache)
- {
- $decorator = $this->copy();
- // reference is necessary for mocks in PHP 4
- $decorator->cache =& $cache;
- $decorator->type = $cache->type;
- return $decorator;
- }
-
- /**
- * Cross-compatible clone substitute
- * @return HTMLPurifier_DefinitionCache_Decorator
- */
- public function copy()
- {
- return new HTMLPurifier_DefinitionCache_Decorator();
- }
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function add($def, $config)
- {
- return $this->cache->add($def, $config);
- }
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function set($def, $config)
- {
- return $this->cache->set($def, $config);
- }
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function replace($def, $config)
- {
- return $this->cache->replace($def, $config);
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function get($config)
- {
- return $this->cache->get($config);
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function remove($config)
- {
- return $this->cache->remove($config);
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function flush($config)
- {
- return $this->cache->flush($config);
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function cleanup($config)
- {
- return $this->cache->cleanup($config);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCache
+{
+
+ /**
+ * Cache object we are decorating
+ * @type HTMLPurifier_DefinitionCache
+ */
+ public $cache;
+
+ /**
+ * The name of the decorator
+ * @var string
+ */
+ public $name;
+
+ public function __construct()
+ {
+ }
+
+ /**
+ * Lazy decorator function
+ * @param HTMLPurifier_DefinitionCache $cache Reference to cache object to decorate
+ * @return HTMLPurifier_DefinitionCache_Decorator
+ */
+ public function decorate(&$cache)
+ {
+ $decorator = $this->copy();
+ // reference is necessary for mocks in PHP 4
+ $decorator->cache =& $cache;
+ $decorator->type = $cache->type;
+ return $decorator;
+ }
+
+ /**
+ * Cross-compatible clone substitute
+ * @return HTMLPurifier_DefinitionCache_Decorator
+ */
+ public function copy()
+ {
+ return new HTMLPurifier_DefinitionCache_Decorator();
+ }
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function add($def, $config)
+ {
+ return $this->cache->add($def, $config);
+ }
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function set($def, $config)
+ {
+ return $this->cache->set($def, $config);
+ }
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function replace($def, $config)
+ {
+ return $this->cache->replace($def, $config);
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function get($config)
+ {
+ return $this->cache->get($config);
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function remove($config)
+ {
+ return $this->cache->remove($config);
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function flush($config)
+ {
+ return $this->cache->flush($config);
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function cleanup($config)
+ {
+ return $this->cache->cleanup($config);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
index 53dca67..4991777 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
@@ -1,78 +1,78 @@
-<?php
-
-/**
- * Definition cache decorator class that cleans up the cache
- * whenever there is a cache miss.
- */
-class HTMLPurifier_DefinitionCache_Decorator_Cleanup extends HTMLPurifier_DefinitionCache_Decorator
-{
- /**
- * @type string
- */
- public $name = 'Cleanup';
-
- /**
- * @return HTMLPurifier_DefinitionCache_Decorator_Cleanup
- */
- public function copy()
- {
- return new HTMLPurifier_DefinitionCache_Decorator_Cleanup();
- }
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function add($def, $config)
- {
- $status = parent::add($def, $config);
- if (!$status) {
- parent::cleanup($config);
- }
- return $status;
- }
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function set($def, $config)
- {
- $status = parent::set($def, $config);
- if (!$status) {
- parent::cleanup($config);
- }
- return $status;
- }
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function replace($def, $config)
- {
- $status = parent::replace($def, $config);
- if (!$status) {
- parent::cleanup($config);
- }
- return $status;
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function get($config)
- {
- $ret = parent::get($config);
- if (!$ret) {
- parent::cleanup($config);
- }
- return $ret;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Definition cache decorator class that cleans up the cache
+ * whenever there is a cache miss.
+ */
+class HTMLPurifier_DefinitionCache_Decorator_Cleanup extends HTMLPurifier_DefinitionCache_Decorator
+{
+ /**
+ * @type string
+ */
+ public $name = 'Cleanup';
+
+ /**
+ * @return HTMLPurifier_DefinitionCache_Decorator_Cleanup
+ */
+ public function copy()
+ {
+ return new HTMLPurifier_DefinitionCache_Decorator_Cleanup();
+ }
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function add($def, $config)
+ {
+ $status = parent::add($def, $config);
+ if (!$status) {
+ parent::cleanup($config);
+ }
+ return $status;
+ }
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function set($def, $config)
+ {
+ $status = parent::set($def, $config);
+ if (!$status) {
+ parent::cleanup($config);
+ }
+ return $status;
+ }
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function replace($def, $config)
+ {
+ $status = parent::replace($def, $config);
+ if (!$status) {
+ parent::cleanup($config);
+ }
+ return $status;
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function get($config)
+ {
+ $ret = parent::get($config);
+ if (!$ret) {
+ parent::cleanup($config);
+ }
+ return $ret;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
index 1725d83..d529dce 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
@@ -1,85 +1,85 @@
-<?php
-
-/**
- * Definition cache decorator class that saves all cache retrievals
- * to PHP's memory; good for unit tests or circumstances where
- * there are lots of configuration objects floating around.
- */
-class HTMLPurifier_DefinitionCache_Decorator_Memory extends HTMLPurifier_DefinitionCache_Decorator
-{
- /**
- * @type array
- */
- protected $definitions;
-
- /**
- * @type string
- */
- public $name = 'Memory';
-
- /**
- * @return HTMLPurifier_DefinitionCache_Decorator_Memory
- */
- public function copy()
- {
- return new HTMLPurifier_DefinitionCache_Decorator_Memory();
- }
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function add($def, $config)
- {
- $status = parent::add($def, $config);
- if ($status) {
- $this->definitions[$this->generateKey($config)] = $def;
- }
- return $status;
- }
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function set($def, $config)
- {
- $status = parent::set($def, $config);
- if ($status) {
- $this->definitions[$this->generateKey($config)] = $def;
- }
- return $status;
- }
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function replace($def, $config)
- {
- $status = parent::replace($def, $config);
- if ($status) {
- $this->definitions[$this->generateKey($config)] = $def;
- }
- return $status;
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function get($config)
- {
- $key = $this->generateKey($config);
- if (isset($this->definitions[$key])) {
- return $this->definitions[$key];
- }
- $this->definitions[$key] = parent::get($config);
- return $this->definitions[$key];
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Definition cache decorator class that saves all cache retrievals
+ * to PHP's memory; good for unit tests or circumstances where
+ * there are lots of configuration objects floating around.
+ */
+class HTMLPurifier_DefinitionCache_Decorator_Memory extends HTMLPurifier_DefinitionCache_Decorator
+{
+ /**
+ * @type array
+ */
+ protected $definitions;
+
+ /**
+ * @type string
+ */
+ public $name = 'Memory';
+
+ /**
+ * @return HTMLPurifier_DefinitionCache_Decorator_Memory
+ */
+ public function copy()
+ {
+ return new HTMLPurifier_DefinitionCache_Decorator_Memory();
+ }
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function add($def, $config)
+ {
+ $status = parent::add($def, $config);
+ if ($status) {
+ $this->definitions[$this->generateKey($config)] = $def;
+ }
+ return $status;
+ }
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function set($def, $config)
+ {
+ $status = parent::set($def, $config);
+ if ($status) {
+ $this->definitions[$this->generateKey($config)] = $def;
+ }
+ return $status;
+ }
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function replace($def, $config)
+ {
+ $status = parent::replace($def, $config);
+ if ($status) {
+ $this->definitions[$this->generateKey($config)] = $def;
+ }
+ return $status;
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function get($config)
+ {
+ $key = $this->generateKey($config);
+ if (isset($this->definitions[$key])) {
+ return $this->definitions[$key];
+ }
+ $this->definitions[$key] = parent::get($config);
+ return $this->definitions[$key];
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
index c586890..b1fec8d 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
@@ -1,82 +1,82 @@
-<?php
-
-require_once 'HTMLPurifier/DefinitionCache/Decorator.php';
-
-/**
- * Definition cache decorator template.
- */
-class HTMLPurifier_DefinitionCache_Decorator_Template extends HTMLPurifier_DefinitionCache_Decorator
-{
-
- /**
- * @type string
- */
- public $name = 'Template'; // replace this
-
- public function copy()
- {
- // replace class name with yours
- return new HTMLPurifier_DefinitionCache_Decorator_Template();
- }
-
- // remove methods you don't need
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function add($def, $config)
- {
- return parent::add($def, $config);
- }
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function set($def, $config)
- {
- return parent::set($def, $config);
- }
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function replace($def, $config)
- {
- return parent::replace($def, $config);
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function get($config)
- {
- return parent::get($config);
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function flush($config)
- {
- return parent::flush($config);
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return mixed
- */
- public function cleanup($config)
- {
- return parent::cleanup($config);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+require_once 'HTMLPurifier/DefinitionCache/Decorator.php';
+
+/**
+ * Definition cache decorator template.
+ */
+class HTMLPurifier_DefinitionCache_Decorator_Template extends HTMLPurifier_DefinitionCache_Decorator
+{
+
+ /**
+ * @type string
+ */
+ public $name = 'Template'; // replace this
+
+ public function copy()
+ {
+ // replace class name with yours
+ return new HTMLPurifier_DefinitionCache_Decorator_Template();
+ }
+
+ // remove methods you don't need
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function add($def, $config)
+ {
+ return parent::add($def, $config);
+ }
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function set($def, $config)
+ {
+ return parent::set($def, $config);
+ }
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function replace($def, $config)
+ {
+ return parent::replace($def, $config);
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function get($config)
+ {
+ return parent::get($config);
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function flush($config)
+ {
+ return parent::flush($config);
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return mixed
+ */
+ public function cleanup($config)
+ {
+ return parent::cleanup($config);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Null.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Null.php
similarity index 94%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Null.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Null.php
index 55eff9e..d9a75ce 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Null.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Null.php
@@ -1,76 +1,76 @@
-<?php
-
-/**
- * Null cache object to use when no caching is on.
- */
-class HTMLPurifier_DefinitionCache_Null extends HTMLPurifier_DefinitionCache
-{
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return bool
- */
- public function add($def, $config)
- {
- return false;
- }
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return bool
- */
- public function set($def, $config)
- {
- return false;
- }
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return bool
- */
- public function replace($def, $config)
- {
- return false;
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return bool
- */
- public function remove($config)
- {
- return false;
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return bool
- */
- public function get($config)
- {
- return false;
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return bool
- */
- public function flush($config)
- {
- return false;
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return bool
- */
- public function cleanup($config)
- {
- return false;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Null cache object to use when no caching is on.
+ */
+class HTMLPurifier_DefinitionCache_Null extends HTMLPurifier_DefinitionCache
+{
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function add($def, $config)
+ {
+ return false;
+ }
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function set($def, $config)
+ {
+ return false;
+ }
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function replace($def, $config)
+ {
+ return false;
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function remove($config)
+ {
+ return false;
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function get($config)
+ {
+ return false;
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function flush($config)
+ {
+ return false;
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function cleanup($config)
+ {
+ return false;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Serializer.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Serializer.php
similarity index 85%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Serializer.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Serializer.php
index 7e8539a..f930c6b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Serializer.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Serializer.php
@@ -1,285 +1,313 @@
-<?php
-
-class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCache
-{
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return int|bool
- */
- public function add($def, $config)
- {
- if (!$this->checkDefType($def)) {
- return;
- }
- $file = $this->generateFilePath($config);
- if (file_exists($file)) {
- return false;
- }
- if (!$this->_prepareDir($config)) {
- return false;
- }
- return $this->_write($file, serialize($def), $config);
- }
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return int|bool
- */
- public function set($def, $config)
- {
- if (!$this->checkDefType($def)) {
- return;
- }
- $file = $this->generateFilePath($config);
- if (!$this->_prepareDir($config)) {
- return false;
- }
- return $this->_write($file, serialize($def), $config);
- }
-
- /**
- * @param HTMLPurifier_Definition $def
- * @param HTMLPurifier_Config $config
- * @return int|bool
- */
- public function replace($def, $config)
- {
- if (!$this->checkDefType($def)) {
- return;
- }
- $file = $this->generateFilePath($config);
- if (!file_exists($file)) {
- return false;
- }
- if (!$this->_prepareDir($config)) {
- return false;
- }
- return $this->_write($file, serialize($def), $config);
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return bool|HTMLPurifier_Config
- */
- public function get($config)
- {
- $file = $this->generateFilePath($config);
- if (!file_exists($file)) {
- return false;
- }
- return unserialize(file_get_contents($file));
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return bool
- */
- public function remove($config)
- {
- $file = $this->generateFilePath($config);
- if (!file_exists($file)) {
- return false;
- }
- return unlink($file);
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return bool
- */
- public function flush($config)
- {
- if (!$this->_prepareDir($config)) {
- return false;
- }
- $dir = $this->generateDirectoryPath($config);
- $dh = opendir($dir);
- while (false !== ($filename = readdir($dh))) {
- if (empty($filename)) {
- continue;
- }
- if ($filename[0] === '.') {
- continue;
- }
- unlink($dir . '/' . $filename);
- }
- }
-
- /**
- * @param HTMLPurifier_Config $config
- * @return bool
- */
- public function cleanup($config)
- {
- if (!$this->_prepareDir($config)) {
- return false;
- }
- $dir = $this->generateDirectoryPath($config);
- $dh = opendir($dir);
- while (false !== ($filename = readdir($dh))) {
- if (empty($filename)) {
- continue;
- }
- if ($filename[0] === '.') {
- continue;
- }
- $key = substr($filename, 0, strlen($filename) - 4);
- if ($this->isOld($key, $config)) {
- unlink($dir . '/' . $filename);
- }
- }
- }
-
- /**
- * Generates the file path to the serial file corresponding to
- * the configuration and definition name
- * @param HTMLPurifier_Config $config
- * @return string
- * @todo Make protected
- */
- public function generateFilePath($config)
- {
- $key = $this->generateKey($config);
- return $this->generateDirectoryPath($config) . '/' . $key . '.ser';
- }
-
- /**
- * Generates the path to the directory contain this cache's serial files
- * @param HTMLPurifier_Config $config
- * @return string
- * @note No trailing slash
- * @todo Make protected
- */
- public function generateDirectoryPath($config)
- {
- $base = $this->generateBaseDirectoryPath($config);
- return $base . '/' . $this->type;
- }
-
- /**
- * Generates path to base directory that contains all definition type
- * serials
- * @param HTMLPurifier_Config $config
- * @return mixed|string
- * @todo Make protected
- */
- public function generateBaseDirectoryPath($config)
- {
- $base = $config->get('Cache.SerializerPath');
- $base = is_null($base) ? HTMLPURIFIER_PREFIX . '/HTMLPurifier/DefinitionCache/Serializer' : $base;
- return $base;
- }
-
- /**
- * Convenience wrapper function for file_put_contents
- * @param string $file File name to write to
- * @param string $data Data to write into file
- * @param HTMLPurifier_Config $config
- * @return int|bool Number of bytes written if success, or false if failure.
- */
- private function _write($file, $data, $config)
- {
- $result = file_put_contents($file, $data);
- if ($result !== false) {
- // set permissions of the new file (no execute)
- $chmod = $config->get('Cache.SerializerPermissions');
- if (!$chmod) {
- $chmod = 0644; // invalid config or simpletest
- }
- $chmod = $chmod & 0666;
- chmod($file, $chmod);
- }
- return $result;
- }
-
- /**
- * Prepares the directory that this type stores the serials in
- * @param HTMLPurifier_Config $config
- * @return bool True if successful
- */
- private function _prepareDir($config)
- {
- $directory = $this->generateDirectoryPath($config);
- $chmod = $config->get('Cache.SerializerPermissions');
- if (!$chmod) {
- $chmod = 0755; // invalid config or simpletest
- }
- if (!is_dir($directory)) {
- $base = $this->generateBaseDirectoryPath($config);
- if (!is_dir($base)) {
- trigger_error(
- 'Base directory ' . $base . ' does not exist,
- please create or change using %Cache.SerializerPath',
- E_USER_WARNING
- );
- return false;
- } elseif (!$this->_testPermissions($base, $chmod)) {
- return false;
- }
- $old = umask(0000);
- mkdir($directory, $chmod);
- umask($old);
- } elseif (!$this->_testPermissions($directory, $chmod)) {
- return false;
- }
- return true;
- }
-
- /**
- * Tests permissions on a directory and throws out friendly
- * error messages and attempts to chmod it itself if possible
- * @param string $dir Directory path
- * @param int $chmod Permissions
- * @return bool True if directory is writable
- */
- private function _testPermissions($dir, $chmod)
- {
- // early abort, if it is writable, everything is hunky-dory
- if (is_writable($dir)) {
- return true;
- }
- if (!is_dir($dir)) {
- // generally, you'll want to handle this beforehand
- // so a more specific error message can be given
- trigger_error(
- 'Directory ' . $dir . ' does not exist',
- E_USER_WARNING
- );
- return false;
- }
- if (function_exists('posix_getuid')) {
- // POSIX system, we can give more specific advice
- if (fileowner($dir) === posix_getuid()) {
- // we can chmod it ourselves
- $chmod = $chmod | 0700;
- if (chmod($dir, $chmod)) {
- return true;
- }
- } elseif (filegroup($dir) === posix_getgid()) {
- $chmod = $chmod | 0070;
- } else {
- // PHP's probably running as nobody, so we'll
- // need to give global permissions
- $chmod = $chmod | 0777;
- }
- trigger_error(
- 'Directory ' . $dir . ' not writable, ' .
- 'please chmod to ' . decoct($chmod),
- E_USER_WARNING
- );
- } else {
- // generic error message
- trigger_error(
- 'Directory ' . $dir . ' not writable, ' .
- 'please alter file permissions',
- E_USER_WARNING
- );
- }
- return false;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCache
+{
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return int|bool
+ */
+ public function add($def, $config)
+ {
+ if (!$this->checkDefType($def)) {
+ return;
+ }
+ $file = $this->generateFilePath($config);
+ if (file_exists($file)) {
+ return false;
+ }
+ if (!$this->_prepareDir($config)) {
+ return false;
+ }
+ return $this->_write($file, serialize($def), $config);
+ }
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return int|bool
+ */
+ public function set($def, $config)
+ {
+ if (!$this->checkDefType($def)) {
+ return;
+ }
+ $file = $this->generateFilePath($config);
+ if (!$this->_prepareDir($config)) {
+ return false;
+ }
+ return $this->_write($file, serialize($def), $config);
+ }
+
+ /**
+ * @param HTMLPurifier_Definition $def
+ * @param HTMLPurifier_Config $config
+ * @return int|bool
+ */
+ public function replace($def, $config)
+ {
+ if (!$this->checkDefType($def)) {
+ return;
+ }
+ $file = $this->generateFilePath($config);
+ if (!file_exists($file)) {
+ return false;
+ }
+ if (!$this->_prepareDir($config)) {
+ return false;
+ }
+ return $this->_write($file, serialize($def), $config);
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return bool|HTMLPurifier_Config
+ */
+ public function get($config)
+ {
+ $file = $this->generateFilePath($config);
+ if (!file_exists($file)) {
+ return false;
+ }
+ return unserialize(file_get_contents($file));
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function remove($config)
+ {
+ $file = $this->generateFilePath($config);
+ if (!file_exists($file)) {
+ return false;
+ }
+ return unlink($file);
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function flush($config)
+ {
+ if (!$this->_prepareDir($config)) {
+ return false;
+ }
+ $dir = $this->generateDirectoryPath($config);
+ $dh = opendir($dir);
+ // Apparently, on some versions of PHP, readdir will return
+ // an empty string if you pass an invalid argument to readdir.
+ // So you need this test. See #49.
+ if (false === $dh) {
+ return false;
+ }
+ while (false !== ($filename = readdir($dh))) {
+ if (empty($filename)) {
+ continue;
+ }
+ if ($filename[0] === '.') {
+ continue;
+ }
+ unlink($dir . '/' . $filename);
+ }
+ return true;
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function cleanup($config)
+ {
+ if (!$this->_prepareDir($config)) {
+ return false;
+ }
+ $dir = $this->generateDirectoryPath($config);
+ $dh = opendir($dir);
+ // See #49 (and above).
+ if (false === $dh) {
+ return false;
+ }
+ while (false !== ($filename = readdir($dh))) {
+ if (empty($filename)) {
+ continue;
+ }
+ if ($filename[0] === '.') {
+ continue;
+ }
+ $key = substr($filename, 0, strlen($filename) - 4);
+ if ($this->isOld($key, $config)) {
+ unlink($dir . '/' . $filename);
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Generates the file path to the serial file corresponding to
+ * the configuration and definition name
+ * @param HTMLPurifier_Config $config
+ * @return string
+ * @todo Make protected
+ */
+ public function generateFilePath($config)
+ {
+ $key = $this->generateKey($config);
+ return $this->generateDirectoryPath($config) . '/' . $key . '.ser';
+ }
+
+ /**
+ * Generates the path to the directory contain this cache's serial files
+ * @param HTMLPurifier_Config $config
+ * @return string
+ * @note No trailing slash
+ * @todo Make protected
+ */
+ public function generateDirectoryPath($config)
+ {
+ $base = $this->generateBaseDirectoryPath($config);
+ return $base . '/' . $this->type;
+ }
+
+ /**
+ * Generates path to base directory that contains all definition type
+ * serials
+ * @param HTMLPurifier_Config $config
+ * @return mixed|string
+ * @todo Make protected
+ */
+ public function generateBaseDirectoryPath($config)
+ {
+ $base = $config->get('Cache.SerializerPath');
+ $base = is_null($base) ? HTMLPURIFIER_PREFIX . '/HTMLPurifier/DefinitionCache/Serializer' : $base;
+ return $base;
+ }
+
+ /**
+ * Convenience wrapper function for file_put_contents
+ * @param string $file File name to write to
+ * @param string $data Data to write into file
+ * @param HTMLPurifier_Config $config
+ * @return int|bool Number of bytes written if success, or false if failure.
+ */
+ private function _write($file, $data, $config)
+ {
+ $result = file_put_contents($file, $data);
+ if ($result !== false) {
+ // set permissions of the new file (no execute)
+ $chmod = $config->get('Cache.SerializerPermissions');
+ if ($chmod === null) {
+ // don't do anything
+ } else {
+ $chmod = $chmod & 0666;
+ chmod($file, $chmod);
+ }
+ }
+ return $result;
+ }
+
+ /**
+ * Prepares the directory that this type stores the serials in
+ * @param HTMLPurifier_Config $config
+ * @return bool True if successful
+ */
+ private function _prepareDir($config)
+ {
+ $directory = $this->generateDirectoryPath($config);
+ $chmod = $config->get('Cache.SerializerPermissions');
+ if (!is_dir($directory)) {
+ $base = $this->generateBaseDirectoryPath($config);
+ if (!is_dir($base)) {
+ trigger_error(
+ 'Base directory ' . $base . ' does not exist,
+ please create or change using %Cache.SerializerPath',
+ E_USER_WARNING
+ );
+ return false;
+ } elseif (!$this->_testPermissions($base, $chmod)) {
+ return false;
+ }
+ if ($chmod === null) {
+ trigger_error(
+ 'Base directory ' . $base . ' does not exist,
+ please create or change using %Cache.SerializerPath',
+ E_USER_WARNING
+ );
+ return false;
+ }
+ if ($chmod !== null) {
+ mkdir($directory, $chmod);
+ } else {
+ mkdir($directory);
+ }
+ if (!$this->_testPermissions($directory, $chmod)) {
+ trigger_error(
+ 'Base directory ' . $base . ' does not exist,
+ please create or change using %Cache.SerializerPath',
+ E_USER_WARNING
+ );
+ return false;
+ }
+ } elseif (!$this->_testPermissions($directory, $chmod)) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Tests permissions on a directory and throws out friendly
+ * error messages and attempts to chmod it itself if possible
+ * @param string $dir Directory path
+ * @param int $chmod Permissions
+ * @return bool True if directory is writable
+ */
+ private function _testPermissions($dir, $chmod)
+ {
+ // early abort, if it is writable, everything is hunky-dory
+ if (is_writable($dir)) {
+ return true;
+ }
+ if (!is_dir($dir)) {
+ // generally, you'll want to handle this beforehand
+ // so a more specific error message can be given
+ trigger_error(
+ 'Directory ' . $dir . ' does not exist',
+ E_USER_WARNING
+ );
+ return false;
+ }
+ if (function_exists('posix_getuid') && $chmod !== null) {
+ // POSIX system, we can give more specific advice
+ if (fileowner($dir) === posix_getuid()) {
+ // we can chmod it ourselves
+ $chmod = $chmod | 0700;
+ if (chmod($dir, $chmod)) {
+ return true;
+ }
+ } elseif (filegroup($dir) === posix_getgid()) {
+ $chmod = $chmod | 0070;
+ } else {
+ // PHP's probably running as nobody, so we'll
+ // need to give global permissions
+ $chmod = $chmod | 0777;
+ }
+ trigger_error(
+ 'Directory ' . $dir . ' not writable, ' .
+ 'please chmod to ' . decoct($chmod),
+ E_USER_WARNING
+ );
+ } else {
+ // generic error message
+ trigger_error(
+ 'Directory ' . $dir . ' not writable, ' .
+ 'please alter file permissions',
+ E_USER_WARNING
+ );
+ }
+ return false;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Serializer/README b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Serializer/README
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Serializer/README
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Serializer/README
index ba005de..2e35c1c 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCache/Serializer/README
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCache/Serializer/README
@@ -1,3 +1,3 @@
-This is a dummy file to prevent Git from ignoring this empty directory.
-
- vim: et sw=4 sts=4
+This is a dummy file to prevent Git from ignoring this empty directory.
+
+ vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCacheFactory.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCacheFactory.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCacheFactory.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCacheFactory.php
index 737b8bb..fd1cc9b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DefinitionCacheFactory.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DefinitionCacheFactory.php
@@ -1,106 +1,106 @@
-<?php
-
-/**
- * Responsible for creating definition caches.
- */
-class HTMLPurifier_DefinitionCacheFactory
-{
- /**
- * @type array
- */
- protected $caches = array('Serializer' => array());
-
- /**
- * @type array
- */
- protected $implementations = array();
-
- /**
- * @type HTMLPurifier_DefinitionCache_Decorator[]
- */
- protected $decorators = array();
-
- /**
- * Initialize default decorators
- */
- public function setup()
- {
- $this->addDecorator('Cleanup');
- }
-
- /**
- * Retrieves an instance of global definition cache factory.
- * @param HTMLPurifier_DefinitionCacheFactory $prototype
- * @return HTMLPurifier_DefinitionCacheFactory
- */
- public static function instance($prototype = null)
- {
- static $instance;
- if ($prototype !== null) {
- $instance = $prototype;
- } elseif ($instance === null || $prototype === true) {
- $instance = new HTMLPurifier_DefinitionCacheFactory();
- $instance->setup();
- }
- return $instance;
- }
-
- /**
- * Registers a new definition cache object
- * @param string $short Short name of cache object, for reference
- * @param string $long Full class name of cache object, for construction
- */
- public function register($short, $long)
- {
- $this->implementations[$short] = $long;
- }
-
- /**
- * Factory method that creates a cache object based on configuration
- * @param string $type Name of definitions handled by cache
- * @param HTMLPurifier_Config $config Config instance
- * @return mixed
- */
- public function create($type, $config)
- {
- $method = $config->get('Cache.DefinitionImpl');
- if ($method === null) {
- return new HTMLPurifier_DefinitionCache_Null($type);
- }
- if (!empty($this->caches[$method][$type])) {
- return $this->caches[$method][$type];
- }
- if (isset($this->implementations[$method]) &&
- class_exists($class = $this->implementations[$method], false)) {
- $cache = new $class($type);
- } else {
- if ($method != 'Serializer') {
- trigger_error("Unrecognized DefinitionCache $method, using Serializer instead", E_USER_WARNING);
- }
- $cache = new HTMLPurifier_DefinitionCache_Serializer($type);
- }
- foreach ($this->decorators as $decorator) {
- $new_cache = $decorator->decorate($cache);
- // prevent infinite recursion in PHP 4
- unset($cache);
- $cache = $new_cache;
- }
- $this->caches[$method][$type] = $cache;
- return $this->caches[$method][$type];
- }
-
- /**
- * Registers a decorator to add to all new cache objects
- * @param HTMLPurifier_DefinitionCache_Decorator|string $decorator An instance or the name of a decorator
- */
- public function addDecorator($decorator)
- {
- if (is_string($decorator)) {
- $class = "HTMLPurifier_DefinitionCache_Decorator_$decorator";
- $decorator = new $class;
- }
- $this->decorators[$decorator->name] = $decorator;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Responsible for creating definition caches.
+ */
+class HTMLPurifier_DefinitionCacheFactory
+{
+ /**
+ * @type array
+ */
+ protected $caches = array('Serializer' => array());
+
+ /**
+ * @type array
+ */
+ protected $implementations = array();
+
+ /**
+ * @type HTMLPurifier_DefinitionCache_Decorator[]
+ */
+ protected $decorators = array();
+
+ /**
+ * Initialize default decorators
+ */
+ public function setup()
+ {
+ $this->addDecorator('Cleanup');
+ }
+
+ /**
+ * Retrieves an instance of global definition cache factory.
+ * @param HTMLPurifier_DefinitionCacheFactory $prototype
+ * @return HTMLPurifier_DefinitionCacheFactory
+ */
+ public static function instance($prototype = null)
+ {
+ static $instance;
+ if ($prototype !== null) {
+ $instance = $prototype;
+ } elseif ($instance === null || $prototype === true) {
+ $instance = new HTMLPurifier_DefinitionCacheFactory();
+ $instance->setup();
+ }
+ return $instance;
+ }
+
+ /**
+ * Registers a new definition cache object
+ * @param string $short Short name of cache object, for reference
+ * @param string $long Full class name of cache object, for construction
+ */
+ public function register($short, $long)
+ {
+ $this->implementations[$short] = $long;
+ }
+
+ /**
+ * Factory method that creates a cache object based on configuration
+ * @param string $type Name of definitions handled by cache
+ * @param HTMLPurifier_Config $config Config instance
+ * @return mixed
+ */
+ public function create($type, $config)
+ {
+ $method = $config->get('Cache.DefinitionImpl');
+ if ($method === null) {
+ return new HTMLPurifier_DefinitionCache_Null($type);
+ }
+ if (!empty($this->caches[$method][$type])) {
+ return $this->caches[$method][$type];
+ }
+ if (isset($this->implementations[$method]) &&
+ class_exists($class = $this->implementations[$method], false)) {
+ $cache = new $class($type);
+ } else {
+ if ($method != 'Serializer') {
+ trigger_error("Unrecognized DefinitionCache $method, using Serializer instead", E_USER_WARNING);
+ }
+ $cache = new HTMLPurifier_DefinitionCache_Serializer($type);
+ }
+ foreach ($this->decorators as $decorator) {
+ $new_cache = $decorator->decorate($cache);
+ // prevent infinite recursion in PHP 4
+ unset($cache);
+ $cache = $new_cache;
+ }
+ $this->caches[$method][$type] = $cache;
+ return $this->caches[$method][$type];
+ }
+
+ /**
+ * Registers a decorator to add to all new cache objects
+ * @param HTMLPurifier_DefinitionCache_Decorator|string $decorator An instance or the name of a decorator
+ */
+ public function addDecorator($decorator)
+ {
+ if (is_string($decorator)) {
+ $class = "HTMLPurifier_DefinitionCache_Decorator_$decorator";
+ $decorator = new $class;
+ }
+ $this->decorators[$decorator->name] = $decorator;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Doctype.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Doctype.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Doctype.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Doctype.php
index 4d72312..4acd06e 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Doctype.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Doctype.php
@@ -1,73 +1,73 @@
-<?php
-
-/**
- * Represents a document type, contains information on which modules
- * need to be loaded.
- * @note This class is inspected by Printer_HTMLDefinition->renderDoctype.
- * If structure changes, please update that function.
- */
-class HTMLPurifier_Doctype
-{
- /**
- * Full name of doctype
- * @type string
- */
- public $name;
-
- /**
- * List of standard modules (string identifiers or literal objects)
- * that this doctype uses
- * @type array
- */
- public $modules = array();
-
- /**
- * List of modules to use for tidying up code
- * @type array
- */
- public $tidyModules = array();
-
- /**
- * Is the language derived from XML (i.e. XHTML)?
- * @type bool
- */
- public $xml = true;
-
- /**
- * List of aliases for this doctype
- * @type array
- */
- public $aliases = array();
-
- /**
- * Public DTD identifier
- * @type string
- */
- public $dtdPublic;
-
- /**
- * System DTD identifier
- * @type string
- */
- public $dtdSystem;
-
- public function __construct(
- $name = null,
- $xml = true,
- $modules = array(),
- $tidyModules = array(),
- $aliases = array(),
- $dtd_public = null,
- $dtd_system = null
- ) {
- $this->name = $name;
- $this->xml = $xml;
- $this->modules = $modules;
- $this->tidyModules = $tidyModules;
- $this->aliases = $aliases;
- $this->dtdPublic = $dtd_public;
- $this->dtdSystem = $dtd_system;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Represents a document type, contains information on which modules
+ * need to be loaded.
+ * @note This class is inspected by Printer_HTMLDefinition->renderDoctype.
+ * If structure changes, please update that function.
+ */
+class HTMLPurifier_Doctype
+{
+ /**
+ * Full name of doctype
+ * @type string
+ */
+ public $name;
+
+ /**
+ * List of standard modules (string identifiers or literal objects)
+ * that this doctype uses
+ * @type array
+ */
+ public $modules = array();
+
+ /**
+ * List of modules to use for tidying up code
+ * @type array
+ */
+ public $tidyModules = array();
+
+ /**
+ * Is the language derived from XML (i.e. XHTML)?
+ * @type bool
+ */
+ public $xml = true;
+
+ /**
+ * List of aliases for this doctype
+ * @type array
+ */
+ public $aliases = array();
+
+ /**
+ * Public DTD identifier
+ * @type string
+ */
+ public $dtdPublic;
+
+ /**
+ * System DTD identifier
+ * @type string
+ */
+ public $dtdSystem;
+
+ public function __construct(
+ $name = null,
+ $xml = true,
+ $modules = array(),
+ $tidyModules = array(),
+ $aliases = array(),
+ $dtd_public = null,
+ $dtd_system = null
+ ) {
+ $this->name = $name;
+ $this->xml = $xml;
+ $this->modules = $modules;
+ $this->tidyModules = $tidyModules;
+ $this->aliases = $aliases;
+ $this->dtdPublic = $dtd_public;
+ $this->dtdSystem = $dtd_system;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DoctypeRegistry.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DoctypeRegistry.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DoctypeRegistry.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DoctypeRegistry.php
index cab9dc5..acc1d64 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/DoctypeRegistry.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/DoctypeRegistry.php
@@ -1,142 +1,142 @@
-<?php
-
-class HTMLPurifier_DoctypeRegistry
-{
-
- /**
- * Hash of doctype names to doctype objects.
- * @type array
- */
- protected $doctypes;
-
- /**
- * Lookup table of aliases to real doctype names.
- * @type array
- */
- protected $aliases;
-
- /**
- * Registers a doctype to the registry
- * @note Accepts a fully-formed doctype object, or the
- * parameters for constructing a doctype object
- * @param string $doctype Name of doctype or literal doctype object
- * @param bool $xml
- * @param array $modules Modules doctype will load
- * @param array $tidy_modules Modules doctype will load for certain modes
- * @param array $aliases Alias names for doctype
- * @param string $dtd_public
- * @param string $dtd_system
- * @return HTMLPurifier_Doctype Editable registered doctype
- */
- public function register(
- $doctype,
- $xml = true,
- $modules = array(),
- $tidy_modules = array(),
- $aliases = array(),
- $dtd_public = null,
- $dtd_system = null
- ) {
- if (!is_array($modules)) {
- $modules = array($modules);
- }
- if (!is_array($tidy_modules)) {
- $tidy_modules = array($tidy_modules);
- }
- if (!is_array($aliases)) {
- $aliases = array($aliases);
- }
- if (!is_object($doctype)) {
- $doctype = new HTMLPurifier_Doctype(
- $doctype,
- $xml,
- $modules,
- $tidy_modules,
- $aliases,
- $dtd_public,
- $dtd_system
- );
- }
- $this->doctypes[$doctype->name] = $doctype;
- $name = $doctype->name;
- // hookup aliases
- foreach ($doctype->aliases as $alias) {
- if (isset($this->doctypes[$alias])) {
- continue;
- }
- $this->aliases[$alias] = $name;
- }
- // remove old aliases
- if (isset($this->aliases[$name])) {
- unset($this->aliases[$name]);
- }
- return $doctype;
- }
-
- /**
- * Retrieves reference to a doctype of a certain name
- * @note This function resolves aliases
- * @note When possible, use the more fully-featured make()
- * @param string $doctype Name of doctype
- * @return HTMLPurifier_Doctype Editable doctype object
- */
- public function get($doctype)
- {
- if (isset($this->aliases[$doctype])) {
- $doctype = $this->aliases[$doctype];
- }
- if (!isset($this->doctypes[$doctype])) {
- trigger_error('Doctype ' . htmlspecialchars($doctype) . ' does not exist', E_USER_ERROR);
- $anon = new HTMLPurifier_Doctype($doctype);
- return $anon;
- }
- return $this->doctypes[$doctype];
- }
-
- /**
- * Creates a doctype based on a configuration object,
- * will perform initialization on the doctype
- * @note Use this function to get a copy of doctype that config
- * can hold on to (this is necessary in order to tell
- * Generator whether or not the current document is XML
- * based or not).
- * @param HTMLPurifier_Config $config
- * @return HTMLPurifier_Doctype
- */
- public function make($config)
- {
- return clone $this->get($this->getDoctypeFromConfig($config));
- }
-
- /**
- * Retrieves the doctype from the configuration object
- * @param HTMLPurifier_Config $config
- * @return string
- */
- public function getDoctypeFromConfig($config)
- {
- // recommended test
- $doctype = $config->get('HTML.Doctype');
- if (!empty($doctype)) {
- return $doctype;
- }
- $doctype = $config->get('HTML.CustomDoctype');
- if (!empty($doctype)) {
- return $doctype;
- }
- // backwards-compatibility
- if ($config->get('HTML.XHTML')) {
- $doctype = 'XHTML 1.0';
- } else {
- $doctype = 'HTML 4.01';
- }
- if ($config->get('HTML.Strict')) {
- $doctype .= ' Strict';
- } else {
- $doctype .= ' Transitional';
- }
- return $doctype;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_DoctypeRegistry
+{
+
+ /**
+ * Hash of doctype names to doctype objects.
+ * @type array
+ */
+ protected $doctypes;
+
+ /**
+ * Lookup table of aliases to real doctype names.
+ * @type array
+ */
+ protected $aliases;
+
+ /**
+ * Registers a doctype to the registry
+ * @note Accepts a fully-formed doctype object, or the
+ * parameters for constructing a doctype object
+ * @param string $doctype Name of doctype or literal doctype object
+ * @param bool $xml
+ * @param array $modules Modules doctype will load
+ * @param array $tidy_modules Modules doctype will load for certain modes
+ * @param array $aliases Alias names for doctype
+ * @param string $dtd_public
+ * @param string $dtd_system
+ * @return HTMLPurifier_Doctype Editable registered doctype
+ */
+ public function register(
+ $doctype,
+ $xml = true,
+ $modules = array(),
+ $tidy_modules = array(),
+ $aliases = array(),
+ $dtd_public = null,
+ $dtd_system = null
+ ) {
+ if (!is_array($modules)) {
+ $modules = array($modules);
+ }
+ if (!is_array($tidy_modules)) {
+ $tidy_modules = array($tidy_modules);
+ }
+ if (!is_array($aliases)) {
+ $aliases = array($aliases);
+ }
+ if (!is_object($doctype)) {
+ $doctype = new HTMLPurifier_Doctype(
+ $doctype,
+ $xml,
+ $modules,
+ $tidy_modules,
+ $aliases,
+ $dtd_public,
+ $dtd_system
+ );
+ }
+ $this->doctypes[$doctype->name] = $doctype;
+ $name = $doctype->name;
+ // hookup aliases
+ foreach ($doctype->aliases as $alias) {
+ if (isset($this->doctypes[$alias])) {
+ continue;
+ }
+ $this->aliases[$alias] = $name;
+ }
+ // remove old aliases
+ if (isset($this->aliases[$name])) {
+ unset($this->aliases[$name]);
+ }
+ return $doctype;
+ }
+
+ /**
+ * Retrieves reference to a doctype of a certain name
+ * @note This function resolves aliases
+ * @note When possible, use the more fully-featured make()
+ * @param string $doctype Name of doctype
+ * @return HTMLPurifier_Doctype Editable doctype object
+ */
+ public function get($doctype)
+ {
+ if (isset($this->aliases[$doctype])) {
+ $doctype = $this->aliases[$doctype];
+ }
+ if (!isset($this->doctypes[$doctype])) {
+ trigger_error('Doctype ' . htmlspecialchars($doctype) . ' does not exist', E_USER_ERROR);
+ $anon = new HTMLPurifier_Doctype($doctype);
+ return $anon;
+ }
+ return $this->doctypes[$doctype];
+ }
+
+ /**
+ * Creates a doctype based on a configuration object,
+ * will perform initialization on the doctype
+ * @note Use this function to get a copy of doctype that config
+ * can hold on to (this is necessary in order to tell
+ * Generator whether or not the current document is XML
+ * based or not).
+ * @param HTMLPurifier_Config $config
+ * @return HTMLPurifier_Doctype
+ */
+ public function make($config)
+ {
+ return clone $this->get($this->getDoctypeFromConfig($config));
+ }
+
+ /**
+ * Retrieves the doctype from the configuration object
+ * @param HTMLPurifier_Config $config
+ * @return string
+ */
+ public function getDoctypeFromConfig($config)
+ {
+ // recommended test
+ $doctype = $config->get('HTML.Doctype');
+ if (!empty($doctype)) {
+ return $doctype;
+ }
+ $doctype = $config->get('HTML.CustomDoctype');
+ if (!empty($doctype)) {
+ return $doctype;
+ }
+ // backwards-compatibility
+ if ($config->get('HTML.XHTML')) {
+ $doctype = 'XHTML 1.0';
+ } else {
+ $doctype = 'HTML 4.01';
+ }
+ if ($config->get('HTML.Strict')) {
+ $doctype .= ' Strict';
+ } else {
+ $doctype .= ' Transitional';
+ }
+ return $doctype;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ElementDef.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ElementDef.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ElementDef.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ElementDef.php
index 089f7ef..d5311ce 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ElementDef.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ElementDef.php
@@ -1,216 +1,216 @@
-<?php
-
-/**
- * Structure that stores an HTML element definition. Used by
- * HTMLPurifier_HTMLDefinition and HTMLPurifier_HTMLModule.
- * @note This class is inspected by HTMLPurifier_Printer_HTMLDefinition.
- * Please update that class too.
- * @warning If you add new properties to this class, you MUST update
- * the mergeIn() method.
- */
-class HTMLPurifier_ElementDef
-{
- /**
- * Does the definition work by itself, or is it created solely
- * for the purpose of merging into another definition?
- * @type bool
- */
- public $standalone = true;
-
- /**
- * Associative array of attribute name to HTMLPurifier_AttrDef.
- * @type array
- * @note Before being processed by HTMLPurifier_AttrCollections
- * when modules are finalized during
- * HTMLPurifier_HTMLDefinition->setup(), this array may also
- * contain an array at index 0 that indicates which attribute
- * collections to load into the full array. It may also
- * contain string indentifiers in lieu of HTMLPurifier_AttrDef,
- * see HTMLPurifier_AttrTypes on how they are expanded during
- * HTMLPurifier_HTMLDefinition->setup() processing.
- */
- public $attr = array();
-
- // XXX: Design note: currently, it's not possible to override
- // previously defined AttrTransforms without messing around with
- // the final generated config. This is by design; a previous version
- // used an associated list of attr_transform, but it was extremely
- // easy to accidentally override other attribute transforms by
- // forgetting to specify an index (and just using 0.) While we
- // could check this by checking the index number and complaining,
- // there is a second problem which is that it is not at all easy to
- // tell when something is getting overridden. Combine this with a
- // codebase where this isn't really being used, and it's perfect for
- // nuking.
-
- /**
- * List of tags HTMLPurifier_AttrTransform to be done before validation.
- * @type array
- */
- public $attr_transform_pre = array();
-
- /**
- * List of tags HTMLPurifier_AttrTransform to be done after validation.
- * @type array
- */
- public $attr_transform_post = array();
-
- /**
- * HTMLPurifier_ChildDef of this tag.
- * @type HTMLPurifier_ChildDef
- */
- public $child;
-
- /**
- * Abstract string representation of internal ChildDef rules.
- * @see HTMLPurifier_ContentSets for how this is parsed and then transformed
- * into an HTMLPurifier_ChildDef.
- * @warning This is a temporary variable that is not available after
- * being processed by HTMLDefinition
- * @type string
- */
- public $content_model;
-
- /**
- * Value of $child->type, used to determine which ChildDef to use,
- * used in combination with $content_model.
- * @warning This must be lowercase
- * @warning This is a temporary variable that is not available after
- * being processed by HTMLDefinition
- * @type string
- */
- public $content_model_type;
-
- /**
- * Does the element have a content model (#PCDATA | Inline)*? This
- * is important for chameleon ins and del processing in
- * HTMLPurifier_ChildDef_Chameleon. Dynamically set: modules don't
- * have to worry about this one.
- * @type bool
- */
- public $descendants_are_inline = false;
-
- /**
- * List of the names of required attributes this element has.
- * Dynamically populated by HTMLPurifier_HTMLDefinition::getElement()
- * @type array
- */
- public $required_attr = array();
-
- /**
- * Lookup table of tags excluded from all descendants of this tag.
- * @type array
- * @note SGML permits exclusions for all descendants, but this is
- * not possible with DTDs or XML Schemas. W3C has elected to
- * use complicated compositions of content_models to simulate
- * exclusion for children, but we go the simpler, SGML-style
- * route of flat-out exclusions, which correctly apply to
- * all descendants and not just children. Note that the XHTML
- * Modularization Abstract Modules are blithely unaware of such
- * distinctions.
- */
- public $excludes = array();
-
- /**
- * This tag is explicitly auto-closed by the following tags.
- * @type array
- */
- public $autoclose = array();
-
- /**
- * If a foreign element is found in this element, test if it is
- * allowed by this sub-element; if it is, instead of closing the
- * current element, place it inside this element.
- * @type string
- */
- public $wrap;
-
- /**
- * Whether or not this is a formatting element affected by the
- * "Active Formatting Elements" algorithm.
- * @type bool
- */
- public $formatting;
-
- /**
- * Low-level factory constructor for creating new standalone element defs
- */
- public static function create($content_model, $content_model_type, $attr)
- {
- $def = new HTMLPurifier_ElementDef();
- $def->content_model = $content_model;
- $def->content_model_type = $content_model_type;
- $def->attr = $attr;
- return $def;
- }
-
- /**
- * Merges the values of another element definition into this one.
- * Values from the new element def take precedence if a value is
- * not mergeable.
- * @param HTMLPurifier_ElementDef $def
- */
- public function mergeIn($def)
- {
- // later keys takes precedence
- foreach ($def->attr as $k => $v) {
- if ($k === 0) {
- // merge in the includes
- // sorry, no way to override an include
- foreach ($v as $v2) {
- $this->attr[0][] = $v2;
- }
- continue;
- }
- if ($v === false) {
- if (isset($this->attr[$k])) {
- unset($this->attr[$k]);
- }
- continue;
- }
- $this->attr[$k] = $v;
- }
- $this->_mergeAssocArray($this->excludes, $def->excludes);
- $this->attr_transform_pre = array_merge($this->attr_transform_pre, $def->attr_transform_pre);
- $this->attr_transform_post = array_merge($this->attr_transform_post, $def->attr_transform_post);
-
- if (!empty($def->content_model)) {
- $this->content_model =
- str_replace("#SUPER", $this->content_model, $def->content_model);
- $this->child = false;
- }
- if (!empty($def->content_model_type)) {
- $this->content_model_type = $def->content_model_type;
- $this->child = false;
- }
- if (!is_null($def->child)) {
- $this->child = $def->child;
- }
- if (!is_null($def->formatting)) {
- $this->formatting = $def->formatting;
- }
- if ($def->descendants_are_inline) {
- $this->descendants_are_inline = $def->descendants_are_inline;
- }
- }
-
- /**
- * Merges one array into another, removes values which equal false
- * @param $a1 Array by reference that is merged into
- * @param $a2 Array that merges into $a1
- */
- private function _mergeAssocArray(&$a1, $a2)
- {
- foreach ($a2 as $k => $v) {
- if ($v === false) {
- if (isset($a1[$k])) {
- unset($a1[$k]);
- }
- continue;
- }
- $a1[$k] = $v;
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Structure that stores an HTML element definition. Used by
+ * HTMLPurifier_HTMLDefinition and HTMLPurifier_HTMLModule.
+ * @note This class is inspected by HTMLPurifier_Printer_HTMLDefinition.
+ * Please update that class too.
+ * @warning If you add new properties to this class, you MUST update
+ * the mergeIn() method.
+ */
+class HTMLPurifier_ElementDef
+{
+ /**
+ * Does the definition work by itself, or is it created solely
+ * for the purpose of merging into another definition?
+ * @type bool
+ */
+ public $standalone = true;
+
+ /**
+ * Associative array of attribute name to HTMLPurifier_AttrDef.
+ * @type array
+ * @note Before being processed by HTMLPurifier_AttrCollections
+ * when modules are finalized during
+ * HTMLPurifier_HTMLDefinition->setup(), this array may also
+ * contain an array at index 0 that indicates which attribute
+ * collections to load into the full array. It may also
+ * contain string indentifiers in lieu of HTMLPurifier_AttrDef,
+ * see HTMLPurifier_AttrTypes on how they are expanded during
+ * HTMLPurifier_HTMLDefinition->setup() processing.
+ */
+ public $attr = array();
+
+ // XXX: Design note: currently, it's not possible to override
+ // previously defined AttrTransforms without messing around with
+ // the final generated config. This is by design; a previous version
+ // used an associated list of attr_transform, but it was extremely
+ // easy to accidentally override other attribute transforms by
+ // forgetting to specify an index (and just using 0.) While we
+ // could check this by checking the index number and complaining,
+ // there is a second problem which is that it is not at all easy to
+ // tell when something is getting overridden. Combine this with a
+ // codebase where this isn't really being used, and it's perfect for
+ // nuking.
+
+ /**
+ * List of tags HTMLPurifier_AttrTransform to be done before validation.
+ * @type array
+ */
+ public $attr_transform_pre = array();
+
+ /**
+ * List of tags HTMLPurifier_AttrTransform to be done after validation.
+ * @type array
+ */
+ public $attr_transform_post = array();
+
+ /**
+ * HTMLPurifier_ChildDef of this tag.
+ * @type HTMLPurifier_ChildDef
+ */
+ public $child;
+
+ /**
+ * Abstract string representation of internal ChildDef rules.
+ * @see HTMLPurifier_ContentSets for how this is parsed and then transformed
+ * into an HTMLPurifier_ChildDef.
+ * @warning This is a temporary variable that is not available after
+ * being processed by HTMLDefinition
+ * @type string
+ */
+ public $content_model;
+
+ /**
+ * Value of $child->type, used to determine which ChildDef to use,
+ * used in combination with $content_model.
+ * @warning This must be lowercase
+ * @warning This is a temporary variable that is not available after
+ * being processed by HTMLDefinition
+ * @type string
+ */
+ public $content_model_type;
+
+ /**
+ * Does the element have a content model (#PCDATA | Inline)*? This
+ * is important for chameleon ins and del processing in
+ * HTMLPurifier_ChildDef_Chameleon. Dynamically set: modules don't
+ * have to worry about this one.
+ * @type bool
+ */
+ public $descendants_are_inline = false;
+
+ /**
+ * List of the names of required attributes this element has.
+ * Dynamically populated by HTMLPurifier_HTMLDefinition::getElement()
+ * @type array
+ */
+ public $required_attr = array();
+
+ /**
+ * Lookup table of tags excluded from all descendants of this tag.
+ * @type array
+ * @note SGML permits exclusions for all descendants, but this is
+ * not possible with DTDs or XML Schemas. W3C has elected to
+ * use complicated compositions of content_models to simulate
+ * exclusion for children, but we go the simpler, SGML-style
+ * route of flat-out exclusions, which correctly apply to
+ * all descendants and not just children. Note that the XHTML
+ * Modularization Abstract Modules are blithely unaware of such
+ * distinctions.
+ */
+ public $excludes = array();
+
+ /**
+ * This tag is explicitly auto-closed by the following tags.
+ * @type array
+ */
+ public $autoclose = array();
+
+ /**
+ * If a foreign element is found in this element, test if it is
+ * allowed by this sub-element; if it is, instead of closing the
+ * current element, place it inside this element.
+ * @type string
+ */
+ public $wrap;
+
+ /**
+ * Whether or not this is a formatting element affected by the
+ * "Active Formatting Elements" algorithm.
+ * @type bool
+ */
+ public $formatting;
+
+ /**
+ * Low-level factory constructor for creating new standalone element defs
+ */
+ public static function create($content_model, $content_model_type, $attr)
+ {
+ $def = new HTMLPurifier_ElementDef();
+ $def->content_model = $content_model;
+ $def->content_model_type = $content_model_type;
+ $def->attr = $attr;
+ return $def;
+ }
+
+ /**
+ * Merges the values of another element definition into this one.
+ * Values from the new element def take precedence if a value is
+ * not mergeable.
+ * @param HTMLPurifier_ElementDef $def
+ */
+ public function mergeIn($def)
+ {
+ // later keys takes precedence
+ foreach ($def->attr as $k => $v) {
+ if ($k === 0) {
+ // merge in the includes
+ // sorry, no way to override an include
+ foreach ($v as $v2) {
+ $this->attr[0][] = $v2;
+ }
+ continue;
+ }
+ if ($v === false) {
+ if (isset($this->attr[$k])) {
+ unset($this->attr[$k]);
+ }
+ continue;
+ }
+ $this->attr[$k] = $v;
+ }
+ $this->_mergeAssocArray($this->excludes, $def->excludes);
+ $this->attr_transform_pre = array_merge($this->attr_transform_pre, $def->attr_transform_pre);
+ $this->attr_transform_post = array_merge($this->attr_transform_post, $def->attr_transform_post);
+
+ if (!empty($def->content_model)) {
+ $this->content_model =
+ str_replace("#SUPER", $this->content_model, $def->content_model);
+ $this->child = false;
+ }
+ if (!empty($def->content_model_type)) {
+ $this->content_model_type = $def->content_model_type;
+ $this->child = false;
+ }
+ if (!is_null($def->child)) {
+ $this->child = $def->child;
+ }
+ if (!is_null($def->formatting)) {
+ $this->formatting = $def->formatting;
+ }
+ if ($def->descendants_are_inline) {
+ $this->descendants_are_inline = $def->descendants_are_inline;
+ }
+ }
+
+ /**
+ * Merges one array into another, removes values which equal false
+ * @param $a1 Array by reference that is merged into
+ * @param $a2 Array that merges into $a1
+ */
+ private function _mergeAssocArray(&$a1, $a2)
+ {
+ foreach ($a2 as $k => $v) {
+ if ($v === false) {
+ if (isset($a1[$k])) {
+ unset($a1[$k]);
+ }
+ continue;
+ }
+ $a1[$k] = $v;
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Encoder.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Encoder.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Encoder.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Encoder.php
index 3aa00ca..fef9b58 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Encoder.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Encoder.php
@@ -1,611 +1,611 @@
-<?php
-
-/**
- * A UTF-8 specific character encoder that handles cleaning and transforming.
- * @note All functions in this class should be static.
- */
-class HTMLPurifier_Encoder
-{
-
- /**
- * Constructor throws fatal error if you attempt to instantiate class
- */
- private function __construct()
- {
- trigger_error('Cannot instantiate encoder, call methods statically', E_USER_ERROR);
- }
-
- /**
- * Error-handler that mutes errors, alternative to shut-up operator.
- */
- public static function muteErrorHandler()
- {
- }
-
- /**
- * iconv wrapper which mutes errors, but doesn't work around bugs.
- * @param string $in Input encoding
- * @param string $out Output encoding
- * @param string $text The text to convert
- * @return string
- */
- public static function unsafeIconv($in, $out, $text)
- {
- set_error_handler(array('HTMLPurifier_Encoder', 'muteErrorHandler'));
- $r = iconv($in, $out, $text);
- restore_error_handler();
- return $r;
- }
-
- /**
- * iconv wrapper which mutes errors and works around bugs.
- * @param string $in Input encoding
- * @param string $out Output encoding
- * @param string $text The text to convert
- * @param int $max_chunk_size
- * @return string
- */
- public static function iconv($in, $out, $text, $max_chunk_size = 8000)
- {
- $code = self::testIconvTruncateBug();
- if ($code == self::ICONV_OK) {
- return self::unsafeIconv($in, $out, $text);
- } elseif ($code == self::ICONV_TRUNCATES) {
- // we can only work around this if the input character set
- // is utf-8
- if ($in == 'utf-8') {
- if ($max_chunk_size < 4) {
- trigger_error('max_chunk_size is too small', E_USER_WARNING);
- return false;
- }
- // split into 8000 byte chunks, but be careful to handle
- // multibyte boundaries properly
- if (($c = strlen($text)) <= $max_chunk_size) {
- return self::unsafeIconv($in, $out, $text);
- }
- $r = '';
- $i = 0;
- while (true) {
- if ($i + $max_chunk_size >= $c) {
- $r .= self::unsafeIconv($in, $out, substr($text, $i));
- break;
- }
- // wibble the boundary
- if (0x80 != (0xC0 & ord($text[$i + $max_chunk_size]))) {
- $chunk_size = $max_chunk_size;
- } elseif (0x80 != (0xC0 & ord($text[$i + $max_chunk_size - 1]))) {
- $chunk_size = $max_chunk_size - 1;
- } elseif (0x80 != (0xC0 & ord($text[$i + $max_chunk_size - 2]))) {
- $chunk_size = $max_chunk_size - 2;
- } elseif (0x80 != (0xC0 & ord($text[$i + $max_chunk_size - 3]))) {
- $chunk_size = $max_chunk_size - 3;
- } else {
- return false; // rather confusing UTF-8...
- }
- $chunk = substr($text, $i, $chunk_size); // substr doesn't mind overlong lengths
- $r .= self::unsafeIconv($in, $out, $chunk);
- $i += $chunk_size;
- }
- return $r;
- } else {
- return false;
- }
- } else {
- return false;
- }
- }
-
- /**
- * Cleans a UTF-8 string for well-formedness and SGML validity
- *
- * It will parse according to UTF-8 and return a valid UTF8 string, with
- * non-SGML codepoints excluded.
- *
- * @param string $str The string to clean
- * @param bool $force_php
- * @return string
- *
- * @note Just for reference, the non-SGML code points are 0 to 31 and
- * 127 to 159, inclusive. However, we allow code points 9, 10
- * and 13, which are the tab, line feed and carriage return
- * respectively. 128 and above the code points map to multibyte
- * UTF-8 representations.
- *
- * @note Fallback code adapted from utf8ToUnicode by Henri Sivonen and
- * hsivonen@iki.fi at <http://iki.fi/hsivonen/php-utf8/> under the
- * LGPL license. Notes on what changed are inside, but in general,
- * the original code transformed UTF-8 text into an array of integer
- * Unicode codepoints. Understandably, transforming that back to
- * a string would be somewhat expensive, so the function was modded to
- * directly operate on the string. However, this discourages code
- * reuse, and the logic enumerated here would be useful for any
- * function that needs to be able to understand UTF-8 characters.
- * As of right now, only smart lossless character encoding converters
- * would need that, and I'm probably not going to implement them.
- * Once again, PHP 6 should solve all our problems.
- */
- public static function cleanUTF8($str, $force_php = false)
- {
- // UTF-8 validity is checked since PHP 4.3.5
- // This is an optimization: if the string is already valid UTF-8, no
- // need to do PHP stuff. 99% of the time, this will be the case.
- // The regexp matches the XML char production, as well as well as excluding
- // non-SGML codepoints U+007F to U+009F
- if (preg_match(
- '/^[\x{9}\x{A}\x{D}\x{20}-\x{7E}\x{A0}-\x{D7FF}\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]*$/Du',
- $str
- )) {
- return $str;
- }
-
- $mState = 0; // cached expected number of octets after the current octet
- // until the beginning of the next UTF8 character sequence
- $mUcs4 = 0; // cached Unicode character
- $mBytes = 1; // cached expected number of octets in the current sequence
-
- // original code involved an $out that was an array of Unicode
- // codepoints. Instead of having to convert back into UTF-8, we've
- // decided to directly append valid UTF-8 characters onto a string
- // $out once they're done. $char accumulates raw bytes, while $mUcs4
- // turns into the Unicode code point, so there's some redundancy.
-
- $out = '';
- $char = '';
-
- $len = strlen($str);
- for ($i = 0; $i < $len; $i++) {
- $in = ord($str{$i});
- $char .= $str[$i]; // append byte to char
- if (0 == $mState) {
- // When mState is zero we expect either a US-ASCII character
- // or a multi-octet sequence.
- if (0 == (0x80 & ($in))) {
- // US-ASCII, pass straight through.
- if (($in <= 31 || $in == 127) &&
- !($in == 9 || $in == 13 || $in == 10) // save \r\t\n
- ) {
- // control characters, remove
- } else {
- $out .= $char;
- }
- // reset
- $char = '';
- $mBytes = 1;
- } elseif (0xC0 == (0xE0 & ($in))) {
- // First octet of 2 octet sequence
- $mUcs4 = ($in);
- $mUcs4 = ($mUcs4 & 0x1F) << 6;
- $mState = 1;
- $mBytes = 2;
- } elseif (0xE0 == (0xF0 & ($in))) {
- // First octet of 3 octet sequence
- $mUcs4 = ($in);
- $mUcs4 = ($mUcs4 & 0x0F) << 12;
- $mState = 2;
- $mBytes = 3;
- } elseif (0xF0 == (0xF8 & ($in))) {
- // First octet of 4 octet sequence
- $mUcs4 = ($in);
- $mUcs4 = ($mUcs4 & 0x07) << 18;
- $mState = 3;
- $mBytes = 4;
- } elseif (0xF8 == (0xFC & ($in))) {
- // First octet of 5 octet sequence.
- //
- // This is illegal because the encoded codepoint must be
- // either:
- // (a) not the shortest form or
- // (b) outside the Unicode range of 0-0x10FFFF.
- // Rather than trying to resynchronize, we will carry on
- // until the end of the sequence and let the later error
- // handling code catch it.
- $mUcs4 = ($in);
- $mUcs4 = ($mUcs4 & 0x03) << 24;
- $mState = 4;
- $mBytes = 5;
- } elseif (0xFC == (0xFE & ($in))) {
- // First octet of 6 octet sequence, see comments for 5
- // octet sequence.
- $mUcs4 = ($in);
- $mUcs4 = ($mUcs4 & 1) << 30;
- $mState = 5;
- $mBytes = 6;
- } else {
- // Current octet is neither in the US-ASCII range nor a
- // legal first octet of a multi-octet sequence.
- $mState = 0;
- $mUcs4 = 0;
- $mBytes = 1;
- $char = '';
- }
- } else {
- // When mState is non-zero, we expect a continuation of the
- // multi-octet sequence
- if (0x80 == (0xC0 & ($in))) {
- // Legal continuation.
- $shift = ($mState - 1) * 6;
- $tmp = $in;
- $tmp = ($tmp & 0x0000003F) << $shift;
- $mUcs4 |= $tmp;
-
- if (0 == --$mState) {
- // End of the multi-octet sequence. mUcs4 now contains
- // the final Unicode codepoint to be output
-
- // Check for illegal sequences and codepoints.
-
- // From Unicode 3.1, non-shortest form is illegal
- if (((2 == $mBytes) && ($mUcs4 < 0x0080)) ||
- ((3 == $mBytes) && ($mUcs4 < 0x0800)) ||
- ((4 == $mBytes) && ($mUcs4 < 0x10000)) ||
- (4 < $mBytes) ||
- // From Unicode 3.2, surrogate characters = illegal
- (($mUcs4 & 0xFFFFF800) == 0xD800) ||
- // Codepoints outside the Unicode range are illegal
- ($mUcs4 > 0x10FFFF)
- ) {
-
- } elseif (0xFEFF != $mUcs4 && // omit BOM
- // check for valid Char unicode codepoints
- (
- 0x9 == $mUcs4 ||
- 0xA == $mUcs4 ||
- 0xD == $mUcs4 ||
- (0x20 <= $mUcs4 && 0x7E >= $mUcs4) ||
- // 7F-9F is not strictly prohibited by XML,
- // but it is non-SGML, and thus we don't allow it
- (0xA0 <= $mUcs4 && 0xD7FF >= $mUcs4) ||
- (0x10000 <= $mUcs4 && 0x10FFFF >= $mUcs4)
- )
- ) {
- $out .= $char;
- }
- // initialize UTF8 cache (reset)
- $mState = 0;
- $mUcs4 = 0;
- $mBytes = 1;
- $char = '';
- }
- } else {
- // ((0xC0 & (*in) != 0x80) && (mState != 0))
- // Incomplete multi-octet sequence.
- // used to result in complete fail, but we'll reset
- $mState = 0;
- $mUcs4 = 0;
- $mBytes = 1;
- $char ='';
- }
- }
- }
- return $out;
- }
-
- /**
- * Translates a Unicode codepoint into its corresponding UTF-8 character.
- * @note Based on Feyd's function at
- * <http://forums.devnetwork.net/viewtopic.php?p=191404#191404>,
- * which is in public domain.
- * @note While we're going to do code point parsing anyway, a good
- * optimization would be to refuse to translate code points that
- * are non-SGML characters. However, this could lead to duplication.
- * @note This is very similar to the unichr function in
- * maintenance/generate-entity-file.php (although this is superior,
- * due to its sanity checks).
- */
-
- // +----------+----------+----------+----------+
- // | 33222222 | 22221111 | 111111 | |
- // | 10987654 | 32109876 | 54321098 | 76543210 | bit
- // +----------+----------+----------+----------+
- // | | | | 0xxxxxxx | 1 byte 0x00000000..0x0000007F
- // | | | 110yyyyy | 10xxxxxx | 2 byte 0x00000080..0x000007FF
- // | | 1110zzzz | 10yyyyyy | 10xxxxxx | 3 byte 0x00000800..0x0000FFFF
- // | 11110www | 10wwzzzz | 10yyyyyy | 10xxxxxx | 4 byte 0x00010000..0x0010FFFF
- // +----------+----------+----------+----------+
- // | 00000000 | 00011111 | 11111111 | 11111111 | Theoretical upper limit of legal scalars: 2097151 (0x001FFFFF)
- // | 00000000 | 00010000 | 11111111 | 11111111 | Defined upper limit of legal scalar codes
- // +----------+----------+----------+----------+
-
- public static function unichr($code)
- {
- if ($code > 1114111 or $code < 0 or
- ($code >= 55296 and $code <= 57343) ) {
- // bits are set outside the "valid" range as defined
- // by UNICODE 4.1.0
- return '';
- }
-
- $x = $y = $z = $w = 0;
- if ($code < 128) {
- // regular ASCII character
- $x = $code;
- } else {
- // set up bits for UTF-8
- $x = ($code & 63) | 128;
- if ($code < 2048) {
- $y = (($code & 2047) >> 6) | 192;
- } else {
- $y = (($code & 4032) >> 6) | 128;
- if ($code < 65536) {
- $z = (($code >> 12) & 15) | 224;
- } else {
- $z = (($code >> 12) & 63) | 128;
- $w = (($code >> 18) & 7) | 240;
- }
- }
- }
- // set up the actual character
- $ret = '';
- if ($w) {
- $ret .= chr($w);
- }
- if ($z) {
- $ret .= chr($z);
- }
- if ($y) {
- $ret .= chr($y);
- }
- $ret .= chr($x);
-
- return $ret;
- }
-
- /**
- * @return bool
- */
- public static function iconvAvailable()
- {
- static $iconv = null;
- if ($iconv === null) {
- $iconv = function_exists('iconv') && self::testIconvTruncateBug() != self::ICONV_UNUSABLE;
- }
- return $iconv;
- }
-
- /**
- * Convert a string to UTF-8 based on configuration.
- * @param string $str The string to convert
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return string
- */
- public static function convertToUTF8($str, $config, $context)
- {
- $encoding = $config->get('Core.Encoding');
- if ($encoding === 'utf-8') {
- return $str;
- }
- static $iconv = null;
- if ($iconv === null) {
- $iconv = self::iconvAvailable();
- }
- if ($iconv && !$config->get('Test.ForceNoIconv')) {
- // unaffected by bugs, since UTF-8 support all characters
- $str = self::unsafeIconv($encoding, 'utf-8//IGNORE', $str);
- if ($str === false) {
- // $encoding is not a valid encoding
- trigger_error('Invalid encoding ' . $encoding, E_USER_ERROR);
- return '';
- }
- // If the string is bjorked by Shift_JIS or a similar encoding
- // that doesn't support all of ASCII, convert the naughty
- // characters to their true byte-wise ASCII/UTF-8 equivalents.
- $str = strtr($str, self::testEncodingSupportsASCII($encoding));
- return $str;
- } elseif ($encoding === 'iso-8859-1') {
- $str = utf8_encode($str);
- return $str;
- }
- $bug = HTMLPurifier_Encoder::testIconvTruncateBug();
- if ($bug == self::ICONV_OK) {
- trigger_error('Encoding not supported, please install iconv', E_USER_ERROR);
- } else {
- trigger_error(
- 'You have a buggy version of iconv, see https://bugs.php.net/bug.php?id=48147 ' .
- 'and http://sourceware.org/bugzilla/show_bug.cgi?id=13541',
- E_USER_ERROR
- );
- }
- }
-
- /**
- * Converts a string from UTF-8 based on configuration.
- * @param string $str The string to convert
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return string
- * @note Currently, this is a lossy conversion, with unexpressable
- * characters being omitted.
- */
- public static function convertFromUTF8($str, $config, $context)
- {
- $encoding = $config->get('Core.Encoding');
- if ($escape = $config->get('Core.EscapeNonASCIICharacters')) {
- $str = self::convertToASCIIDumbLossless($str);
- }
- if ($encoding === 'utf-8') {
- return $str;
- }
- static $iconv = null;
- if ($iconv === null) {
- $iconv = self::iconvAvailable();
- }
- if ($iconv && !$config->get('Test.ForceNoIconv')) {
- // Undo our previous fix in convertToUTF8, otherwise iconv will barf
- $ascii_fix = self::testEncodingSupportsASCII($encoding);
- if (!$escape && !empty($ascii_fix)) {
- $clear_fix = array();
- foreach ($ascii_fix as $utf8 => $native) {
- $clear_fix[$utf8] = '';
- }
- $str = strtr($str, $clear_fix);
- }
- $str = strtr($str, array_flip($ascii_fix));
- // Normal stuff
- $str = self::iconv('utf-8', $encoding . '//IGNORE', $str);
- return $str;
- } elseif ($encoding === 'iso-8859-1') {
- $str = utf8_decode($str);
- return $str;
- }
- trigger_error('Encoding not supported', E_USER_ERROR);
- // You might be tempted to assume that the ASCII representation
- // might be OK, however, this is *not* universally true over all
- // encodings. So we take the conservative route here, rather
- // than forcibly turn on %Core.EscapeNonASCIICharacters
- }
-
- /**
- * Lossless (character-wise) conversion of HTML to ASCII
- * @param string $str UTF-8 string to be converted to ASCII
- * @return string ASCII encoded string with non-ASCII character entity-ized
- * @warning Adapted from MediaWiki, claiming fair use: this is a common
- * algorithm. If you disagree with this license fudgery,
- * implement it yourself.
- * @note Uses decimal numeric entities since they are best supported.
- * @note This is a DUMB function: it has no concept of keeping
- * character entities that the projected character encoding
- * can allow. We could possibly implement a smart version
- * but that would require it to also know which Unicode
- * codepoints the charset supported (not an easy task).
- * @note Sort of with cleanUTF8() but it assumes that $str is
- * well-formed UTF-8
- */
- public static function convertToASCIIDumbLossless($str)
- {
- $bytesleft = 0;
- $result = '';
- $working = 0;
- $len = strlen($str);
- for ($i = 0; $i < $len; $i++) {
- $bytevalue = ord($str[$i]);
- if ($bytevalue <= 0x7F) { //0xxx xxxx
- $result .= chr($bytevalue);
- $bytesleft = 0;
- } elseif ($bytevalue <= 0xBF) { //10xx xxxx
- $working = $working << 6;
- $working += ($bytevalue & 0x3F);
- $bytesleft--;
- if ($bytesleft <= 0) {
- $result .= "&#" . $working . ";";
- }
- } elseif ($bytevalue <= 0xDF) { //110x xxxx
- $working = $bytevalue & 0x1F;
- $bytesleft = 1;
- } elseif ($bytevalue <= 0xEF) { //1110 xxxx
- $working = $bytevalue & 0x0F;
- $bytesleft = 2;
- } else { //1111 0xxx
- $working = $bytevalue & 0x07;
- $bytesleft = 3;
- }
- }
- return $result;
- }
-
- /** No bugs detected in iconv. */
- const ICONV_OK = 0;
-
- /** Iconv truncates output if converting from UTF-8 to another
- * character set with //IGNORE, and a non-encodable character is found */
- const ICONV_TRUNCATES = 1;
-
- /** Iconv does not support //IGNORE, making it unusable for
- * transcoding purposes */
- const ICONV_UNUSABLE = 2;
-
- /**
- * glibc iconv has a known bug where it doesn't handle the magic
- * //IGNORE stanza correctly. In particular, rather than ignore
- * characters, it will return an EILSEQ after consuming some number
- * of characters, and expect you to restart iconv as if it were
- * an E2BIG. Old versions of PHP did not respect the errno, and
- * returned the fragment, so as a result you would see iconv
- * mysteriously truncating output. We can work around this by
- * manually chopping our input into segments of about 8000
- * characters, as long as PHP ignores the error code. If PHP starts
- * paying attention to the error code, iconv becomes unusable.
- *
- * @return int Error code indicating severity of bug.
- */
- public static function testIconvTruncateBug()
- {
- static $code = null;
- if ($code === null) {
- // better not use iconv, otherwise infinite loop!
- $r = self::unsafeIconv('utf-8', 'ascii//IGNORE', "\xCE\xB1" . str_repeat('a', 9000));
- if ($r === false) {
- $code = self::ICONV_UNUSABLE;
- } elseif (($c = strlen($r)) < 9000) {
- $code = self::ICONV_TRUNCATES;
- } elseif ($c > 9000) {
- trigger_error(
- 'Your copy of iconv is extremely buggy. Please notify HTML Purifier maintainers: ' .
- 'include your iconv version as per phpversion()',
- E_USER_ERROR
- );
- } else {
- $code = self::ICONV_OK;
- }
- }
- return $code;
- }
-
- /**
- * This expensive function tests whether or not a given character
- * encoding supports ASCII. 7/8-bit encodings like Shift_JIS will
- * fail this test, and require special processing. Variable width
- * encodings shouldn't ever fail.
- *
- * @param string $encoding Encoding name to test, as per iconv format
- * @param bool $bypass Whether or not to bypass the precompiled arrays.
- * @return Array of UTF-8 characters to their corresponding ASCII,
- * which can be used to "undo" any overzealous iconv action.
- */
- public static function testEncodingSupportsASCII($encoding, $bypass = false)
- {
- // All calls to iconv here are unsafe, proof by case analysis:
- // If ICONV_OK, no difference.
- // If ICONV_TRUNCATE, all calls involve one character inputs,
- // so bug is not triggered.
- // If ICONV_UNUSABLE, this call is irrelevant
- static $encodings = array();
- if (!$bypass) {
- if (isset($encodings[$encoding])) {
- return $encodings[$encoding];
- }
- $lenc = strtolower($encoding);
- switch ($lenc) {
- case 'shift_jis':
- return array("\xC2\xA5" => '\\', "\xE2\x80\xBE" => '~');
- case 'johab':
- return array("\xE2\x82\xA9" => '\\');
- }
- if (strpos($lenc, 'iso-8859-') === 0) {
- return array();
- }
- }
- $ret = array();
- if (self::unsafeIconv('UTF-8', $encoding, 'a') === false) {
- return false;
- }
- for ($i = 0x20; $i <= 0x7E; $i++) { // all printable ASCII chars
- $c = chr($i); // UTF-8 char
- $r = self::unsafeIconv('UTF-8', "$encoding//IGNORE", $c); // initial conversion
- if ($r === '' ||
- // This line is needed for iconv implementations that do not
- // omit characters that do not exist in the target character set
- ($r === $c && self::unsafeIconv($encoding, 'UTF-8//IGNORE', $r) !== $c)
- ) {
- // Reverse engineer: what's the UTF-8 equiv of this byte
- // sequence? This assumes that there's no variable width
- // encoding that doesn't support ASCII.
- $ret[self::unsafeIconv($encoding, 'UTF-8//IGNORE', $c)] = $c;
- }
- }
- $encodings[$encoding] = $ret;
- return $ret;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * A UTF-8 specific character encoder that handles cleaning and transforming.
+ * @note All functions in this class should be static.
+ */
+class HTMLPurifier_Encoder
+{
+
+ /**
+ * Constructor throws fatal error if you attempt to instantiate class
+ */
+ private function __construct()
+ {
+ trigger_error('Cannot instantiate encoder, call methods statically', E_USER_ERROR);
+ }
+
+ /**
+ * Error-handler that mutes errors, alternative to shut-up operator.
+ */
+ public static function muteErrorHandler()
+ {
+ }
+
+ /**
+ * iconv wrapper which mutes errors, but doesn't work around bugs.
+ * @param string $in Input encoding
+ * @param string $out Output encoding
+ * @param string $text The text to convert
+ * @return string
+ */
+ public static function unsafeIconv($in, $out, $text)
+ {
+ set_error_handler(array('HTMLPurifier_Encoder', 'muteErrorHandler'));
+ $r = iconv($in, $out, $text);
+ restore_error_handler();
+ return $r;
+ }
+
+ /**
+ * iconv wrapper which mutes errors and works around bugs.
+ * @param string $in Input encoding
+ * @param string $out Output encoding
+ * @param string $text The text to convert
+ * @param int $max_chunk_size
+ * @return string
+ */
+ public static function iconv($in, $out, $text, $max_chunk_size = 8000)
+ {
+ $code = self::testIconvTruncateBug();
+ if ($code == self::ICONV_OK) {
+ return self::unsafeIconv($in, $out, $text);
+ } elseif ($code == self::ICONV_TRUNCATES) {
+ // we can only work around this if the input character set
+ // is utf-8
+ if ($in == 'utf-8') {
+ if ($max_chunk_size < 4) {
+ trigger_error('max_chunk_size is too small', E_USER_WARNING);
+ return false;
+ }
+ // split into 8000 byte chunks, but be careful to handle
+ // multibyte boundaries properly
+ if (($c = strlen($text)) <= $max_chunk_size) {
+ return self::unsafeIconv($in, $out, $text);
+ }
+ $r = '';
+ $i = 0;
+ while (true) {
+ if ($i + $max_chunk_size >= $c) {
+ $r .= self::unsafeIconv($in, $out, substr($text, $i));
+ break;
+ }
+ // wibble the boundary
+ if (0x80 != (0xC0 & ord($text[$i + $max_chunk_size]))) {
+ $chunk_size = $max_chunk_size;
+ } elseif (0x80 != (0xC0 & ord($text[$i + $max_chunk_size - 1]))) {
+ $chunk_size = $max_chunk_size - 1;
+ } elseif (0x80 != (0xC0 & ord($text[$i + $max_chunk_size - 2]))) {
+ $chunk_size = $max_chunk_size - 2;
+ } elseif (0x80 != (0xC0 & ord($text[$i + $max_chunk_size - 3]))) {
+ $chunk_size = $max_chunk_size - 3;
+ } else {
+ return false; // rather confusing UTF-8...
+ }
+ $chunk = substr($text, $i, $chunk_size); // substr doesn't mind overlong lengths
+ $r .= self::unsafeIconv($in, $out, $chunk);
+ $i += $chunk_size;
+ }
+ return $r;
+ } else {
+ return false;
+ }
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Cleans a UTF-8 string for well-formedness and SGML validity
+ *
+ * It will parse according to UTF-8 and return a valid UTF8 string, with
+ * non-SGML codepoints excluded.
+ *
+ * @param string $str The string to clean
+ * @param bool $force_php
+ * @return string
+ *
+ * @note Just for reference, the non-SGML code points are 0 to 31 and
+ * 127 to 159, inclusive. However, we allow code points 9, 10
+ * and 13, which are the tab, line feed and carriage return
+ * respectively. 128 and above the code points map to multibyte
+ * UTF-8 representations.
+ *
+ * @note Fallback code adapted from utf8ToUnicode by Henri Sivonen and
+ * hsivonen@iki.fi at <http://iki.fi/hsivonen/php-utf8/> under the
+ * LGPL license. Notes on what changed are inside, but in general,
+ * the original code transformed UTF-8 text into an array of integer
+ * Unicode codepoints. Understandably, transforming that back to
+ * a string would be somewhat expensive, so the function was modded to
+ * directly operate on the string. However, this discourages code
+ * reuse, and the logic enumerated here would be useful for any
+ * function that needs to be able to understand UTF-8 characters.
+ * As of right now, only smart lossless character encoding converters
+ * would need that, and I'm probably not going to implement them.
+ * Once again, PHP 6 should solve all our problems.
+ */
+ public static function cleanUTF8($str, $force_php = false)
+ {
+ // UTF-8 validity is checked since PHP 4.3.5
+ // This is an optimization: if the string is already valid UTF-8, no
+ // need to do PHP stuff. 99% of the time, this will be the case.
+ // The regexp matches the XML char production, as well as well as excluding
+ // non-SGML codepoints U+007F to U+009F
+ if (preg_match(
+ '/^[\x{9}\x{A}\x{D}\x{20}-\x{7E}\x{A0}-\x{D7FF}\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]*$/Du',
+ $str
+ )) {
+ return $str;
+ }
+
+ $mState = 0; // cached expected number of octets after the current octet
+ // until the beginning of the next UTF8 character sequence
+ $mUcs4 = 0; // cached Unicode character
+ $mBytes = 1; // cached expected number of octets in the current sequence
+
+ // original code involved an $out that was an array of Unicode
+ // codepoints. Instead of having to convert back into UTF-8, we've
+ // decided to directly append valid UTF-8 characters onto a string
+ // $out once they're done. $char accumulates raw bytes, while $mUcs4
+ // turns into the Unicode code point, so there's some redundancy.
+
+ $out = '';
+ $char = '';
+
+ $len = strlen($str);
+ for ($i = 0; $i < $len; $i++) {
+ $in = ord($str{$i});
+ $char .= $str[$i]; // append byte to char
+ if (0 == $mState) {
+ // When mState is zero we expect either a US-ASCII character
+ // or a multi-octet sequence.
+ if (0 == (0x80 & ($in))) {
+ // US-ASCII, pass straight through.
+ if (($in <= 31 || $in == 127) &&
+ !($in == 9 || $in == 13 || $in == 10) // save \r\t\n
+ ) {
+ // control characters, remove
+ } else {
+ $out .= $char;
+ }
+ // reset
+ $char = '';
+ $mBytes = 1;
+ } elseif (0xC0 == (0xE0 & ($in))) {
+ // First octet of 2 octet sequence
+ $mUcs4 = ($in);
+ $mUcs4 = ($mUcs4 & 0x1F) << 6;
+ $mState = 1;
+ $mBytes = 2;
+ } elseif (0xE0 == (0xF0 & ($in))) {
+ // First octet of 3 octet sequence
+ $mUcs4 = ($in);
+ $mUcs4 = ($mUcs4 & 0x0F) << 12;
+ $mState = 2;
+ $mBytes = 3;
+ } elseif (0xF0 == (0xF8 & ($in))) {
+ // First octet of 4 octet sequence
+ $mUcs4 = ($in);
+ $mUcs4 = ($mUcs4 & 0x07) << 18;
+ $mState = 3;
+ $mBytes = 4;
+ } elseif (0xF8 == (0xFC & ($in))) {
+ // First octet of 5 octet sequence.
+ //
+ // This is illegal because the encoded codepoint must be
+ // either:
+ // (a) not the shortest form or
+ // (b) outside the Unicode range of 0-0x10FFFF.
+ // Rather than trying to resynchronize, we will carry on
+ // until the end of the sequence and let the later error
+ // handling code catch it.
+ $mUcs4 = ($in);
+ $mUcs4 = ($mUcs4 & 0x03) << 24;
+ $mState = 4;
+ $mBytes = 5;
+ } elseif (0xFC == (0xFE & ($in))) {
+ // First octet of 6 octet sequence, see comments for 5
+ // octet sequence.
+ $mUcs4 = ($in);
+ $mUcs4 = ($mUcs4 & 1) << 30;
+ $mState = 5;
+ $mBytes = 6;
+ } else {
+ // Current octet is neither in the US-ASCII range nor a
+ // legal first octet of a multi-octet sequence.
+ $mState = 0;
+ $mUcs4 = 0;
+ $mBytes = 1;
+ $char = '';
+ }
+ } else {
+ // When mState is non-zero, we expect a continuation of the
+ // multi-octet sequence
+ if (0x80 == (0xC0 & ($in))) {
+ // Legal continuation.
+ $shift = ($mState - 1) * 6;
+ $tmp = $in;
+ $tmp = ($tmp & 0x0000003F) << $shift;
+ $mUcs4 |= $tmp;
+
+ if (0 == --$mState) {
+ // End of the multi-octet sequence. mUcs4 now contains
+ // the final Unicode codepoint to be output
+
+ // Check for illegal sequences and codepoints.
+
+ // From Unicode 3.1, non-shortest form is illegal
+ if (((2 == $mBytes) && ($mUcs4 < 0x0080)) ||
+ ((3 == $mBytes) && ($mUcs4 < 0x0800)) ||
+ ((4 == $mBytes) && ($mUcs4 < 0x10000)) ||
+ (4 < $mBytes) ||
+ // From Unicode 3.2, surrogate characters = illegal
+ (($mUcs4 & 0xFFFFF800) == 0xD800) ||
+ // Codepoints outside the Unicode range are illegal
+ ($mUcs4 > 0x10FFFF)
+ ) {
+
+ } elseif (0xFEFF != $mUcs4 && // omit BOM
+ // check for valid Char unicode codepoints
+ (
+ 0x9 == $mUcs4 ||
+ 0xA == $mUcs4 ||
+ 0xD == $mUcs4 ||
+ (0x20 <= $mUcs4 && 0x7E >= $mUcs4) ||
+ // 7F-9F is not strictly prohibited by XML,
+ // but it is non-SGML, and thus we don't allow it
+ (0xA0 <= $mUcs4 && 0xD7FF >= $mUcs4) ||
+ (0x10000 <= $mUcs4 && 0x10FFFF >= $mUcs4)
+ )
+ ) {
+ $out .= $char;
+ }
+ // initialize UTF8 cache (reset)
+ $mState = 0;
+ $mUcs4 = 0;
+ $mBytes = 1;
+ $char = '';
+ }
+ } else {
+ // ((0xC0 & (*in) != 0x80) && (mState != 0))
+ // Incomplete multi-octet sequence.
+ // used to result in complete fail, but we'll reset
+ $mState = 0;
+ $mUcs4 = 0;
+ $mBytes = 1;
+ $char ='';
+ }
+ }
+ }
+ return $out;
+ }
+
+ /**
+ * Translates a Unicode codepoint into its corresponding UTF-8 character.
+ * @note Based on Feyd's function at
+ * <http://forums.devnetwork.net/viewtopic.php?p=191404#191404>,
+ * which is in public domain.
+ * @note While we're going to do code point parsing anyway, a good
+ * optimization would be to refuse to translate code points that
+ * are non-SGML characters. However, this could lead to duplication.
+ * @note This is very similar to the unichr function in
+ * maintenance/generate-entity-file.php (although this is superior,
+ * due to its sanity checks).
+ */
+
+ // +----------+----------+----------+----------+
+ // | 33222222 | 22221111 | 111111 | |
+ // | 10987654 | 32109876 | 54321098 | 76543210 | bit
+ // +----------+----------+----------+----------+
+ // | | | | 0xxxxxxx | 1 byte 0x00000000..0x0000007F
+ // | | | 110yyyyy | 10xxxxxx | 2 byte 0x00000080..0x000007FF
+ // | | 1110zzzz | 10yyyyyy | 10xxxxxx | 3 byte 0x00000800..0x0000FFFF
+ // | 11110www | 10wwzzzz | 10yyyyyy | 10xxxxxx | 4 byte 0x00010000..0x0010FFFF
+ // +----------+----------+----------+----------+
+ // | 00000000 | 00011111 | 11111111 | 11111111 | Theoretical upper limit of legal scalars: 2097151 (0x001FFFFF)
+ // | 00000000 | 00010000 | 11111111 | 11111111 | Defined upper limit of legal scalar codes
+ // +----------+----------+----------+----------+
+
+ public static function unichr($code)
+ {
+ if ($code > 1114111 or $code < 0 or
+ ($code >= 55296 and $code <= 57343) ) {
+ // bits are set outside the "valid" range as defined
+ // by UNICODE 4.1.0
+ return '';
+ }
+
+ $x = $y = $z = $w = 0;
+ if ($code < 128) {
+ // regular ASCII character
+ $x = $code;
+ } else {
+ // set up bits for UTF-8
+ $x = ($code & 63) | 128;
+ if ($code < 2048) {
+ $y = (($code & 2047) >> 6) | 192;
+ } else {
+ $y = (($code & 4032) >> 6) | 128;
+ if ($code < 65536) {
+ $z = (($code >> 12) & 15) | 224;
+ } else {
+ $z = (($code >> 12) & 63) | 128;
+ $w = (($code >> 18) & 7) | 240;
+ }
+ }
+ }
+ // set up the actual character
+ $ret = '';
+ if ($w) {
+ $ret .= chr($w);
+ }
+ if ($z) {
+ $ret .= chr($z);
+ }
+ if ($y) {
+ $ret .= chr($y);
+ }
+ $ret .= chr($x);
+
+ return $ret;
+ }
+
+ /**
+ * @return bool
+ */
+ public static function iconvAvailable()
+ {
+ static $iconv = null;
+ if ($iconv === null) {
+ $iconv = function_exists('iconv') && self::testIconvTruncateBug() != self::ICONV_UNUSABLE;
+ }
+ return $iconv;
+ }
+
+ /**
+ * Convert a string to UTF-8 based on configuration.
+ * @param string $str The string to convert
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return string
+ */
+ public static function convertToUTF8($str, $config, $context)
+ {
+ $encoding = $config->get('Core.Encoding');
+ if ($encoding === 'utf-8') {
+ return $str;
+ }
+ static $iconv = null;
+ if ($iconv === null) {
+ $iconv = self::iconvAvailable();
+ }
+ if ($iconv && !$config->get('Test.ForceNoIconv')) {
+ // unaffected by bugs, since UTF-8 support all characters
+ $str = self::unsafeIconv($encoding, 'utf-8//IGNORE', $str);
+ if ($str === false) {
+ // $encoding is not a valid encoding
+ trigger_error('Invalid encoding ' . $encoding, E_USER_ERROR);
+ return '';
+ }
+ // If the string is bjorked by Shift_JIS or a similar encoding
+ // that doesn't support all of ASCII, convert the naughty
+ // characters to their true byte-wise ASCII/UTF-8 equivalents.
+ $str = strtr($str, self::testEncodingSupportsASCII($encoding));
+ return $str;
+ } elseif ($encoding === 'iso-8859-1') {
+ $str = utf8_encode($str);
+ return $str;
+ }
+ $bug = HTMLPurifier_Encoder::testIconvTruncateBug();
+ if ($bug == self::ICONV_OK) {
+ trigger_error('Encoding not supported, please install iconv', E_USER_ERROR);
+ } else {
+ trigger_error(
+ 'You have a buggy version of iconv, see https://bugs.php.net/bug.php?id=48147 ' .
+ 'and http://sourceware.org/bugzilla/show_bug.cgi?id=13541',
+ E_USER_ERROR
+ );
+ }
+ }
+
+ /**
+ * Converts a string from UTF-8 based on configuration.
+ * @param string $str The string to convert
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return string
+ * @note Currently, this is a lossy conversion, with unexpressable
+ * characters being omitted.
+ */
+ public static function convertFromUTF8($str, $config, $context)
+ {
+ $encoding = $config->get('Core.Encoding');
+ if ($escape = $config->get('Core.EscapeNonASCIICharacters')) {
+ $str = self::convertToASCIIDumbLossless($str);
+ }
+ if ($encoding === 'utf-8') {
+ return $str;
+ }
+ static $iconv = null;
+ if ($iconv === null) {
+ $iconv = self::iconvAvailable();
+ }
+ if ($iconv && !$config->get('Test.ForceNoIconv')) {
+ // Undo our previous fix in convertToUTF8, otherwise iconv will barf
+ $ascii_fix = self::testEncodingSupportsASCII($encoding);
+ if (!$escape && !empty($ascii_fix)) {
+ $clear_fix = array();
+ foreach ($ascii_fix as $utf8 => $native) {
+ $clear_fix[$utf8] = '';
+ }
+ $str = strtr($str, $clear_fix);
+ }
+ $str = strtr($str, array_flip($ascii_fix));
+ // Normal stuff
+ $str = self::iconv('utf-8', $encoding . '//IGNORE', $str);
+ return $str;
+ } elseif ($encoding === 'iso-8859-1') {
+ $str = utf8_decode($str);
+ return $str;
+ }
+ trigger_error('Encoding not supported', E_USER_ERROR);
+ // You might be tempted to assume that the ASCII representation
+ // might be OK, however, this is *not* universally true over all
+ // encodings. So we take the conservative route here, rather
+ // than forcibly turn on %Core.EscapeNonASCIICharacters
+ }
+
+ /**
+ * Lossless (character-wise) conversion of HTML to ASCII
+ * @param string $str UTF-8 string to be converted to ASCII
+ * @return string ASCII encoded string with non-ASCII character entity-ized
+ * @warning Adapted from MediaWiki, claiming fair use: this is a common
+ * algorithm. If you disagree with this license fudgery,
+ * implement it yourself.
+ * @note Uses decimal numeric entities since they are best supported.
+ * @note This is a DUMB function: it has no concept of keeping
+ * character entities that the projected character encoding
+ * can allow. We could possibly implement a smart version
+ * but that would require it to also know which Unicode
+ * codepoints the charset supported (not an easy task).
+ * @note Sort of with cleanUTF8() but it assumes that $str is
+ * well-formed UTF-8
+ */
+ public static function convertToASCIIDumbLossless($str)
+ {
+ $bytesleft = 0;
+ $result = '';
+ $working = 0;
+ $len = strlen($str);
+ for ($i = 0; $i < $len; $i++) {
+ $bytevalue = ord($str[$i]);
+ if ($bytevalue <= 0x7F) { //0xxx xxxx
+ $result .= chr($bytevalue);
+ $bytesleft = 0;
+ } elseif ($bytevalue <= 0xBF) { //10xx xxxx
+ $working = $working << 6;
+ $working += ($bytevalue & 0x3F);
+ $bytesleft--;
+ if ($bytesleft <= 0) {
+ $result .= "&#" . $working . ";";
+ }
+ } elseif ($bytevalue <= 0xDF) { //110x xxxx
+ $working = $bytevalue & 0x1F;
+ $bytesleft = 1;
+ } elseif ($bytevalue <= 0xEF) { //1110 xxxx
+ $working = $bytevalue & 0x0F;
+ $bytesleft = 2;
+ } else { //1111 0xxx
+ $working = $bytevalue & 0x07;
+ $bytesleft = 3;
+ }
+ }
+ return $result;
+ }
+
+ /** No bugs detected in iconv. */
+ const ICONV_OK = 0;
+
+ /** Iconv truncates output if converting from UTF-8 to another
+ * character set with //IGNORE, and a non-encodable character is found */
+ const ICONV_TRUNCATES = 1;
+
+ /** Iconv does not support //IGNORE, making it unusable for
+ * transcoding purposes */
+ const ICONV_UNUSABLE = 2;
+
+ /**
+ * glibc iconv has a known bug where it doesn't handle the magic
+ * //IGNORE stanza correctly. In particular, rather than ignore
+ * characters, it will return an EILSEQ after consuming some number
+ * of characters, and expect you to restart iconv as if it were
+ * an E2BIG. Old versions of PHP did not respect the errno, and
+ * returned the fragment, so as a result you would see iconv
+ * mysteriously truncating output. We can work around this by
+ * manually chopping our input into segments of about 8000
+ * characters, as long as PHP ignores the error code. If PHP starts
+ * paying attention to the error code, iconv becomes unusable.
+ *
+ * @return int Error code indicating severity of bug.
+ */
+ public static function testIconvTruncateBug()
+ {
+ static $code = null;
+ if ($code === null) {
+ // better not use iconv, otherwise infinite loop!
+ $r = self::unsafeIconv('utf-8', 'ascii//IGNORE', "\xCE\xB1" . str_repeat('a', 9000));
+ if ($r === false) {
+ $code = self::ICONV_UNUSABLE;
+ } elseif (($c = strlen($r)) < 9000) {
+ $code = self::ICONV_TRUNCATES;
+ } elseif ($c > 9000) {
+ trigger_error(
+ 'Your copy of iconv is extremely buggy. Please notify HTML Purifier maintainers: ' .
+ 'include your iconv version as per phpversion()',
+ E_USER_ERROR
+ );
+ } else {
+ $code = self::ICONV_OK;
+ }
+ }
+ return $code;
+ }
+
+ /**
+ * This expensive function tests whether or not a given character
+ * encoding supports ASCII. 7/8-bit encodings like Shift_JIS will
+ * fail this test, and require special processing. Variable width
+ * encodings shouldn't ever fail.
+ *
+ * @param string $encoding Encoding name to test, as per iconv format
+ * @param bool $bypass Whether or not to bypass the precompiled arrays.
+ * @return Array of UTF-8 characters to their corresponding ASCII,
+ * which can be used to "undo" any overzealous iconv action.
+ */
+ public static function testEncodingSupportsASCII($encoding, $bypass = false)
+ {
+ // All calls to iconv here are unsafe, proof by case analysis:
+ // If ICONV_OK, no difference.
+ // If ICONV_TRUNCATE, all calls involve one character inputs,
+ // so bug is not triggered.
+ // If ICONV_UNUSABLE, this call is irrelevant
+ static $encodings = array();
+ if (!$bypass) {
+ if (isset($encodings[$encoding])) {
+ return $encodings[$encoding];
+ }
+ $lenc = strtolower($encoding);
+ switch ($lenc) {
+ case 'shift_jis':
+ return array("\xC2\xA5" => '\\', "\xE2\x80\xBE" => '~');
+ case 'johab':
+ return array("\xE2\x82\xA9" => '\\');
+ }
+ if (strpos($lenc, 'iso-8859-') === 0) {
+ return array();
+ }
+ }
+ $ret = array();
+ if (self::unsafeIconv('UTF-8', $encoding, 'a') === false) {
+ return false;
+ }
+ for ($i = 0x20; $i <= 0x7E; $i++) { // all printable ASCII chars
+ $c = chr($i); // UTF-8 char
+ $r = self::unsafeIconv('UTF-8', "$encoding//IGNORE", $c); // initial conversion
+ if ($r === '' ||
+ // This line is needed for iconv implementations that do not
+ // omit characters that do not exist in the target character set
+ ($r === $c && self::unsafeIconv($encoding, 'UTF-8//IGNORE', $r) !== $c)
+ ) {
+ // Reverse engineer: what's the UTF-8 equiv of this byte
+ // sequence? This assumes that there's no variable width
+ // encoding that doesn't support ASCII.
+ $ret[self::unsafeIconv($encoding, 'UTF-8//IGNORE', $c)] = $c;
+ }
+ }
+ $encodings[$encoding] = $ret;
+ return $ret;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/EntityLookup.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/EntityLookup.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/EntityLookup.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/EntityLookup.php
index cb3474e..f12ff13 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/EntityLookup.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/EntityLookup.php
@@ -1,48 +1,48 @@
-<?php
-
-/**
- * Object that provides entity lookup table from entity name to character
- */
-class HTMLPurifier_EntityLookup
-{
- /**
- * Assoc array of entity name to character represented.
- * @type array
- */
- public $table;
-
- /**
- * Sets up the entity lookup table from the serialized file contents.
- * @param bool $file
- * @note The serialized contents are versioned, but were generated
- * using the maintenance script generate_entity_file.php
- * @warning This is not in constructor to help enforce the Singleton
- */
- public function setup($file = false)
- {
- if (!$file) {
- $file = HTMLPURIFIER_PREFIX . '/HTMLPurifier/EntityLookup/entities.ser';
- }
- $this->table = unserialize(file_get_contents($file));
- }
-
- /**
- * Retrieves sole instance of the object.
- * @param bool|HTMLPurifier_EntityLookup $prototype Optional prototype of custom lookup table to overload with.
- * @return HTMLPurifier_EntityLookup
- */
- public static function instance($prototype = false)
- {
- // no references, since PHP doesn't copy unless modified
- static $instance = null;
- if ($prototype) {
- $instance = $prototype;
- } elseif (!$instance) {
- $instance = new HTMLPurifier_EntityLookup();
- $instance->setup();
- }
- return $instance;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Object that provides entity lookup table from entity name to character
+ */
+class HTMLPurifier_EntityLookup
+{
+ /**
+ * Assoc array of entity name to character represented.
+ * @type array
+ */
+ public $table;
+
+ /**
+ * Sets up the entity lookup table from the serialized file contents.
+ * @param bool $file
+ * @note The serialized contents are versioned, but were generated
+ * using the maintenance script generate_entity_file.php
+ * @warning This is not in constructor to help enforce the Singleton
+ */
+ public function setup($file = false)
+ {
+ if (!$file) {
+ $file = HTMLPURIFIER_PREFIX . '/HTMLPurifier/EntityLookup/entities.ser';
+ }
+ $this->table = unserialize(file_get_contents($file));
+ }
+
+ /**
+ * Retrieves sole instance of the object.
+ * @param bool|HTMLPurifier_EntityLookup $prototype Optional prototype of custom lookup table to overload with.
+ * @return HTMLPurifier_EntityLookup
+ */
+ public static function instance($prototype = false)
+ {
+ // no references, since PHP doesn't copy unless modified
+ static $instance = null;
+ if ($prototype) {
+ $instance = $prototype;
+ } elseif (!$instance) {
+ $instance = new HTMLPurifier_EntityLookup();
+ $instance->setup();
+ }
+ return $instance;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/EntityLookup/entities.ser b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/EntityLookup/entities.ser
similarity index 100%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/EntityLookup/entities.ser
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/EntityLookup/entities.ser
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/EntityParser.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/EntityParser.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/EntityParser.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/EntityParser.php
index 432a4f9..61529dc 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/EntityParser.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/EntityParser.php
@@ -1,153 +1,153 @@
-<?php
-
-// if want to implement error collecting here, we'll need to use some sort
-// of global data (probably trigger_error) because it's impossible to pass
-// $config or $context to the callback functions.
-
-/**
- * Handles referencing and derefencing character entities
- */
-class HTMLPurifier_EntityParser
-{
-
- /**
- * Reference to entity lookup table.
- * @type HTMLPurifier_EntityLookup
- */
- protected $_entity_lookup;
-
- /**
- * Callback regex string for parsing entities.
- * @type string
- */
- protected $_substituteEntitiesRegex =
- '/&(?:[#]x([a-fA-F0-9]+)|[#]0*(\d+)|([A-Za-z_:][A-Za-z0-9.\-_:]*));?/';
- // 1. hex 2. dec 3. string (XML style)
-
- /**
- * Decimal to parsed string conversion table for special entities.
- * @type array
- */
- protected $_special_dec2str =
- array(
- 34 => '"',
- 38 => '&',
- 39 => "'",
- 60 => '<',
- 62 => '>'
- );
-
- /**
- * Stripped entity names to decimal conversion table for special entities.
- * @type array
- */
- protected $_special_ent2dec =
- array(
- 'quot' => 34,
- 'amp' => 38,
- 'lt' => 60,
- 'gt' => 62
- );
-
- /**
- * Substitutes non-special entities with their parsed equivalents. Since
- * running this whenever you have parsed character is t3h 5uck, we run
- * it before everything else.
- *
- * @param string $string String to have non-special entities parsed.
- * @return string Parsed string.
- */
- public function substituteNonSpecialEntities($string)
- {
- // it will try to detect missing semicolons, but don't rely on it
- return preg_replace_callback(
- $this->_substituteEntitiesRegex,
- array($this, 'nonSpecialEntityCallback'),
- $string
- );
- }
-
- /**
- * Callback function for substituteNonSpecialEntities() that does the work.
- *
- * @param array $matches PCRE matches array, with 0 the entire match, and
- * either index 1, 2 or 3 set with a hex value, dec value,
- * or string (respectively).
- * @return string Replacement string.
- */
-
- protected function nonSpecialEntityCallback($matches)
- {
- // replaces all but big five
- $entity = $matches[0];
- $is_num = (@$matches[0][1] === '#');
- if ($is_num) {
- $is_hex = (@$entity[2] === 'x');
- $code = $is_hex ? hexdec($matches[1]) : (int) $matches[2];
- // abort for special characters
- if (isset($this->_special_dec2str[$code])) {
- return $entity;
- }
- return HTMLPurifier_Encoder::unichr($code);
- } else {
- if (isset($this->_special_ent2dec[$matches[3]])) {
- return $entity;
- }
- if (!$this->_entity_lookup) {
- $this->_entity_lookup = HTMLPurifier_EntityLookup::instance();
- }
- if (isset($this->_entity_lookup->table[$matches[3]])) {
- return $this->_entity_lookup->table[$matches[3]];
- } else {
- return $entity;
- }
- }
- }
-
- /**
- * Substitutes only special entities with their parsed equivalents.
- *
- * @notice We try to avoid calling this function because otherwise, it
- * would have to be called a lot (for every parsed section).
- *
- * @param string $string String to have non-special entities parsed.
- * @return string Parsed string.
- */
- public function substituteSpecialEntities($string)
- {
- return preg_replace_callback(
- $this->_substituteEntitiesRegex,
- array($this, 'specialEntityCallback'),
- $string
- );
- }
-
- /**
- * Callback function for substituteSpecialEntities() that does the work.
- *
- * This callback has same syntax as nonSpecialEntityCallback().
- *
- * @param array $matches PCRE-style matches array, with 0 the entire match, and
- * either index 1, 2 or 3 set with a hex value, dec value,
- * or string (respectively).
- * @return string Replacement string.
- */
- protected function specialEntityCallback($matches)
- {
- $entity = $matches[0];
- $is_num = (@$matches[0][1] === '#');
- if ($is_num) {
- $is_hex = (@$entity[2] === 'x');
- $int = $is_hex ? hexdec($matches[1]) : (int) $matches[2];
- return isset($this->_special_dec2str[$int]) ?
- $this->_special_dec2str[$int] :
- $entity;
- } else {
- return isset($this->_special_ent2dec[$matches[3]]) ?
- $this->_special_ent2dec[$matches[3]] :
- $entity;
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+// if want to implement error collecting here, we'll need to use some sort
+// of global data (probably trigger_error) because it's impossible to pass
+// $config or $context to the callback functions.
+
+/**
+ * Handles referencing and derefencing character entities
+ */
+class HTMLPurifier_EntityParser
+{
+
+ /**
+ * Reference to entity lookup table.
+ * @type HTMLPurifier_EntityLookup
+ */
+ protected $_entity_lookup;
+
+ /**
+ * Callback regex string for parsing entities.
+ * @type string
+ */
+ protected $_substituteEntitiesRegex =
+ '/&(?:[#]x([a-fA-F0-9]+)|[#]0*(\d+)|([A-Za-z_:][A-Za-z0-9.\-_:]*));?/';
+ // 1. hex 2. dec 3. string (XML style)
+
+ /**
+ * Decimal to parsed string conversion table for special entities.
+ * @type array
+ */
+ protected $_special_dec2str =
+ array(
+ 34 => '"',
+ 38 => '&',
+ 39 => "'",
+ 60 => '<',
+ 62 => '>'
+ );
+
+ /**
+ * Stripped entity names to decimal conversion table for special entities.
+ * @type array
+ */
+ protected $_special_ent2dec =
+ array(
+ 'quot' => 34,
+ 'amp' => 38,
+ 'lt' => 60,
+ 'gt' => 62
+ );
+
+ /**
+ * Substitutes non-special entities with their parsed equivalents. Since
+ * running this whenever you have parsed character is t3h 5uck, we run
+ * it before everything else.
+ *
+ * @param string $string String to have non-special entities parsed.
+ * @return string Parsed string.
+ */
+ public function substituteNonSpecialEntities($string)
+ {
+ // it will try to detect missing semicolons, but don't rely on it
+ return preg_replace_callback(
+ $this->_substituteEntitiesRegex,
+ array($this, 'nonSpecialEntityCallback'),
+ $string
+ );
+ }
+
+ /**
+ * Callback function for substituteNonSpecialEntities() that does the work.
+ *
+ * @param array $matches PCRE matches array, with 0 the entire match, and
+ * either index 1, 2 or 3 set with a hex value, dec value,
+ * or string (respectively).
+ * @return string Replacement string.
+ */
+
+ protected function nonSpecialEntityCallback($matches)
+ {
+ // replaces all but big five
+ $entity = $matches[0];
+ $is_num = (@$matches[0][1] === '#');
+ if ($is_num) {
+ $is_hex = (@$entity[2] === 'x');
+ $code = $is_hex ? hexdec($matches[1]) : (int) $matches[2];
+ // abort for special characters
+ if (isset($this->_special_dec2str[$code])) {
+ return $entity;
+ }
+ return HTMLPurifier_Encoder::unichr($code);
+ } else {
+ if (isset($this->_special_ent2dec[$matches[3]])) {
+ return $entity;
+ }
+ if (!$this->_entity_lookup) {
+ $this->_entity_lookup = HTMLPurifier_EntityLookup::instance();
+ }
+ if (isset($this->_entity_lookup->table[$matches[3]])) {
+ return $this->_entity_lookup->table[$matches[3]];
+ } else {
+ return $entity;
+ }
+ }
+ }
+
+ /**
+ * Substitutes only special entities with their parsed equivalents.
+ *
+ * @notice We try to avoid calling this function because otherwise, it
+ * would have to be called a lot (for every parsed section).
+ *
+ * @param string $string String to have non-special entities parsed.
+ * @return string Parsed string.
+ */
+ public function substituteSpecialEntities($string)
+ {
+ return preg_replace_callback(
+ $this->_substituteEntitiesRegex,
+ array($this, 'specialEntityCallback'),
+ $string
+ );
+ }
+
+ /**
+ * Callback function for substituteSpecialEntities() that does the work.
+ *
+ * This callback has same syntax as nonSpecialEntityCallback().
+ *
+ * @param array $matches PCRE-style matches array, with 0 the entire match, and
+ * either index 1, 2 or 3 set with a hex value, dec value,
+ * or string (respectively).
+ * @return string Replacement string.
+ */
+ protected function specialEntityCallback($matches)
+ {
+ $entity = $matches[0];
+ $is_num = (@$matches[0][1] === '#');
+ if ($is_num) {
+ $is_hex = (@$entity[2] === 'x');
+ $int = $is_hex ? hexdec($matches[1]) : (int) $matches[2];
+ return isset($this->_special_dec2str[$int]) ?
+ $this->_special_dec2str[$int] :
+ $entity;
+ } else {
+ return isset($this->_special_ent2dec[$matches[3]]) ?
+ $this->_special_ent2dec[$matches[3]] :
+ $entity;
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ErrorCollector.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ErrorCollector.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ErrorCollector.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ErrorCollector.php
index a6cbcaa..d47e3f2 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ErrorCollector.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ErrorCollector.php
@@ -1,244 +1,244 @@
-<?php
-
-/**
- * Error collection class that enables HTML Purifier to report HTML
- * problems back to the user
- */
-class HTMLPurifier_ErrorCollector
-{
-
- /**
- * Identifiers for the returned error array. These are purposely numeric
- * so list() can be used.
- */
- const LINENO = 0;
- const SEVERITY = 1;
- const MESSAGE = 2;
- const CHILDREN = 3;
-
- /**
- * @type array
- */
- protected $errors;
-
- /**
- * @type array
- */
- protected $_current;
-
- /**
- * @type array
- */
- protected $_stacks = array(array());
-
- /**
- * @type HTMLPurifier_Language
- */
- protected $locale;
-
- /**
- * @type HTMLPurifier_Generator
- */
- protected $generator;
-
- /**
- * @type HTMLPurifier_Context
- */
- protected $context;
-
- /**
- * @type array
- */
- protected $lines = array();
-
- /**
- * @param HTMLPurifier_Context $context
- */
- public function __construct($context)
- {
- $this->locale =& $context->get('Locale');
- $this->context = $context;
- $this->_current =& $this->_stacks[0];
- $this->errors =& $this->_stacks[0];
- }
-
- /**
- * Sends an error message to the collector for later use
- * @param int $severity Error severity, PHP error style (don't use E_USER_)
- * @param string $msg Error message text
- */
- public function send($severity, $msg)
- {
- $args = array();
- if (func_num_args() > 2) {
- $args = func_get_args();
- array_shift($args);
- unset($args[0]);
- }
-
- $token = $this->context->get('CurrentToken', true);
- $line = $token ? $token->line : $this->context->get('CurrentLine', true);
- $col = $token ? $token->col : $this->context->get('CurrentCol', true);
- $attr = $this->context->get('CurrentAttr', true);
-
- // perform special substitutions, also add custom parameters
- $subst = array();
- if (!is_null($token)) {
- $args['CurrentToken'] = $token;
- }
- if (!is_null($attr)) {
- $subst['$CurrentAttr.Name'] = $attr;
- if (isset($token->attr[$attr])) {
- $subst['$CurrentAttr.Value'] = $token->attr[$attr];
- }
- }
-
- if (empty($args)) {
- $msg = $this->locale->getMessage($msg);
- } else {
- $msg = $this->locale->formatMessage($msg, $args);
- }
-
- if (!empty($subst)) {
- $msg = strtr($msg, $subst);
- }
-
- // (numerically indexed)
- $error = array(
- self::LINENO => $line,
- self::SEVERITY => $severity,
- self::MESSAGE => $msg,
- self::CHILDREN => array()
- );
- $this->_current[] = $error;
-
- // NEW CODE BELOW ...
- // Top-level errors are either:
- // TOKEN type, if $value is set appropriately, or
- // "syntax" type, if $value is null
- $new_struct = new HTMLPurifier_ErrorStruct();
- $new_struct->type = HTMLPurifier_ErrorStruct::TOKEN;
- if ($token) {
- $new_struct->value = clone $token;
- }
- if (is_int($line) && is_int($col)) {
- if (isset($this->lines[$line][$col])) {
- $struct = $this->lines[$line][$col];
- } else {
- $struct = $this->lines[$line][$col] = $new_struct;
- }
- // These ksorts may present a performance problem
- ksort($this->lines[$line], SORT_NUMERIC);
- } else {
- if (isset($this->lines[-1])) {
- $struct = $this->lines[-1];
- } else {
- $struct = $this->lines[-1] = $new_struct;
- }
- }
- ksort($this->lines, SORT_NUMERIC);
-
- // Now, check if we need to operate on a lower structure
- if (!empty($attr)) {
- $struct = $struct->getChild(HTMLPurifier_ErrorStruct::ATTR, $attr);
- if (!$struct->value) {
- $struct->value = array($attr, 'PUT VALUE HERE');
- }
- }
- if (!empty($cssprop)) {
- $struct = $struct->getChild(HTMLPurifier_ErrorStruct::CSSPROP, $cssprop);
- if (!$struct->value) {
- // if we tokenize CSS this might be a little more difficult to do
- $struct->value = array($cssprop, 'PUT VALUE HERE');
- }
- }
-
- // Ok, structs are all setup, now time to register the error
- $struct->addError($severity, $msg);
- }
-
- /**
- * Retrieves raw error data for custom formatter to use
- */
- public function getRaw()
- {
- return $this->errors;
- }
-
- /**
- * Default HTML formatting implementation for error messages
- * @param HTMLPurifier_Config $config Configuration, vital for HTML output nature
- * @param array $errors Errors array to display; used for recursion.
- * @return string
- */
- public function getHTMLFormatted($config, $errors = null)
- {
- $ret = array();
-
- $this->generator = new HTMLPurifier_Generator($config, $this->context);
- if ($errors === null) {
- $errors = $this->errors;
- }
-
- // 'At line' message needs to be removed
-
- // generation code for new structure goes here. It needs to be recursive.
- foreach ($this->lines as $line => $col_array) {
- if ($line == -1) {
- continue;
- }
- foreach ($col_array as $col => $struct) {
- $this->_renderStruct($ret, $struct, $line, $col);
- }
- }
- if (isset($this->lines[-1])) {
- $this->_renderStruct($ret, $this->lines[-1]);
- }
-
- if (empty($errors)) {
- return '<p>' . $this->locale->getMessage('ErrorCollector: No errors') . '</p>';
- } else {
- return '<ul><li>' . implode('</li><li>', $ret) . '</li></ul>';
- }
-
- }
-
- private function _renderStruct(&$ret, $struct, $line = null, $col = null)
- {
- $stack = array($struct);
- $context_stack = array(array());
- while ($current = array_pop($stack)) {
- $context = array_pop($context_stack);
- foreach ($current->errors as $error) {
- list($severity, $msg) = $error;
- $string = '';
- $string .= '<div>';
- // W3C uses an icon to indicate the severity of the error.
- $error = $this->locale->getErrorName($severity);
- $string .= "<span class=\"error e$severity\"><strong>$error</strong></span> ";
- if (!is_null($line) && !is_null($col)) {
- $string .= "<em class=\"location\">Line $line, Column $col: </em> ";
- } else {
- $string .= '<em class="location">End of Document: </em> ';
- }
- $string .= '<strong class="description">' . $this->generator->escape($msg) . '</strong> ';
- $string .= '</div>';
- // Here, have a marker for the character on the column appropriate.
- // Be sure to clip extremely long lines.
- //$string .= '<pre>';
- //$string .= '';
- //$string .= '</pre>';
- $ret[] = $string;
- }
- foreach ($current->children as $array) {
- $context[] = $current;
- $stack = array_merge($stack, array_reverse($array, true));
- for ($i = count($array); $i > 0; $i--) {
- $context_stack[] = $context;
- }
- }
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Error collection class that enables HTML Purifier to report HTML
+ * problems back to the user
+ */
+class HTMLPurifier_ErrorCollector
+{
+
+ /**
+ * Identifiers for the returned error array. These are purposely numeric
+ * so list() can be used.
+ */
+ const LINENO = 0;
+ const SEVERITY = 1;
+ const MESSAGE = 2;
+ const CHILDREN = 3;
+
+ /**
+ * @type array
+ */
+ protected $errors;
+
+ /**
+ * @type array
+ */
+ protected $_current;
+
+ /**
+ * @type array
+ */
+ protected $_stacks = array(array());
+
+ /**
+ * @type HTMLPurifier_Language
+ */
+ protected $locale;
+
+ /**
+ * @type HTMLPurifier_Generator
+ */
+ protected $generator;
+
+ /**
+ * @type HTMLPurifier_Context
+ */
+ protected $context;
+
+ /**
+ * @type array
+ */
+ protected $lines = array();
+
+ /**
+ * @param HTMLPurifier_Context $context
+ */
+ public function __construct($context)
+ {
+ $this->locale =& $context->get('Locale');
+ $this->context = $context;
+ $this->_current =& $this->_stacks[0];
+ $this->errors =& $this->_stacks[0];
+ }
+
+ /**
+ * Sends an error message to the collector for later use
+ * @param int $severity Error severity, PHP error style (don't use E_USER_)
+ * @param string $msg Error message text
+ */
+ public function send($severity, $msg)
+ {
+ $args = array();
+ if (func_num_args() > 2) {
+ $args = func_get_args();
+ array_shift($args);
+ unset($args[0]);
+ }
+
+ $token = $this->context->get('CurrentToken', true);
+ $line = $token ? $token->line : $this->context->get('CurrentLine', true);
+ $col = $token ? $token->col : $this->context->get('CurrentCol', true);
+ $attr = $this->context->get('CurrentAttr', true);
+
+ // perform special substitutions, also add custom parameters
+ $subst = array();
+ if (!is_null($token)) {
+ $args['CurrentToken'] = $token;
+ }
+ if (!is_null($attr)) {
+ $subst['$CurrentAttr.Name'] = $attr;
+ if (isset($token->attr[$attr])) {
+ $subst['$CurrentAttr.Value'] = $token->attr[$attr];
+ }
+ }
+
+ if (empty($args)) {
+ $msg = $this->locale->getMessage($msg);
+ } else {
+ $msg = $this->locale->formatMessage($msg, $args);
+ }
+
+ if (!empty($subst)) {
+ $msg = strtr($msg, $subst);
+ }
+
+ // (numerically indexed)
+ $error = array(
+ self::LINENO => $line,
+ self::SEVERITY => $severity,
+ self::MESSAGE => $msg,
+ self::CHILDREN => array()
+ );
+ $this->_current[] = $error;
+
+ // NEW CODE BELOW ...
+ // Top-level errors are either:
+ // TOKEN type, if $value is set appropriately, or
+ // "syntax" type, if $value is null
+ $new_struct = new HTMLPurifier_ErrorStruct();
+ $new_struct->type = HTMLPurifier_ErrorStruct::TOKEN;
+ if ($token) {
+ $new_struct->value = clone $token;
+ }
+ if (is_int($line) && is_int($col)) {
+ if (isset($this->lines[$line][$col])) {
+ $struct = $this->lines[$line][$col];
+ } else {
+ $struct = $this->lines[$line][$col] = $new_struct;
+ }
+ // These ksorts may present a performance problem
+ ksort($this->lines[$line], SORT_NUMERIC);
+ } else {
+ if (isset($this->lines[-1])) {
+ $struct = $this->lines[-1];
+ } else {
+ $struct = $this->lines[-1] = $new_struct;
+ }
+ }
+ ksort($this->lines, SORT_NUMERIC);
+
+ // Now, check if we need to operate on a lower structure
+ if (!empty($attr)) {
+ $struct = $struct->getChild(HTMLPurifier_ErrorStruct::ATTR, $attr);
+ if (!$struct->value) {
+ $struct->value = array($attr, 'PUT VALUE HERE');
+ }
+ }
+ if (!empty($cssprop)) {
+ $struct = $struct->getChild(HTMLPurifier_ErrorStruct::CSSPROP, $cssprop);
+ if (!$struct->value) {
+ // if we tokenize CSS this might be a little more difficult to do
+ $struct->value = array($cssprop, 'PUT VALUE HERE');
+ }
+ }
+
+ // Ok, structs are all setup, now time to register the error
+ $struct->addError($severity, $msg);
+ }
+
+ /**
+ * Retrieves raw error data for custom formatter to use
+ */
+ public function getRaw()
+ {
+ return $this->errors;
+ }
+
+ /**
+ * Default HTML formatting implementation for error messages
+ * @param HTMLPurifier_Config $config Configuration, vital for HTML output nature
+ * @param array $errors Errors array to display; used for recursion.
+ * @return string
+ */
+ public function getHTMLFormatted($config, $errors = null)
+ {
+ $ret = array();
+
+ $this->generator = new HTMLPurifier_Generator($config, $this->context);
+ if ($errors === null) {
+ $errors = $this->errors;
+ }
+
+ // 'At line' message needs to be removed
+
+ // generation code for new structure goes here. It needs to be recursive.
+ foreach ($this->lines as $line => $col_array) {
+ if ($line == -1) {
+ continue;
+ }
+ foreach ($col_array as $col => $struct) {
+ $this->_renderStruct($ret, $struct, $line, $col);
+ }
+ }
+ if (isset($this->lines[-1])) {
+ $this->_renderStruct($ret, $this->lines[-1]);
+ }
+
+ if (empty($errors)) {
+ return '<p>' . $this->locale->getMessage('ErrorCollector: No errors') . '</p>';
+ } else {
+ return '<ul><li>' . implode('</li><li>', $ret) . '</li></ul>';
+ }
+
+ }
+
+ private function _renderStruct(&$ret, $struct, $line = null, $col = null)
+ {
+ $stack = array($struct);
+ $context_stack = array(array());
+ while ($current = array_pop($stack)) {
+ $context = array_pop($context_stack);
+ foreach ($current->errors as $error) {
+ list($severity, $msg) = $error;
+ $string = '';
+ $string .= '<div>';
+ // W3C uses an icon to indicate the severity of the error.
+ $error = $this->locale->getErrorName($severity);
+ $string .= "<span class=\"error e$severity\"><strong>$error</strong></span> ";
+ if (!is_null($line) && !is_null($col)) {
+ $string .= "<em class=\"location\">Line $line, Column $col: </em> ";
+ } else {
+ $string .= '<em class="location">End of Document: </em> ';
+ }
+ $string .= '<strong class="description">' . $this->generator->escape($msg) . '</strong> ';
+ $string .= '</div>';
+ // Here, have a marker for the character on the column appropriate.
+ // Be sure to clip extremely long lines.
+ //$string .= '<pre>';
+ //$string .= '';
+ //$string .= '</pre>';
+ $ret[] = $string;
+ }
+ foreach ($current->children as $array) {
+ $context[] = $current;
+ $stack = array_merge($stack, array_reverse($array, true));
+ for ($i = count($array); $i > 0; $i--) {
+ $context_stack[] = $context;
+ }
+ }
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ErrorStruct.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ErrorStruct.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ErrorStruct.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ErrorStruct.php
index a6c0da2..cf869d3 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/ErrorStruct.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/ErrorStruct.php
@@ -1,74 +1,74 @@
-<?php
-
-/**
- * Records errors for particular segments of an HTML document such as tokens,
- * attributes or CSS properties. They can contain error structs (which apply
- * to components of what they represent), but their main purpose is to hold
- * errors applying to whatever struct is being used.
- */
-class HTMLPurifier_ErrorStruct
-{
-
- /**
- * Possible values for $children first-key. Note that top-level structures
- * are automatically token-level.
- */
- const TOKEN = 0;
- const ATTR = 1;
- const CSSPROP = 2;
-
- /**
- * Type of this struct.
- * @type string
- */
- public $type;
-
- /**
- * Value of the struct we are recording errors for. There are various
- * values for this:
- * - TOKEN: Instance of HTMLPurifier_Token
- * - ATTR: array('attr-name', 'value')
- * - CSSPROP: array('prop-name', 'value')
- * @type mixed
- */
- public $value;
-
- /**
- * Errors registered for this structure.
- * @type array
- */
- public $errors = array();
-
- /**
- * Child ErrorStructs that are from this structure. For example, a TOKEN
- * ErrorStruct would contain ATTR ErrorStructs. This is a multi-dimensional
- * array in structure: [TYPE]['identifier']
- * @type array
- */
- public $children = array();
-
- /**
- * @param string $type
- * @param string $id
- * @return mixed
- */
- public function getChild($type, $id)
- {
- if (!isset($this->children[$type][$id])) {
- $this->children[$type][$id] = new HTMLPurifier_ErrorStruct();
- $this->children[$type][$id]->type = $type;
- }
- return $this->children[$type][$id];
- }
-
- /**
- * @param int $severity
- * @param string $message
- */
- public function addError($severity, $message)
- {
- $this->errors[] = array($severity, $message);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Records errors for particular segments of an HTML document such as tokens,
+ * attributes or CSS properties. They can contain error structs (which apply
+ * to components of what they represent), but their main purpose is to hold
+ * errors applying to whatever struct is being used.
+ */
+class HTMLPurifier_ErrorStruct
+{
+
+ /**
+ * Possible values for $children first-key. Note that top-level structures
+ * are automatically token-level.
+ */
+ const TOKEN = 0;
+ const ATTR = 1;
+ const CSSPROP = 2;
+
+ /**
+ * Type of this struct.
+ * @type string
+ */
+ public $type;
+
+ /**
+ * Value of the struct we are recording errors for. There are various
+ * values for this:
+ * - TOKEN: Instance of HTMLPurifier_Token
+ * - ATTR: array('attr-name', 'value')
+ * - CSSPROP: array('prop-name', 'value')
+ * @type mixed
+ */
+ public $value;
+
+ /**
+ * Errors registered for this structure.
+ * @type array
+ */
+ public $errors = array();
+
+ /**
+ * Child ErrorStructs that are from this structure. For example, a TOKEN
+ * ErrorStruct would contain ATTR ErrorStructs. This is a multi-dimensional
+ * array in structure: [TYPE]['identifier']
+ * @type array
+ */
+ public $children = array();
+
+ /**
+ * @param string $type
+ * @param string $id
+ * @return mixed
+ */
+ public function getChild($type, $id)
+ {
+ if (!isset($this->children[$type][$id])) {
+ $this->children[$type][$id] = new HTMLPurifier_ErrorStruct();
+ $this->children[$type][$id]->type = $type;
+ }
+ return $this->children[$type][$id];
+ }
+
+ /**
+ * @param int $severity
+ * @param string $message
+ */
+ public function addError($severity, $message)
+ {
+ $this->errors[] = array($severity, $message);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Exception.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Exception.php
similarity index 93%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Exception.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Exception.php
index defe157..be85b4c 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Exception.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Exception.php
@@ -1,12 +1,12 @@
-<?php
-
-/**
- * Global exception class for HTML Purifier; any exceptions we throw
- * are from here.
- */
-class HTMLPurifier_Exception extends Exception
-{
-
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Global exception class for HTML Purifier; any exceptions we throw
+ * are from here.
+ */
+class HTMLPurifier_Exception extends Exception
+{
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Filter.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Filter.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Filter.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Filter.php
index 2f85b93..c1f41ee 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Filter.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Filter.php
@@ -1,56 +1,56 @@
-<?php
-
-/**
- * Represents a pre or post processing filter on HTML Purifier's output
- *
- * Sometimes, a little ad-hoc fixing of HTML has to be done before
- * it gets sent through HTML Purifier: you can use filters to acheive
- * this effect. For instance, YouTube videos can be preserved using
- * this manner. You could have used a decorator for this task, but
- * PHP's support for them is not terribly robust, so we're going
- * to just loop through the filters.
- *
- * Filters should be exited first in, last out. If there are three filters,
- * named 1, 2 and 3, the order of execution should go 1->preFilter,
- * 2->preFilter, 3->preFilter, purify, 3->postFilter, 2->postFilter,
- * 1->postFilter.
- *
- * @note Methods are not declared abstract as it is perfectly legitimate
- * for an implementation not to want anything to happen on a step
- */
-
-class HTMLPurifier_Filter
-{
-
- /**
- * Name of the filter for identification purposes.
- * @type string
- */
- public $name;
-
- /**
- * Pre-processor function, handles HTML before HTML Purifier
- * @param string $html
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return string
- */
- public function preFilter($html, $config, $context)
- {
- return $html;
- }
-
- /**
- * Post-processor function, handles HTML after HTML Purifier
- * @param string $html
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return string
- */
- public function postFilter($html, $config, $context)
- {
- return $html;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Represents a pre or post processing filter on HTML Purifier's output
+ *
+ * Sometimes, a little ad-hoc fixing of HTML has to be done before
+ * it gets sent through HTML Purifier: you can use filters to acheive
+ * this effect. For instance, YouTube videos can be preserved using
+ * this manner. You could have used a decorator for this task, but
+ * PHP's support for them is not terribly robust, so we're going
+ * to just loop through the filters.
+ *
+ * Filters should be exited first in, last out. If there are three filters,
+ * named 1, 2 and 3, the order of execution should go 1->preFilter,
+ * 2->preFilter, 3->preFilter, purify, 3->postFilter, 2->postFilter,
+ * 1->postFilter.
+ *
+ * @note Methods are not declared abstract as it is perfectly legitimate
+ * for an implementation not to want anything to happen on a step
+ */
+
+class HTMLPurifier_Filter
+{
+
+ /**
+ * Name of the filter for identification purposes.
+ * @type string
+ */
+ public $name;
+
+ /**
+ * Pre-processor function, handles HTML before HTML Purifier
+ * @param string $html
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return string
+ */
+ public function preFilter($html, $config, $context)
+ {
+ return $html;
+ }
+
+ /**
+ * Post-processor function, handles HTML after HTML Purifier
+ * @param string $html
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return string
+ */
+ public function postFilter($html, $config, $context)
+ {
+ return $html;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Filter/ExtractStyleBlocks.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
index 9a115d8..08e62c1 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
@@ -1,338 +1,338 @@
-<?php
-
-// why is this a top level function? Because PHP 5.2.0 doesn't seem to
-// understand how to interpret this filter if it's a static method.
-// It's all really silly, but if we go this route it might be reasonable
-// to coalesce all of these methods into one.
-function htmlpurifier_filter_extractstyleblocks_muteerrorhandler()
-{
-}
-
-/**
- * This filter extracts <style> blocks from input HTML, cleans them up
- * using CSSTidy, and then places them in $purifier->context->get('StyleBlocks')
- * so they can be used elsewhere in the document.
- *
- * @note
- * See tests/HTMLPurifier/Filter/ExtractStyleBlocksTest.php for
- * sample usage.
- *
- * @note
- * This filter can also be used on stylesheets not included in the
- * document--something purists would probably prefer. Just directly
- * call HTMLPurifier_Filter_ExtractStyleBlocks->cleanCSS()
- */
-class HTMLPurifier_Filter_ExtractStyleBlocks extends HTMLPurifier_Filter
-{
- /**
- * @type string
- */
- public $name = 'ExtractStyleBlocks';
-
- /**
- * @type array
- */
- private $_styleMatches = array();
-
- /**
- * @type csstidy
- */
- private $_tidy;
-
- /**
- * @type HTMLPurifier_AttrDef_HTML_ID
- */
- private $_id_attrdef;
-
- /**
- * @type HTMLPurifier_AttrDef_CSS_Ident
- */
- private $_class_attrdef;
-
- /**
- * @type HTMLPurifier_AttrDef_Enum
- */
- private $_enum_attrdef;
-
- public function __construct()
- {
- $this->_tidy = new csstidy();
- $this->_tidy->set_cfg('lowercase_s', false);
- $this->_id_attrdef = new HTMLPurifier_AttrDef_HTML_ID(true);
- $this->_class_attrdef = new HTMLPurifier_AttrDef_CSS_Ident();
- $this->_enum_attrdef = new HTMLPurifier_AttrDef_Enum(
- array(
- 'first-child',
- 'link',
- 'visited',
- 'active',
- 'hover',
- 'focus'
- )
- );
- }
-
- /**
- * Save the contents of CSS blocks to style matches
- * @param array $matches preg_replace style $matches array
- */
- protected function styleCallback($matches)
- {
- $this->_styleMatches[] = $matches[1];
- }
-
- /**
- * Removes inline <style> tags from HTML, saves them for later use
- * @param string $html
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return string
- * @todo Extend to indicate non-text/css style blocks
- */
- public function preFilter($html, $config, $context)
- {
- $tidy = $config->get('Filter.ExtractStyleBlocks.TidyImpl');
- if ($tidy !== null) {
- $this->_tidy = $tidy;
- }
- $html = preg_replace_callback('#<style(?:\s.*)?>(.+)</style>#isU', array($this, 'styleCallback'), $html);
- $style_blocks = $this->_styleMatches;
- $this->_styleMatches = array(); // reset
- $context->register('StyleBlocks', $style_blocks); // $context must not be reused
- if ($this->_tidy) {
- foreach ($style_blocks as &$style) {
- $style = $this->cleanCSS($style, $config, $context);
- }
- }
- return $html;
- }
-
- /**
- * Takes CSS (the stuff found in <style>) and cleans it.
- * @warning Requires CSSTidy <http://csstidy.sourceforge.net/>
- * @param string $css CSS styling to clean
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @throws HTMLPurifier_Exception
- * @return string Cleaned CSS
- */
- public function cleanCSS($css, $config, $context)
- {
- // prepare scope
- $scope = $config->get('Filter.ExtractStyleBlocks.Scope');
- if ($scope !== null) {
- $scopes = array_map('trim', explode(',', $scope));
- } else {
- $scopes = array();
- }
- // remove comments from CSS
- $css = trim($css);
- if (strncmp('<!--', $css, 4) === 0) {
- $css = substr($css, 4);
- }
- if (strlen($css) > 3 && substr($css, -3) == '-->') {
- $css = substr($css, 0, -3);
- }
- $css = trim($css);
- set_error_handler('htmlpurifier_filter_extractstyleblocks_muteerrorhandler');
- $this->_tidy->parse($css);
- restore_error_handler();
- $css_definition = $config->getDefinition('CSS');
- $html_definition = $config->getDefinition('HTML');
- $new_css = array();
- foreach ($this->_tidy->css as $k => $decls) {
- // $decls are all CSS declarations inside an @ selector
- $new_decls = array();
- foreach ($decls as $selector => $style) {
- $selector = trim($selector);
- if ($selector === '') {
- continue;
- } // should not happen
- // Parse the selector
- // Here is the relevant part of the CSS grammar:
- //
- // ruleset
- // : selector [ ',' S* selector ]* '{' ...
- // selector
- // : simple_selector [ combinator selector | S+ [ combinator? selector ]? ]?
- // combinator
- // : '+' S*
- // : '>' S*
- // simple_selector
- // : element_name [ HASH | class | attrib | pseudo ]*
- // | [ HASH | class | attrib | pseudo ]+
- // element_name
- // : IDENT | '*'
- // ;
- // class
- // : '.' IDENT
- // ;
- // attrib
- // : '[' S* IDENT S* [ [ '=' | INCLUDES | DASHMATCH ] S*
- // [ IDENT | STRING ] S* ]? ']'
- // ;
- // pseudo
- // : ':' [ IDENT | FUNCTION S* [IDENT S*]? ')' ]
- // ;
- //
- // For reference, here are the relevant tokens:
- //
- // HASH #{name}
- // IDENT {ident}
- // INCLUDES ==
- // DASHMATCH |=
- // STRING {string}
- // FUNCTION {ident}\(
- //
- // And the lexical scanner tokens
- //
- // name {nmchar}+
- // nmchar [_a-z0-9-]|{nonascii}|{escape}
- // nonascii [\240-\377]
- // escape {unicode}|\\[^\r\n\f0-9a-f]
- // unicode \\{h}}{1,6}(\r\n|[ \t\r\n\f])?
- // ident -?{nmstart}{nmchar*}
- // nmstart [_a-z]|{nonascii}|{escape}
- // string {string1}|{string2}
- // string1 \"([^\n\r\f\\"]|\\{nl}|{escape})*\"
- // string2 \'([^\n\r\f\\"]|\\{nl}|{escape})*\'
- //
- // We'll implement a subset (in order to reduce attack
- // surface); in particular:
- //
- // - No Unicode support
- // - No escapes support
- // - No string support (by proxy no attrib support)
- // - element_name is matched against allowed
- // elements (some people might find this
- // annoying...)
- // - Pseudo-elements one of :first-child, :link,
- // :visited, :active, :hover, :focus
-
- // handle ruleset
- $selectors = array_map('trim', explode(',', $selector));
- $new_selectors = array();
- foreach ($selectors as $sel) {
- // split on +, > and spaces
- $basic_selectors = preg_split('/\s*([+> ])\s*/', $sel, -1, PREG_SPLIT_DELIM_CAPTURE);
- // even indices are chunks, odd indices are
- // delimiters
- $nsel = null;
- $delim = null; // guaranteed to be non-null after
- // two loop iterations
- for ($i = 0, $c = count($basic_selectors); $i < $c; $i++) {
- $x = $basic_selectors[$i];
- if ($i % 2) {
- // delimiter
- if ($x === ' ') {
- $delim = ' ';
- } else {
- $delim = ' ' . $x . ' ';
- }
- } else {
- // simple selector
- $components = preg_split('/([#.:])/', $x, -1, PREG_SPLIT_DELIM_CAPTURE);
- $sdelim = null;
- $nx = null;
- for ($j = 0, $cc = count($components); $j < $cc; $j++) {
- $y = $components[$j];
- if ($j === 0) {
- if ($y === '*' || isset($html_definition->info[$y = strtolower($y)])) {
- $nx = $y;
- } else {
- // $nx stays null; this matters
- // if we don't manage to find
- // any valid selector content,
- // in which case we ignore the
- // outer $delim
- }
- } elseif ($j % 2) {
- // set delimiter
- $sdelim = $y;
- } else {
- $attrdef = null;
- if ($sdelim === '#') {
- $attrdef = $this->_id_attrdef;
- } elseif ($sdelim === '.') {
- $attrdef = $this->_class_attrdef;
- } elseif ($sdelim === ':') {
- $attrdef = $this->_enum_attrdef;
- } else {
- throw new HTMLPurifier_Exception('broken invariant sdelim and preg_split');
- }
- $r = $attrdef->validate($y, $config, $context);
- if ($r !== false) {
- if ($r !== true) {
- $y = $r;
- }
- if ($nx === null) {
- $nx = '';
- }
- $nx .= $sdelim . $y;
- }
- }
- }
- if ($nx !== null) {
- if ($nsel === null) {
- $nsel = $nx;
- } else {
- $nsel .= $delim . $nx;
- }
- } else {
- // delimiters to the left of invalid
- // basic selector ignored
- }
- }
- }
- if ($nsel !== null) {
- if (!empty($scopes)) {
- foreach ($scopes as $s) {
- $new_selectors[] = "$s $nsel";
- }
- } else {
- $new_selectors[] = $nsel;
- }
- }
- }
- if (empty($new_selectors)) {
- continue;
- }
- $selector = implode(', ', $new_selectors);
- foreach ($style as $name => $value) {
- if (!isset($css_definition->info[$name])) {
- unset($style[$name]);
- continue;
- }
- $def = $css_definition->info[$name];
- $ret = $def->validate($value, $config, $context);
- if ($ret === false) {
- unset($style[$name]);
- } else {
- $style[$name] = $ret;
- }
- }
- $new_decls[$selector] = $style;
- }
- $new_css[$k] = $new_decls;
- }
- // remove stuff that shouldn't be used, could be reenabled
- // after security risks are analyzed
- $this->_tidy->css = $new_css;
- $this->_tidy->import = array();
- $this->_tidy->charset = null;
- $this->_tidy->namespace = null;
- $css = $this->_tidy->print->plain();
- // we are going to escape any special characters <>& to ensure
- // that no funny business occurs (i.e. </style> in a font-family prop).
- if ($config->get('Filter.ExtractStyleBlocks.Escaping')) {
- $css = str_replace(
- array('<', '>', '&'),
- array('\3C ', '\3E ', '\26 '),
- $css
- );
- }
- return $css;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+// why is this a top level function? Because PHP 5.2.0 doesn't seem to
+// understand how to interpret this filter if it's a static method.
+// It's all really silly, but if we go this route it might be reasonable
+// to coalesce all of these methods into one.
+function htmlpurifier_filter_extractstyleblocks_muteerrorhandler()
+{
+}
+
+/**
+ * This filter extracts <style> blocks from input HTML, cleans them up
+ * using CSSTidy, and then places them in $purifier->context->get('StyleBlocks')
+ * so they can be used elsewhere in the document.
+ *
+ * @note
+ * See tests/HTMLPurifier/Filter/ExtractStyleBlocksTest.php for
+ * sample usage.
+ *
+ * @note
+ * This filter can also be used on stylesheets not included in the
+ * document--something purists would probably prefer. Just directly
+ * call HTMLPurifier_Filter_ExtractStyleBlocks->cleanCSS()
+ */
+class HTMLPurifier_Filter_ExtractStyleBlocks extends HTMLPurifier_Filter
+{
+ /**
+ * @type string
+ */
+ public $name = 'ExtractStyleBlocks';
+
+ /**
+ * @type array
+ */
+ private $_styleMatches = array();
+
+ /**
+ * @type csstidy
+ */
+ private $_tidy;
+
+ /**
+ * @type HTMLPurifier_AttrDef_HTML_ID
+ */
+ private $_id_attrdef;
+
+ /**
+ * @type HTMLPurifier_AttrDef_CSS_Ident
+ */
+ private $_class_attrdef;
+
+ /**
+ * @type HTMLPurifier_AttrDef_Enum
+ */
+ private $_enum_attrdef;
+
+ public function __construct()
+ {
+ $this->_tidy = new csstidy();
+ $this->_tidy->set_cfg('lowercase_s', false);
+ $this->_id_attrdef = new HTMLPurifier_AttrDef_HTML_ID(true);
+ $this->_class_attrdef = new HTMLPurifier_AttrDef_CSS_Ident();
+ $this->_enum_attrdef = new HTMLPurifier_AttrDef_Enum(
+ array(
+ 'first-child',
+ 'link',
+ 'visited',
+ 'active',
+ 'hover',
+ 'focus'
+ )
+ );
+ }
+
+ /**
+ * Save the contents of CSS blocks to style matches
+ * @param array $matches preg_replace style $matches array
+ */
+ protected function styleCallback($matches)
+ {
+ $this->_styleMatches[] = $matches[1];
+ }
+
+ /**
+ * Removes inline <style> tags from HTML, saves them for later use
+ * @param string $html
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return string
+ * @todo Extend to indicate non-text/css style blocks
+ */
+ public function preFilter($html, $config, $context)
+ {
+ $tidy = $config->get('Filter.ExtractStyleBlocks.TidyImpl');
+ if ($tidy !== null) {
+ $this->_tidy = $tidy;
+ }
+ $html = preg_replace_callback('#<style(?:\s.*)?>(.+)</style>#isU', array($this, 'styleCallback'), $html);
+ $style_blocks = $this->_styleMatches;
+ $this->_styleMatches = array(); // reset
+ $context->register('StyleBlocks', $style_blocks); // $context must not be reused
+ if ($this->_tidy) {
+ foreach ($style_blocks as &$style) {
+ $style = $this->cleanCSS($style, $config, $context);
+ }
+ }
+ return $html;
+ }
+
+ /**
+ * Takes CSS (the stuff found in <style>) and cleans it.
+ * @warning Requires CSSTidy <http://csstidy.sourceforge.net/>
+ * @param string $css CSS styling to clean
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @throws HTMLPurifier_Exception
+ * @return string Cleaned CSS
+ */
+ public function cleanCSS($css, $config, $context)
+ {
+ // prepare scope
+ $scope = $config->get('Filter.ExtractStyleBlocks.Scope');
+ if ($scope !== null) {
+ $scopes = array_map('trim', explode(',', $scope));
+ } else {
+ $scopes = array();
+ }
+ // remove comments from CSS
+ $css = trim($css);
+ if (strncmp('<!--', $css, 4) === 0) {
+ $css = substr($css, 4);
+ }
+ if (strlen($css) > 3 && substr($css, -3) == '-->') {
+ $css = substr($css, 0, -3);
+ }
+ $css = trim($css);
+ set_error_handler('htmlpurifier_filter_extractstyleblocks_muteerrorhandler');
+ $this->_tidy->parse($css);
+ restore_error_handler();
+ $css_definition = $config->getDefinition('CSS');
+ $html_definition = $config->getDefinition('HTML');
+ $new_css = array();
+ foreach ($this->_tidy->css as $k => $decls) {
+ // $decls are all CSS declarations inside an @ selector
+ $new_decls = array();
+ foreach ($decls as $selector => $style) {
+ $selector = trim($selector);
+ if ($selector === '') {
+ continue;
+ } // should not happen
+ // Parse the selector
+ // Here is the relevant part of the CSS grammar:
+ //
+ // ruleset
+ // : selector [ ',' S* selector ]* '{' ...
+ // selector
+ // : simple_selector [ combinator selector | S+ [ combinator? selector ]? ]?
+ // combinator
+ // : '+' S*
+ // : '>' S*
+ // simple_selector
+ // : element_name [ HASH | class | attrib | pseudo ]*
+ // | [ HASH | class | attrib | pseudo ]+
+ // element_name
+ // : IDENT | '*'
+ // ;
+ // class
+ // : '.' IDENT
+ // ;
+ // attrib
+ // : '[' S* IDENT S* [ [ '=' | INCLUDES | DASHMATCH ] S*
+ // [ IDENT | STRING ] S* ]? ']'
+ // ;
+ // pseudo
+ // : ':' [ IDENT | FUNCTION S* [IDENT S*]? ')' ]
+ // ;
+ //
+ // For reference, here are the relevant tokens:
+ //
+ // HASH #{name}
+ // IDENT {ident}
+ // INCLUDES ==
+ // DASHMATCH |=
+ // STRING {string}
+ // FUNCTION {ident}\(
+ //
+ // And the lexical scanner tokens
+ //
+ // name {nmchar}+
+ // nmchar [_a-z0-9-]|{nonascii}|{escape}
+ // nonascii [\240-\377]
+ // escape {unicode}|\\[^\r\n\f0-9a-f]
+ // unicode \\{h}}{1,6}(\r\n|[ \t\r\n\f])?
+ // ident -?{nmstart}{nmchar*}
+ // nmstart [_a-z]|{nonascii}|{escape}
+ // string {string1}|{string2}
+ // string1 \"([^\n\r\f\\"]|\\{nl}|{escape})*\"
+ // string2 \'([^\n\r\f\\"]|\\{nl}|{escape})*\'
+ //
+ // We'll implement a subset (in order to reduce attack
+ // surface); in particular:
+ //
+ // - No Unicode support
+ // - No escapes support
+ // - No string support (by proxy no attrib support)
+ // - element_name is matched against allowed
+ // elements (some people might find this
+ // annoying...)
+ // - Pseudo-elements one of :first-child, :link,
+ // :visited, :active, :hover, :focus
+
+ // handle ruleset
+ $selectors = array_map('trim', explode(',', $selector));
+ $new_selectors = array();
+ foreach ($selectors as $sel) {
+ // split on +, > and spaces
+ $basic_selectors = preg_split('/\s*([+> ])\s*/', $sel, -1, PREG_SPLIT_DELIM_CAPTURE);
+ // even indices are chunks, odd indices are
+ // delimiters
+ $nsel = null;
+ $delim = null; // guaranteed to be non-null after
+ // two loop iterations
+ for ($i = 0, $c = count($basic_selectors); $i < $c; $i++) {
+ $x = $basic_selectors[$i];
+ if ($i % 2) {
+ // delimiter
+ if ($x === ' ') {
+ $delim = ' ';
+ } else {
+ $delim = ' ' . $x . ' ';
+ }
+ } else {
+ // simple selector
+ $components = preg_split('/([#.:])/', $x, -1, PREG_SPLIT_DELIM_CAPTURE);
+ $sdelim = null;
+ $nx = null;
+ for ($j = 0, $cc = count($components); $j < $cc; $j++) {
+ $y = $components[$j];
+ if ($j === 0) {
+ if ($y === '*' || isset($html_definition->info[$y = strtolower($y)])) {
+ $nx = $y;
+ } else {
+ // $nx stays null; this matters
+ // if we don't manage to find
+ // any valid selector content,
+ // in which case we ignore the
+ // outer $delim
+ }
+ } elseif ($j % 2) {
+ // set delimiter
+ $sdelim = $y;
+ } else {
+ $attrdef = null;
+ if ($sdelim === '#') {
+ $attrdef = $this->_id_attrdef;
+ } elseif ($sdelim === '.') {
+ $attrdef = $this->_class_attrdef;
+ } elseif ($sdelim === ':') {
+ $attrdef = $this->_enum_attrdef;
+ } else {
+ throw new HTMLPurifier_Exception('broken invariant sdelim and preg_split');
+ }
+ $r = $attrdef->validate($y, $config, $context);
+ if ($r !== false) {
+ if ($r !== true) {
+ $y = $r;
+ }
+ if ($nx === null) {
+ $nx = '';
+ }
+ $nx .= $sdelim . $y;
+ }
+ }
+ }
+ if ($nx !== null) {
+ if ($nsel === null) {
+ $nsel = $nx;
+ } else {
+ $nsel .= $delim . $nx;
+ }
+ } else {
+ // delimiters to the left of invalid
+ // basic selector ignored
+ }
+ }
+ }
+ if ($nsel !== null) {
+ if (!empty($scopes)) {
+ foreach ($scopes as $s) {
+ $new_selectors[] = "$s $nsel";
+ }
+ } else {
+ $new_selectors[] = $nsel;
+ }
+ }
+ }
+ if (empty($new_selectors)) {
+ continue;
+ }
+ $selector = implode(', ', $new_selectors);
+ foreach ($style as $name => $value) {
+ if (!isset($css_definition->info[$name])) {
+ unset($style[$name]);
+ continue;
+ }
+ $def = $css_definition->info[$name];
+ $ret = $def->validate($value, $config, $context);
+ if ($ret === false) {
+ unset($style[$name]);
+ } else {
+ $style[$name] = $ret;
+ }
+ }
+ $new_decls[$selector] = $style;
+ }
+ $new_css[$k] = $new_decls;
+ }
+ // remove stuff that shouldn't be used, could be reenabled
+ // after security risks are analyzed
+ $this->_tidy->css = $new_css;
+ $this->_tidy->import = array();
+ $this->_tidy->charset = null;
+ $this->_tidy->namespace = null;
+ $css = $this->_tidy->print->plain();
+ // we are going to escape any special characters <>& to ensure
+ // that no funny business occurs (i.e. </style> in a font-family prop).
+ if ($config->get('Filter.ExtractStyleBlocks.Escaping')) {
+ $css = str_replace(
+ array('<', '>', '&'),
+ array('\3C ', '\3E ', '\26 '),
+ $css
+ );
+ }
+ return $css;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Filter/YouTube.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Filter/YouTube.php
similarity index 81%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Filter/YouTube.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Filter/YouTube.php
index 9200802..276d836 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Filter/YouTube.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Filter/YouTube.php
@@ -1,65 +1,65 @@
-<?php
-
-class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
-{
-
- /**
- * @type string
- */
- public $name = 'YouTube';
-
- /**
- * @param string $html
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return string
- */
- public function preFilter($html, $config, $context)
- {
- $pre_regex = '#<object[^>]+>.+?' .
- 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s';
- $pre_replace = '<span class="youtube-embed">\1</span>';
- return preg_replace($pre_regex, $pre_replace, $html);
- }
-
- /**
- * @param string $html
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return string
- */
- public function postFilter($html, $config, $context)
- {
- $post_regex = '#<span class="youtube-embed">((?:v|cp)/[A-Za-z0-9\-_=]+)</span>#';
- return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html);
- }
-
- /**
- * @param $url
- * @return string
- */
- protected function armorUrl($url)
- {
- return str_replace('--', '--', $url);
- }
-
- /**
- * @param array $matches
- * @return string
- */
- protected function postFilterCallback($matches)
- {
- $url = $this->armorUrl($matches[1]);
- return '<object width="425" height="350" type="application/x-shockwave-flash" ' .
- 'data="http://www.youtube.com/' . $url . '">' .
- '<param name="movie" value="http://www.youtube.com/' . $url . '"></param>' .
- '<!--[if IE]>' .
- '<embed src="http://www.youtube.com/' . $url . '"' .
- 'type="application/x-shockwave-flash"' .
- 'wmode="transparent" width="425" height="350" />' .
- '<![endif]-->' .
- '</object>';
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
+{
+
+ /**
+ * @type string
+ */
+ public $name = 'YouTube';
+
+ /**
+ * @param string $html
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return string
+ */
+ public function preFilter($html, $config, $context)
+ {
+ $pre_regex = '#<object[^>]+>.+?' .
+ '(?:http:)?//www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s';
+ $pre_replace = '<span class="youtube-embed">\1</span>';
+ return preg_replace($pre_regex, $pre_replace, $html);
+ }
+
+ /**
+ * @param string $html
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return string
+ */
+ public function postFilter($html, $config, $context)
+ {
+ $post_regex = '#<span class="youtube-embed">((?:v|cp)/[A-Za-z0-9\-_=]+)</span>#';
+ return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html);
+ }
+
+ /**
+ * @param $url
+ * @return string
+ */
+ protected function armorUrl($url)
+ {
+ return str_replace('--', '--', $url);
+ }
+
+ /**
+ * @param array $matches
+ * @return string
+ */
+ protected function postFilterCallback($matches)
+ {
+ $url = $this->armorUrl($matches[1]);
+ return '<object width="425" height="350" type="application/x-shockwave-flash" ' .
+ 'data="//www.youtube.com/' . $url . '">' .
+ '<param name="movie" value="//www.youtube.com/' . $url . '"></param>' .
+ '<!--[if IE]>' .
+ '<embed src="//www.youtube.com/' . $url . '"' .
+ 'type="application/x-shockwave-flash"' .
+ 'wmode="transparent" width="425" height="350" />' .
+ '<![endif]-->' .
+ '</object>';
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Generator.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Generator.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Generator.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Generator.php
index ca76ba6..6fb5687 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Generator.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Generator.php
@@ -1,286 +1,286 @@
-<?php
-
-/**
- * Generates HTML from tokens.
- * @todo Refactor interface so that configuration/context is determined
- * upon instantiation, no need for messy generateFromTokens() calls
- * @todo Make some of the more internal functions protected, and have
- * unit tests work around that
- */
-class HTMLPurifier_Generator
-{
-
- /**
- * Whether or not generator should produce XML output.
- * @type bool
- */
- private $_xhtml = true;
-
- /**
- * :HACK: Whether or not generator should comment the insides of <script> tags.
- * @type bool
- */
- private $_scriptFix = false;
-
- /**
- * Cache of HTMLDefinition during HTML output to determine whether or
- * not attributes should be minimized.
- * @type HTMLPurifier_HTMLDefinition
- */
- private $_def;
-
- /**
- * Cache of %Output.SortAttr.
- * @type bool
- */
- private $_sortAttr;
-
- /**
- * Cache of %Output.FlashCompat.
- * @type bool
- */
- private $_flashCompat;
-
- /**
- * Cache of %Output.FixInnerHTML.
- * @type bool
- */
- private $_innerHTMLFix;
-
- /**
- * Stack for keeping track of object information when outputting IE
- * compatibility code.
- * @type array
- */
- private $_flashStack = array();
-
- /**
- * Configuration for the generator
- * @type HTMLPurifier_Config
- */
- protected $config;
-
- /**
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- */
- public function __construct($config, $context)
- {
- $this->config = $config;
- $this->_scriptFix = $config->get('Output.CommentScriptContents');
- $this->_innerHTMLFix = $config->get('Output.FixInnerHTML');
- $this->_sortAttr = $config->get('Output.SortAttr');
- $this->_flashCompat = $config->get('Output.FlashCompat');
- $this->_def = $config->getHTMLDefinition();
- $this->_xhtml = $this->_def->doctype->xml;
- }
-
- /**
- * Generates HTML from an array of tokens.
- * @param HTMLPurifier_Token[] $tokens Array of HTMLPurifier_Token
- * @return string Generated HTML
- */
- public function generateFromTokens($tokens)
- {
- if (!$tokens) {
- return '';
- }
-
- // Basic algorithm
- $html = '';
- for ($i = 0, $size = count($tokens); $i < $size; $i++) {
- if ($this->_scriptFix && $tokens[$i]->name === 'script'
- && $i + 2 < $size && $tokens[$i+2] instanceof HTMLPurifier_Token_End) {
- // script special case
- // the contents of the script block must be ONE token
- // for this to work.
- $html .= $this->generateFromToken($tokens[$i++]);
- $html .= $this->generateScriptFromToken($tokens[$i++]);
- }
- $html .= $this->generateFromToken($tokens[$i]);
- }
-
- // Tidy cleanup
- if (extension_loaded('tidy') && $this->config->get('Output.TidyFormat')) {
- $tidy = new Tidy;
- $tidy->parseString(
- $html,
- array(
- 'indent'=> true,
- 'output-xhtml' => $this->_xhtml,
- 'show-body-only' => true,
- 'indent-spaces' => 2,
- 'wrap' => 68,
- ),
- 'utf8'
- );
- $tidy->cleanRepair();
- $html = (string) $tidy; // explicit cast necessary
- }
-
- // Normalize newlines to system defined value
- if ($this->config->get('Core.NormalizeNewlines')) {
- $nl = $this->config->get('Output.Newline');
- if ($nl === null) {
- $nl = PHP_EOL;
- }
- if ($nl !== "\n") {
- $html = str_replace("\n", $nl, $html);
- }
- }
- return $html;
- }
-
- /**
- * Generates HTML from a single token.
- * @param HTMLPurifier_Token $token HTMLPurifier_Token object.
- * @return string Generated HTML
- */
- public function generateFromToken($token)
- {
- if (!$token instanceof HTMLPurifier_Token) {
- trigger_error('Cannot generate HTML from non-HTMLPurifier_Token object', E_USER_WARNING);
- return '';
-
- } elseif ($token instanceof HTMLPurifier_Token_Start) {
- $attr = $this->generateAttributes($token->attr, $token->name);
- if ($this->_flashCompat) {
- if ($token->name == "object") {
- $flash = new stdclass();
- $flash->attr = $token->attr;
- $flash->param = array();
- $this->_flashStack[] = $flash;
- }
- }
- return '<' . $token->name . ($attr ? ' ' : '') . $attr . '>';
-
- } elseif ($token instanceof HTMLPurifier_Token_End) {
- $_extra = '';
- if ($this->_flashCompat) {
- if ($token->name == "object" && !empty($this->_flashStack)) {
- // doesn't do anything for now
- }
- }
- return $_extra . '</' . $token->name . '>';
-
- } elseif ($token instanceof HTMLPurifier_Token_Empty) {
- if ($this->_flashCompat && $token->name == "param" && !empty($this->_flashStack)) {
- $this->_flashStack[count($this->_flashStack)-1]->param[$token->attr['name']] = $token->attr['value'];
- }
- $attr = $this->generateAttributes($token->attr, $token->name);
- return '<' . $token->name . ($attr ? ' ' : '') . $attr .
- ( $this->_xhtml ? ' /': '' ) // <br /> v. <br>
- . '>';
-
- } elseif ($token instanceof HTMLPurifier_Token_Text) {
- return $this->escape($token->data, ENT_NOQUOTES);
-
- } elseif ($token instanceof HTMLPurifier_Token_Comment) {
- return '<!--' . $token->data . '-->';
- } else {
- return '';
-
- }
- }
-
- /**
- * Special case processor for the contents of script tags
- * @param HTMLPurifier_Token $token HTMLPurifier_Token object.
- * @return string
- * @warning This runs into problems if there's already a literal
- * --> somewhere inside the script contents.
- */
- public function generateScriptFromToken($token)
- {
- if (!$token instanceof HTMLPurifier_Token_Text) {
- return $this->generateFromToken($token);
- }
- // Thanks <http://lachy.id.au/log/2005/05/script-comments>
- $data = preg_replace('#//\s*$#', '', $token->data);
- return '<!--//--><![CDATA[//><!--' . "\n" . trim($data) . "\n" . '//--><!]]>';
- }
-
- /**
- * Generates attribute declarations from attribute array.
- * @note This does not include the leading or trailing space.
- * @param array $assoc_array_of_attributes Attribute array
- * @param string $element Name of element attributes are for, used to check
- * attribute minimization.
- * @return string Generated HTML fragment for insertion.
- */
- public function generateAttributes($assoc_array_of_attributes, $element = '')
- {
- $html = '';
- if ($this->_sortAttr) {
- ksort($assoc_array_of_attributes);
- }
- foreach ($assoc_array_of_attributes as $key => $value) {
- if (!$this->_xhtml) {
- // Remove namespaced attributes
- if (strpos($key, ':') !== false) {
- continue;
- }
- // Check if we should minimize the attribute: val="val" -> val
- if ($element && !empty($this->_def->info[$element]->attr[$key]->minimized)) {
- $html .= $key . ' ';
- continue;
- }
- }
- // Workaround for Internet Explorer innerHTML bug.
- // Essentially, Internet Explorer, when calculating
- // innerHTML, omits quotes if there are no instances of
- // angled brackets, quotes or spaces. However, when parsing
- // HTML (for example, when you assign to innerHTML), it
- // treats backticks as quotes. Thus,
- // <img alt="``" />
- // becomes
- // <img alt=`` />
- // becomes
- // <img alt='' />
- // Fortunately, all we need to do is trigger an appropriate
- // quoting style, which we do by adding an extra space.
- // This also is consistent with the W3C spec, which states
- // that user agents may ignore leading or trailing
- // whitespace (in fact, most don't, at least for attributes
- // like alt, but an extra space at the end is barely
- // noticeable). Still, we have a configuration knob for
- // this, since this transformation is not necesary if you
- // don't process user input with innerHTML or you don't plan
- // on supporting Internet Explorer.
- if ($this->_innerHTMLFix) {
- if (strpos($value, '`') !== false) {
- // check if correct quoting style would not already be
- // triggered
- if (strcspn($value, '"\' <>') === strlen($value)) {
- // protect!
- $value .= ' ';
- }
- }
- }
- $html .= $key.'="'.$this->escape($value).'" ';
- }
- return rtrim($html);
- }
-
- /**
- * Escapes raw text data.
- * @todo This really ought to be protected, but until we have a facility
- * for properly generating HTML here w/o using tokens, it stays
- * public.
- * @param string $string String data to escape for HTML.
- * @param int $quote Quoting style, like htmlspecialchars. ENT_NOQUOTES is
- * permissible for non-attribute output.
- * @return string escaped data.
- */
- public function escape($string, $quote = null)
- {
- // Workaround for APC bug on Mac Leopard reported by sidepodcast
- // http://htmlpurifier.org/phorum/read.php?3,4823,4846
- if ($quote === null) {
- $quote = ENT_COMPAT;
- }
- return htmlspecialchars($string, $quote, 'UTF-8');
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Generates HTML from tokens.
+ * @todo Refactor interface so that configuration/context is determined
+ * upon instantiation, no need for messy generateFromTokens() calls
+ * @todo Make some of the more internal functions protected, and have
+ * unit tests work around that
+ */
+class HTMLPurifier_Generator
+{
+
+ /**
+ * Whether or not generator should produce XML output.
+ * @type bool
+ */
+ private $_xhtml = true;
+
+ /**
+ * :HACK: Whether or not generator should comment the insides of <script> tags.
+ * @type bool
+ */
+ private $_scriptFix = false;
+
+ /**
+ * Cache of HTMLDefinition during HTML output to determine whether or
+ * not attributes should be minimized.
+ * @type HTMLPurifier_HTMLDefinition
+ */
+ private $_def;
+
+ /**
+ * Cache of %Output.SortAttr.
+ * @type bool
+ */
+ private $_sortAttr;
+
+ /**
+ * Cache of %Output.FlashCompat.
+ * @type bool
+ */
+ private $_flashCompat;
+
+ /**
+ * Cache of %Output.FixInnerHTML.
+ * @type bool
+ */
+ private $_innerHTMLFix;
+
+ /**
+ * Stack for keeping track of object information when outputting IE
+ * compatibility code.
+ * @type array
+ */
+ private $_flashStack = array();
+
+ /**
+ * Configuration for the generator
+ * @type HTMLPurifier_Config
+ */
+ protected $config;
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ */
+ public function __construct($config, $context)
+ {
+ $this->config = $config;
+ $this->_scriptFix = $config->get('Output.CommentScriptContents');
+ $this->_innerHTMLFix = $config->get('Output.FixInnerHTML');
+ $this->_sortAttr = $config->get('Output.SortAttr');
+ $this->_flashCompat = $config->get('Output.FlashCompat');
+ $this->_def = $config->getHTMLDefinition();
+ $this->_xhtml = $this->_def->doctype->xml;
+ }
+
+ /**
+ * Generates HTML from an array of tokens.
+ * @param HTMLPurifier_Token[] $tokens Array of HTMLPurifier_Token
+ * @return string Generated HTML
+ */
+ public function generateFromTokens($tokens)
+ {
+ if (!$tokens) {
+ return '';
+ }
+
+ // Basic algorithm
+ $html = '';
+ for ($i = 0, $size = count($tokens); $i < $size; $i++) {
+ if ($this->_scriptFix && $tokens[$i]->name === 'script'
+ && $i + 2 < $size && $tokens[$i+2] instanceof HTMLPurifier_Token_End) {
+ // script special case
+ // the contents of the script block must be ONE token
+ // for this to work.
+ $html .= $this->generateFromToken($tokens[$i++]);
+ $html .= $this->generateScriptFromToken($tokens[$i++]);
+ }
+ $html .= $this->generateFromToken($tokens[$i]);
+ }
+
+ // Tidy cleanup
+ if (extension_loaded('tidy') && $this->config->get('Output.TidyFormat')) {
+ $tidy = new Tidy;
+ $tidy->parseString(
+ $html,
+ array(
+ 'indent'=> true,
+ 'output-xhtml' => $this->_xhtml,
+ 'show-body-only' => true,
+ 'indent-spaces' => 2,
+ 'wrap' => 68,
+ ),
+ 'utf8'
+ );
+ $tidy->cleanRepair();
+ $html = (string) $tidy; // explicit cast necessary
+ }
+
+ // Normalize newlines to system defined value
+ if ($this->config->get('Core.NormalizeNewlines')) {
+ $nl = $this->config->get('Output.Newline');
+ if ($nl === null) {
+ $nl = PHP_EOL;
+ }
+ if ($nl !== "\n") {
+ $html = str_replace("\n", $nl, $html);
+ }
+ }
+ return $html;
+ }
+
+ /**
+ * Generates HTML from a single token.
+ * @param HTMLPurifier_Token $token HTMLPurifier_Token object.
+ * @return string Generated HTML
+ */
+ public function generateFromToken($token)
+ {
+ if (!$token instanceof HTMLPurifier_Token) {
+ trigger_error('Cannot generate HTML from non-HTMLPurifier_Token object', E_USER_WARNING);
+ return '';
+
+ } elseif ($token instanceof HTMLPurifier_Token_Start) {
+ $attr = $this->generateAttributes($token->attr, $token->name);
+ if ($this->_flashCompat) {
+ if ($token->name == "object") {
+ $flash = new stdclass();
+ $flash->attr = $token->attr;
+ $flash->param = array();
+ $this->_flashStack[] = $flash;
+ }
+ }
+ return '<' . $token->name . ($attr ? ' ' : '') . $attr . '>';
+
+ } elseif ($token instanceof HTMLPurifier_Token_End) {
+ $_extra = '';
+ if ($this->_flashCompat) {
+ if ($token->name == "object" && !empty($this->_flashStack)) {
+ // doesn't do anything for now
+ }
+ }
+ return $_extra . '</' . $token->name . '>';
+
+ } elseif ($token instanceof HTMLPurifier_Token_Empty) {
+ if ($this->_flashCompat && $token->name == "param" && !empty($this->_flashStack)) {
+ $this->_flashStack[count($this->_flashStack)-1]->param[$token->attr['name']] = $token->attr['value'];
+ }
+ $attr = $this->generateAttributes($token->attr, $token->name);
+ return '<' . $token->name . ($attr ? ' ' : '') . $attr .
+ ( $this->_xhtml ? ' /': '' ) // <br /> v. <br>
+ . '>';
+
+ } elseif ($token instanceof HTMLPurifier_Token_Text) {
+ return $this->escape($token->data, ENT_NOQUOTES);
+
+ } elseif ($token instanceof HTMLPurifier_Token_Comment) {
+ return '<!--' . $token->data . '-->';
+ } else {
+ return '';
+
+ }
+ }
+
+ /**
+ * Special case processor for the contents of script tags
+ * @param HTMLPurifier_Token $token HTMLPurifier_Token object.
+ * @return string
+ * @warning This runs into problems if there's already a literal
+ * --> somewhere inside the script contents.
+ */
+ public function generateScriptFromToken($token)
+ {
+ if (!$token instanceof HTMLPurifier_Token_Text) {
+ return $this->generateFromToken($token);
+ }
+ // Thanks <http://lachy.id.au/log/2005/05/script-comments>
+ $data = preg_replace('#//\s*$#', '', $token->data);
+ return '<!--//--><![CDATA[//><!--' . "\n" . trim($data) . "\n" . '//--><!]]>';
+ }
+
+ /**
+ * Generates attribute declarations from attribute array.
+ * @note This does not include the leading or trailing space.
+ * @param array $assoc_array_of_attributes Attribute array
+ * @param string $element Name of element attributes are for, used to check
+ * attribute minimization.
+ * @return string Generated HTML fragment for insertion.
+ */
+ public function generateAttributes($assoc_array_of_attributes, $element = '')
+ {
+ $html = '';
+ if ($this->_sortAttr) {
+ ksort($assoc_array_of_attributes);
+ }
+ foreach ($assoc_array_of_attributes as $key => $value) {
+ if (!$this->_xhtml) {
+ // Remove namespaced attributes
+ if (strpos($key, ':') !== false) {
+ continue;
+ }
+ // Check if we should minimize the attribute: val="val" -> val
+ if ($element && !empty($this->_def->info[$element]->attr[$key]->minimized)) {
+ $html .= $key . ' ';
+ continue;
+ }
+ }
+ // Workaround for Internet Explorer innerHTML bug.
+ // Essentially, Internet Explorer, when calculating
+ // innerHTML, omits quotes if there are no instances of
+ // angled brackets, quotes or spaces. However, when parsing
+ // HTML (for example, when you assign to innerHTML), it
+ // treats backticks as quotes. Thus,
+ // <img alt="``" />
+ // becomes
+ // <img alt=`` />
+ // becomes
+ // <img alt='' />
+ // Fortunately, all we need to do is trigger an appropriate
+ // quoting style, which we do by adding an extra space.
+ // This also is consistent with the W3C spec, which states
+ // that user agents may ignore leading or trailing
+ // whitespace (in fact, most don't, at least for attributes
+ // like alt, but an extra space at the end is barely
+ // noticeable). Still, we have a configuration knob for
+ // this, since this transformation is not necesary if you
+ // don't process user input with innerHTML or you don't plan
+ // on supporting Internet Explorer.
+ if ($this->_innerHTMLFix) {
+ if (strpos($value, '`') !== false) {
+ // check if correct quoting style would not already be
+ // triggered
+ if (strcspn($value, '"\' <>') === strlen($value)) {
+ // protect!
+ $value .= ' ';
+ }
+ }
+ }
+ $html .= $key.'="'.$this->escape($value).'" ';
+ }
+ return rtrim($html);
+ }
+
+ /**
+ * Escapes raw text data.
+ * @todo This really ought to be protected, but until we have a facility
+ * for properly generating HTML here w/o using tokens, it stays
+ * public.
+ * @param string $string String data to escape for HTML.
+ * @param int $quote Quoting style, like htmlspecialchars. ENT_NOQUOTES is
+ * permissible for non-attribute output.
+ * @return string escaped data.
+ */
+ public function escape($string, $quote = null)
+ {
+ // Workaround for APC bug on Mac Leopard reported by sidepodcast
+ // http://htmlpurifier.org/phorum/read.php?3,4823,4846
+ if ($quote === null) {
+ $quote = ENT_COMPAT;
+ }
+ return htmlspecialchars($string, $quote, 'UTF-8');
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLDefinition.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLDefinition.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLDefinition.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLDefinition.php
index 027c85d..9b7b334 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLDefinition.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLDefinition.php
@@ -1,493 +1,493 @@
-<?php
-
-/**
- * Definition of the purified HTML that describes allowed children,
- * attributes, and many other things.
- *
- * Conventions:
- *
- * All member variables that are prefixed with info
- * (including the main $info array) are used by HTML Purifier internals
- * and should not be directly edited when customizing the HTMLDefinition.
- * They can usually be set via configuration directives or custom
- * modules.
- *
- * On the other hand, member variables without the info prefix are used
- * internally by the HTMLDefinition and MUST NOT be used by other HTML
- * Purifier internals. Many of them, however, are public, and may be
- * edited by userspace code to tweak the behavior of HTMLDefinition.
- *
- * @note This class is inspected by Printer_HTMLDefinition; please
- * update that class if things here change.
- *
- * @warning Directives that change this object's structure must be in
- * the HTML or Attr namespace!
- */
-class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition
-{
-
- // FULLY-PUBLIC VARIABLES ---------------------------------------------
-
- /**
- * Associative array of element names to HTMLPurifier_ElementDef.
- * @type HTMLPurifier_ElementDef[]
- */
- public $info = array();
-
- /**
- * Associative array of global attribute name to attribute definition.
- * @type array
- */
- public $info_global_attr = array();
-
- /**
- * String name of parent element HTML will be going into.
- * @type string
- */
- public $info_parent = 'div';
-
- /**
- * Definition for parent element, allows parent element to be a
- * tag that's not allowed inside the HTML fragment.
- * @type HTMLPurifier_ElementDef
- */
- public $info_parent_def;
-
- /**
- * String name of element used to wrap inline elements in block context.
- * @type string
- * @note This is rarely used except for BLOCKQUOTEs in strict mode
- */
- public $info_block_wrapper = 'p';
-
- /**
- * Associative array of deprecated tag name to HTMLPurifier_TagTransform.
- * @type array
- */
- public $info_tag_transform = array();
-
- /**
- * Indexed list of HTMLPurifier_AttrTransform to be performed before validation.
- * @type HTMLPurifier_AttrTransform[]
- */
- public $info_attr_transform_pre = array();
-
- /**
- * Indexed list of HTMLPurifier_AttrTransform to be performed after validation.
- * @type HTMLPurifier_AttrTransform[]
- */
- public $info_attr_transform_post = array();
-
- /**
- * Nested lookup array of content set name (Block, Inline) to
- * element name to whether or not it belongs in that content set.
- * @type array
- */
- public $info_content_sets = array();
-
- /**
- * Indexed list of HTMLPurifier_Injector to be used.
- * @type HTMLPurifier_Injector[]
- */
- public $info_injector = array();
-
- /**
- * Doctype object
- * @type HTMLPurifier_Doctype
- */
- public $doctype;
-
-
-
- // RAW CUSTOMIZATION STUFF --------------------------------------------
-
- /**
- * Adds a custom attribute to a pre-existing element
- * @note This is strictly convenience, and does not have a corresponding
- * method in HTMLPurifier_HTMLModule
- * @param string $element_name Element name to add attribute to
- * @param string $attr_name Name of attribute
- * @param mixed $def Attribute definition, can be string or object, see
- * HTMLPurifier_AttrTypes for details
- */
- public function addAttribute($element_name, $attr_name, $def)
- {
- $module = $this->getAnonymousModule();
- if (!isset($module->info[$element_name])) {
- $element = $module->addBlankElement($element_name);
- } else {
- $element = $module->info[$element_name];
- }
- $element->attr[$attr_name] = $def;
- }
-
- /**
- * Adds a custom element to your HTML definition
- * @see HTMLPurifier_HTMLModule::addElement() for detailed
- * parameter and return value descriptions.
- */
- public function addElement($element_name, $type, $contents, $attr_collections, $attributes = array())
- {
- $module = $this->getAnonymousModule();
- // assume that if the user is calling this, the element
- // is safe. This may not be a good idea
- $element = $module->addElement($element_name, $type, $contents, $attr_collections, $attributes);
- return $element;
- }
-
- /**
- * Adds a blank element to your HTML definition, for overriding
- * existing behavior
- * @param string $element_name
- * @return HTMLPurifier_ElementDef
- * @see HTMLPurifier_HTMLModule::addBlankElement() for detailed
- * parameter and return value descriptions.
- */
- public function addBlankElement($element_name)
- {
- $module = $this->getAnonymousModule();
- $element = $module->addBlankElement($element_name);
- return $element;
- }
-
- /**
- * Retrieves a reference to the anonymous module, so you can
- * bust out advanced features without having to make your own
- * module.
- * @return HTMLPurifier_HTMLModule
- */
- public function getAnonymousModule()
- {
- if (!$this->_anonModule) {
- $this->_anonModule = new HTMLPurifier_HTMLModule();
- $this->_anonModule->name = 'Anonymous';
- }
- return $this->_anonModule;
- }
-
- private $_anonModule = null;
-
- // PUBLIC BUT INTERNAL VARIABLES --------------------------------------
-
- /**
- * @type string
- */
- public $type = 'HTML';
-
- /**
- * @type HTMLPurifier_HTMLModuleManager
- */
- public $manager;
-
- /**
- * Performs low-cost, preliminary initialization.
- */
- public function __construct()
- {
- $this->manager = new HTMLPurifier_HTMLModuleManager();
- }
-
- /**
- * @param HTMLPurifier_Config $config
- */
- protected function doSetup($config)
- {
- $this->processModules($config);
- $this->setupConfigStuff($config);
- unset($this->manager);
-
- // cleanup some of the element definitions
- foreach ($this->info as $k => $v) {
- unset($this->info[$k]->content_model);
- unset($this->info[$k]->content_model_type);
- }
- }
-
- /**
- * Extract out the information from the manager
- * @param HTMLPurifier_Config $config
- */
- protected function processModules($config)
- {
- if ($this->_anonModule) {
- // for user specific changes
- // this is late-loaded so we don't have to deal with PHP4
- // reference wonky-ness
- $this->manager->addModule($this->_anonModule);
- unset($this->_anonModule);
- }
-
- $this->manager->setup($config);
- $this->doctype = $this->manager->doctype;
-
- foreach ($this->manager->modules as $module) {
- foreach ($module->info_tag_transform as $k => $v) {
- if ($v === false) {
- unset($this->info_tag_transform[$k]);
- } else {
- $this->info_tag_transform[$k] = $v;
- }
- }
- foreach ($module->info_attr_transform_pre as $k => $v) {
- if ($v === false) {
- unset($this->info_attr_transform_pre[$k]);
- } else {
- $this->info_attr_transform_pre[$k] = $v;
- }
- }
- foreach ($module->info_attr_transform_post as $k => $v) {
- if ($v === false) {
- unset($this->info_attr_transform_post[$k]);
- } else {
- $this->info_attr_transform_post[$k] = $v;
- }
- }
- foreach ($module->info_injector as $k => $v) {
- if ($v === false) {
- unset($this->info_injector[$k]);
- } else {
- $this->info_injector[$k] = $v;
- }
- }
- }
- $this->info = $this->manager->getElements();
- $this->info_content_sets = $this->manager->contentSets->lookup;
- }
-
- /**
- * Sets up stuff based on config. We need a better way of doing this.
- * @param HTMLPurifier_Config $config
- */
- protected function setupConfigStuff($config)
- {
- $block_wrapper = $config->get('HTML.BlockWrapper');
- if (isset($this->info_content_sets['Block'][$block_wrapper])) {
- $this->info_block_wrapper = $block_wrapper;
- } else {
- trigger_error(
- 'Cannot use non-block element as block wrapper',
- E_USER_ERROR
- );
- }
-
- $parent = $config->get('HTML.Parent');
- $def = $this->manager->getElement($parent, true);
- if ($def) {
- $this->info_parent = $parent;
- $this->info_parent_def = $def;
- } else {
- trigger_error(
- 'Cannot use unrecognized element as parent',
- E_USER_ERROR
- );
- $this->info_parent_def = $this->manager->getElement($this->info_parent, true);
- }
-
- // support template text
- $support = "(for information on implementing this, see the support forums) ";
-
- // setup allowed elements -----------------------------------------
-
- $allowed_elements = $config->get('HTML.AllowedElements');
- $allowed_attributes = $config->get('HTML.AllowedAttributes'); // retrieve early
-
- if (!is_array($allowed_elements) && !is_array($allowed_attributes)) {
- $allowed = $config->get('HTML.Allowed');
- if (is_string($allowed)) {
- list($allowed_elements, $allowed_attributes) = $this->parseTinyMCEAllowedList($allowed);
- }
- }
-
- if (is_array($allowed_elements)) {
- foreach ($this->info as $name => $d) {
- if (!isset($allowed_elements[$name])) {
- unset($this->info[$name]);
- }
- unset($allowed_elements[$name]);
- }
- // emit errors
- foreach ($allowed_elements as $element => $d) {
- $element = htmlspecialchars($element); // PHP doesn't escape errors, be careful!
- trigger_error("Element '$element' is not supported $support", E_USER_WARNING);
- }
- }
-
- // setup allowed attributes ---------------------------------------
-
- $allowed_attributes_mutable = $allowed_attributes; // by copy!
- if (is_array($allowed_attributes)) {
- // This actually doesn't do anything, since we went away from
- // global attributes. It's possible that userland code uses
- // it, but HTMLModuleManager doesn't!
- foreach ($this->info_global_attr as $attr => $x) {
- $keys = array($attr, "*@$attr", "*.$attr");
- $delete = true;
- foreach ($keys as $key) {
- if ($delete && isset($allowed_attributes[$key])) {
- $delete = false;
- }
- if (isset($allowed_attributes_mutable[$key])) {
- unset($allowed_attributes_mutable[$key]);
- }
- }
- if ($delete) {
- unset($this->info_global_attr[$attr]);
- }
- }
-
- foreach ($this->info as $tag => $info) {
- foreach ($info->attr as $attr => $x) {
- $keys = array("$tag@$attr", $attr, "*@$attr", "$tag.$attr", "*.$attr");
- $delete = true;
- foreach ($keys as $key) {
- if ($delete && isset($allowed_attributes[$key])) {
- $delete = false;
- }
- if (isset($allowed_attributes_mutable[$key])) {
- unset($allowed_attributes_mutable[$key]);
- }
- }
- if ($delete) {
- if ($this->info[$tag]->attr[$attr]->required) {
- trigger_error(
- "Required attribute '$attr' in element '$tag' " .
- "was not allowed, which means '$tag' will not be allowed either",
- E_USER_WARNING
- );
- }
- unset($this->info[$tag]->attr[$attr]);
- }
- }
- }
- // emit errors
- foreach ($allowed_attributes_mutable as $elattr => $d) {
- $bits = preg_split('/[.@]/', $elattr, 2);
- $c = count($bits);
- switch ($c) {
- case 2:
- if ($bits[0] !== '*') {
- $element = htmlspecialchars($bits[0]);
- $attribute = htmlspecialchars($bits[1]);
- if (!isset($this->info[$element])) {
- trigger_error(
- "Cannot allow attribute '$attribute' if element " .
- "'$element' is not allowed/supported $support"
- );
- } else {
- trigger_error(
- "Attribute '$attribute' in element '$element' not supported $support",
- E_USER_WARNING
- );
- }
- break;
- }
- // otherwise fall through
- case 1:
- $attribute = htmlspecialchars($bits[0]);
- trigger_error(
- "Global attribute '$attribute' is not ".
- "supported in any elements $support",
- E_USER_WARNING
- );
- break;
- }
- }
- }
-
- // setup forbidden elements ---------------------------------------
-
- $forbidden_elements = $config->get('HTML.ForbiddenElements');
- $forbidden_attributes = $config->get('HTML.ForbiddenAttributes');
-
- foreach ($this->info as $tag => $info) {
- if (isset($forbidden_elements[$tag])) {
- unset($this->info[$tag]);
- continue;
- }
- foreach ($info->attr as $attr => $x) {
- if (isset($forbidden_attributes["$tag@$attr"]) ||
- isset($forbidden_attributes["*@$attr"]) ||
- isset($forbidden_attributes[$attr])
- ) {
- unset($this->info[$tag]->attr[$attr]);
- continue;
- } elseif (isset($forbidden_attributes["$tag.$attr"])) { // this segment might get removed eventually
- // $tag.$attr are not user supplied, so no worries!
- trigger_error(
- "Error with $tag.$attr: tag.attr syntax not supported for " .
- "HTML.ForbiddenAttributes; use tag@attr instead",
- E_USER_WARNING
- );
- }
- }
- }
- foreach ($forbidden_attributes as $key => $v) {
- if (strlen($key) < 2) {
- continue;
- }
- if ($key[0] != '*') {
- continue;
- }
- if ($key[1] == '.') {
- trigger_error(
- "Error with $key: *.attr syntax not supported for HTML.ForbiddenAttributes; use attr instead",
- E_USER_WARNING
- );
- }
- }
-
- // setup injectors -----------------------------------------------------
- foreach ($this->info_injector as $i => $injector) {
- if ($injector->checkNeeded($config) !== false) {
- // remove injector that does not have it's required
- // elements/attributes present, and is thus not needed.
- unset($this->info_injector[$i]);
- }
- }
- }
-
- /**
- * Parses a TinyMCE-flavored Allowed Elements and Attributes list into
- * separate lists for processing. Format is element[attr1|attr2],element2...
- * @warning Although it's largely drawn from TinyMCE's implementation,
- * it is different, and you'll probably have to modify your lists
- * @param array $list String list to parse
- * @return array
- * @todo Give this its own class, probably static interface
- */
- public function parseTinyMCEAllowedList($list)
- {
- $list = str_replace(array(' ', "\t"), '', $list);
-
- $elements = array();
- $attributes = array();
-
- $chunks = preg_split('/(,|[\n\r]+)/', $list);
- foreach ($chunks as $chunk) {
- if (empty($chunk)) {
- continue;
- }
- // remove TinyMCE element control characters
- if (!strpos($chunk, '[')) {
- $element = $chunk;
- $attr = false;
- } else {
- list($element, $attr) = explode('[', $chunk);
- }
- if ($element !== '*') {
- $elements[$element] = true;
- }
- if (!$attr) {
- continue;
- }
- $attr = substr($attr, 0, strlen($attr) - 1); // remove trailing ]
- $attr = explode('|', $attr);
- foreach ($attr as $key) {
- $attributes["$element.$key"] = true;
- }
- }
- return array($elements, $attributes);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Definition of the purified HTML that describes allowed children,
+ * attributes, and many other things.
+ *
+ * Conventions:
+ *
+ * All member variables that are prefixed with info
+ * (including the main $info array) are used by HTML Purifier internals
+ * and should not be directly edited when customizing the HTMLDefinition.
+ * They can usually be set via configuration directives or custom
+ * modules.
+ *
+ * On the other hand, member variables without the info prefix are used
+ * internally by the HTMLDefinition and MUST NOT be used by other HTML
+ * Purifier internals. Many of them, however, are public, and may be
+ * edited by userspace code to tweak the behavior of HTMLDefinition.
+ *
+ * @note This class is inspected by Printer_HTMLDefinition; please
+ * update that class if things here change.
+ *
+ * @warning Directives that change this object's structure must be in
+ * the HTML or Attr namespace!
+ */
+class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition
+{
+
+ // FULLY-PUBLIC VARIABLES ---------------------------------------------
+
+ /**
+ * Associative array of element names to HTMLPurifier_ElementDef.
+ * @type HTMLPurifier_ElementDef[]
+ */
+ public $info = array();
+
+ /**
+ * Associative array of global attribute name to attribute definition.
+ * @type array
+ */
+ public $info_global_attr = array();
+
+ /**
+ * String name of parent element HTML will be going into.
+ * @type string
+ */
+ public $info_parent = 'div';
+
+ /**
+ * Definition for parent element, allows parent element to be a
+ * tag that's not allowed inside the HTML fragment.
+ * @type HTMLPurifier_ElementDef
+ */
+ public $info_parent_def;
+
+ /**
+ * String name of element used to wrap inline elements in block context.
+ * @type string
+ * @note This is rarely used except for BLOCKQUOTEs in strict mode
+ */
+ public $info_block_wrapper = 'p';
+
+ /**
+ * Associative array of deprecated tag name to HTMLPurifier_TagTransform.
+ * @type array
+ */
+ public $info_tag_transform = array();
+
+ /**
+ * Indexed list of HTMLPurifier_AttrTransform to be performed before validation.
+ * @type HTMLPurifier_AttrTransform[]
+ */
+ public $info_attr_transform_pre = array();
+
+ /**
+ * Indexed list of HTMLPurifier_AttrTransform to be performed after validation.
+ * @type HTMLPurifier_AttrTransform[]
+ */
+ public $info_attr_transform_post = array();
+
+ /**
+ * Nested lookup array of content set name (Block, Inline) to
+ * element name to whether or not it belongs in that content set.
+ * @type array
+ */
+ public $info_content_sets = array();
+
+ /**
+ * Indexed list of HTMLPurifier_Injector to be used.
+ * @type HTMLPurifier_Injector[]
+ */
+ public $info_injector = array();
+
+ /**
+ * Doctype object
+ * @type HTMLPurifier_Doctype
+ */
+ public $doctype;
+
+
+
+ // RAW CUSTOMIZATION STUFF --------------------------------------------
+
+ /**
+ * Adds a custom attribute to a pre-existing element
+ * @note This is strictly convenience, and does not have a corresponding
+ * method in HTMLPurifier_HTMLModule
+ * @param string $element_name Element name to add attribute to
+ * @param string $attr_name Name of attribute
+ * @param mixed $def Attribute definition, can be string or object, see
+ * HTMLPurifier_AttrTypes for details
+ */
+ public function addAttribute($element_name, $attr_name, $def)
+ {
+ $module = $this->getAnonymousModule();
+ if (!isset($module->info[$element_name])) {
+ $element = $module->addBlankElement($element_name);
+ } else {
+ $element = $module->info[$element_name];
+ }
+ $element->attr[$attr_name] = $def;
+ }
+
+ /**
+ * Adds a custom element to your HTML definition
+ * @see HTMLPurifier_HTMLModule::addElement() for detailed
+ * parameter and return value descriptions.
+ */
+ public function addElement($element_name, $type, $contents, $attr_collections, $attributes = array())
+ {
+ $module = $this->getAnonymousModule();
+ // assume that if the user is calling this, the element
+ // is safe. This may not be a good idea
+ $element = $module->addElement($element_name, $type, $contents, $attr_collections, $attributes);
+ return $element;
+ }
+
+ /**
+ * Adds a blank element to your HTML definition, for overriding
+ * existing behavior
+ * @param string $element_name
+ * @return HTMLPurifier_ElementDef
+ * @see HTMLPurifier_HTMLModule::addBlankElement() for detailed
+ * parameter and return value descriptions.
+ */
+ public function addBlankElement($element_name)
+ {
+ $module = $this->getAnonymousModule();
+ $element = $module->addBlankElement($element_name);
+ return $element;
+ }
+
+ /**
+ * Retrieves a reference to the anonymous module, so you can
+ * bust out advanced features without having to make your own
+ * module.
+ * @return HTMLPurifier_HTMLModule
+ */
+ public function getAnonymousModule()
+ {
+ if (!$this->_anonModule) {
+ $this->_anonModule = new HTMLPurifier_HTMLModule();
+ $this->_anonModule->name = 'Anonymous';
+ }
+ return $this->_anonModule;
+ }
+
+ private $_anonModule = null;
+
+ // PUBLIC BUT INTERNAL VARIABLES --------------------------------------
+
+ /**
+ * @type string
+ */
+ public $type = 'HTML';
+
+ /**
+ * @type HTMLPurifier_HTMLModuleManager
+ */
+ public $manager;
+
+ /**
+ * Performs low-cost, preliminary initialization.
+ */
+ public function __construct()
+ {
+ $this->manager = new HTMLPurifier_HTMLModuleManager();
+ }
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ protected function doSetup($config)
+ {
+ $this->processModules($config);
+ $this->setupConfigStuff($config);
+ unset($this->manager);
+
+ // cleanup some of the element definitions
+ foreach ($this->info as $k => $v) {
+ unset($this->info[$k]->content_model);
+ unset($this->info[$k]->content_model_type);
+ }
+ }
+
+ /**
+ * Extract out the information from the manager
+ * @param HTMLPurifier_Config $config
+ */
+ protected function processModules($config)
+ {
+ if ($this->_anonModule) {
+ // for user specific changes
+ // this is late-loaded so we don't have to deal with PHP4
+ // reference wonky-ness
+ $this->manager->addModule($this->_anonModule);
+ unset($this->_anonModule);
+ }
+
+ $this->manager->setup($config);
+ $this->doctype = $this->manager->doctype;
+
+ foreach ($this->manager->modules as $module) {
+ foreach ($module->info_tag_transform as $k => $v) {
+ if ($v === false) {
+ unset($this->info_tag_transform[$k]);
+ } else {
+ $this->info_tag_transform[$k] = $v;
+ }
+ }
+ foreach ($module->info_attr_transform_pre as $k => $v) {
+ if ($v === false) {
+ unset($this->info_attr_transform_pre[$k]);
+ } else {
+ $this->info_attr_transform_pre[$k] = $v;
+ }
+ }
+ foreach ($module->info_attr_transform_post as $k => $v) {
+ if ($v === false) {
+ unset($this->info_attr_transform_post[$k]);
+ } else {
+ $this->info_attr_transform_post[$k] = $v;
+ }
+ }
+ foreach ($module->info_injector as $k => $v) {
+ if ($v === false) {
+ unset($this->info_injector[$k]);
+ } else {
+ $this->info_injector[$k] = $v;
+ }
+ }
+ }
+ $this->info = $this->manager->getElements();
+ $this->info_content_sets = $this->manager->contentSets->lookup;
+ }
+
+ /**
+ * Sets up stuff based on config. We need a better way of doing this.
+ * @param HTMLPurifier_Config $config
+ */
+ protected function setupConfigStuff($config)
+ {
+ $block_wrapper = $config->get('HTML.BlockWrapper');
+ if (isset($this->info_content_sets['Block'][$block_wrapper])) {
+ $this->info_block_wrapper = $block_wrapper;
+ } else {
+ trigger_error(
+ 'Cannot use non-block element as block wrapper',
+ E_USER_ERROR
+ );
+ }
+
+ $parent = $config->get('HTML.Parent');
+ $def = $this->manager->getElement($parent, true);
+ if ($def) {
+ $this->info_parent = $parent;
+ $this->info_parent_def = $def;
+ } else {
+ trigger_error(
+ 'Cannot use unrecognized element as parent',
+ E_USER_ERROR
+ );
+ $this->info_parent_def = $this->manager->getElement($this->info_parent, true);
+ }
+
+ // support template text
+ $support = "(for information on implementing this, see the support forums) ";
+
+ // setup allowed elements -----------------------------------------
+
+ $allowed_elements = $config->get('HTML.AllowedElements');
+ $allowed_attributes = $config->get('HTML.AllowedAttributes'); // retrieve early
+
+ if (!is_array($allowed_elements) && !is_array($allowed_attributes)) {
+ $allowed = $config->get('HTML.Allowed');
+ if (is_string($allowed)) {
+ list($allowed_elements, $allowed_attributes) = $this->parseTinyMCEAllowedList($allowed);
+ }
+ }
+
+ if (is_array($allowed_elements)) {
+ foreach ($this->info as $name => $d) {
+ if (!isset($allowed_elements[$name])) {
+ unset($this->info[$name]);
+ }
+ unset($allowed_elements[$name]);
+ }
+ // emit errors
+ foreach ($allowed_elements as $element => $d) {
+ $element = htmlspecialchars($element); // PHP doesn't escape errors, be careful!
+ trigger_error("Element '$element' is not supported $support", E_USER_WARNING);
+ }
+ }
+
+ // setup allowed attributes ---------------------------------------
+
+ $allowed_attributes_mutable = $allowed_attributes; // by copy!
+ if (is_array($allowed_attributes)) {
+ // This actually doesn't do anything, since we went away from
+ // global attributes. It's possible that userland code uses
+ // it, but HTMLModuleManager doesn't!
+ foreach ($this->info_global_attr as $attr => $x) {
+ $keys = array($attr, "*@$attr", "*.$attr");
+ $delete = true;
+ foreach ($keys as $key) {
+ if ($delete && isset($allowed_attributes[$key])) {
+ $delete = false;
+ }
+ if (isset($allowed_attributes_mutable[$key])) {
+ unset($allowed_attributes_mutable[$key]);
+ }
+ }
+ if ($delete) {
+ unset($this->info_global_attr[$attr]);
+ }
+ }
+
+ foreach ($this->info as $tag => $info) {
+ foreach ($info->attr as $attr => $x) {
+ $keys = array("$tag@$attr", $attr, "*@$attr", "$tag.$attr", "*.$attr");
+ $delete = true;
+ foreach ($keys as $key) {
+ if ($delete && isset($allowed_attributes[$key])) {
+ $delete = false;
+ }
+ if (isset($allowed_attributes_mutable[$key])) {
+ unset($allowed_attributes_mutable[$key]);
+ }
+ }
+ if ($delete) {
+ if ($this->info[$tag]->attr[$attr]->required) {
+ trigger_error(
+ "Required attribute '$attr' in element '$tag' " .
+ "was not allowed, which means '$tag' will not be allowed either",
+ E_USER_WARNING
+ );
+ }
+ unset($this->info[$tag]->attr[$attr]);
+ }
+ }
+ }
+ // emit errors
+ foreach ($allowed_attributes_mutable as $elattr => $d) {
+ $bits = preg_split('/[.@]/', $elattr, 2);
+ $c = count($bits);
+ switch ($c) {
+ case 2:
+ if ($bits[0] !== '*') {
+ $element = htmlspecialchars($bits[0]);
+ $attribute = htmlspecialchars($bits[1]);
+ if (!isset($this->info[$element])) {
+ trigger_error(
+ "Cannot allow attribute '$attribute' if element " .
+ "'$element' is not allowed/supported $support"
+ );
+ } else {
+ trigger_error(
+ "Attribute '$attribute' in element '$element' not supported $support",
+ E_USER_WARNING
+ );
+ }
+ break;
+ }
+ // otherwise fall through
+ case 1:
+ $attribute = htmlspecialchars($bits[0]);
+ trigger_error(
+ "Global attribute '$attribute' is not ".
+ "supported in any elements $support",
+ E_USER_WARNING
+ );
+ break;
+ }
+ }
+ }
+
+ // setup forbidden elements ---------------------------------------
+
+ $forbidden_elements = $config->get('HTML.ForbiddenElements');
+ $forbidden_attributes = $config->get('HTML.ForbiddenAttributes');
+
+ foreach ($this->info as $tag => $info) {
+ if (isset($forbidden_elements[$tag])) {
+ unset($this->info[$tag]);
+ continue;
+ }
+ foreach ($info->attr as $attr => $x) {
+ if (isset($forbidden_attributes["$tag@$attr"]) ||
+ isset($forbidden_attributes["*@$attr"]) ||
+ isset($forbidden_attributes[$attr])
+ ) {
+ unset($this->info[$tag]->attr[$attr]);
+ continue;
+ } elseif (isset($forbidden_attributes["$tag.$attr"])) { // this segment might get removed eventually
+ // $tag.$attr are not user supplied, so no worries!
+ trigger_error(
+ "Error with $tag.$attr: tag.attr syntax not supported for " .
+ "HTML.ForbiddenAttributes; use tag@attr instead",
+ E_USER_WARNING
+ );
+ }
+ }
+ }
+ foreach ($forbidden_attributes as $key => $v) {
+ if (strlen($key) < 2) {
+ continue;
+ }
+ if ($key[0] != '*') {
+ continue;
+ }
+ if ($key[1] == '.') {
+ trigger_error(
+ "Error with $key: *.attr syntax not supported for HTML.ForbiddenAttributes; use attr instead",
+ E_USER_WARNING
+ );
+ }
+ }
+
+ // setup injectors -----------------------------------------------------
+ foreach ($this->info_injector as $i => $injector) {
+ if ($injector->checkNeeded($config) !== false) {
+ // remove injector that does not have it's required
+ // elements/attributes present, and is thus not needed.
+ unset($this->info_injector[$i]);
+ }
+ }
+ }
+
+ /**
+ * Parses a TinyMCE-flavored Allowed Elements and Attributes list into
+ * separate lists for processing. Format is element[attr1|attr2],element2...
+ * @warning Although it's largely drawn from TinyMCE's implementation,
+ * it is different, and you'll probably have to modify your lists
+ * @param array $list String list to parse
+ * @return array
+ * @todo Give this its own class, probably static interface
+ */
+ public function parseTinyMCEAllowedList($list)
+ {
+ $list = str_replace(array(' ', "\t"), '', $list);
+
+ $elements = array();
+ $attributes = array();
+
+ $chunks = preg_split('/(,|[\n\r]+)/', $list);
+ foreach ($chunks as $chunk) {
+ if (empty($chunk)) {
+ continue;
+ }
+ // remove TinyMCE element control characters
+ if (!strpos($chunk, '[')) {
+ $element = $chunk;
+ $attr = false;
+ } else {
+ list($element, $attr) = explode('[', $chunk);
+ }
+ if ($element !== '*') {
+ $elements[$element] = true;
+ }
+ if (!$attr) {
+ continue;
+ }
+ $attr = substr($attr, 0, strlen($attr) - 1); // remove trailing ]
+ $attr = explode('|', $attr);
+ foreach ($attr as $key) {
+ $attributes["$element.$key"] = true;
+ }
+ }
+ return array($elements, $attributes);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule.php
index 9877f9e..bb3a923 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule.php
@@ -1,284 +1,284 @@
-<?php
-
-/**
- * Represents an XHTML 1.1 module, with information on elements, tags
- * and attributes.
- * @note Even though this is technically XHTML 1.1, it is also used for
- * regular HTML parsing. We are using modulization as a convenient
- * way to represent the internals of HTMLDefinition, and our
- * implementation is by no means conforming and does not directly
- * use the normative DTDs or XML schemas.
- * @note The public variables in a module should almost directly
- * correspond to the variables in HTMLPurifier_HTMLDefinition.
- * However, the prefix info carries no special meaning in these
- * objects (include it anyway if that's the correspondence though).
- * @todo Consider making some member functions protected
- */
-
-class HTMLPurifier_HTMLModule
-{
-
- // -- Overloadable ----------------------------------------------------
-
- /**
- * Short unique string identifier of the module.
- * @type string
- */
- public $name;
-
- /**
- * Informally, a list of elements this module changes.
- * Not used in any significant way.
- * @type array
- */
- public $elements = array();
-
- /**
- * Associative array of element names to element definitions.
- * Some definitions may be incomplete, to be merged in later
- * with the full definition.
- * @type array
- */
- public $info = array();
-
- /**
- * Associative array of content set names to content set additions.
- * This is commonly used to, say, add an A element to the Inline
- * content set. This corresponds to an internal variable $content_sets
- * and NOT info_content_sets member variable of HTMLDefinition.
- * @type array
- */
- public $content_sets = array();
-
- /**
- * Associative array of attribute collection names to attribute
- * collection additions. More rarely used for adding attributes to
- * the global collections. Example is the StyleAttribute module adding
- * the style attribute to the Core. Corresponds to HTMLDefinition's
- * attr_collections->info, since the object's data is only info,
- * with extra behavior associated with it.
- * @type array
- */
- public $attr_collections = array();
-
- /**
- * Associative array of deprecated tag name to HTMLPurifier_TagTransform.
- * @type array
- */
- public $info_tag_transform = array();
-
- /**
- * List of HTMLPurifier_AttrTransform to be performed before validation.
- * @type array
- */
- public $info_attr_transform_pre = array();
-
- /**
- * List of HTMLPurifier_AttrTransform to be performed after validation.
- * @type array
- */
- public $info_attr_transform_post = array();
-
- /**
- * List of HTMLPurifier_Injector to be performed during well-formedness fixing.
- * An injector will only be invoked if all of it's pre-requisites are met;
- * if an injector fails setup, there will be no error; it will simply be
- * silently disabled.
- * @type array
- */
- public $info_injector = array();
-
- /**
- * Boolean flag that indicates whether or not getChildDef is implemented.
- * For optimization reasons: may save a call to a function. Be sure
- * to set it if you do implement getChildDef(), otherwise it will have
- * no effect!
- * @type bool
- */
- public $defines_child_def = false;
-
- /**
- * Boolean flag whether or not this module is safe. If it is not safe, all
- * of its members are unsafe. Modules are safe by default (this might be
- * slightly dangerous, but it doesn't make much sense to force HTML Purifier,
- * which is based off of safe HTML, to explicitly say, "This is safe," even
- * though there are modules which are "unsafe")
- *
- * @type bool
- * @note Previously, safety could be applied at an element level granularity.
- * We've removed this ability, so in order to add "unsafe" elements
- * or attributes, a dedicated module with this property set to false
- * must be used.
- */
- public $safe = true;
-
- /**
- * Retrieves a proper HTMLPurifier_ChildDef subclass based on
- * content_model and content_model_type member variables of
- * the HTMLPurifier_ElementDef class. There is a similar function
- * in HTMLPurifier_HTMLDefinition.
- * @param HTMLPurifier_ElementDef $def
- * @return HTMLPurifier_ChildDef subclass
- */
- public function getChildDef($def)
- {
- return false;
- }
-
- // -- Convenience -----------------------------------------------------
-
- /**
- * Convenience function that sets up a new element
- * @param string $element Name of element to add
- * @param string|bool $type What content set should element be registered to?
- * Set as false to skip this step.
- * @param string $contents Allowed children in form of:
- * "$content_model_type: $content_model"
- * @param array $attr_includes What attribute collections to register to
- * element?
- * @param array $attr What unique attributes does the element define?
- * @see HTMLPurifier_ElementDef:: for in-depth descriptions of these parameters.
- * @return HTMLPurifier_ElementDef Created element definition object, so you
- * can set advanced parameters
- */
- public function addElement($element, $type, $contents, $attr_includes = array(), $attr = array())
- {
- $this->elements[] = $element;
- // parse content_model
- list($content_model_type, $content_model) = $this->parseContents($contents);
- // merge in attribute inclusions
- $this->mergeInAttrIncludes($attr, $attr_includes);
- // add element to content sets
- if ($type) {
- $this->addElementToContentSet($element, $type);
- }
- // create element
- $this->info[$element] = HTMLPurifier_ElementDef::create(
- $content_model,
- $content_model_type,
- $attr
- );
- // literal object $contents means direct child manipulation
- if (!is_string($contents)) {
- $this->info[$element]->child = $contents;
- }
- return $this->info[$element];
- }
-
- /**
- * Convenience function that creates a totally blank, non-standalone
- * element.
- * @param string $element Name of element to create
- * @return HTMLPurifier_ElementDef Created element
- */
- public function addBlankElement($element)
- {
- if (!isset($this->info[$element])) {
- $this->elements[] = $element;
- $this->info[$element] = new HTMLPurifier_ElementDef();
- $this->info[$element]->standalone = false;
- } else {
- trigger_error("Definition for $element already exists in module, cannot redefine");
- }
- return $this->info[$element];
- }
-
- /**
- * Convenience function that registers an element to a content set
- * @param string $element Element to register
- * @param string $type Name content set (warning: case sensitive, usually upper-case
- * first letter)
- */
- public function addElementToContentSet($element, $type)
- {
- if (!isset($this->content_sets[$type])) {
- $this->content_sets[$type] = '';
- } else {
- $this->content_sets[$type] .= ' | ';
- }
- $this->content_sets[$type] .= $element;
- }
-
- /**
- * Convenience function that transforms single-string contents
- * into separate content model and content model type
- * @param string $contents Allowed children in form of:
- * "$content_model_type: $content_model"
- * @return array
- * @note If contents is an object, an array of two nulls will be
- * returned, and the callee needs to take the original $contents
- * and use it directly.
- */
- public function parseContents($contents)
- {
- if (!is_string($contents)) {
- return array(null, null);
- } // defer
- switch ($contents) {
- // check for shorthand content model forms
- case 'Empty':
- return array('empty', '');
- case 'Inline':
- return array('optional', 'Inline | #PCDATA');
- case 'Flow':
- return array('optional', 'Flow | #PCDATA');
- }
- list($content_model_type, $content_model) = explode(':', $contents);
- $content_model_type = strtolower(trim($content_model_type));
- $content_model = trim($content_model);
- return array($content_model_type, $content_model);
- }
-
- /**
- * Convenience function that merges a list of attribute includes into
- * an attribute array.
- * @param array $attr Reference to attr array to modify
- * @param array $attr_includes Array of includes / string include to merge in
- */
- public function mergeInAttrIncludes(&$attr, $attr_includes)
- {
- if (!is_array($attr_includes)) {
- if (empty($attr_includes)) {
- $attr_includes = array();
- } else {
- $attr_includes = array($attr_includes);
- }
- }
- $attr[0] = $attr_includes;
- }
-
- /**
- * Convenience function that generates a lookup table with boolean
- * true as value.
- * @param string $list List of values to turn into a lookup
- * @note You can also pass an arbitrary number of arguments in
- * place of the regular argument
- * @return array array equivalent of list
- */
- public function makeLookup($list)
- {
- if (is_string($list)) {
- $list = func_get_args();
- }
- $ret = array();
- foreach ($list as $value) {
- if (is_null($value)) {
- continue;
- }
- $ret[$value] = true;
- }
- return $ret;
- }
-
- /**
- * Lazy load construction of the module after determining whether
- * or not it's needed, and also when a finalized configuration object
- * is available.
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Represents an XHTML 1.1 module, with information on elements, tags
+ * and attributes.
+ * @note Even though this is technically XHTML 1.1, it is also used for
+ * regular HTML parsing. We are using modulization as a convenient
+ * way to represent the internals of HTMLDefinition, and our
+ * implementation is by no means conforming and does not directly
+ * use the normative DTDs or XML schemas.
+ * @note The public variables in a module should almost directly
+ * correspond to the variables in HTMLPurifier_HTMLDefinition.
+ * However, the prefix info carries no special meaning in these
+ * objects (include it anyway if that's the correspondence though).
+ * @todo Consider making some member functions protected
+ */
+
+class HTMLPurifier_HTMLModule
+{
+
+ // -- Overloadable ----------------------------------------------------
+
+ /**
+ * Short unique string identifier of the module.
+ * @type string
+ */
+ public $name;
+
+ /**
+ * Informally, a list of elements this module changes.
+ * Not used in any significant way.
+ * @type array
+ */
+ public $elements = array();
+
+ /**
+ * Associative array of element names to element definitions.
+ * Some definitions may be incomplete, to be merged in later
+ * with the full definition.
+ * @type array
+ */
+ public $info = array();
+
+ /**
+ * Associative array of content set names to content set additions.
+ * This is commonly used to, say, add an A element to the Inline
+ * content set. This corresponds to an internal variable $content_sets
+ * and NOT info_content_sets member variable of HTMLDefinition.
+ * @type array
+ */
+ public $content_sets = array();
+
+ /**
+ * Associative array of attribute collection names to attribute
+ * collection additions. More rarely used for adding attributes to
+ * the global collections. Example is the StyleAttribute module adding
+ * the style attribute to the Core. Corresponds to HTMLDefinition's
+ * attr_collections->info, since the object's data is only info,
+ * with extra behavior associated with it.
+ * @type array
+ */
+ public $attr_collections = array();
+
+ /**
+ * Associative array of deprecated tag name to HTMLPurifier_TagTransform.
+ * @type array
+ */
+ public $info_tag_transform = array();
+
+ /**
+ * List of HTMLPurifier_AttrTransform to be performed before validation.
+ * @type array
+ */
+ public $info_attr_transform_pre = array();
+
+ /**
+ * List of HTMLPurifier_AttrTransform to be performed after validation.
+ * @type array
+ */
+ public $info_attr_transform_post = array();
+
+ /**
+ * List of HTMLPurifier_Injector to be performed during well-formedness fixing.
+ * An injector will only be invoked if all of it's pre-requisites are met;
+ * if an injector fails setup, there will be no error; it will simply be
+ * silently disabled.
+ * @type array
+ */
+ public $info_injector = array();
+
+ /**
+ * Boolean flag that indicates whether or not getChildDef is implemented.
+ * For optimization reasons: may save a call to a function. Be sure
+ * to set it if you do implement getChildDef(), otherwise it will have
+ * no effect!
+ * @type bool
+ */
+ public $defines_child_def = false;
+
+ /**
+ * Boolean flag whether or not this module is safe. If it is not safe, all
+ * of its members are unsafe. Modules are safe by default (this might be
+ * slightly dangerous, but it doesn't make much sense to force HTML Purifier,
+ * which is based off of safe HTML, to explicitly say, "This is safe," even
+ * though there are modules which are "unsafe")
+ *
+ * @type bool
+ * @note Previously, safety could be applied at an element level granularity.
+ * We've removed this ability, so in order to add "unsafe" elements
+ * or attributes, a dedicated module with this property set to false
+ * must be used.
+ */
+ public $safe = true;
+
+ /**
+ * Retrieves a proper HTMLPurifier_ChildDef subclass based on
+ * content_model and content_model_type member variables of
+ * the HTMLPurifier_ElementDef class. There is a similar function
+ * in HTMLPurifier_HTMLDefinition.
+ * @param HTMLPurifier_ElementDef $def
+ * @return HTMLPurifier_ChildDef subclass
+ */
+ public function getChildDef($def)
+ {
+ return false;
+ }
+
+ // -- Convenience -----------------------------------------------------
+
+ /**
+ * Convenience function that sets up a new element
+ * @param string $element Name of element to add
+ * @param string|bool $type What content set should element be registered to?
+ * Set as false to skip this step.
+ * @param string $contents Allowed children in form of:
+ * "$content_model_type: $content_model"
+ * @param array $attr_includes What attribute collections to register to
+ * element?
+ * @param array $attr What unique attributes does the element define?
+ * @see HTMLPurifier_ElementDef:: for in-depth descriptions of these parameters.
+ * @return HTMLPurifier_ElementDef Created element definition object, so you
+ * can set advanced parameters
+ */
+ public function addElement($element, $type, $contents, $attr_includes = array(), $attr = array())
+ {
+ $this->elements[] = $element;
+ // parse content_model
+ list($content_model_type, $content_model) = $this->parseContents($contents);
+ // merge in attribute inclusions
+ $this->mergeInAttrIncludes($attr, $attr_includes);
+ // add element to content sets
+ if ($type) {
+ $this->addElementToContentSet($element, $type);
+ }
+ // create element
+ $this->info[$element] = HTMLPurifier_ElementDef::create(
+ $content_model,
+ $content_model_type,
+ $attr
+ );
+ // literal object $contents means direct child manipulation
+ if (!is_string($contents)) {
+ $this->info[$element]->child = $contents;
+ }
+ return $this->info[$element];
+ }
+
+ /**
+ * Convenience function that creates a totally blank, non-standalone
+ * element.
+ * @param string $element Name of element to create
+ * @return HTMLPurifier_ElementDef Created element
+ */
+ public function addBlankElement($element)
+ {
+ if (!isset($this->info[$element])) {
+ $this->elements[] = $element;
+ $this->info[$element] = new HTMLPurifier_ElementDef();
+ $this->info[$element]->standalone = false;
+ } else {
+ trigger_error("Definition for $element already exists in module, cannot redefine");
+ }
+ return $this->info[$element];
+ }
+
+ /**
+ * Convenience function that registers an element to a content set
+ * @param string $element Element to register
+ * @param string $type Name content set (warning: case sensitive, usually upper-case
+ * first letter)
+ */
+ public function addElementToContentSet($element, $type)
+ {
+ if (!isset($this->content_sets[$type])) {
+ $this->content_sets[$type] = '';
+ } else {
+ $this->content_sets[$type] .= ' | ';
+ }
+ $this->content_sets[$type] .= $element;
+ }
+
+ /**
+ * Convenience function that transforms single-string contents
+ * into separate content model and content model type
+ * @param string $contents Allowed children in form of:
+ * "$content_model_type: $content_model"
+ * @return array
+ * @note If contents is an object, an array of two nulls will be
+ * returned, and the callee needs to take the original $contents
+ * and use it directly.
+ */
+ public function parseContents($contents)
+ {
+ if (!is_string($contents)) {
+ return array(null, null);
+ } // defer
+ switch ($contents) {
+ // check for shorthand content model forms
+ case 'Empty':
+ return array('empty', '');
+ case 'Inline':
+ return array('optional', 'Inline | #PCDATA');
+ case 'Flow':
+ return array('optional', 'Flow | #PCDATA');
+ }
+ list($content_model_type, $content_model) = explode(':', $contents);
+ $content_model_type = strtolower(trim($content_model_type));
+ $content_model = trim($content_model);
+ return array($content_model_type, $content_model);
+ }
+
+ /**
+ * Convenience function that merges a list of attribute includes into
+ * an attribute array.
+ * @param array $attr Reference to attr array to modify
+ * @param array $attr_includes Array of includes / string include to merge in
+ */
+ public function mergeInAttrIncludes(&$attr, $attr_includes)
+ {
+ if (!is_array($attr_includes)) {
+ if (empty($attr_includes)) {
+ $attr_includes = array();
+ } else {
+ $attr_includes = array($attr_includes);
+ }
+ }
+ $attr[0] = $attr_includes;
+ }
+
+ /**
+ * Convenience function that generates a lookup table with boolean
+ * true as value.
+ * @param string $list List of values to turn into a lookup
+ * @note You can also pass an arbitrary number of arguments in
+ * place of the regular argument
+ * @return array array equivalent of list
+ */
+ public function makeLookup($list)
+ {
+ if (is_string($list)) {
+ $list = func_get_args();
+ }
+ $ret = array();
+ foreach ($list as $value) {
+ if (is_null($value)) {
+ continue;
+ }
+ $ret[$value] = true;
+ }
+ return $ret;
+ }
+
+ /**
+ * Lazy load construction of the module after determining whether
+ * or not it's needed, and also when a finalized configuration object
+ * is available.
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Bdo.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Bdo.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Bdo.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Bdo.php
index 191a78d..1e67c79 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Bdo.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Bdo.php
@@ -1,44 +1,44 @@
-<?php
-
-/**
- * XHTML 1.1 Bi-directional Text Module, defines elements that
- * declare directionality of content. Text Extension Module.
- */
-class HTMLPurifier_HTMLModule_Bdo extends HTMLPurifier_HTMLModule
-{
-
- /**
- * @type string
- */
- public $name = 'Bdo';
-
- /**
- * @type array
- */
- public $attr_collections = array(
- 'I18N' => array('dir' => false)
- );
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $bdo = $this->addElement(
- 'bdo',
- 'Inline',
- 'Inline',
- array('Core', 'Lang'),
- array(
- 'dir' => 'Enum#ltr,rtl', // required
- // The Abstract Module specification has the attribute
- // inclusions wrong for bdo: bdo allows Lang
- )
- );
- $bdo->attr_transform_post[] = new HTMLPurifier_AttrTransform_BdoDir();
-
- $this->attr_collections['I18N']['dir'] = 'Enum#ltr,rtl';
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * XHTML 1.1 Bi-directional Text Module, defines elements that
+ * declare directionality of content. Text Extension Module.
+ */
+class HTMLPurifier_HTMLModule_Bdo extends HTMLPurifier_HTMLModule
+{
+
+ /**
+ * @type string
+ */
+ public $name = 'Bdo';
+
+ /**
+ * @type array
+ */
+ public $attr_collections = array(
+ 'I18N' => array('dir' => false)
+ );
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $bdo = $this->addElement(
+ 'bdo',
+ 'Inline',
+ 'Inline',
+ array('Core', 'Lang'),
+ array(
+ 'dir' => 'Enum#ltr,rtl', // required
+ // The Abstract Module specification has the attribute
+ // inclusions wrong for bdo: bdo allows Lang
+ )
+ );
+ $bdo->attr_transform_post[] = new HTMLPurifier_AttrTransform_BdoDir();
+
+ $this->attr_collections['I18N']['dir'] = 'Enum#ltr,rtl';
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/CommonAttributes.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/CommonAttributes.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/CommonAttributes.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/CommonAttributes.php
index e2fe53f..a96ab1b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/CommonAttributes.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/CommonAttributes.php
@@ -1,31 +1,31 @@
-<?php
-
-class HTMLPurifier_HTMLModule_CommonAttributes extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'CommonAttributes';
-
- /**
- * @type array
- */
- public $attr_collections = array(
- 'Core' => array(
- 0 => array('Style'),
- // 'xml:space' => false,
- 'class' => 'Class',
- 'id' => 'ID',
- 'title' => 'CDATA',
- ),
- 'Lang' => array(),
- 'I18N' => array(
- 0 => array('Lang'), // proprietary, for xml:lang/lang
- ),
- 'Common' => array(
- 0 => array('Core', 'I18N')
- )
- );
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_HTMLModule_CommonAttributes extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'CommonAttributes';
+
+ /**
+ * @type array
+ */
+ public $attr_collections = array(
+ 'Core' => array(
+ 0 => array('Style'),
+ // 'xml:space' => false,
+ 'class' => 'Class',
+ 'id' => 'ID',
+ 'title' => 'CDATA',
+ ),
+ 'Lang' => array(),
+ 'I18N' => array(
+ 0 => array('Lang'), // proprietary, for xml:lang/lang
+ ),
+ 'Common' => array(
+ 0 => array('Core', 'I18N')
+ )
+ );
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Edit.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Edit.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Edit.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Edit.php
index b828836..a9042a3 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Edit.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Edit.php
@@ -1,55 +1,55 @@
-<?php
-
-/**
- * XHTML 1.1 Edit Module, defines editing-related elements. Text Extension
- * Module.
- */
-class HTMLPurifier_HTMLModule_Edit extends HTMLPurifier_HTMLModule
-{
-
- /**
- * @type string
- */
- public $name = 'Edit';
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $contents = 'Chameleon: #PCDATA | Inline ! #PCDATA | Flow';
- $attr = array(
- 'cite' => 'URI',
- // 'datetime' => 'Datetime', // not implemented
- );
- $this->addElement('del', 'Inline', $contents, 'Common', $attr);
- $this->addElement('ins', 'Inline', $contents, 'Common', $attr);
- }
-
- // HTML 4.01 specifies that ins/del must not contain block
- // elements when used in an inline context, chameleon is
- // a complicated workaround to acheive this effect
-
- // Inline context ! Block context (exclamation mark is
- // separator, see getChildDef for parsing)
-
- /**
- * @type bool
- */
- public $defines_child_def = true;
-
- /**
- * @param HTMLPurifier_ElementDef $def
- * @return HTMLPurifier_ChildDef_Chameleon
- */
- public function getChildDef($def)
- {
- if ($def->content_model_type != 'chameleon') {
- return false;
- }
- $value = explode('!', $def->content_model);
- return new HTMLPurifier_ChildDef_Chameleon($value[0], $value[1]);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * XHTML 1.1 Edit Module, defines editing-related elements. Text Extension
+ * Module.
+ */
+class HTMLPurifier_HTMLModule_Edit extends HTMLPurifier_HTMLModule
+{
+
+ /**
+ * @type string
+ */
+ public $name = 'Edit';
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $contents = 'Chameleon: #PCDATA | Inline ! #PCDATA | Flow';
+ $attr = array(
+ 'cite' => 'URI',
+ // 'datetime' => 'Datetime', // not implemented
+ );
+ $this->addElement('del', 'Inline', $contents, 'Common', $attr);
+ $this->addElement('ins', 'Inline', $contents, 'Common', $attr);
+ }
+
+ // HTML 4.01 specifies that ins/del must not contain block
+ // elements when used in an inline context, chameleon is
+ // a complicated workaround to acheive this effect
+
+ // Inline context ! Block context (exclamation mark is
+ // separator, see getChildDef for parsing)
+
+ /**
+ * @type bool
+ */
+ public $defines_child_def = true;
+
+ /**
+ * @param HTMLPurifier_ElementDef $def
+ * @return HTMLPurifier_ChildDef_Chameleon
+ */
+ public function getChildDef($def)
+ {
+ if ($def->content_model_type != 'chameleon') {
+ return false;
+ }
+ $value = explode('!', $def->content_model);
+ return new HTMLPurifier_ChildDef_Chameleon($value[0], $value[1]);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Forms.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Forms.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Forms.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Forms.php
index 13ce6ad..6f7ddbc 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Forms.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Forms.php
@@ -1,190 +1,190 @@
-<?php
-
-/**
- * XHTML 1.1 Forms module, defines all form-related elements found in HTML 4.
- */
-class HTMLPurifier_HTMLModule_Forms extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'Forms';
-
- /**
- * @type bool
- */
- public $safe = false;
-
- /**
- * @type array
- */
- public $content_sets = array(
- 'Block' => 'Form',
- 'Inline' => 'Formctrl',
- );
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $form = $this->addElement(
- 'form',
- 'Form',
- 'Required: Heading | List | Block | fieldset',
- 'Common',
- array(
- 'accept' => 'ContentTypes',
- 'accept-charset' => 'Charsets',
- 'action*' => 'URI',
- 'method' => 'Enum#get,post',
- // really ContentType, but these two are the only ones used today
- 'enctype' => 'Enum#application/x-www-form-urlencoded,multipart/form-data',
- )
- );
- $form->excludes = array('form' => true);
-
- $input = $this->addElement(
- 'input',
- 'Formctrl',
- 'Empty',
- 'Common',
- array(
- 'accept' => 'ContentTypes',
- 'accesskey' => 'Character',
- 'alt' => 'Text',
- 'checked' => 'Bool#checked',
- 'disabled' => 'Bool#disabled',
- 'maxlength' => 'Number',
- 'name' => 'CDATA',
- 'readonly' => 'Bool#readonly',
- 'size' => 'Number',
- 'src' => 'URI#embedded',
- 'tabindex' => 'Number',
- 'type' => 'Enum#text,password,checkbox,button,radio,submit,reset,file,hidden,image',
- 'value' => 'CDATA',
- )
- );
- $input->attr_transform_post[] = new HTMLPurifier_AttrTransform_Input();
-
- $this->addElement(
- 'select',
- 'Formctrl',
- 'Required: optgroup | option',
- 'Common',
- array(
- 'disabled' => 'Bool#disabled',
- 'multiple' => 'Bool#multiple',
- 'name' => 'CDATA',
- 'size' => 'Number',
- 'tabindex' => 'Number',
- )
- );
-
- $this->addElement(
- 'option',
- false,
- 'Optional: #PCDATA',
- 'Common',
- array(
- 'disabled' => 'Bool#disabled',
- 'label' => 'Text',
- 'selected' => 'Bool#selected',
- 'value' => 'CDATA',
- )
- );
- // It's illegal for there to be more than one selected, but not
- // be multiple. Also, no selected means undefined behavior. This might
- // be difficult to implement; perhaps an injector, or a context variable.
-
- $textarea = $this->addElement(
- 'textarea',
- 'Formctrl',
- 'Optional: #PCDATA',
- 'Common',
- array(
- 'accesskey' => 'Character',
- 'cols*' => 'Number',
- 'disabled' => 'Bool#disabled',
- 'name' => 'CDATA',
- 'readonly' => 'Bool#readonly',
- 'rows*' => 'Number',
- 'tabindex' => 'Number',
- )
- );
- $textarea->attr_transform_pre[] = new HTMLPurifier_AttrTransform_Textarea();
-
- $button = $this->addElement(
- 'button',
- 'Formctrl',
- 'Optional: #PCDATA | Heading | List | Block | Inline',
- 'Common',
- array(
- 'accesskey' => 'Character',
- 'disabled' => 'Bool#disabled',
- 'name' => 'CDATA',
- 'tabindex' => 'Number',
- 'type' => 'Enum#button,submit,reset',
- 'value' => 'CDATA',
- )
- );
-
- // For exclusions, ideally we'd specify content sets, not literal elements
- $button->excludes = $this->makeLookup(
- 'form',
- 'fieldset', // Form
- 'input',
- 'select',
- 'textarea',
- 'label',
- 'button', // Formctrl
- 'a', // as per HTML 4.01 spec, this is omitted by modularization
- 'isindex',
- 'iframe' // legacy items
- );
-
- // Extra exclusion: img usemap="" is not permitted within this element.
- // We'll omit this for now, since we don't have any good way of
- // indicating it yet.
-
- // This is HIGHLY user-unfriendly; we need a custom child-def for this
- $this->addElement('fieldset', 'Form', 'Custom: (#WS?,legend,(Flow|#PCDATA)*)', 'Common');
-
- $label = $this->addElement(
- 'label',
- 'Formctrl',
- 'Optional: #PCDATA | Inline',
- 'Common',
- array(
- 'accesskey' => 'Character',
- // 'for' => 'IDREF', // IDREF not implemented, cannot allow
- )
- );
- $label->excludes = array('label' => true);
-
- $this->addElement(
- 'legend',
- false,
- 'Optional: #PCDATA | Inline',
- 'Common',
- array(
- 'accesskey' => 'Character',
- )
- );
-
- $this->addElement(
- 'optgroup',
- false,
- 'Required: option',
- 'Common',
- array(
- 'disabled' => 'Bool#disabled',
- 'label*' => 'Text',
- )
- );
- // Don't forget an injector for <isindex>. This one's a little complex
- // because it maps to multiple elements.
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * XHTML 1.1 Forms module, defines all form-related elements found in HTML 4.
+ */
+class HTMLPurifier_HTMLModule_Forms extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'Forms';
+
+ /**
+ * @type bool
+ */
+ public $safe = false;
+
+ /**
+ * @type array
+ */
+ public $content_sets = array(
+ 'Block' => 'Form',
+ 'Inline' => 'Formctrl',
+ );
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $form = $this->addElement(
+ 'form',
+ 'Form',
+ 'Required: Heading | List | Block | fieldset',
+ 'Common',
+ array(
+ 'accept' => 'ContentTypes',
+ 'accept-charset' => 'Charsets',
+ 'action*' => 'URI',
+ 'method' => 'Enum#get,post',
+ // really ContentType, but these two are the only ones used today
+ 'enctype' => 'Enum#application/x-www-form-urlencoded,multipart/form-data',
+ )
+ );
+ $form->excludes = array('form' => true);
+
+ $input = $this->addElement(
+ 'input',
+ 'Formctrl',
+ 'Empty',
+ 'Common',
+ array(
+ 'accept' => 'ContentTypes',
+ 'accesskey' => 'Character',
+ 'alt' => 'Text',
+ 'checked' => 'Bool#checked',
+ 'disabled' => 'Bool#disabled',
+ 'maxlength' => 'Number',
+ 'name' => 'CDATA',
+ 'readonly' => 'Bool#readonly',
+ 'size' => 'Number',
+ 'src' => 'URI#embedded',
+ 'tabindex' => 'Number',
+ 'type' => 'Enum#text,password,checkbox,button,radio,submit,reset,file,hidden,image',
+ 'value' => 'CDATA',
+ )
+ );
+ $input->attr_transform_post[] = new HTMLPurifier_AttrTransform_Input();
+
+ $this->addElement(
+ 'select',
+ 'Formctrl',
+ 'Required: optgroup | option',
+ 'Common',
+ array(
+ 'disabled' => 'Bool#disabled',
+ 'multiple' => 'Bool#multiple',
+ 'name' => 'CDATA',
+ 'size' => 'Number',
+ 'tabindex' => 'Number',
+ )
+ );
+
+ $this->addElement(
+ 'option',
+ false,
+ 'Optional: #PCDATA',
+ 'Common',
+ array(
+ 'disabled' => 'Bool#disabled',
+ 'label' => 'Text',
+ 'selected' => 'Bool#selected',
+ 'value' => 'CDATA',
+ )
+ );
+ // It's illegal for there to be more than one selected, but not
+ // be multiple. Also, no selected means undefined behavior. This might
+ // be difficult to implement; perhaps an injector, or a context variable.
+
+ $textarea = $this->addElement(
+ 'textarea',
+ 'Formctrl',
+ 'Optional: #PCDATA',
+ 'Common',
+ array(
+ 'accesskey' => 'Character',
+ 'cols*' => 'Number',
+ 'disabled' => 'Bool#disabled',
+ 'name' => 'CDATA',
+ 'readonly' => 'Bool#readonly',
+ 'rows*' => 'Number',
+ 'tabindex' => 'Number',
+ )
+ );
+ $textarea->attr_transform_pre[] = new HTMLPurifier_AttrTransform_Textarea();
+
+ $button = $this->addElement(
+ 'button',
+ 'Formctrl',
+ 'Optional: #PCDATA | Heading | List | Block | Inline',
+ 'Common',
+ array(
+ 'accesskey' => 'Character',
+ 'disabled' => 'Bool#disabled',
+ 'name' => 'CDATA',
+ 'tabindex' => 'Number',
+ 'type' => 'Enum#button,submit,reset',
+ 'value' => 'CDATA',
+ )
+ );
+
+ // For exclusions, ideally we'd specify content sets, not literal elements
+ $button->excludes = $this->makeLookup(
+ 'form',
+ 'fieldset', // Form
+ 'input',
+ 'select',
+ 'textarea',
+ 'label',
+ 'button', // Formctrl
+ 'a', // as per HTML 4.01 spec, this is omitted by modularization
+ 'isindex',
+ 'iframe' // legacy items
+ );
+
+ // Extra exclusion: img usemap="" is not permitted within this element.
+ // We'll omit this for now, since we don't have any good way of
+ // indicating it yet.
+
+ // This is HIGHLY user-unfriendly; we need a custom child-def for this
+ $this->addElement('fieldset', 'Form', 'Custom: (#WS?,legend,(Flow|#PCDATA)*)', 'Common');
+
+ $label = $this->addElement(
+ 'label',
+ 'Formctrl',
+ 'Optional: #PCDATA | Inline',
+ 'Common',
+ array(
+ 'accesskey' => 'Character',
+ // 'for' => 'IDREF', // IDREF not implemented, cannot allow
+ )
+ );
+ $label->excludes = array('label' => true);
+
+ $this->addElement(
+ 'legend',
+ false,
+ 'Optional: #PCDATA | Inline',
+ 'Common',
+ array(
+ 'accesskey' => 'Character',
+ )
+ );
+
+ $this->addElement(
+ 'optgroup',
+ false,
+ 'Required: option',
+ 'Common',
+ array(
+ 'disabled' => 'Bool#disabled',
+ 'label*' => 'Text',
+ )
+ );
+ // Don't forget an injector for <isindex>. This one's a little complex
+ // because it maps to multiple elements.
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Hypertext.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Hypertext.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Hypertext.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Hypertext.php
index 968c07e..72d7a31 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Hypertext.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Hypertext.php
@@ -1,40 +1,40 @@
-<?php
-
-/**
- * XHTML 1.1 Hypertext Module, defines hypertext links. Core Module.
- */
-class HTMLPurifier_HTMLModule_Hypertext extends HTMLPurifier_HTMLModule
-{
-
- /**
- * @type string
- */
- public $name = 'Hypertext';
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $a = $this->addElement(
- 'a',
- 'Inline',
- 'Inline',
- 'Common',
- array(
- // 'accesskey' => 'Character',
- // 'charset' => 'Charset',
- 'href' => 'URI',
- // 'hreflang' => 'LanguageCode',
- 'rel' => new HTMLPurifier_AttrDef_HTML_LinkTypes('rel'),
- 'rev' => new HTMLPurifier_AttrDef_HTML_LinkTypes('rev'),
- // 'tabindex' => 'Number',
- // 'type' => 'ContentType',
- )
- );
- $a->formatting = true;
- $a->excludes = array('a' => true);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * XHTML 1.1 Hypertext Module, defines hypertext links. Core Module.
+ */
+class HTMLPurifier_HTMLModule_Hypertext extends HTMLPurifier_HTMLModule
+{
+
+ /**
+ * @type string
+ */
+ public $name = 'Hypertext';
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $a = $this->addElement(
+ 'a',
+ 'Inline',
+ 'Inline',
+ 'Common',
+ array(
+ // 'accesskey' => 'Character',
+ // 'charset' => 'Charset',
+ 'href' => 'URI',
+ // 'hreflang' => 'LanguageCode',
+ 'rel' => new HTMLPurifier_AttrDef_HTML_LinkTypes('rel'),
+ 'rev' => new HTMLPurifier_AttrDef_HTML_LinkTypes('rev'),
+ // 'tabindex' => 'Number',
+ // 'type' => 'ContentType',
+ )
+ );
+ $a->formatting = true;
+ $a->excludes = array('a' => true);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Iframe.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Iframe.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Iframe.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Iframe.php
index 2c9bdc5..f7e7c91 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Iframe.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Iframe.php
@@ -1,51 +1,51 @@
-<?php
-
-/**
- * XHTML 1.1 Iframe Module provides inline frames.
- *
- * @note This module is not considered safe unless an Iframe
- * whitelisting mechanism is specified. Currently, the only
- * such mechanism is %URL.SafeIframeRegexp
- */
-class HTMLPurifier_HTMLModule_Iframe extends HTMLPurifier_HTMLModule
-{
-
- /**
- * @type string
- */
- public $name = 'Iframe';
-
- /**
- * @type bool
- */
- public $safe = false;
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- if ($config->get('HTML.SafeIframe')) {
- $this->safe = true;
- }
- $this->addElement(
- 'iframe',
- 'Inline',
- 'Flow',
- 'Common',
- array(
- 'src' => 'URI#embedded',
- 'width' => 'Length',
- 'height' => 'Length',
- 'name' => 'ID',
- 'scrolling' => 'Enum#yes,no,auto',
- 'frameborder' => 'Enum#0,1',
- 'longdesc' => 'URI',
- 'marginheight' => 'Pixels',
- 'marginwidth' => 'Pixels',
- )
- );
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * XHTML 1.1 Iframe Module provides inline frames.
+ *
+ * @note This module is not considered safe unless an Iframe
+ * whitelisting mechanism is specified. Currently, the only
+ * such mechanism is %URL.SafeIframeRegexp
+ */
+class HTMLPurifier_HTMLModule_Iframe extends HTMLPurifier_HTMLModule
+{
+
+ /**
+ * @type string
+ */
+ public $name = 'Iframe';
+
+ /**
+ * @type bool
+ */
+ public $safe = false;
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ if ($config->get('HTML.SafeIframe')) {
+ $this->safe = true;
+ }
+ $this->addElement(
+ 'iframe',
+ 'Inline',
+ 'Flow',
+ 'Common',
+ array(
+ 'src' => 'URI#embedded',
+ 'width' => 'Length',
+ 'height' => 'Length',
+ 'name' => 'ID',
+ 'scrolling' => 'Enum#yes,no,auto',
+ 'frameborder' => 'Enum#0,1',
+ 'longdesc' => 'URI',
+ 'marginheight' => 'Pixels',
+ 'marginwidth' => 'Pixels',
+ )
+ );
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Image.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Image.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Image.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Image.php
index 0ed7411..0f5fdb3 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Image.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Image.php
@@ -1,49 +1,49 @@
-<?php
-
-/**
- * XHTML 1.1 Image Module provides basic image embedding.
- * @note There is specialized code for removing empty images in
- * HTMLPurifier_Strategy_RemoveForeignElements
- */
-class HTMLPurifier_HTMLModule_Image extends HTMLPurifier_HTMLModule
-{
-
- /**
- * @type string
- */
- public $name = 'Image';
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $max = $config->get('HTML.MaxImgLength');
- $img = $this->addElement(
- 'img',
- 'Inline',
- 'Empty',
- 'Common',
- array(
- 'alt*' => 'Text',
- // According to the spec, it's Length, but percents can
- // be abused, so we allow only Pixels.
- 'height' => 'Pixels#' . $max,
- 'width' => 'Pixels#' . $max,
- 'longdesc' => 'URI',
- 'src*' => new HTMLPurifier_AttrDef_URI(true), // embedded
- )
- );
- if ($max === null || $config->get('HTML.Trusted')) {
- $img->attr['height'] =
- $img->attr['width'] = 'Length';
- }
-
- // kind of strange, but splitting things up would be inefficient
- $img->attr_transform_pre[] =
- $img->attr_transform_post[] =
- new HTMLPurifier_AttrTransform_ImgRequired();
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * XHTML 1.1 Image Module provides basic image embedding.
+ * @note There is specialized code for removing empty images in
+ * HTMLPurifier_Strategy_RemoveForeignElements
+ */
+class HTMLPurifier_HTMLModule_Image extends HTMLPurifier_HTMLModule
+{
+
+ /**
+ * @type string
+ */
+ public $name = 'Image';
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $max = $config->get('HTML.MaxImgLength');
+ $img = $this->addElement(
+ 'img',
+ 'Inline',
+ 'Empty',
+ 'Common',
+ array(
+ 'alt*' => 'Text',
+ // According to the spec, it's Length, but percents can
+ // be abused, so we allow only Pixels.
+ 'height' => 'Pixels#' . $max,
+ 'width' => 'Pixels#' . $max,
+ 'longdesc' => 'URI',
+ 'src*' => new HTMLPurifier_AttrDef_URI(true), // embedded
+ )
+ );
+ if ($max === null || $config->get('HTML.Trusted')) {
+ $img->attr['height'] =
+ $img->attr['width'] = 'Length';
+ }
+
+ // kind of strange, but splitting things up would be inefficient
+ $img->attr_transform_pre[] =
+ $img->attr_transform_post[] =
+ new HTMLPurifier_AttrTransform_ImgRequired();
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Legacy.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Legacy.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Legacy.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Legacy.php
index 9ca1cb3..86b5299 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Legacy.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Legacy.php
@@ -1,186 +1,186 @@
-<?php
-
-/**
- * XHTML 1.1 Legacy module defines elements that were previously
- * deprecated.
- *
- * @note Not all legacy elements have been implemented yet, which
- * is a bit of a reverse problem as compared to browsers! In
- * addition, this legacy module may implement a bit more than
- * mandated by XHTML 1.1.
- *
- * This module can be used in combination with TransformToStrict in order
- * to transform as many deprecated elements as possible, but retain
- * questionably deprecated elements that do not have good alternatives
- * as well as transform elements that don't have an implementation.
- * See docs/ref-strictness.txt for more details.
- */
-
-class HTMLPurifier_HTMLModule_Legacy extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'Legacy';
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $this->addElement(
- 'basefont',
- 'Inline',
- 'Empty',
- null,
- array(
- 'color' => 'Color',
- 'face' => 'Text', // extremely broad, we should
- 'size' => 'Text', // tighten it
- 'id' => 'ID'
- )
- );
- $this->addElement('center', 'Block', 'Flow', 'Common');
- $this->addElement(
- 'dir',
- 'Block',
- 'Required: li',
- 'Common',
- array(
- 'compact' => 'Bool#compact'
- )
- );
- $this->addElement(
- 'font',
- 'Inline',
- 'Inline',
- array('Core', 'I18N'),
- array(
- 'color' => 'Color',
- 'face' => 'Text', // extremely broad, we should
- 'size' => 'Text', // tighten it
- )
- );
- $this->addElement(
- 'menu',
- 'Block',
- 'Required: li',
- 'Common',
- array(
- 'compact' => 'Bool#compact'
- )
- );
-
- $s = $this->addElement('s', 'Inline', 'Inline', 'Common');
- $s->formatting = true;
-
- $strike = $this->addElement('strike', 'Inline', 'Inline', 'Common');
- $strike->formatting = true;
-
- $u = $this->addElement('u', 'Inline', 'Inline', 'Common');
- $u->formatting = true;
-
- // setup modifications to old elements
-
- $align = 'Enum#left,right,center,justify';
-
- $address = $this->addBlankElement('address');
- $address->content_model = 'Inline | #PCDATA | p';
- $address->content_model_type = 'optional';
- $address->child = false;
-
- $blockquote = $this->addBlankElement('blockquote');
- $blockquote->content_model = 'Flow | #PCDATA';
- $blockquote->content_model_type = 'optional';
- $blockquote->child = false;
-
- $br = $this->addBlankElement('br');
- $br->attr['clear'] = 'Enum#left,all,right,none';
-
- $caption = $this->addBlankElement('caption');
- $caption->attr['align'] = 'Enum#top,bottom,left,right';
-
- $div = $this->addBlankElement('div');
- $div->attr['align'] = $align;
-
- $dl = $this->addBlankElement('dl');
- $dl->attr['compact'] = 'Bool#compact';
-
- for ($i = 1; $i <= 6; $i++) {
- $h = $this->addBlankElement("h$i");
- $h->attr['align'] = $align;
- }
-
- $hr = $this->addBlankElement('hr');
- $hr->attr['align'] = $align;
- $hr->attr['noshade'] = 'Bool#noshade';
- $hr->attr['size'] = 'Pixels';
- $hr->attr['width'] = 'Length';
-
- $img = $this->addBlankElement('img');
- $img->attr['align'] = 'IAlign';
- $img->attr['border'] = 'Pixels';
- $img->attr['hspace'] = 'Pixels';
- $img->attr['vspace'] = 'Pixels';
-
- // figure out this integer business
-
- $li = $this->addBlankElement('li');
- $li->attr['value'] = new HTMLPurifier_AttrDef_Integer();
- $li->attr['type'] = 'Enum#s:1,i,I,a,A,disc,square,circle';
-
- $ol = $this->addBlankElement('ol');
- $ol->attr['compact'] = 'Bool#compact';
- $ol->attr['start'] = new HTMLPurifier_AttrDef_Integer();
- $ol->attr['type'] = 'Enum#s:1,i,I,a,A';
-
- $p = $this->addBlankElement('p');
- $p->attr['align'] = $align;
-
- $pre = $this->addBlankElement('pre');
- $pre->attr['width'] = 'Number';
-
- // script omitted
-
- $table = $this->addBlankElement('table');
- $table->attr['align'] = 'Enum#left,center,right';
- $table->attr['bgcolor'] = 'Color';
-
- $tr = $this->addBlankElement('tr');
- $tr->attr['bgcolor'] = 'Color';
-
- $th = $this->addBlankElement('th');
- $th->attr['bgcolor'] = 'Color';
- $th->attr['height'] = 'Length';
- $th->attr['nowrap'] = 'Bool#nowrap';
- $th->attr['width'] = 'Length';
-
- $td = $this->addBlankElement('td');
- $td->attr['bgcolor'] = 'Color';
- $td->attr['height'] = 'Length';
- $td->attr['nowrap'] = 'Bool#nowrap';
- $td->attr['width'] = 'Length';
-
- $ul = $this->addBlankElement('ul');
- $ul->attr['compact'] = 'Bool#compact';
- $ul->attr['type'] = 'Enum#square,disc,circle';
-
- // "safe" modifications to "unsafe" elements
- // WARNING: If you want to add support for an unsafe, legacy
- // attribute, make a new TrustedLegacy module with the trusted
- // bit set appropriately
-
- $form = $this->addBlankElement('form');
- $form->content_model = 'Flow | #PCDATA';
- $form->content_model_type = 'optional';
- $form->attr['target'] = 'FrameTarget';
-
- $input = $this->addBlankElement('input');
- $input->attr['align'] = 'IAlign';
-
- $legend = $this->addBlankElement('legend');
- $legend->attr['align'] = 'LAlign';
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * XHTML 1.1 Legacy module defines elements that were previously
+ * deprecated.
+ *
+ * @note Not all legacy elements have been implemented yet, which
+ * is a bit of a reverse problem as compared to browsers! In
+ * addition, this legacy module may implement a bit more than
+ * mandated by XHTML 1.1.
+ *
+ * This module can be used in combination with TransformToStrict in order
+ * to transform as many deprecated elements as possible, but retain
+ * questionably deprecated elements that do not have good alternatives
+ * as well as transform elements that don't have an implementation.
+ * See docs/ref-strictness.txt for more details.
+ */
+
+class HTMLPurifier_HTMLModule_Legacy extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'Legacy';
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $this->addElement(
+ 'basefont',
+ 'Inline',
+ 'Empty',
+ null,
+ array(
+ 'color' => 'Color',
+ 'face' => 'Text', // extremely broad, we should
+ 'size' => 'Text', // tighten it
+ 'id' => 'ID'
+ )
+ );
+ $this->addElement('center', 'Block', 'Flow', 'Common');
+ $this->addElement(
+ 'dir',
+ 'Block',
+ 'Required: li',
+ 'Common',
+ array(
+ 'compact' => 'Bool#compact'
+ )
+ );
+ $this->addElement(
+ 'font',
+ 'Inline',
+ 'Inline',
+ array('Core', 'I18N'),
+ array(
+ 'color' => 'Color',
+ 'face' => 'Text', // extremely broad, we should
+ 'size' => 'Text', // tighten it
+ )
+ );
+ $this->addElement(
+ 'menu',
+ 'Block',
+ 'Required: li',
+ 'Common',
+ array(
+ 'compact' => 'Bool#compact'
+ )
+ );
+
+ $s = $this->addElement('s', 'Inline', 'Inline', 'Common');
+ $s->formatting = true;
+
+ $strike = $this->addElement('strike', 'Inline', 'Inline', 'Common');
+ $strike->formatting = true;
+
+ $u = $this->addElement('u', 'Inline', 'Inline', 'Common');
+ $u->formatting = true;
+
+ // setup modifications to old elements
+
+ $align = 'Enum#left,right,center,justify';
+
+ $address = $this->addBlankElement('address');
+ $address->content_model = 'Inline | #PCDATA | p';
+ $address->content_model_type = 'optional';
+ $address->child = false;
+
+ $blockquote = $this->addBlankElement('blockquote');
+ $blockquote->content_model = 'Flow | #PCDATA';
+ $blockquote->content_model_type = 'optional';
+ $blockquote->child = false;
+
+ $br = $this->addBlankElement('br');
+ $br->attr['clear'] = 'Enum#left,all,right,none';
+
+ $caption = $this->addBlankElement('caption');
+ $caption->attr['align'] = 'Enum#top,bottom,left,right';
+
+ $div = $this->addBlankElement('div');
+ $div->attr['align'] = $align;
+
+ $dl = $this->addBlankElement('dl');
+ $dl->attr['compact'] = 'Bool#compact';
+
+ for ($i = 1; $i <= 6; $i++) {
+ $h = $this->addBlankElement("h$i");
+ $h->attr['align'] = $align;
+ }
+
+ $hr = $this->addBlankElement('hr');
+ $hr->attr['align'] = $align;
+ $hr->attr['noshade'] = 'Bool#noshade';
+ $hr->attr['size'] = 'Pixels';
+ $hr->attr['width'] = 'Length';
+
+ $img = $this->addBlankElement('img');
+ $img->attr['align'] = 'IAlign';
+ $img->attr['border'] = 'Pixels';
+ $img->attr['hspace'] = 'Pixels';
+ $img->attr['vspace'] = 'Pixels';
+
+ // figure out this integer business
+
+ $li = $this->addBlankElement('li');
+ $li->attr['value'] = new HTMLPurifier_AttrDef_Integer();
+ $li->attr['type'] = 'Enum#s:1,i,I,a,A,disc,square,circle';
+
+ $ol = $this->addBlankElement('ol');
+ $ol->attr['compact'] = 'Bool#compact';
+ $ol->attr['start'] = new HTMLPurifier_AttrDef_Integer();
+ $ol->attr['type'] = 'Enum#s:1,i,I,a,A';
+
+ $p = $this->addBlankElement('p');
+ $p->attr['align'] = $align;
+
+ $pre = $this->addBlankElement('pre');
+ $pre->attr['width'] = 'Number';
+
+ // script omitted
+
+ $table = $this->addBlankElement('table');
+ $table->attr['align'] = 'Enum#left,center,right';
+ $table->attr['bgcolor'] = 'Color';
+
+ $tr = $this->addBlankElement('tr');
+ $tr->attr['bgcolor'] = 'Color';
+
+ $th = $this->addBlankElement('th');
+ $th->attr['bgcolor'] = 'Color';
+ $th->attr['height'] = 'Length';
+ $th->attr['nowrap'] = 'Bool#nowrap';
+ $th->attr['width'] = 'Length';
+
+ $td = $this->addBlankElement('td');
+ $td->attr['bgcolor'] = 'Color';
+ $td->attr['height'] = 'Length';
+ $td->attr['nowrap'] = 'Bool#nowrap';
+ $td->attr['width'] = 'Length';
+
+ $ul = $this->addBlankElement('ul');
+ $ul->attr['compact'] = 'Bool#compact';
+ $ul->attr['type'] = 'Enum#square,disc,circle';
+
+ // "safe" modifications to "unsafe" elements
+ // WARNING: If you want to add support for an unsafe, legacy
+ // attribute, make a new TrustedLegacy module with the trusted
+ // bit set appropriately
+
+ $form = $this->addBlankElement('form');
+ $form->content_model = 'Flow | #PCDATA';
+ $form->content_model_type = 'optional';
+ $form->attr['target'] = 'FrameTarget';
+
+ $input = $this->addBlankElement('input');
+ $input->attr['align'] = 'IAlign';
+
+ $legend = $this->addBlankElement('legend');
+ $legend->attr['align'] = 'LAlign';
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/List.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/List.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/List.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/List.php
index 605e37c..7a20ff7 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/List.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/List.php
@@ -1,51 +1,51 @@
-<?php
-
-/**
- * XHTML 1.1 List Module, defines list-oriented elements. Core Module.
- */
-class HTMLPurifier_HTMLModule_List extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'List';
-
- // According to the abstract schema, the List content set is a fully formed
- // one or more expr, but it invariably occurs in an optional declaration
- // so we're not going to do that subtlety. It might cause trouble
- // if a user defines "List" and expects that multiple lists are
- // allowed to be specified, but then again, that's not very intuitive.
- // Furthermore, the actual XML Schema may disagree. Regardless,
- // we don't have support for such nested expressions without using
- // the incredibly inefficient and draconic Custom ChildDef.
-
- /**
- * @type array
- */
- public $content_sets = array('Flow' => 'List');
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $ol = $this->addElement('ol', 'List', new HTMLPurifier_ChildDef_List(), 'Common');
- $ul = $this->addElement('ul', 'List', new HTMLPurifier_ChildDef_List(), 'Common');
- // XXX The wrap attribute is handled by MakeWellFormed. This is all
- // quite unsatisfactory, because we generated this
- // *specifically* for lists, and now a big chunk of the handling
- // is done properly by the List ChildDef. So actually, we just
- // want enough information to make autoclosing work properly,
- // and then hand off the tricky stuff to the ChildDef.
- $ol->wrap = 'li';
- $ul->wrap = 'li';
- $this->addElement('dl', 'List', 'Required: dt | dd', 'Common');
-
- $this->addElement('li', false, 'Flow', 'Common');
-
- $this->addElement('dd', false, 'Flow', 'Common');
- $this->addElement('dt', false, 'Inline', 'Common');
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * XHTML 1.1 List Module, defines list-oriented elements. Core Module.
+ */
+class HTMLPurifier_HTMLModule_List extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'List';
+
+ // According to the abstract schema, the List content set is a fully formed
+ // one or more expr, but it invariably occurs in an optional declaration
+ // so we're not going to do that subtlety. It might cause trouble
+ // if a user defines "List" and expects that multiple lists are
+ // allowed to be specified, but then again, that's not very intuitive.
+ // Furthermore, the actual XML Schema may disagree. Regardless,
+ // we don't have support for such nested expressions without using
+ // the incredibly inefficient and draconic Custom ChildDef.
+
+ /**
+ * @type array
+ */
+ public $content_sets = array('Flow' => 'List');
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $ol = $this->addElement('ol', 'List', new HTMLPurifier_ChildDef_List(), 'Common');
+ $ul = $this->addElement('ul', 'List', new HTMLPurifier_ChildDef_List(), 'Common');
+ // XXX The wrap attribute is handled by MakeWellFormed. This is all
+ // quite unsatisfactory, because we generated this
+ // *specifically* for lists, and now a big chunk of the handling
+ // is done properly by the List ChildDef. So actually, we just
+ // want enough information to make autoclosing work properly,
+ // and then hand off the tricky stuff to the ChildDef.
+ $ol->wrap = 'li';
+ $ul->wrap = 'li';
+ $this->addElement('dl', 'List', 'Required: dt | dd', 'Common');
+
+ $this->addElement('li', false, 'Flow', 'Common');
+
+ $this->addElement('dd', false, 'Flow', 'Common');
+ $this->addElement('dt', false, 'Inline', 'Common');
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Name.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Name.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Name.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Name.php
index 315e22a..60c0545 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Name.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Name.php
@@ -1,26 +1,26 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Name extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'Name';
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $elements = array('a', 'applet', 'form', 'frame', 'iframe', 'img', 'map');
- foreach ($elements as $name) {
- $element = $this->addBlankElement($name);
- $element->attr['name'] = 'CDATA';
- if (!$config->get('HTML.Attr.Name.UseCDATA')) {
- $element->attr_transform_post[] = new HTMLPurifier_AttrTransform_NameSync();
- }
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_HTMLModule_Name extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'Name';
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $elements = array('a', 'applet', 'form', 'frame', 'iframe', 'img', 'map');
+ foreach ($elements as $name) {
+ $element = $this->addBlankElement($name);
+ $element->attr['name'] = 'CDATA';
+ if (!$config->get('HTML.Attr.Name.UseCDATA')) {
+ $element->attr_transform_post[] = new HTMLPurifier_AttrTransform_NameSync();
+ }
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Nofollow.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Nofollow.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Nofollow.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Nofollow.php
index c145e8e..dc9410a 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Nofollow.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Nofollow.php
@@ -1,25 +1,25 @@
-<?php
-
-/**
- * Module adds the nofollow attribute transformation to a tags. It
- * is enabled by HTML.Nofollow
- */
-class HTMLPurifier_HTMLModule_Nofollow extends HTMLPurifier_HTMLModule
-{
-
- /**
- * @type string
- */
- public $name = 'Nofollow';
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $a = $this->addBlankElement('a');
- $a->attr_transform_post[] = new HTMLPurifier_AttrTransform_Nofollow();
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Module adds the nofollow attribute transformation to a tags. It
+ * is enabled by HTML.Nofollow
+ */
+class HTMLPurifier_HTMLModule_Nofollow extends HTMLPurifier_HTMLModule
+{
+
+ /**
+ * @type string
+ */
+ public $name = 'Nofollow';
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $a = $this->addBlankElement('a');
+ $a->attr_transform_post[] = new HTMLPurifier_AttrTransform_Nofollow();
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
similarity index 94%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
index 7d66e11..da72225 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
@@ -1,20 +1,20 @@
-<?php
-
-class HTMLPurifier_HTMLModule_NonXMLCommonAttributes extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'NonXMLCommonAttributes';
-
- /**
- * @type array
- */
- public $attr_collections = array(
- 'Lang' => array(
- 'lang' => 'LanguageCode',
- )
- );
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_HTMLModule_NonXMLCommonAttributes extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'NonXMLCommonAttributes';
+
+ /**
+ * @type array
+ */
+ public $attr_collections = array(
+ 'Lang' => array(
+ 'lang' => 'LanguageCode',
+ )
+ );
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Object.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Object.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Object.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Object.php
index d388b24..2f9efc5 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Object.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Object.php
@@ -1,62 +1,62 @@
-<?php
-
-/**
- * XHTML 1.1 Object Module, defines elements for generic object inclusion
- * @warning Users will commonly use <embed> to cater to legacy browsers: this
- * module does not allow this sort of behavior
- */
-class HTMLPurifier_HTMLModule_Object extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'Object';
-
- /**
- * @type bool
- */
- public $safe = false;
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $this->addElement(
- 'object',
- 'Inline',
- 'Optional: #PCDATA | Flow | param',
- 'Common',
- array(
- 'archive' => 'URI',
- 'classid' => 'URI',
- 'codebase' => 'URI',
- 'codetype' => 'Text',
- 'data' => 'URI',
- 'declare' => 'Bool#declare',
- 'height' => 'Length',
- 'name' => 'CDATA',
- 'standby' => 'Text',
- 'tabindex' => 'Number',
- 'type' => 'ContentType',
- 'width' => 'Length'
- )
- );
-
- $this->addElement(
- 'param',
- false,
- 'Empty',
- null,
- array(
- 'id' => 'ID',
- 'name*' => 'Text',
- 'type' => 'Text',
- 'value' => 'Text',
- 'valuetype' => 'Enum#data,ref,object'
- )
- );
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * XHTML 1.1 Object Module, defines elements for generic object inclusion
+ * @warning Users will commonly use <embed> to cater to legacy browsers: this
+ * module does not allow this sort of behavior
+ */
+class HTMLPurifier_HTMLModule_Object extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'Object';
+
+ /**
+ * @type bool
+ */
+ public $safe = false;
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $this->addElement(
+ 'object',
+ 'Inline',
+ 'Optional: #PCDATA | Flow | param',
+ 'Common',
+ array(
+ 'archive' => 'URI',
+ 'classid' => 'URI',
+ 'codebase' => 'URI',
+ 'codetype' => 'Text',
+ 'data' => 'URI',
+ 'declare' => 'Bool#declare',
+ 'height' => 'Length',
+ 'name' => 'CDATA',
+ 'standby' => 'Text',
+ 'tabindex' => 'Number',
+ 'type' => 'ContentType',
+ 'width' => 'Length'
+ )
+ );
+
+ $this->addElement(
+ 'param',
+ false,
+ 'Empty',
+ null,
+ array(
+ 'id' => 'ID',
+ 'name*' => 'Text',
+ 'type' => 'Text',
+ 'value' => 'Text',
+ 'valuetype' => 'Enum#data,ref,object'
+ )
+ );
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Presentation.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Presentation.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Presentation.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Presentation.php
index 831db4c..6458ce9 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Presentation.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Presentation.php
@@ -1,42 +1,42 @@
-<?php
-
-/**
- * XHTML 1.1 Presentation Module, defines simple presentation-related
- * markup. Text Extension Module.
- * @note The official XML Schema and DTD specs further divide this into
- * two modules:
- * - Block Presentation (hr)
- * - Inline Presentation (b, big, i, small, sub, sup, tt)
- * We have chosen not to heed this distinction, as content_sets
- * provides satisfactory disambiguation.
- */
-class HTMLPurifier_HTMLModule_Presentation extends HTMLPurifier_HTMLModule
-{
-
- /**
- * @type string
- */
- public $name = 'Presentation';
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $this->addElement('hr', 'Block', 'Empty', 'Common');
- $this->addElement('sub', 'Inline', 'Inline', 'Common');
- $this->addElement('sup', 'Inline', 'Inline', 'Common');
- $b = $this->addElement('b', 'Inline', 'Inline', 'Common');
- $b->formatting = true;
- $big = $this->addElement('big', 'Inline', 'Inline', 'Common');
- $big->formatting = true;
- $i = $this->addElement('i', 'Inline', 'Inline', 'Common');
- $i->formatting = true;
- $small = $this->addElement('small', 'Inline', 'Inline', 'Common');
- $small->formatting = true;
- $tt = $this->addElement('tt', 'Inline', 'Inline', 'Common');
- $tt->formatting = true;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * XHTML 1.1 Presentation Module, defines simple presentation-related
+ * markup. Text Extension Module.
+ * @note The official XML Schema and DTD specs further divide this into
+ * two modules:
+ * - Block Presentation (hr)
+ * - Inline Presentation (b, big, i, small, sub, sup, tt)
+ * We have chosen not to heed this distinction, as content_sets
+ * provides satisfactory disambiguation.
+ */
+class HTMLPurifier_HTMLModule_Presentation extends HTMLPurifier_HTMLModule
+{
+
+ /**
+ * @type string
+ */
+ public $name = 'Presentation';
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $this->addElement('hr', 'Block', 'Empty', 'Common');
+ $this->addElement('sub', 'Inline', 'Inline', 'Common');
+ $this->addElement('sup', 'Inline', 'Inline', 'Common');
+ $b = $this->addElement('b', 'Inline', 'Inline', 'Common');
+ $b->formatting = true;
+ $big = $this->addElement('big', 'Inline', 'Inline', 'Common');
+ $big->formatting = true;
+ $i = $this->addElement('i', 'Inline', 'Inline', 'Common');
+ $i->formatting = true;
+ $small = $this->addElement('small', 'Inline', 'Inline', 'Common');
+ $small->formatting = true;
+ $tt = $this->addElement('tt', 'Inline', 'Inline', 'Common');
+ $tt->formatting = true;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Proprietary.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Proprietary.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Proprietary.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Proprietary.php
index 4593fc4..5ee3c8e 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Proprietary.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Proprietary.php
@@ -1,40 +1,40 @@
-<?php
-
-/**
- * Module defines proprietary tags and attributes in HTML.
- * @warning If this module is enabled, standards-compliance is off!
- */
-class HTMLPurifier_HTMLModule_Proprietary extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'Proprietary';
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $this->addElement(
- 'marquee',
- 'Inline',
- 'Flow',
- 'Common',
- array(
- 'direction' => 'Enum#left,right,up,down',
- 'behavior' => 'Enum#alternate',
- 'width' => 'Length',
- 'height' => 'Length',
- 'scrolldelay' => 'Number',
- 'scrollamount' => 'Number',
- 'loop' => 'Number',
- 'bgcolor' => 'Color',
- 'hspace' => 'Pixels',
- 'vspace' => 'Pixels',
- )
- );
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Module defines proprietary tags and attributes in HTML.
+ * @warning If this module is enabled, standards-compliance is off!
+ */
+class HTMLPurifier_HTMLModule_Proprietary extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'Proprietary';
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $this->addElement(
+ 'marquee',
+ 'Inline',
+ 'Flow',
+ 'Common',
+ array(
+ 'direction' => 'Enum#left,right,up,down',
+ 'behavior' => 'Enum#alternate',
+ 'width' => 'Length',
+ 'height' => 'Length',
+ 'scrolldelay' => 'Number',
+ 'scrollamount' => 'Number',
+ 'loop' => 'Number',
+ 'bgcolor' => 'Color',
+ 'hspace' => 'Pixels',
+ 'vspace' => 'Pixels',
+ )
+ );
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Ruby.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Ruby.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Ruby.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Ruby.php
index 9a26172..a0d4892 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Ruby.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Ruby.php
@@ -1,36 +1,36 @@
-<?php
-
-/**
- * XHTML 1.1 Ruby Annotation Module, defines elements that indicate
- * short runs of text alongside base text for annotation or pronounciation.
- */
-class HTMLPurifier_HTMLModule_Ruby extends HTMLPurifier_HTMLModule
-{
-
- /**
- * @type string
- */
- public $name = 'Ruby';
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $this->addElement(
- 'ruby',
- 'Inline',
- 'Custom: ((rb, (rt | (rp, rt, rp))) | (rbc, rtc, rtc?))',
- 'Common'
- );
- $this->addElement('rbc', false, 'Required: rb', 'Common');
- $this->addElement('rtc', false, 'Required: rt', 'Common');
- $rb = $this->addElement('rb', false, 'Inline', 'Common');
- $rb->excludes = array('ruby' => true);
- $rt = $this->addElement('rt', false, 'Inline', 'Common', array('rbspan' => 'Number'));
- $rt->excludes = array('ruby' => true);
- $this->addElement('rp', false, 'Optional: #PCDATA', 'Common');
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * XHTML 1.1 Ruby Annotation Module, defines elements that indicate
+ * short runs of text alongside base text for annotation or pronounciation.
+ */
+class HTMLPurifier_HTMLModule_Ruby extends HTMLPurifier_HTMLModule
+{
+
+ /**
+ * @type string
+ */
+ public $name = 'Ruby';
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $this->addElement(
+ 'ruby',
+ 'Inline',
+ 'Custom: ((rb, (rt | (rp, rt, rp))) | (rbc, rtc, rtc?))',
+ 'Common'
+ );
+ $this->addElement('rbc', false, 'Required: rb', 'Common');
+ $this->addElement('rtc', false, 'Required: rt', 'Common');
+ $rb = $this->addElement('rb', false, 'Inline', 'Common');
+ $rb->excludes = array('ruby' => true);
+ $rt = $this->addElement('rt', false, 'Inline', 'Common', array('rbspan' => 'Number'));
+ $rt->excludes = array('ruby' => true);
+ $this->addElement('rp', false, 'Optional: #PCDATA', 'Common');
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/SafeEmbed.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/SafeEmbed.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/SafeEmbed.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/SafeEmbed.php
index 1157288..04e6689 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/SafeEmbed.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/SafeEmbed.php
@@ -1,40 +1,40 @@
-<?php
-
-/**
- * A "safe" embed module. See SafeObject. This is a proprietary element.
- */
-class HTMLPurifier_HTMLModule_SafeEmbed extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'SafeEmbed';
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $max = $config->get('HTML.MaxImgLength');
- $embed = $this->addElement(
- 'embed',
- 'Inline',
- 'Empty',
- 'Common',
- array(
- 'src*' => 'URI#embedded',
- 'type' => 'Enum#application/x-shockwave-flash',
- 'width' => 'Pixels#' . $max,
- 'height' => 'Pixels#' . $max,
- 'allowscriptaccess' => 'Enum#never',
- 'allownetworking' => 'Enum#internal',
- 'flashvars' => 'Text',
- 'wmode' => 'Enum#window,transparent,opaque',
- 'name' => 'ID',
- )
- );
- $embed->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeEmbed();
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * A "safe" embed module. See SafeObject. This is a proprietary element.
+ */
+class HTMLPurifier_HTMLModule_SafeEmbed extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'SafeEmbed';
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $max = $config->get('HTML.MaxImgLength');
+ $embed = $this->addElement(
+ 'embed',
+ 'Inline',
+ 'Empty',
+ 'Common',
+ array(
+ 'src*' => 'URI#embedded',
+ 'type' => 'Enum#application/x-shockwave-flash',
+ 'width' => 'Pixels#' . $max,
+ 'height' => 'Pixels#' . $max,
+ 'allowscriptaccess' => 'Enum#never',
+ 'allownetworking' => 'Enum#internal',
+ 'flashvars' => 'Text',
+ 'wmode' => 'Enum#window,transparent,opaque',
+ 'name' => 'ID',
+ )
+ );
+ $embed->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeEmbed();
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/SafeObject.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/SafeObject.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/SafeObject.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/SafeObject.php
index a061cec..1297f80 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/SafeObject.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/SafeObject.php
@@ -1,62 +1,62 @@
-<?php
-
-/**
- * A "safe" object module. In theory, objects permitted by this module will
- * be safe, and untrusted users can be allowed to embed arbitrary flash objects
- * (maybe other types too, but only Flash is supported as of right now).
- * Highly experimental.
- */
-class HTMLPurifier_HTMLModule_SafeObject extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'SafeObject';
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- // These definitions are not intrinsically safe: the attribute transforms
- // are a vital part of ensuring safety.
-
- $max = $config->get('HTML.MaxImgLength');
- $object = $this->addElement(
- 'object',
- 'Inline',
- 'Optional: param | Flow | #PCDATA',
- 'Common',
- array(
- // While technically not required by the spec, we're forcing
- // it to this value.
- 'type' => 'Enum#application/x-shockwave-flash',
- 'width' => 'Pixels#' . $max,
- 'height' => 'Pixels#' . $max,
- 'data' => 'URI#embedded',
- 'codebase' => new HTMLPurifier_AttrDef_Enum(
- array(
- 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0'
- )
- ),
- )
- );
- $object->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeObject();
-
- $param = $this->addElement(
- 'param',
- false,
- 'Empty',
- false,
- array(
- 'id' => 'ID',
- 'name*' => 'Text',
- 'value' => 'Text'
- )
- );
- $param->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeParam();
- $this->info_injector[] = 'SafeObject';
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * A "safe" object module. In theory, objects permitted by this module will
+ * be safe, and untrusted users can be allowed to embed arbitrary flash objects
+ * (maybe other types too, but only Flash is supported as of right now).
+ * Highly experimental.
+ */
+class HTMLPurifier_HTMLModule_SafeObject extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'SafeObject';
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ // These definitions are not intrinsically safe: the attribute transforms
+ // are a vital part of ensuring safety.
+
+ $max = $config->get('HTML.MaxImgLength');
+ $object = $this->addElement(
+ 'object',
+ 'Inline',
+ 'Optional: param | Flow | #PCDATA',
+ 'Common',
+ array(
+ // While technically not required by the spec, we're forcing
+ // it to this value.
+ 'type' => 'Enum#application/x-shockwave-flash',
+ 'width' => 'Pixels#' . $max,
+ 'height' => 'Pixels#' . $max,
+ 'data' => 'URI#embedded',
+ 'codebase' => new HTMLPurifier_AttrDef_Enum(
+ array(
+ 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0'
+ )
+ ),
+ )
+ );
+ $object->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeObject();
+
+ $param = $this->addElement(
+ 'param',
+ false,
+ 'Empty',
+ false,
+ array(
+ 'id' => 'ID',
+ 'name*' => 'Text',
+ 'value' => 'Text'
+ )
+ );
+ $param->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeParam();
+ $this->info_injector[] = 'SafeObject';
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/SafeScripting.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/SafeScripting.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/SafeScripting.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/SafeScripting.php
index 6e9113c..0330cd9 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/SafeScripting.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/SafeScripting.php
@@ -1,40 +1,40 @@
-<?php
-
-/**
- * A "safe" script module. No inline JS is allowed, and pointed to JS
- * files must match whitelist.
- */
-class HTMLPurifier_HTMLModule_SafeScripting extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'SafeScripting';
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- // These definitions are not intrinsically safe: the attribute transforms
- // are a vital part of ensuring safety.
-
- $allowed = $config->get('HTML.SafeScripting');
- $script = $this->addElement(
- 'script',
- 'Inline',
- 'Empty',
- null,
- array(
- // While technically not required by the spec, we're forcing
- // it to this value.
- 'type' => 'Enum#text/javascript',
- 'src*' => new HTMLPurifier_AttrDef_Enum(array_keys($allowed))
- )
- );
- $script->attr_transform_pre[] =
- $script->attr_transform_post[] = new HTMLPurifier_AttrTransform_ScriptRequired();
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * A "safe" script module. No inline JS is allowed, and pointed to JS
+ * files must match whitelist.
+ */
+class HTMLPurifier_HTMLModule_SafeScripting extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'SafeScripting';
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ // These definitions are not intrinsically safe: the attribute transforms
+ // are a vital part of ensuring safety.
+
+ $allowed = $config->get('HTML.SafeScripting');
+ $script = $this->addElement(
+ 'script',
+ 'Inline',
+ 'Empty',
+ null,
+ array(
+ // While technically not required by the spec, we're forcing
+ // it to this value.
+ 'type' => 'Enum#text/javascript',
+ 'src*' => new HTMLPurifier_AttrDef_Enum(array_keys($allowed))
+ )
+ );
+ $script->attr_transform_pre[] =
+ $script->attr_transform_post[] = new HTMLPurifier_AttrTransform_ScriptRequired();
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Scripting.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Scripting.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Scripting.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Scripting.php
index 1878537..8b28a7b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Scripting.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Scripting.php
@@ -1,73 +1,73 @@
-<?php
-
-/*
-
-WARNING: THIS MODULE IS EXTREMELY DANGEROUS AS IT ENABLES INLINE SCRIPTING
-INSIDE HTML PURIFIER DOCUMENTS. USE ONLY WITH TRUSTED USER INPUT!!!
-
-*/
-
-/**
- * XHTML 1.1 Scripting module, defines elements that are used to contain
- * information pertaining to executable scripts or the lack of support
- * for executable scripts.
- * @note This module does not contain inline scripting elements
- */
-class HTMLPurifier_HTMLModule_Scripting extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'Scripting';
-
- /**
- * @type array
- */
- public $elements = array('script', 'noscript');
-
- /**
- * @type array
- */
- public $content_sets = array('Block' => 'script | noscript', 'Inline' => 'script | noscript');
-
- /**
- * @type bool
- */
- public $safe = false;
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- // TODO: create custom child-definition for noscript that
- // auto-wraps stray #PCDATA in a similar manner to
- // blockquote's custom definition (we would use it but
- // blockquote's contents are optional while noscript's contents
- // are required)
-
- // TODO: convert this to new syntax, main problem is getting
- // both content sets working
-
- // In theory, this could be safe, but I don't see any reason to
- // allow it.
- $this->info['noscript'] = new HTMLPurifier_ElementDef();
- $this->info['noscript']->attr = array(0 => array('Common'));
- $this->info['noscript']->content_model = 'Heading | List | Block';
- $this->info['noscript']->content_model_type = 'required';
-
- $this->info['script'] = new HTMLPurifier_ElementDef();
- $this->info['script']->attr = array(
- 'defer' => new HTMLPurifier_AttrDef_Enum(array('defer')),
- 'src' => new HTMLPurifier_AttrDef_URI(true),
- 'type' => new HTMLPurifier_AttrDef_Enum(array('text/javascript'))
- );
- $this->info['script']->content_model = '#PCDATA';
- $this->info['script']->content_model_type = 'optional';
- $this->info['script']->attr_transform_pre[] =
- $this->info['script']->attr_transform_post[] =
- new HTMLPurifier_AttrTransform_ScriptRequired();
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/*
+
+WARNING: THIS MODULE IS EXTREMELY DANGEROUS AS IT ENABLES INLINE SCRIPTING
+INSIDE HTML PURIFIER DOCUMENTS. USE ONLY WITH TRUSTED USER INPUT!!!
+
+*/
+
+/**
+ * XHTML 1.1 Scripting module, defines elements that are used to contain
+ * information pertaining to executable scripts or the lack of support
+ * for executable scripts.
+ * @note This module does not contain inline scripting elements
+ */
+class HTMLPurifier_HTMLModule_Scripting extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'Scripting';
+
+ /**
+ * @type array
+ */
+ public $elements = array('script', 'noscript');
+
+ /**
+ * @type array
+ */
+ public $content_sets = array('Block' => 'script | noscript', 'Inline' => 'script | noscript');
+
+ /**
+ * @type bool
+ */
+ public $safe = false;
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ // TODO: create custom child-definition for noscript that
+ // auto-wraps stray #PCDATA in a similar manner to
+ // blockquote's custom definition (we would use it but
+ // blockquote's contents are optional while noscript's contents
+ // are required)
+
+ // TODO: convert this to new syntax, main problem is getting
+ // both content sets working
+
+ // In theory, this could be safe, but I don't see any reason to
+ // allow it.
+ $this->info['noscript'] = new HTMLPurifier_ElementDef();
+ $this->info['noscript']->attr = array(0 => array('Common'));
+ $this->info['noscript']->content_model = 'Heading | List | Block';
+ $this->info['noscript']->content_model_type = 'required';
+
+ $this->info['script'] = new HTMLPurifier_ElementDef();
+ $this->info['script']->attr = array(
+ 'defer' => new HTMLPurifier_AttrDef_Enum(array('defer')),
+ 'src' => new HTMLPurifier_AttrDef_URI(true),
+ 'type' => new HTMLPurifier_AttrDef_Enum(array('text/javascript'))
+ );
+ $this->info['script']->content_model = '#PCDATA';
+ $this->info['script']->content_model_type = 'optional';
+ $this->info['script']->attr_transform_pre[] =
+ $this->info['script']->attr_transform_post[] =
+ new HTMLPurifier_AttrTransform_ScriptRequired();
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/StyleAttribute.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/StyleAttribute.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/StyleAttribute.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/StyleAttribute.php
index f192780..497b832 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/StyleAttribute.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/StyleAttribute.php
@@ -1,33 +1,33 @@
-<?php
-
-/**
- * XHTML 1.1 Edit Module, defines editing-related elements. Text Extension
- * Module.
- */
-class HTMLPurifier_HTMLModule_StyleAttribute extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'StyleAttribute';
-
- /**
- * @type array
- */
- public $attr_collections = array(
- // The inclusion routine differs from the Abstract Modules but
- // is in line with the DTD and XML Schemas.
- 'Style' => array('style' => false), // see constructor
- 'Core' => array(0 => array('Style'))
- );
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $this->attr_collections['Style']['style'] = new HTMLPurifier_AttrDef_CSS();
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * XHTML 1.1 Edit Module, defines editing-related elements. Text Extension
+ * Module.
+ */
+class HTMLPurifier_HTMLModule_StyleAttribute extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'StyleAttribute';
+
+ /**
+ * @type array
+ */
+ public $attr_collections = array(
+ // The inclusion routine differs from the Abstract Modules but
+ // is in line with the DTD and XML Schemas.
+ 'Style' => array('style' => false), // see constructor
+ 'Core' => array(0 => array('Style'))
+ );
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $this->attr_collections['Style']['style'] = new HTMLPurifier_AttrDef_CSS();
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tables.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tables.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tables.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tables.php
index f993e3c..8a0b3b4 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tables.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tables.php
@@ -1,75 +1,75 @@
-<?php
-
-/**
- * XHTML 1.1 Tables Module, fully defines accessible table elements.
- */
-class HTMLPurifier_HTMLModule_Tables extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'Tables';
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $this->addElement('caption', false, 'Inline', 'Common');
-
- $this->addElement(
- 'table',
- 'Block',
- new HTMLPurifier_ChildDef_Table(),
- 'Common',
- array(
- 'border' => 'Pixels',
- 'cellpadding' => 'Length',
- 'cellspacing' => 'Length',
- 'frame' => 'Enum#void,above,below,hsides,lhs,rhs,vsides,box,border',
- 'rules' => 'Enum#none,groups,rows,cols,all',
- 'summary' => 'Text',
- 'width' => 'Length'
- )
- );
-
- // common attributes
- $cell_align = array(
- 'align' => 'Enum#left,center,right,justify,char',
- 'charoff' => 'Length',
- 'valign' => 'Enum#top,middle,bottom,baseline',
- );
-
- $cell_t = array_merge(
- array(
- 'abbr' => 'Text',
- 'colspan' => 'Number',
- 'rowspan' => 'Number',
- // Apparently, as of HTML5 this attribute only applies
- // to 'th' elements.
- 'scope' => 'Enum#row,col,rowgroup,colgroup',
- ),
- $cell_align
- );
- $this->addElement('td', false, 'Flow', 'Common', $cell_t);
- $this->addElement('th', false, 'Flow', 'Common', $cell_t);
-
- $this->addElement('tr', false, 'Required: td | th', 'Common', $cell_align);
-
- $cell_col = array_merge(
- array(
- 'span' => 'Number',
- 'width' => 'MultiLength',
- ),
- $cell_align
- );
- $this->addElement('col', false, 'Empty', 'Common', $cell_col);
- $this->addElement('colgroup', false, 'Optional: col', 'Common', $cell_col);
-
- $this->addElement('tbody', false, 'Required: tr', 'Common', $cell_align);
- $this->addElement('thead', false, 'Required: tr', 'Common', $cell_align);
- $this->addElement('tfoot', false, 'Required: tr', 'Common', $cell_align);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * XHTML 1.1 Tables Module, fully defines accessible table elements.
+ */
+class HTMLPurifier_HTMLModule_Tables extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'Tables';
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $this->addElement('caption', false, 'Inline', 'Common');
+
+ $this->addElement(
+ 'table',
+ 'Block',
+ new HTMLPurifier_ChildDef_Table(),
+ 'Common',
+ array(
+ 'border' => 'Pixels',
+ 'cellpadding' => 'Length',
+ 'cellspacing' => 'Length',
+ 'frame' => 'Enum#void,above,below,hsides,lhs,rhs,vsides,box,border',
+ 'rules' => 'Enum#none,groups,rows,cols,all',
+ 'summary' => 'Text',
+ 'width' => 'Length'
+ )
+ );
+
+ // common attributes
+ $cell_align = array(
+ 'align' => 'Enum#left,center,right,justify,char',
+ 'charoff' => 'Length',
+ 'valign' => 'Enum#top,middle,bottom,baseline',
+ );
+
+ $cell_t = array_merge(
+ array(
+ 'abbr' => 'Text',
+ 'colspan' => 'Number',
+ 'rowspan' => 'Number',
+ // Apparently, as of HTML5 this attribute only applies
+ // to 'th' elements.
+ 'scope' => 'Enum#row,col,rowgroup,colgroup',
+ ),
+ $cell_align
+ );
+ $this->addElement('td', false, 'Flow', 'Common', $cell_t);
+ $this->addElement('th', false, 'Flow', 'Common', $cell_t);
+
+ $this->addElement('tr', false, 'Required: td | th', 'Common', $cell_align);
+
+ $cell_col = array_merge(
+ array(
+ 'span' => 'Number',
+ 'width' => 'MultiLength',
+ ),
+ $cell_align
+ );
+ $this->addElement('col', false, 'Empty', 'Common', $cell_col);
+ $this->addElement('colgroup', false, 'Optional: col', 'Common', $cell_col);
+
+ $this->addElement('tbody', false, 'Required: tr', 'Common', $cell_align);
+ $this->addElement('thead', false, 'Required: tr', 'Common', $cell_align);
+ $this->addElement('tfoot', false, 'Required: tr', 'Common', $cell_align);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Target.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Target.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Target.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Target.php
index f3af048..b188ac9 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Target.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Target.php
@@ -1,28 +1,28 @@
-<?php
-
-/**
- * XHTML 1.1 Target Module, defines target attribute in link elements.
- */
-class HTMLPurifier_HTMLModule_Target extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'Target';
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $elements = array('a');
- foreach ($elements as $name) {
- $e = $this->addBlankElement($name);
- $e->attr = array(
- 'target' => new HTMLPurifier_AttrDef_HTML_FrameTarget()
- );
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * XHTML 1.1 Target Module, defines target attribute in link elements.
+ */
+class HTMLPurifier_HTMLModule_Target extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'Target';
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $elements = array('a');
+ foreach ($elements as $name) {
+ $e = $this->addBlankElement($name);
+ $e->attr = array(
+ 'target' => new HTMLPurifier_AttrDef_HTML_FrameTarget()
+ );
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/TargetBlank.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/TargetBlank.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/TargetBlank.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/TargetBlank.php
index 757cddc..58ccc68 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/TargetBlank.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/TargetBlank.php
@@ -1,24 +1,24 @@
-<?php
-
-/**
- * Module adds the target=blank attribute transformation to a tags. It
- * is enabled by HTML.TargetBlank
- */
-class HTMLPurifier_HTMLModule_TargetBlank extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'TargetBlank';
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $a = $this->addBlankElement('a');
- $a->attr_transform_post[] = new HTMLPurifier_AttrTransform_TargetBlank();
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Module adds the target=blank attribute transformation to a tags. It
+ * is enabled by HTML.TargetBlank
+ */
+class HTMLPurifier_HTMLModule_TargetBlank extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'TargetBlank';
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $a = $this->addBlankElement('a');
+ $a->attr_transform_post[] = new HTMLPurifier_AttrTransform_TargetBlank();
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/TargetNoreferrer.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/TargetNoreferrer.php
new file mode 100755
index 0000000..32484d6
--- /dev/null
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/TargetNoreferrer.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Module adds the target-based noreferrer attribute transformation to a tags. It
+ * is enabled by HTML.TargetNoreferrer
+ */
+class HTMLPurifier_HTMLModule_TargetNoreferrer extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'TargetNoreferrer';
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config) {
+ $a = $this->addBlankElement('a');
+ $a->attr_transform_post[] = new HTMLPurifier_AttrTransform_TargetNoreferrer();
+ }
+}
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Text.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Text.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Text.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Text.php
index 11fdd8b..7a65e00 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Text.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Text.php
@@ -1,87 +1,87 @@
-<?php
-
-/**
- * XHTML 1.1 Text Module, defines basic text containers. Core Module.
- * @note In the normative XML Schema specification, this module
- * is further abstracted into the following modules:
- * - Block Phrasal (address, blockquote, pre, h1, h2, h3, h4, h5, h6)
- * - Block Structural (div, p)
- * - Inline Phrasal (abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var)
- * - Inline Structural (br, span)
- * This module, functionally, does not distinguish between these
- * sub-modules, but the code is internally structured to reflect
- * these distinctions.
- */
-class HTMLPurifier_HTMLModule_Text extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'Text';
-
- /**
- * @type array
- */
- public $content_sets = array(
- 'Flow' => 'Heading | Block | Inline'
- );
-
- /**
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- // Inline Phrasal -------------------------------------------------
- $this->addElement('abbr', 'Inline', 'Inline', 'Common');
- $this->addElement('acronym', 'Inline', 'Inline', 'Common');
- $this->addElement('cite', 'Inline', 'Inline', 'Common');
- $this->addElement('dfn', 'Inline', 'Inline', 'Common');
- $this->addElement('kbd', 'Inline', 'Inline', 'Common');
- $this->addElement('q', 'Inline', 'Inline', 'Common', array('cite' => 'URI'));
- $this->addElement('samp', 'Inline', 'Inline', 'Common');
- $this->addElement('var', 'Inline', 'Inline', 'Common');
-
- $em = $this->addElement('em', 'Inline', 'Inline', 'Common');
- $em->formatting = true;
-
- $strong = $this->addElement('strong', 'Inline', 'Inline', 'Common');
- $strong->formatting = true;
-
- $code = $this->addElement('code', 'Inline', 'Inline', 'Common');
- $code->formatting = true;
-
- // Inline Structural ----------------------------------------------
- $this->addElement('span', 'Inline', 'Inline', 'Common');
- $this->addElement('br', 'Inline', 'Empty', 'Core');
-
- // Block Phrasal --------------------------------------------------
- $this->addElement('address', 'Block', 'Inline', 'Common');
- $this->addElement('blockquote', 'Block', 'Optional: Heading | Block | List', 'Common', array('cite' => 'URI'));
- $pre = $this->addElement('pre', 'Block', 'Inline', 'Common');
- $pre->excludes = $this->makeLookup(
- 'img',
- 'big',
- 'small',
- 'object',
- 'applet',
- 'font',
- 'basefont'
- );
- $this->addElement('h1', 'Heading', 'Inline', 'Common');
- $this->addElement('h2', 'Heading', 'Inline', 'Common');
- $this->addElement('h3', 'Heading', 'Inline', 'Common');
- $this->addElement('h4', 'Heading', 'Inline', 'Common');
- $this->addElement('h5', 'Heading', 'Inline', 'Common');
- $this->addElement('h6', 'Heading', 'Inline', 'Common');
-
- // Block Structural -----------------------------------------------
- $p = $this->addElement('p', 'Block', 'Inline', 'Common');
- $p->autoclose = array_flip(
- array("address", "blockquote", "center", "dir", "div", "dl", "fieldset", "ol", "p", "ul")
- );
-
- $this->addElement('div', 'Block', 'Flow', 'Common');
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * XHTML 1.1 Text Module, defines basic text containers. Core Module.
+ * @note In the normative XML Schema specification, this module
+ * is further abstracted into the following modules:
+ * - Block Phrasal (address, blockquote, pre, h1, h2, h3, h4, h5, h6)
+ * - Block Structural (div, p)
+ * - Inline Phrasal (abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var)
+ * - Inline Structural (br, span)
+ * This module, functionally, does not distinguish between these
+ * sub-modules, but the code is internally structured to reflect
+ * these distinctions.
+ */
+class HTMLPurifier_HTMLModule_Text extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'Text';
+
+ /**
+ * @type array
+ */
+ public $content_sets = array(
+ 'Flow' => 'Heading | Block | Inline'
+ );
+
+ /**
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ // Inline Phrasal -------------------------------------------------
+ $this->addElement('abbr', 'Inline', 'Inline', 'Common');
+ $this->addElement('acronym', 'Inline', 'Inline', 'Common');
+ $this->addElement('cite', 'Inline', 'Inline', 'Common');
+ $this->addElement('dfn', 'Inline', 'Inline', 'Common');
+ $this->addElement('kbd', 'Inline', 'Inline', 'Common');
+ $this->addElement('q', 'Inline', 'Inline', 'Common', array('cite' => 'URI'));
+ $this->addElement('samp', 'Inline', 'Inline', 'Common');
+ $this->addElement('var', 'Inline', 'Inline', 'Common');
+
+ $em = $this->addElement('em', 'Inline', 'Inline', 'Common');
+ $em->formatting = true;
+
+ $strong = $this->addElement('strong', 'Inline', 'Inline', 'Common');
+ $strong->formatting = true;
+
+ $code = $this->addElement('code', 'Inline', 'Inline', 'Common');
+ $code->formatting = true;
+
+ // Inline Structural ----------------------------------------------
+ $this->addElement('span', 'Inline', 'Inline', 'Common');
+ $this->addElement('br', 'Inline', 'Empty', 'Core');
+
+ // Block Phrasal --------------------------------------------------
+ $this->addElement('address', 'Block', 'Inline', 'Common');
+ $this->addElement('blockquote', 'Block', 'Optional: Heading | Block | List', 'Common', array('cite' => 'URI'));
+ $pre = $this->addElement('pre', 'Block', 'Inline', 'Common');
+ $pre->excludes = $this->makeLookup(
+ 'img',
+ 'big',
+ 'small',
+ 'object',
+ 'applet',
+ 'font',
+ 'basefont'
+ );
+ $this->addElement('h1', 'Heading', 'Inline', 'Common');
+ $this->addElement('h2', 'Heading', 'Inline', 'Common');
+ $this->addElement('h3', 'Heading', 'Inline', 'Common');
+ $this->addElement('h4', 'Heading', 'Inline', 'Common');
+ $this->addElement('h5', 'Heading', 'Inline', 'Common');
+ $this->addElement('h6', 'Heading', 'Inline', 'Common');
+
+ // Block Structural -----------------------------------------------
+ $p = $this->addElement('p', 'Block', 'Inline', 'Common');
+ $p->autoclose = array_flip(
+ array("address", "blockquote", "center", "dir", "div", "dl", "fieldset", "ol", "p", "ul")
+ );
+
+ $this->addElement('div', 'Block', 'Flow', 'Common');
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy.php
index f482a37..08aa232 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy.php
@@ -1,230 +1,230 @@
-<?php
-
-/**
- * Abstract class for a set of proprietary modules that clean up (tidy)
- * poorly written HTML.
- * @todo Figure out how to protect some of these methods/properties
- */
-class HTMLPurifier_HTMLModule_Tidy extends HTMLPurifier_HTMLModule
-{
- /**
- * List of supported levels.
- * Index zero is a special case "no fixes" level.
- * @type array
- */
- public $levels = array(0 => 'none', 'light', 'medium', 'heavy');
-
- /**
- * Default level to place all fixes in.
- * Disabled by default.
- * @type string
- */
- public $defaultLevel = null;
-
- /**
- * Lists of fixes used by getFixesForLevel().
- * Format is:
- * HTMLModule_Tidy->fixesForLevel[$level] = array('fix-1', 'fix-2');
- * @type array
- */
- public $fixesForLevel = array(
- 'light' => array(),
- 'medium' => array(),
- 'heavy' => array()
- );
-
- /**
- * Lazy load constructs the module by determining the necessary
- * fixes to create and then delegating to the populate() function.
- * @param HTMLPurifier_Config $config
- * @todo Wildcard matching and error reporting when an added or
- * subtracted fix has no effect.
- */
- public function setup($config)
- {
- // create fixes, initialize fixesForLevel
- $fixes = $this->makeFixes();
- $this->makeFixesForLevel($fixes);
-
- // figure out which fixes to use
- $level = $config->get('HTML.TidyLevel');
- $fixes_lookup = $this->getFixesForLevel($level);
-
- // get custom fix declarations: these need namespace processing
- $add_fixes = $config->get('HTML.TidyAdd');
- $remove_fixes = $config->get('HTML.TidyRemove');
-
- foreach ($fixes as $name => $fix) {
- // needs to be refactored a little to implement globbing
- if (isset($remove_fixes[$name]) ||
- (!isset($add_fixes[$name]) && !isset($fixes_lookup[$name]))) {
- unset($fixes[$name]);
- }
- }
-
- // populate this module with necessary fixes
- $this->populate($fixes);
- }
-
- /**
- * Retrieves all fixes per a level, returning fixes for that specific
- * level as well as all levels below it.
- * @param string $level level identifier, see $levels for valid values
- * @return array Lookup up table of fixes
- */
- public function getFixesForLevel($level)
- {
- if ($level == $this->levels[0]) {
- return array();
- }
- $activated_levels = array();
- for ($i = 1, $c = count($this->levels); $i < $c; $i++) {
- $activated_levels[] = $this->levels[$i];
- if ($this->levels[$i] == $level) {
- break;
- }
- }
- if ($i == $c) {
- trigger_error(
- 'Tidy level ' . htmlspecialchars($level) . ' not recognized',
- E_USER_WARNING
- );
- return array();
- }
- $ret = array();
- foreach ($activated_levels as $level) {
- foreach ($this->fixesForLevel[$level] as $fix) {
- $ret[$fix] = true;
- }
- }
- return $ret;
- }
-
- /**
- * Dynamically populates the $fixesForLevel member variable using
- * the fixes array. It may be custom overloaded, used in conjunction
- * with $defaultLevel, or not used at all.
- * @param array $fixes
- */
- public function makeFixesForLevel($fixes)
- {
- if (!isset($this->defaultLevel)) {
- return;
- }
- if (!isset($this->fixesForLevel[$this->defaultLevel])) {
- trigger_error(
- 'Default level ' . $this->defaultLevel . ' does not exist',
- E_USER_ERROR
- );
- return;
- }
- $this->fixesForLevel[$this->defaultLevel] = array_keys($fixes);
- }
-
- /**
- * Populates the module with transforms and other special-case code
- * based on a list of fixes passed to it
- * @param array $fixes Lookup table of fixes to activate
- */
- public function populate($fixes)
- {
- foreach ($fixes as $name => $fix) {
- // determine what the fix is for
- list($type, $params) = $this->getFixType($name);
- switch ($type) {
- case 'attr_transform_pre':
- case 'attr_transform_post':
- $attr = $params['attr'];
- if (isset($params['element'])) {
- $element = $params['element'];
- if (empty($this->info[$element])) {
- $e = $this->addBlankElement($element);
- } else {
- $e = $this->info[$element];
- }
- } else {
- $type = "info_$type";
- $e = $this;
- }
- // PHP does some weird parsing when I do
- // $e->$type[$attr], so I have to assign a ref.
- $f =& $e->$type;
- $f[$attr] = $fix;
- break;
- case 'tag_transform':
- $this->info_tag_transform[$params['element']] = $fix;
- break;
- case 'child':
- case 'content_model_type':
- $element = $params['element'];
- if (empty($this->info[$element])) {
- $e = $this->addBlankElement($element);
- } else {
- $e = $this->info[$element];
- }
- $e->$type = $fix;
- break;
- default:
- trigger_error("Fix type $type not supported", E_USER_ERROR);
- break;
- }
- }
- }
-
- /**
- * Parses a fix name and determines what kind of fix it is, as well
- * as other information defined by the fix
- * @param $name String name of fix
- * @return array(string $fix_type, array $fix_parameters)
- * @note $fix_parameters is type dependant, see populate() for usage
- * of these parameters
- */
- public function getFixType($name)
- {
- // parse it
- $property = $attr = null;
- if (strpos($name, '#') !== false) {
- list($name, $property) = explode('#', $name);
- }
- if (strpos($name, '@') !== false) {
- list($name, $attr) = explode('@', $name);
- }
-
- // figure out the parameters
- $params = array();
- if ($name !== '') {
- $params['element'] = $name;
- }
- if (!is_null($attr)) {
- $params['attr'] = $attr;
- }
-
- // special case: attribute transform
- if (!is_null($attr)) {
- if (is_null($property)) {
- $property = 'pre';
- }
- $type = 'attr_transform_' . $property;
- return array($type, $params);
- }
-
- // special case: tag transform
- if (is_null($property)) {
- return array('tag_transform', $params);
- }
-
- return array($property, $params);
-
- }
-
- /**
- * Defines all fixes the module will perform in a compact
- * associative array of fix name to fix implementation.
- * @return array
- */
- public function makeFixes()
- {
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Abstract class for a set of proprietary modules that clean up (tidy)
+ * poorly written HTML.
+ * @todo Figure out how to protect some of these methods/properties
+ */
+class HTMLPurifier_HTMLModule_Tidy extends HTMLPurifier_HTMLModule
+{
+ /**
+ * List of supported levels.
+ * Index zero is a special case "no fixes" level.
+ * @type array
+ */
+ public $levels = array(0 => 'none', 'light', 'medium', 'heavy');
+
+ /**
+ * Default level to place all fixes in.
+ * Disabled by default.
+ * @type string
+ */
+ public $defaultLevel = null;
+
+ /**
+ * Lists of fixes used by getFixesForLevel().
+ * Format is:
+ * HTMLModule_Tidy->fixesForLevel[$level] = array('fix-1', 'fix-2');
+ * @type array
+ */
+ public $fixesForLevel = array(
+ 'light' => array(),
+ 'medium' => array(),
+ 'heavy' => array()
+ );
+
+ /**
+ * Lazy load constructs the module by determining the necessary
+ * fixes to create and then delegating to the populate() function.
+ * @param HTMLPurifier_Config $config
+ * @todo Wildcard matching and error reporting when an added or
+ * subtracted fix has no effect.
+ */
+ public function setup($config)
+ {
+ // create fixes, initialize fixesForLevel
+ $fixes = $this->makeFixes();
+ $this->makeFixesForLevel($fixes);
+
+ // figure out which fixes to use
+ $level = $config->get('HTML.TidyLevel');
+ $fixes_lookup = $this->getFixesForLevel($level);
+
+ // get custom fix declarations: these need namespace processing
+ $add_fixes = $config->get('HTML.TidyAdd');
+ $remove_fixes = $config->get('HTML.TidyRemove');
+
+ foreach ($fixes as $name => $fix) {
+ // needs to be refactored a little to implement globbing
+ if (isset($remove_fixes[$name]) ||
+ (!isset($add_fixes[$name]) && !isset($fixes_lookup[$name]))) {
+ unset($fixes[$name]);
+ }
+ }
+
+ // populate this module with necessary fixes
+ $this->populate($fixes);
+ }
+
+ /**
+ * Retrieves all fixes per a level, returning fixes for that specific
+ * level as well as all levels below it.
+ * @param string $level level identifier, see $levels for valid values
+ * @return array Lookup up table of fixes
+ */
+ public function getFixesForLevel($level)
+ {
+ if ($level == $this->levels[0]) {
+ return array();
+ }
+ $activated_levels = array();
+ for ($i = 1, $c = count($this->levels); $i < $c; $i++) {
+ $activated_levels[] = $this->levels[$i];
+ if ($this->levels[$i] == $level) {
+ break;
+ }
+ }
+ if ($i == $c) {
+ trigger_error(
+ 'Tidy level ' . htmlspecialchars($level) . ' not recognized',
+ E_USER_WARNING
+ );
+ return array();
+ }
+ $ret = array();
+ foreach ($activated_levels as $level) {
+ foreach ($this->fixesForLevel[$level] as $fix) {
+ $ret[$fix] = true;
+ }
+ }
+ return $ret;
+ }
+
+ /**
+ * Dynamically populates the $fixesForLevel member variable using
+ * the fixes array. It may be custom overloaded, used in conjunction
+ * with $defaultLevel, or not used at all.
+ * @param array $fixes
+ */
+ public function makeFixesForLevel($fixes)
+ {
+ if (!isset($this->defaultLevel)) {
+ return;
+ }
+ if (!isset($this->fixesForLevel[$this->defaultLevel])) {
+ trigger_error(
+ 'Default level ' . $this->defaultLevel . ' does not exist',
+ E_USER_ERROR
+ );
+ return;
+ }
+ $this->fixesForLevel[$this->defaultLevel] = array_keys($fixes);
+ }
+
+ /**
+ * Populates the module with transforms and other special-case code
+ * based on a list of fixes passed to it
+ * @param array $fixes Lookup table of fixes to activate
+ */
+ public function populate($fixes)
+ {
+ foreach ($fixes as $name => $fix) {
+ // determine what the fix is for
+ list($type, $params) = $this->getFixType($name);
+ switch ($type) {
+ case 'attr_transform_pre':
+ case 'attr_transform_post':
+ $attr = $params['attr'];
+ if (isset($params['element'])) {
+ $element = $params['element'];
+ if (empty($this->info[$element])) {
+ $e = $this->addBlankElement($element);
+ } else {
+ $e = $this->info[$element];
+ }
+ } else {
+ $type = "info_$type";
+ $e = $this;
+ }
+ // PHP does some weird parsing when I do
+ // $e->$type[$attr], so I have to assign a ref.
+ $f =& $e->$type;
+ $f[$attr] = $fix;
+ break;
+ case 'tag_transform':
+ $this->info_tag_transform[$params['element']] = $fix;
+ break;
+ case 'child':
+ case 'content_model_type':
+ $element = $params['element'];
+ if (empty($this->info[$element])) {
+ $e = $this->addBlankElement($element);
+ } else {
+ $e = $this->info[$element];
+ }
+ $e->$type = $fix;
+ break;
+ default:
+ trigger_error("Fix type $type not supported", E_USER_ERROR);
+ break;
+ }
+ }
+ }
+
+ /**
+ * Parses a fix name and determines what kind of fix it is, as well
+ * as other information defined by the fix
+ * @param $name String name of fix
+ * @return array(string $fix_type, array $fix_parameters)
+ * @note $fix_parameters is type dependant, see populate() for usage
+ * of these parameters
+ */
+ public function getFixType($name)
+ {
+ // parse it
+ $property = $attr = null;
+ if (strpos($name, '#') !== false) {
+ list($name, $property) = explode('#', $name);
+ }
+ if (strpos($name, '@') !== false) {
+ list($name, $attr) = explode('@', $name);
+ }
+
+ // figure out the parameters
+ $params = array();
+ if ($name !== '') {
+ $params['element'] = $name;
+ }
+ if (!is_null($attr)) {
+ $params['attr'] = $attr;
+ }
+
+ // special case: attribute transform
+ if (!is_null($attr)) {
+ if (is_null($property)) {
+ $property = 'pre';
+ }
+ $type = 'attr_transform_' . $property;
+ return array($type, $params);
+ }
+
+ // special case: tag transform
+ if (is_null($property)) {
+ return array('tag_transform', $params);
+ }
+
+ return array($property, $params);
+
+ }
+
+ /**
+ * Defines all fixes the module will perform in a compact
+ * associative array of fix name to fix implementation.
+ * @return array
+ */
+ public function makeFixes()
+ {
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/Name.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/Name.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/Name.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/Name.php
index bb47baf..a995161 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/Name.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/Name.php
@@ -1,33 +1,33 @@
-<?php
-
-/**
- * Name is deprecated, but allowed in strict doctypes, so onl
- */
-class HTMLPurifier_HTMLModule_Tidy_Name extends HTMLPurifier_HTMLModule_Tidy
-{
- /**
- * @type string
- */
- public $name = 'Tidy_Name';
-
- /**
- * @type string
- */
- public $defaultLevel = 'heavy';
-
- /**
- * @return array
- */
- public function makeFixes()
- {
- $r = array();
- // @name for img, a -----------------------------------------------
- // Technically, it's allowed even on strict, so we allow authors to use
- // it. However, it's deprecated in future versions of XHTML.
- $r['img@name'] =
- $r['a@name'] = new HTMLPurifier_AttrTransform_Name();
- return $r;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Name is deprecated, but allowed in strict doctypes, so onl
+ */
+class HTMLPurifier_HTMLModule_Tidy_Name extends HTMLPurifier_HTMLModule_Tidy
+{
+ /**
+ * @type string
+ */
+ public $name = 'Tidy_Name';
+
+ /**
+ * @type string
+ */
+ public $defaultLevel = 'heavy';
+
+ /**
+ * @return array
+ */
+ public function makeFixes()
+ {
+ $r = array();
+ // @name for img, a -----------------------------------------------
+ // Technically, it's allowed even on strict, so we allow authors to use
+ // it. However, it's deprecated in future versions of XHTML.
+ $r['img@name'] =
+ $r['a@name'] = new HTMLPurifier_AttrTransform_Name();
+ return $r;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
index 638cb54..3326438 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
@@ -1,34 +1,34 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_Proprietary extends HTMLPurifier_HTMLModule_Tidy
-{
-
- /**
- * @type string
- */
- public $name = 'Tidy_Proprietary';
-
- /**
- * @type string
- */
- public $defaultLevel = 'light';
-
- /**
- * @return array
- */
- public function makeFixes()
- {
- $r = array();
- $r['table@background'] = new HTMLPurifier_AttrTransform_Background();
- $r['td@background'] = new HTMLPurifier_AttrTransform_Background();
- $r['th@background'] = new HTMLPurifier_AttrTransform_Background();
- $r['tr@background'] = new HTMLPurifier_AttrTransform_Background();
- $r['thead@background'] = new HTMLPurifier_AttrTransform_Background();
- $r['tfoot@background'] = new HTMLPurifier_AttrTransform_Background();
- $r['tbody@background'] = new HTMLPurifier_AttrTransform_Background();
- $r['table@height'] = new HTMLPurifier_AttrTransform_Length('height');
- return $r;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_HTMLModule_Tidy_Proprietary extends HTMLPurifier_HTMLModule_Tidy
+{
+
+ /**
+ * @type string
+ */
+ public $name = 'Tidy_Proprietary';
+
+ /**
+ * @type string
+ */
+ public $defaultLevel = 'light';
+
+ /**
+ * @return array
+ */
+ public function makeFixes()
+ {
+ $r = array();
+ $r['table@background'] = new HTMLPurifier_AttrTransform_Background();
+ $r['td@background'] = new HTMLPurifier_AttrTransform_Background();
+ $r['th@background'] = new HTMLPurifier_AttrTransform_Background();
+ $r['tr@background'] = new HTMLPurifier_AttrTransform_Background();
+ $r['thead@background'] = new HTMLPurifier_AttrTransform_Background();
+ $r['tfoot@background'] = new HTMLPurifier_AttrTransform_Background();
+ $r['tbody@background'] = new HTMLPurifier_AttrTransform_Background();
+ $r['table@height'] = new HTMLPurifier_AttrTransform_Length('height');
+ return $r;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/Strict.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
index ba3260e..803c44f 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
@@ -1,43 +1,43 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_Strict extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4
-{
- /**
- * @type string
- */
- public $name = 'Tidy_Strict';
-
- /**
- * @type string
- */
- public $defaultLevel = 'light';
-
- /**
- * @return array
- */
- public function makeFixes()
- {
- $r = parent::makeFixes();
- $r['blockquote#content_model_type'] = 'strictblockquote';
- return $r;
- }
-
- /**
- * @type bool
- */
- public $defines_child_def = true;
-
- /**
- * @param HTMLPurifier_ElementDef $def
- * @return HTMLPurifier_ChildDef_StrictBlockquote
- */
- public function getChildDef($def)
- {
- if ($def->content_model_type != 'strictblockquote') {
- return parent::getChildDef($def);
- }
- return new HTMLPurifier_ChildDef_StrictBlockquote($def->content_model);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_HTMLModule_Tidy_Strict extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4
+{
+ /**
+ * @type string
+ */
+ public $name = 'Tidy_Strict';
+
+ /**
+ * @type string
+ */
+ public $defaultLevel = 'light';
+
+ /**
+ * @return array
+ */
+ public function makeFixes()
+ {
+ $r = parent::makeFixes();
+ $r['blockquote#content_model_type'] = 'strictblockquote';
+ return $r;
+ }
+
+ /**
+ * @type bool
+ */
+ public $defines_child_def = true;
+
+ /**
+ * @param HTMLPurifier_ElementDef $def
+ * @return HTMLPurifier_ChildDef_StrictBlockquote
+ */
+ public function getChildDef($def)
+ {
+ if ($def->content_model_type != 'strictblockquote') {
+ return parent::getChildDef($def);
+ }
+ return new HTMLPurifier_ChildDef_StrictBlockquote($def->content_model);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
similarity index 94%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
index 79411d2..c095ad9 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
@@ -1,16 +1,16 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_Transitional extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4
-{
- /**
- * @type string
- */
- public $name = 'Tidy_Transitional';
-
- /**
- * @type string
- */
- public $defaultLevel = 'heavy';
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_HTMLModule_Tidy_Transitional extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4
+{
+ /**
+ * @type string
+ */
+ public $name = 'Tidy_Transitional';
+
+ /**
+ * @type string
+ */
+ public $defaultLevel = 'heavy';
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
similarity index 94%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
index 935ad7f..3ecddc4 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
@@ -1,26 +1,26 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_XHTML extends HTMLPurifier_HTMLModule_Tidy
-{
- /**
- * @type string
- */
- public $name = 'Tidy_XHTML';
-
- /**
- * @type string
- */
- public $defaultLevel = 'medium';
-
- /**
- * @return array
- */
- public function makeFixes()
- {
- $r = array();
- $r['@lang'] = new HTMLPurifier_AttrTransform_Lang();
- return $r;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_HTMLModule_Tidy_XHTML extends HTMLPurifier_HTMLModule_Tidy
+{
+ /**
+ * @type string
+ */
+ public $name = 'Tidy_XHTML';
+
+ /**
+ * @type string
+ */
+ public $defaultLevel = 'medium';
+
+ /**
+ * @return array
+ */
+ public function makeFixes()
+ {
+ $r = array();
+ $r['@lang'] = new HTMLPurifier_AttrTransform_Lang();
+ return $r;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
index 17164fb..c4f16a4 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
@@ -1,179 +1,179 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4 extends HTMLPurifier_HTMLModule_Tidy
-{
-
- /**
- * @return array
- */
- public function makeFixes()
- {
- $r = array();
-
- // == deprecated tag transforms ===================================
-
- $r['font'] = new HTMLPurifier_TagTransform_Font();
- $r['menu'] = new HTMLPurifier_TagTransform_Simple('ul');
- $r['dir'] = new HTMLPurifier_TagTransform_Simple('ul');
- $r['center'] = new HTMLPurifier_TagTransform_Simple('div', 'text-align:center;');
- $r['u'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:underline;');
- $r['s'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
- $r['strike'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
-
- // == deprecated attribute transforms =============================
-
- $r['caption@align'] =
- new HTMLPurifier_AttrTransform_EnumToCSS(
- 'align',
- array(
- // we're following IE's behavior, not Firefox's, due
- // to the fact that no one supports caption-side:right,
- // W3C included (with CSS 2.1). This is a slightly
- // unreasonable attribute!
- 'left' => 'text-align:left;',
- 'right' => 'text-align:right;',
- 'top' => 'caption-side:top;',
- 'bottom' => 'caption-side:bottom;' // not supported by IE
- )
- );
-
- // @align for img -------------------------------------------------
- $r['img@align'] =
- new HTMLPurifier_AttrTransform_EnumToCSS(
- 'align',
- array(
- 'left' => 'float:left;',
- 'right' => 'float:right;',
- 'top' => 'vertical-align:top;',
- 'middle' => 'vertical-align:middle;',
- 'bottom' => 'vertical-align:baseline;',
- )
- );
-
- // @align for table -----------------------------------------------
- $r['table@align'] =
- new HTMLPurifier_AttrTransform_EnumToCSS(
- 'align',
- array(
- 'left' => 'float:left;',
- 'center' => 'margin-left:auto;margin-right:auto;',
- 'right' => 'float:right;'
- )
- );
-
- // @align for hr -----------------------------------------------
- $r['hr@align'] =
- new HTMLPurifier_AttrTransform_EnumToCSS(
- 'align',
- array(
- // we use both text-align and margin because these work
- // for different browsers (IE and Firefox, respectively)
- // and the melange makes for a pretty cross-compatible
- // solution
- 'left' => 'margin-left:0;margin-right:auto;text-align:left;',
- 'center' => 'margin-left:auto;margin-right:auto;text-align:center;',
- 'right' => 'margin-left:auto;margin-right:0;text-align:right;'
- )
- );
-
- // @align for h1, h2, h3, h4, h5, h6, p, div ----------------------
- // {{{
- $align_lookup = array();
- $align_values = array('left', 'right', 'center', 'justify');
- foreach ($align_values as $v) {
- $align_lookup[$v] = "text-align:$v;";
- }
- // }}}
- $r['h1@align'] =
- $r['h2@align'] =
- $r['h3@align'] =
- $r['h4@align'] =
- $r['h5@align'] =
- $r['h6@align'] =
- $r['p@align'] =
- $r['div@align'] =
- new HTMLPurifier_AttrTransform_EnumToCSS('align', $align_lookup);
-
- // @bgcolor for table, tr, td, th ---------------------------------
- $r['table@bgcolor'] =
- $r['td@bgcolor'] =
- $r['th@bgcolor'] =
- new HTMLPurifier_AttrTransform_BgColor();
-
- // @border for img ------------------------------------------------
- $r['img@border'] = new HTMLPurifier_AttrTransform_Border();
-
- // @clear for br --------------------------------------------------
- $r['br@clear'] =
- new HTMLPurifier_AttrTransform_EnumToCSS(
- 'clear',
- array(
- 'left' => 'clear:left;',
- 'right' => 'clear:right;',
- 'all' => 'clear:both;',
- 'none' => 'clear:none;',
- )
- );
-
- // @height for td, th ---------------------------------------------
- $r['td@height'] =
- $r['th@height'] =
- new HTMLPurifier_AttrTransform_Length('height');
-
- // @hspace for img ------------------------------------------------
- $r['img@hspace'] = new HTMLPurifier_AttrTransform_ImgSpace('hspace');
-
- // @noshade for hr ------------------------------------------------
- // this transformation is not precise but often good enough.
- // different browsers use different styles to designate noshade
- $r['hr@noshade'] =
- new HTMLPurifier_AttrTransform_BoolToCSS(
- 'noshade',
- 'color:#808080;background-color:#808080;border:0;'
- );
-
- // @nowrap for td, th ---------------------------------------------
- $r['td@nowrap'] =
- $r['th@nowrap'] =
- new HTMLPurifier_AttrTransform_BoolToCSS(
- 'nowrap',
- 'white-space:nowrap;'
- );
-
- // @size for hr --------------------------------------------------
- $r['hr@size'] = new HTMLPurifier_AttrTransform_Length('size', 'height');
-
- // @type for li, ol, ul -------------------------------------------
- // {{{
- $ul_types = array(
- 'disc' => 'list-style-type:disc;',
- 'square' => 'list-style-type:square;',
- 'circle' => 'list-style-type:circle;'
- );
- $ol_types = array(
- '1' => 'list-style-type:decimal;',
- 'i' => 'list-style-type:lower-roman;',
- 'I' => 'list-style-type:upper-roman;',
- 'a' => 'list-style-type:lower-alpha;',
- 'A' => 'list-style-type:upper-alpha;'
- );
- $li_types = $ul_types + $ol_types;
- // }}}
-
- $r['ul@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ul_types);
- $r['ol@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ol_types, true);
- $r['li@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $li_types, true);
-
- // @vspace for img ------------------------------------------------
- $r['img@vspace'] = new HTMLPurifier_AttrTransform_ImgSpace('vspace');
-
- // @width for hr, td, th ------------------------------------------
- $r['td@width'] =
- $r['th@width'] =
- $r['hr@width'] = new HTMLPurifier_AttrTransform_Length('width');
-
- return $r;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4 extends HTMLPurifier_HTMLModule_Tidy
+{
+
+ /**
+ * @return array
+ */
+ public function makeFixes()
+ {
+ $r = array();
+
+ // == deprecated tag transforms ===================================
+
+ $r['font'] = new HTMLPurifier_TagTransform_Font();
+ $r['menu'] = new HTMLPurifier_TagTransform_Simple('ul');
+ $r['dir'] = new HTMLPurifier_TagTransform_Simple('ul');
+ $r['center'] = new HTMLPurifier_TagTransform_Simple('div', 'text-align:center;');
+ $r['u'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:underline;');
+ $r['s'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
+ $r['strike'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
+
+ // == deprecated attribute transforms =============================
+
+ $r['caption@align'] =
+ new HTMLPurifier_AttrTransform_EnumToCSS(
+ 'align',
+ array(
+ // we're following IE's behavior, not Firefox's, due
+ // to the fact that no one supports caption-side:right,
+ // W3C included (with CSS 2.1). This is a slightly
+ // unreasonable attribute!
+ 'left' => 'text-align:left;',
+ 'right' => 'text-align:right;',
+ 'top' => 'caption-side:top;',
+ 'bottom' => 'caption-side:bottom;' // not supported by IE
+ )
+ );
+
+ // @align for img -------------------------------------------------
+ $r['img@align'] =
+ new HTMLPurifier_AttrTransform_EnumToCSS(
+ 'align',
+ array(
+ 'left' => 'float:left;',
+ 'right' => 'float:right;',
+ 'top' => 'vertical-align:top;',
+ 'middle' => 'vertical-align:middle;',
+ 'bottom' => 'vertical-align:baseline;',
+ )
+ );
+
+ // @align for table -----------------------------------------------
+ $r['table@align'] =
+ new HTMLPurifier_AttrTransform_EnumToCSS(
+ 'align',
+ array(
+ 'left' => 'float:left;',
+ 'center' => 'margin-left:auto;margin-right:auto;',
+ 'right' => 'float:right;'
+ )
+ );
+
+ // @align for hr -----------------------------------------------
+ $r['hr@align'] =
+ new HTMLPurifier_AttrTransform_EnumToCSS(
+ 'align',
+ array(
+ // we use both text-align and margin because these work
+ // for different browsers (IE and Firefox, respectively)
+ // and the melange makes for a pretty cross-compatible
+ // solution
+ 'left' => 'margin-left:0;margin-right:auto;text-align:left;',
+ 'center' => 'margin-left:auto;margin-right:auto;text-align:center;',
+ 'right' => 'margin-left:auto;margin-right:0;text-align:right;'
+ )
+ );
+
+ // @align for h1, h2, h3, h4, h5, h6, p, div ----------------------
+ // {{{
+ $align_lookup = array();
+ $align_values = array('left', 'right', 'center', 'justify');
+ foreach ($align_values as $v) {
+ $align_lookup[$v] = "text-align:$v;";
+ }
+ // }}}
+ $r['h1@align'] =
+ $r['h2@align'] =
+ $r['h3@align'] =
+ $r['h4@align'] =
+ $r['h5@align'] =
+ $r['h6@align'] =
+ $r['p@align'] =
+ $r['div@align'] =
+ new HTMLPurifier_AttrTransform_EnumToCSS('align', $align_lookup);
+
+ // @bgcolor for table, tr, td, th ---------------------------------
+ $r['table@bgcolor'] =
+ $r['td@bgcolor'] =
+ $r['th@bgcolor'] =
+ new HTMLPurifier_AttrTransform_BgColor();
+
+ // @border for img ------------------------------------------------
+ $r['img@border'] = new HTMLPurifier_AttrTransform_Border();
+
+ // @clear for br --------------------------------------------------
+ $r['br@clear'] =
+ new HTMLPurifier_AttrTransform_EnumToCSS(
+ 'clear',
+ array(
+ 'left' => 'clear:left;',
+ 'right' => 'clear:right;',
+ 'all' => 'clear:both;',
+ 'none' => 'clear:none;',
+ )
+ );
+
+ // @height for td, th ---------------------------------------------
+ $r['td@height'] =
+ $r['th@height'] =
+ new HTMLPurifier_AttrTransform_Length('height');
+
+ // @hspace for img ------------------------------------------------
+ $r['img@hspace'] = new HTMLPurifier_AttrTransform_ImgSpace('hspace');
+
+ // @noshade for hr ------------------------------------------------
+ // this transformation is not precise but often good enough.
+ // different browsers use different styles to designate noshade
+ $r['hr@noshade'] =
+ new HTMLPurifier_AttrTransform_BoolToCSS(
+ 'noshade',
+ 'color:#808080;background-color:#808080;border:0;'
+ );
+
+ // @nowrap for td, th ---------------------------------------------
+ $r['td@nowrap'] =
+ $r['th@nowrap'] =
+ new HTMLPurifier_AttrTransform_BoolToCSS(
+ 'nowrap',
+ 'white-space:nowrap;'
+ );
+
+ // @size for hr --------------------------------------------------
+ $r['hr@size'] = new HTMLPurifier_AttrTransform_Length('size', 'height');
+
+ // @type for li, ol, ul -------------------------------------------
+ // {{{
+ $ul_types = array(
+ 'disc' => 'list-style-type:disc;',
+ 'square' => 'list-style-type:square;',
+ 'circle' => 'list-style-type:circle;'
+ );
+ $ol_types = array(
+ '1' => 'list-style-type:decimal;',
+ 'i' => 'list-style-type:lower-roman;',
+ 'I' => 'list-style-type:upper-roman;',
+ 'a' => 'list-style-type:lower-alpha;',
+ 'A' => 'list-style-type:upper-alpha;'
+ );
+ $li_types = $ul_types + $ol_types;
+ // }}}
+
+ $r['ul@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ul_types);
+ $r['ol@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ol_types, true);
+ $r['li@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $li_types, true);
+
+ // @vspace for img ------------------------------------------------
+ $r['img@vspace'] = new HTMLPurifier_AttrTransform_ImgSpace('vspace');
+
+ // @width for hr, td, th ------------------------------------------
+ $r['td@width'] =
+ $r['th@width'] =
+ $r['hr@width'] = new HTMLPurifier_AttrTransform_Length('width');
+
+ return $r;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
similarity index 94%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
index 27a353d..01dbe9d 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
@@ -1,20 +1,20 @@
-<?php
-
-class HTMLPurifier_HTMLModule_XMLCommonAttributes extends HTMLPurifier_HTMLModule
-{
- /**
- * @type string
- */
- public $name = 'XMLCommonAttributes';
-
- /**
- * @type array
- */
- public $attr_collections = array(
- 'Lang' => array(
- 'xml:lang' => 'LanguageCode',
- )
- );
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_HTMLModule_XMLCommonAttributes extends HTMLPurifier_HTMLModule
+{
+ /**
+ * @type string
+ */
+ public $name = 'XMLCommonAttributes';
+
+ /**
+ * @type array
+ */
+ public $attr_collections = array(
+ 'Lang' => array(
+ 'xml:lang' => 'LanguageCode',
+ )
+ );
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModuleManager.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModuleManager.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModuleManager.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModuleManager.php
index c684961..2546c04 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/HTMLModuleManager.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/HTMLModuleManager.php
@@ -1,459 +1,464 @@
-<?php
-
-class HTMLPurifier_HTMLModuleManager
-{
-
- /**
- * @type HTMLPurifier_DoctypeRegistry
- */
- public $doctypes;
-
- /**
- * Instance of current doctype.
- * @type string
- */
- public $doctype;
-
- /**
- * @type HTMLPurifier_AttrTypes
- */
- public $attrTypes;
-
- /**
- * Active instances of modules for the specified doctype are
- * indexed, by name, in this array.
- * @type HTMLPurifier_HTMLModule[]
- */
- public $modules = array();
-
- /**
- * Array of recognized HTMLPurifier_HTMLModule instances,
- * indexed by module's class name. This array is usually lazy loaded, but a
- * user can overload a module by pre-emptively registering it.
- * @type HTMLPurifier_HTMLModule[]
- */
- public $registeredModules = array();
-
- /**
- * List of extra modules that were added by the user
- * using addModule(). These get unconditionally merged into the current doctype, whatever
- * it may be.
- * @type HTMLPurifier_HTMLModule[]
- */
- public $userModules = array();
-
- /**
- * Associative array of element name to list of modules that have
- * definitions for the element; this array is dynamically filled.
- * @type array
- */
- public $elementLookup = array();
-
- /**
- * List of prefixes we should use for registering small names.
- * @type array
- */
- public $prefixes = array('HTMLPurifier_HTMLModule_');
-
- /**
- * @type HTMLPurifier_ContentSets
- */
- public $contentSets;
-
- /**
- * @type HTMLPurifier_AttrCollections
- */
- public $attrCollections;
-
- /**
- * If set to true, unsafe elements and attributes will be allowed.
- * @type bool
- */
- public $trusted = false;
-
- public function __construct()
- {
- // editable internal objects
- $this->attrTypes = new HTMLPurifier_AttrTypes();
- $this->doctypes = new HTMLPurifier_DoctypeRegistry();
-
- // setup basic modules
- $common = array(
- 'CommonAttributes', 'Text', 'Hypertext', 'List',
- 'Presentation', 'Edit', 'Bdo', 'Tables', 'Image',
- 'StyleAttribute',
- // Unsafe:
- 'Scripting', 'Object', 'Forms',
- // Sorta legacy, but present in strict:
- 'Name',
- );
- $transitional = array('Legacy', 'Target', 'Iframe');
- $xml = array('XMLCommonAttributes');
- $non_xml = array('NonXMLCommonAttributes');
-
- // setup basic doctypes
- $this->doctypes->register(
- 'HTML 4.01 Transitional',
- false,
- array_merge($common, $transitional, $non_xml),
- array('Tidy_Transitional', 'Tidy_Proprietary'),
- array(),
- '-//W3C//DTD HTML 4.01 Transitional//EN',
- 'http://www.w3.org/TR/html4/loose.dtd'
- );
-
- $this->doctypes->register(
- 'HTML 4.01 Strict',
- false,
- array_merge($common, $non_xml),
- array('Tidy_Strict', 'Tidy_Proprietary', 'Tidy_Name'),
- array(),
- '-//W3C//DTD HTML 4.01//EN',
- 'http://www.w3.org/TR/html4/strict.dtd'
- );
-
- $this->doctypes->register(
- 'XHTML 1.0 Transitional',
- true,
- array_merge($common, $transitional, $xml, $non_xml),
- array('Tidy_Transitional', 'Tidy_XHTML', 'Tidy_Proprietary', 'Tidy_Name'),
- array(),
- '-//W3C//DTD XHTML 1.0 Transitional//EN',
- 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'
- );
-
- $this->doctypes->register(
- 'XHTML 1.0 Strict',
- true,
- array_merge($common, $xml, $non_xml),
- array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Strict', 'Tidy_Proprietary', 'Tidy_Name'),
- array(),
- '-//W3C//DTD XHTML 1.0 Strict//EN',
- 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
- );
-
- $this->doctypes->register(
- 'XHTML 1.1',
- true,
- // Iframe is a real XHTML 1.1 module, despite being
- // "transitional"!
- array_merge($common, $xml, array('Ruby', 'Iframe')),
- array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Proprietary', 'Tidy_Strict', 'Tidy_Name'), // Tidy_XHTML1_1
- array(),
- '-//W3C//DTD XHTML 1.1//EN',
- 'http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd'
- );
-
- }
-
- /**
- * Registers a module to the recognized module list, useful for
- * overloading pre-existing modules.
- * @param $module Mixed: string module name, with or without
- * HTMLPurifier_HTMLModule prefix, or instance of
- * subclass of HTMLPurifier_HTMLModule.
- * @param $overload Boolean whether or not to overload previous modules.
- * If this is not set, and you do overload a module,
- * HTML Purifier will complain with a warning.
- * @note This function will not call autoload, you must instantiate
- * (and thus invoke) autoload outside the method.
- * @note If a string is passed as a module name, different variants
- * will be tested in this order:
- * - Check for HTMLPurifier_HTMLModule_$name
- * - Check all prefixes with $name in order they were added
- * - Check for literal object name
- * - Throw fatal error
- * If your object name collides with an internal class, specify
- * your module manually. All modules must have been included
- * externally: registerModule will not perform inclusions for you!
- */
- public function registerModule($module, $overload = false)
- {
- if (is_string($module)) {
- // attempt to load the module
- $original_module = $module;
- $ok = false;
- foreach ($this->prefixes as $prefix) {
- $module = $prefix . $original_module;
- if (class_exists($module)) {
- $ok = true;
- break;
- }
- }
- if (!$ok) {
- $module = $original_module;
- if (!class_exists($module)) {
- trigger_error(
- $original_module . ' module does not exist',
- E_USER_ERROR
- );
- return;
- }
- }
- $module = new $module();
- }
- if (empty($module->name)) {
- trigger_error('Module instance of ' . get_class($module) . ' must have name');
- return;
- }
- if (!$overload && isset($this->registeredModules[$module->name])) {
- trigger_error('Overloading ' . $module->name . ' without explicit overload parameter', E_USER_WARNING);
- }
- $this->registeredModules[$module->name] = $module;
- }
-
- /**
- * Adds a module to the current doctype by first registering it,
- * and then tacking it on to the active doctype
- */
- public function addModule($module)
- {
- $this->registerModule($module);
- if (is_object($module)) {
- $module = $module->name;
- }
- $this->userModules[] = $module;
- }
-
- /**
- * Adds a class prefix that registerModule() will use to resolve a
- * string name to a concrete class
- */
- public function addPrefix($prefix)
- {
- $this->prefixes[] = $prefix;
- }
-
- /**
- * Performs processing on modules, after being called you may
- * use getElement() and getElements()
- * @param HTMLPurifier_Config $config
- */
- public function setup($config)
- {
- $this->trusted = $config->get('HTML.Trusted');
-
- // generate
- $this->doctype = $this->doctypes->make($config);
- $modules = $this->doctype->modules;
-
- // take out the default modules that aren't allowed
- $lookup = $config->get('HTML.AllowedModules');
- $special_cases = $config->get('HTML.CoreModules');
-
- if (is_array($lookup)) {
- foreach ($modules as $k => $m) {
- if (isset($special_cases[$m])) {
- continue;
- }
- if (!isset($lookup[$m])) {
- unset($modules[$k]);
- }
- }
- }
-
- // custom modules
- if ($config->get('HTML.Proprietary')) {
- $modules[] = 'Proprietary';
- }
- if ($config->get('HTML.SafeObject')) {
- $modules[] = 'SafeObject';
- }
- if ($config->get('HTML.SafeEmbed')) {
- $modules[] = 'SafeEmbed';
- }
- if ($config->get('HTML.SafeScripting') !== array()) {
- $modules[] = 'SafeScripting';
- }
- if ($config->get('HTML.Nofollow')) {
- $modules[] = 'Nofollow';
- }
- if ($config->get('HTML.TargetBlank')) {
- $modules[] = 'TargetBlank';
- }
-
- // merge in custom modules
- $modules = array_merge($modules, $this->userModules);
-
- foreach ($modules as $module) {
- $this->processModule($module);
- $this->modules[$module]->setup($config);
- }
-
- foreach ($this->doctype->tidyModules as $module) {
- $this->processModule($module);
- $this->modules[$module]->setup($config);
- }
-
- // prepare any injectors
- foreach ($this->modules as $module) {
- $n = array();
- foreach ($module->info_injector as $injector) {
- if (!is_object($injector)) {
- $class = "HTMLPurifier_Injector_$injector";
- $injector = new $class;
- }
- $n[$injector->name] = $injector;
- }
- $module->info_injector = $n;
- }
-
- // setup lookup table based on all valid modules
- foreach ($this->modules as $module) {
- foreach ($module->info as $name => $def) {
- if (!isset($this->elementLookup[$name])) {
- $this->elementLookup[$name] = array();
- }
- $this->elementLookup[$name][] = $module->name;
- }
- }
-
- // note the different choice
- $this->contentSets = new HTMLPurifier_ContentSets(
- // content set assembly deals with all possible modules,
- // not just ones deemed to be "safe"
- $this->modules
- );
- $this->attrCollections = new HTMLPurifier_AttrCollections(
- $this->attrTypes,
- // there is no way to directly disable a global attribute,
- // but using AllowedAttributes or simply not including
- // the module in your custom doctype should be sufficient
- $this->modules
- );
- }
-
- /**
- * Takes a module and adds it to the active module collection,
- * registering it if necessary.
- */
- public function processModule($module)
- {
- if (!isset($this->registeredModules[$module]) || is_object($module)) {
- $this->registerModule($module);
- }
- $this->modules[$module] = $this->registeredModules[$module];
- }
-
- /**
- * Retrieves merged element definitions.
- * @return Array of HTMLPurifier_ElementDef
- */
- public function getElements()
- {
- $elements = array();
- foreach ($this->modules as $module) {
- if (!$this->trusted && !$module->safe) {
- continue;
- }
- foreach ($module->info as $name => $v) {
- if (isset($elements[$name])) {
- continue;
- }
- $elements[$name] = $this->getElement($name);
- }
- }
-
- // remove dud elements, this happens when an element that
- // appeared to be safe actually wasn't
- foreach ($elements as $n => $v) {
- if ($v === false) {
- unset($elements[$n]);
- }
- }
-
- return $elements;
-
- }
-
- /**
- * Retrieves a single merged element definition
- * @param string $name Name of element
- * @param bool $trusted Boolean trusted overriding parameter: set to true
- * if you want the full version of an element
- * @return HTMLPurifier_ElementDef Merged HTMLPurifier_ElementDef
- * @note You may notice that modules are getting iterated over twice (once
- * in getElements() and once here). This
- * is because
- */
- public function getElement($name, $trusted = null)
- {
- if (!isset($this->elementLookup[$name])) {
- return false;
- }
-
- // setup global state variables
- $def = false;
- if ($trusted === null) {
- $trusted = $this->trusted;
- }
-
- // iterate through each module that has registered itself to this
- // element
- foreach ($this->elementLookup[$name] as $module_name) {
- $module = $this->modules[$module_name];
-
- // refuse to create/merge from a module that is deemed unsafe--
- // pretend the module doesn't exist--when trusted mode is not on.
- if (!$trusted && !$module->safe) {
- continue;
- }
-
- // clone is used because, ideally speaking, the original
- // definition should not be modified. Usually, this will
- // make no difference, but for consistency's sake
- $new_def = clone $module->info[$name];
-
- if (!$def && $new_def->standalone) {
- $def = $new_def;
- } elseif ($def) {
- // This will occur even if $new_def is standalone. In practice,
- // this will usually result in a full replacement.
- $def->mergeIn($new_def);
- } else {
- // :TODO:
- // non-standalone definitions that don't have a standalone
- // to merge into could be deferred to the end
- // HOWEVER, it is perfectly valid for a non-standalone
- // definition to lack a standalone definition, even
- // after all processing: this allows us to safely
- // specify extra attributes for elements that may not be
- // enabled all in one place. In particular, this might
- // be the case for trusted elements. WARNING: care must
- // be taken that the /extra/ definitions are all safe.
- continue;
- }
-
- // attribute value expansions
- $this->attrCollections->performInclusions($def->attr);
- $this->attrCollections->expandIdentifiers($def->attr, $this->attrTypes);
-
- // descendants_are_inline, for ChildDef_Chameleon
- if (is_string($def->content_model) &&
- strpos($def->content_model, 'Inline') !== false) {
- if ($name != 'del' && $name != 'ins') {
- // this is for you, ins/del
- $def->descendants_are_inline = true;
- }
- }
-
- $this->contentSets->generateChildDef($def, $module);
- }
-
- // This can occur if there is a blank definition, but no base to
- // mix it in with
- if (!$def) {
- return false;
- }
-
- // add information on required attributes
- foreach ($def->attr as $attr_name => $attr_def) {
- if ($attr_def->required) {
- $def->required_attr[] = $attr_name;
- }
- }
- return $def;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_HTMLModuleManager
+{
+
+ /**
+ * @type HTMLPurifier_DoctypeRegistry
+ */
+ public $doctypes;
+
+ /**
+ * Instance of current doctype.
+ * @type string
+ */
+ public $doctype;
+
+ /**
+ * @type HTMLPurifier_AttrTypes
+ */
+ public $attrTypes;
+
+ /**
+ * Active instances of modules for the specified doctype are
+ * indexed, by name, in this array.
+ * @type HTMLPurifier_HTMLModule[]
+ */
+ public $modules = array();
+
+ /**
+ * Array of recognized HTMLPurifier_HTMLModule instances,
+ * indexed by module's class name. This array is usually lazy loaded, but a
+ * user can overload a module by pre-emptively registering it.
+ * @type HTMLPurifier_HTMLModule[]
+ */
+ public $registeredModules = array();
+
+ /**
+ * List of extra modules that were added by the user
+ * using addModule(). These get unconditionally merged into the current doctype, whatever
+ * it may be.
+ * @type HTMLPurifier_HTMLModule[]
+ */
+ public $userModules = array();
+
+ /**
+ * Associative array of element name to list of modules that have
+ * definitions for the element; this array is dynamically filled.
+ * @type array
+ */
+ public $elementLookup = array();
+
+ /**
+ * List of prefixes we should use for registering small names.
+ * @type array
+ */
+ public $prefixes = array('HTMLPurifier_HTMLModule_');
+
+ /**
+ * @type HTMLPurifier_ContentSets
+ */
+ public $contentSets;
+
+ /**
+ * @type HTMLPurifier_AttrCollections
+ */
+ public $attrCollections;
+
+ /**
+ * If set to true, unsafe elements and attributes will be allowed.
+ * @type bool
+ */
+ public $trusted = false;
+
+ public function __construct()
+ {
+ // editable internal objects
+ $this->attrTypes = new HTMLPurifier_AttrTypes();
+ $this->doctypes = new HTMLPurifier_DoctypeRegistry();
+
+ // setup basic modules
+ $common = array(
+ 'CommonAttributes', 'Text', 'Hypertext', 'List',
+ 'Presentation', 'Edit', 'Bdo', 'Tables', 'Image',
+ 'StyleAttribute',
+ // Unsafe:
+ 'Scripting', 'Object', 'Forms',
+ // Sorta legacy, but present in strict:
+ 'Name',
+ );
+ $transitional = array('Legacy', 'Target', 'Iframe');
+ $xml = array('XMLCommonAttributes');
+ $non_xml = array('NonXMLCommonAttributes');
+
+ // setup basic doctypes
+ $this->doctypes->register(
+ 'HTML 4.01 Transitional',
+ false,
+ array_merge($common, $transitional, $non_xml),
+ array('Tidy_Transitional', 'Tidy_Proprietary'),
+ array(),
+ '-//W3C//DTD HTML 4.01 Transitional//EN',
+ 'http://www.w3.org/TR/html4/loose.dtd'
+ );
+
+ $this->doctypes->register(
+ 'HTML 4.01 Strict',
+ false,
+ array_merge($common, $non_xml),
+ array('Tidy_Strict', 'Tidy_Proprietary', 'Tidy_Name'),
+ array(),
+ '-//W3C//DTD HTML 4.01//EN',
+ 'http://www.w3.org/TR/html4/strict.dtd'
+ );
+
+ $this->doctypes->register(
+ 'XHTML 1.0 Transitional',
+ true,
+ array_merge($common, $transitional, $xml, $non_xml),
+ array('Tidy_Transitional', 'Tidy_XHTML', 'Tidy_Proprietary', 'Tidy_Name'),
+ array(),
+ '-//W3C//DTD XHTML 1.0 Transitional//EN',
+ 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'
+ );
+
+ $this->doctypes->register(
+ 'XHTML 1.0 Strict',
+ true,
+ array_merge($common, $xml, $non_xml),
+ array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Strict', 'Tidy_Proprietary', 'Tidy_Name'),
+ array(),
+ '-//W3C//DTD XHTML 1.0 Strict//EN',
+ 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
+ );
+
+ $this->doctypes->register(
+ 'XHTML 1.1',
+ true,
+ // Iframe is a real XHTML 1.1 module, despite being
+ // "transitional"!
+ array_merge($common, $xml, array('Ruby', 'Iframe')),
+ array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Proprietary', 'Tidy_Strict', 'Tidy_Name'), // Tidy_XHTML1_1
+ array(),
+ '-//W3C//DTD XHTML 1.1//EN',
+ 'http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd'
+ );
+
+ }
+
+ /**
+ * Registers a module to the recognized module list, useful for
+ * overloading pre-existing modules.
+ * @param $module Mixed: string module name, with or without
+ * HTMLPurifier_HTMLModule prefix, or instance of
+ * subclass of HTMLPurifier_HTMLModule.
+ * @param $overload Boolean whether or not to overload previous modules.
+ * If this is not set, and you do overload a module,
+ * HTML Purifier will complain with a warning.
+ * @note This function will not call autoload, you must instantiate
+ * (and thus invoke) autoload outside the method.
+ * @note If a string is passed as a module name, different variants
+ * will be tested in this order:
+ * - Check for HTMLPurifier_HTMLModule_$name
+ * - Check all prefixes with $name in order they were added
+ * - Check for literal object name
+ * - Throw fatal error
+ * If your object name collides with an internal class, specify
+ * your module manually. All modules must have been included
+ * externally: registerModule will not perform inclusions for you!
+ */
+ public function registerModule($module, $overload = false)
+ {
+ if (is_string($module)) {
+ // attempt to load the module
+ $original_module = $module;
+ $ok = false;
+ foreach ($this->prefixes as $prefix) {
+ $module = $prefix . $original_module;
+ if (class_exists($module)) {
+ $ok = true;
+ break;
+ }
+ }
+ if (!$ok) {
+ $module = $original_module;
+ if (!class_exists($module)) {
+ trigger_error(
+ $original_module . ' module does not exist',
+ E_USER_ERROR
+ );
+ return;
+ }
+ }
+ $module = new $module();
+ }
+ if (empty($module->name)) {
+ trigger_error('Module instance of ' . get_class($module) . ' must have name');
+ return;
+ }
+ if (!$overload && isset($this->registeredModules[$module->name])) {
+ trigger_error('Overloading ' . $module->name . ' without explicit overload parameter', E_USER_WARNING);
+ }
+ $this->registeredModules[$module->name] = $module;
+ }
+
+ /**
+ * Adds a module to the current doctype by first registering it,
+ * and then tacking it on to the active doctype
+ */
+ public function addModule($module)
+ {
+ $this->registerModule($module);
+ if (is_object($module)) {
+ $module = $module->name;
+ }
+ $this->userModules[] = $module;
+ }
+
+ /**
+ * Adds a class prefix that registerModule() will use to resolve a
+ * string name to a concrete class
+ */
+ public function addPrefix($prefix)
+ {
+ $this->prefixes[] = $prefix;
+ }
+
+ /**
+ * Performs processing on modules, after being called you may
+ * use getElement() and getElements()
+ * @param HTMLPurifier_Config $config
+ */
+ public function setup($config)
+ {
+ $this->trusted = $config->get('HTML.Trusted');
+
+ // generate
+ $this->doctype = $this->doctypes->make($config);
+ $modules = $this->doctype->modules;
+
+ // take out the default modules that aren't allowed
+ $lookup = $config->get('HTML.AllowedModules');
+ $special_cases = $config->get('HTML.CoreModules');
+
+ if (is_array($lookup)) {
+ foreach ($modules as $k => $m) {
+ if (isset($special_cases[$m])) {
+ continue;
+ }
+ if (!isset($lookup[$m])) {
+ unset($modules[$k]);
+ }
+ }
+ }
+
+ // custom modules
+ if ($config->get('HTML.Proprietary')) {
+ $modules[] = 'Proprietary';
+ }
+ if ($config->get('HTML.SafeObject')) {
+ $modules[] = 'SafeObject';
+ }
+ if ($config->get('HTML.SafeEmbed')) {
+ $modules[] = 'SafeEmbed';
+ }
+ if ($config->get('HTML.SafeScripting') !== array()) {
+ $modules[] = 'SafeScripting';
+ }
+ if ($config->get('HTML.Nofollow')) {
+ $modules[] = 'Nofollow';
+ }
+ if ($config->get('HTML.TargetBlank')) {
+ $modules[] = 'TargetBlank';
+ }
+ // NB: HTML.TargetNoreferrer must be AFTER HTML.TargetBlank
+ // so that its post-attr-transform gets run afterwards.
+ if ($config->get('HTML.TargetNoreferrer')) {
+ $modules[] = 'TargetNoreferrer';
+ }
+
+ // merge in custom modules
+ $modules = array_merge($modules, $this->userModules);
+
+ foreach ($modules as $module) {
+ $this->processModule($module);
+ $this->modules[$module]->setup($config);
+ }
+
+ foreach ($this->doctype->tidyModules as $module) {
+ $this->processModule($module);
+ $this->modules[$module]->setup($config);
+ }
+
+ // prepare any injectors
+ foreach ($this->modules as $module) {
+ $n = array();
+ foreach ($module->info_injector as $injector) {
+ if (!is_object($injector)) {
+ $class = "HTMLPurifier_Injector_$injector";
+ $injector = new $class;
+ }
+ $n[$injector->name] = $injector;
+ }
+ $module->info_injector = $n;
+ }
+
+ // setup lookup table based on all valid modules
+ foreach ($this->modules as $module) {
+ foreach ($module->info as $name => $def) {
+ if (!isset($this->elementLookup[$name])) {
+ $this->elementLookup[$name] = array();
+ }
+ $this->elementLookup[$name][] = $module->name;
+ }
+ }
+
+ // note the different choice
+ $this->contentSets = new HTMLPurifier_ContentSets(
+ // content set assembly deals with all possible modules,
+ // not just ones deemed to be "safe"
+ $this->modules
+ );
+ $this->attrCollections = new HTMLPurifier_AttrCollections(
+ $this->attrTypes,
+ // there is no way to directly disable a global attribute,
+ // but using AllowedAttributes or simply not including
+ // the module in your custom doctype should be sufficient
+ $this->modules
+ );
+ }
+
+ /**
+ * Takes a module and adds it to the active module collection,
+ * registering it if necessary.
+ */
+ public function processModule($module)
+ {
+ if (!isset($this->registeredModules[$module]) || is_object($module)) {
+ $this->registerModule($module);
+ }
+ $this->modules[$module] = $this->registeredModules[$module];
+ }
+
+ /**
+ * Retrieves merged element definitions.
+ * @return Array of HTMLPurifier_ElementDef
+ */
+ public function getElements()
+ {
+ $elements = array();
+ foreach ($this->modules as $module) {
+ if (!$this->trusted && !$module->safe) {
+ continue;
+ }
+ foreach ($module->info as $name => $v) {
+ if (isset($elements[$name])) {
+ continue;
+ }
+ $elements[$name] = $this->getElement($name);
+ }
+ }
+
+ // remove dud elements, this happens when an element that
+ // appeared to be safe actually wasn't
+ foreach ($elements as $n => $v) {
+ if ($v === false) {
+ unset($elements[$n]);
+ }
+ }
+
+ return $elements;
+
+ }
+
+ /**
+ * Retrieves a single merged element definition
+ * @param string $name Name of element
+ * @param bool $trusted Boolean trusted overriding parameter: set to true
+ * if you want the full version of an element
+ * @return HTMLPurifier_ElementDef Merged HTMLPurifier_ElementDef
+ * @note You may notice that modules are getting iterated over twice (once
+ * in getElements() and once here). This
+ * is because
+ */
+ public function getElement($name, $trusted = null)
+ {
+ if (!isset($this->elementLookup[$name])) {
+ return false;
+ }
+
+ // setup global state variables
+ $def = false;
+ if ($trusted === null) {
+ $trusted = $this->trusted;
+ }
+
+ // iterate through each module that has registered itself to this
+ // element
+ foreach ($this->elementLookup[$name] as $module_name) {
+ $module = $this->modules[$module_name];
+
+ // refuse to create/merge from a module that is deemed unsafe--
+ // pretend the module doesn't exist--when trusted mode is not on.
+ if (!$trusted && !$module->safe) {
+ continue;
+ }
+
+ // clone is used because, ideally speaking, the original
+ // definition should not be modified. Usually, this will
+ // make no difference, but for consistency's sake
+ $new_def = clone $module->info[$name];
+
+ if (!$def && $new_def->standalone) {
+ $def = $new_def;
+ } elseif ($def) {
+ // This will occur even if $new_def is standalone. In practice,
+ // this will usually result in a full replacement.
+ $def->mergeIn($new_def);
+ } else {
+ // :TODO:
+ // non-standalone definitions that don't have a standalone
+ // to merge into could be deferred to the end
+ // HOWEVER, it is perfectly valid for a non-standalone
+ // definition to lack a standalone definition, even
+ // after all processing: this allows us to safely
+ // specify extra attributes for elements that may not be
+ // enabled all in one place. In particular, this might
+ // be the case for trusted elements. WARNING: care must
+ // be taken that the /extra/ definitions are all safe.
+ continue;
+ }
+
+ // attribute value expansions
+ $this->attrCollections->performInclusions($def->attr);
+ $this->attrCollections->expandIdentifiers($def->attr, $this->attrTypes);
+
+ // descendants_are_inline, for ChildDef_Chameleon
+ if (is_string($def->content_model) &&
+ strpos($def->content_model, 'Inline') !== false) {
+ if ($name != 'del' && $name != 'ins') {
+ // this is for you, ins/del
+ $def->descendants_are_inline = true;
+ }
+ }
+
+ $this->contentSets->generateChildDef($def, $module);
+ }
+
+ // This can occur if there is a blank definition, but no base to
+ // mix it in with
+ if (!$def) {
+ return false;
+ }
+
+ // add information on required attributes
+ foreach ($def->attr as $attr_name => $attr_def) {
+ if ($attr_def->required) {
+ $def->required_attr[] = $attr_name;
+ }
+ }
+ return $def;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/IDAccumulator.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/IDAccumulator.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/IDAccumulator.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/IDAccumulator.php
index bf399af..65c902c 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/IDAccumulator.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/IDAccumulator.php
@@ -1,57 +1,57 @@
-<?php
-
-/**
- * Component of HTMLPurifier_AttrContext that accumulates IDs to prevent dupes
- * @note In Slashdot-speak, dupe means duplicate.
- * @note The default constructor does not accept $config or $context objects:
- * use must use the static build() factory method to perform initialization.
- */
-class HTMLPurifier_IDAccumulator
-{
-
- /**
- * Lookup table of IDs we've accumulated.
- * @public
- */
- public $ids = array();
-
- /**
- * Builds an IDAccumulator, also initializing the default blacklist
- * @param HTMLPurifier_Config $config Instance of HTMLPurifier_Config
- * @param HTMLPurifier_Context $context Instance of HTMLPurifier_Context
- * @return HTMLPurifier_IDAccumulator Fully initialized HTMLPurifier_IDAccumulator
- */
- public static function build($config, $context)
- {
- $id_accumulator = new HTMLPurifier_IDAccumulator();
- $id_accumulator->load($config->get('Attr.IDBlacklist'));
- return $id_accumulator;
- }
-
- /**
- * Add an ID to the lookup table.
- * @param string $id ID to be added.
- * @return bool status, true if success, false if there's a dupe
- */
- public function add($id)
- {
- if (isset($this->ids[$id])) {
- return false;
- }
- return $this->ids[$id] = true;
- }
-
- /**
- * Load a list of IDs into the lookup table
- * @param $array_of_ids Array of IDs to load
- * @note This function doesn't care about duplicates
- */
- public function load($array_of_ids)
- {
- foreach ($array_of_ids as $id) {
- $this->ids[$id] = true;
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Component of HTMLPurifier_AttrContext that accumulates IDs to prevent dupes
+ * @note In Slashdot-speak, dupe means duplicate.
+ * @note The default constructor does not accept $config or $context objects:
+ * use must use the static build() factory method to perform initialization.
+ */
+class HTMLPurifier_IDAccumulator
+{
+
+ /**
+ * Lookup table of IDs we've accumulated.
+ * @public
+ */
+ public $ids = array();
+
+ /**
+ * Builds an IDAccumulator, also initializing the default blacklist
+ * @param HTMLPurifier_Config $config Instance of HTMLPurifier_Config
+ * @param HTMLPurifier_Context $context Instance of HTMLPurifier_Context
+ * @return HTMLPurifier_IDAccumulator Fully initialized HTMLPurifier_IDAccumulator
+ */
+ public static function build($config, $context)
+ {
+ $id_accumulator = new HTMLPurifier_IDAccumulator();
+ $id_accumulator->load($config->get('Attr.IDBlacklist'));
+ return $id_accumulator;
+ }
+
+ /**
+ * Add an ID to the lookup table.
+ * @param string $id ID to be added.
+ * @return bool status, true if success, false if there's a dupe
+ */
+ public function add($id)
+ {
+ if (isset($this->ids[$id])) {
+ return false;
+ }
+ return $this->ids[$id] = true;
+ }
+
+ /**
+ * Load a list of IDs into the lookup table
+ * @param $array_of_ids Array of IDs to load
+ * @note This function doesn't care about duplicates
+ */
+ public function load($array_of_ids)
+ {
+ foreach ($array_of_ids as $id) {
+ $this->ids[$id] = true;
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector.php
index f1a74a4..5060eef 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector.php
@@ -1,281 +1,281 @@
-<?php
-
-/**
- * Injects tokens into the document while parsing for well-formedness.
- * This enables "formatter-like" functionality such as auto-paragraphing,
- * smiley-ification and linkification to take place.
- *
- * A note on how handlers create changes; this is done by assigning a new
- * value to the $token reference. These values can take a variety of forms and
- * are best described HTMLPurifier_Strategy_MakeWellFormed->processToken()
- * documentation.
- *
- * @todo Allow injectors to request a re-run on their output. This
- * would help if an operation is recursive.
- */
-abstract class HTMLPurifier_Injector
-{
-
- /**
- * Advisory name of injector, this is for friendly error messages.
- * @type string
- */
- public $name;
-
- /**
- * @type HTMLPurifier_HTMLDefinition
- */
- protected $htmlDefinition;
-
- /**
- * Reference to CurrentNesting variable in Context. This is an array
- * list of tokens that we are currently "inside"
- * @type array
- */
- protected $currentNesting;
-
- /**
- * Reference to current token.
- * @type HTMLPurifier_Token
- */
- protected $currentToken;
-
- /**
- * Reference to InputZipper variable in Context.
- * @type HTMLPurifier_Zipper
- */
- protected $inputZipper;
-
- /**
- * Array of elements and attributes this injector creates and therefore
- * need to be allowed by the definition. Takes form of
- * array('element' => array('attr', 'attr2'), 'element2')
- * @type array
- */
- public $needed = array();
-
- /**
- * Number of elements to rewind backwards (relative).
- * @type bool|int
- */
- protected $rewindOffset = false;
-
- /**
- * Rewind to a spot to re-perform processing. This is useful if you
- * deleted a node, and now need to see if this change affected any
- * earlier nodes. Rewinding does not affect other injectors, and can
- * result in infinite loops if not used carefully.
- * @param bool|int $offset
- * @warning HTML Purifier will prevent you from fast-forwarding with this
- * function.
- */
- public function rewindOffset($offset)
- {
- $this->rewindOffset = $offset;
- }
-
- /**
- * Retrieves rewind offset, and then unsets it.
- * @return bool|int
- */
- public function getRewindOffset()
- {
- $r = $this->rewindOffset;
- $this->rewindOffset = false;
- return $r;
- }
-
- /**
- * Prepares the injector by giving it the config and context objects:
- * this allows references to important variables to be made within
- * the injector. This function also checks if the HTML environment
- * will work with the Injector (see checkNeeded()).
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool|string Boolean false if success, string of missing needed element/attribute if failure
- */
- public function prepare($config, $context)
- {
- $this->htmlDefinition = $config->getHTMLDefinition();
- // Even though this might fail, some unit tests ignore this and
- // still test checkNeeded, so be careful. Maybe get rid of that
- // dependency.
- $result = $this->checkNeeded($config);
- if ($result !== false) {
- return $result;
- }
- $this->currentNesting =& $context->get('CurrentNesting');
- $this->currentToken =& $context->get('CurrentToken');
- $this->inputZipper =& $context->get('InputZipper');
- return false;
- }
-
- /**
- * This function checks if the HTML environment
- * will work with the Injector: if p tags are not allowed, the
- * Auto-Paragraphing injector should not be enabled.
- * @param HTMLPurifier_Config $config
- * @return bool|string Boolean false if success, string of missing needed element/attribute if failure
- */
- public function checkNeeded($config)
- {
- $def = $config->getHTMLDefinition();
- foreach ($this->needed as $element => $attributes) {
- if (is_int($element)) {
- $element = $attributes;
- }
- if (!isset($def->info[$element])) {
- return $element;
- }
- if (!is_array($attributes)) {
- continue;
- }
- foreach ($attributes as $name) {
- if (!isset($def->info[$element]->attr[$name])) {
- return "$element.$name";
- }
- }
- }
- return false;
- }
-
- /**
- * Tests if the context node allows a certain element
- * @param string $name Name of element to test for
- * @return bool True if element is allowed, false if it is not
- */
- public function allowsElement($name)
- {
- if (!empty($this->currentNesting)) {
- $parent_token = array_pop($this->currentNesting);
- $this->currentNesting[] = $parent_token;
- $parent = $this->htmlDefinition->info[$parent_token->name];
- } else {
- $parent = $this->htmlDefinition->info_parent_def;
- }
- if (!isset($parent->child->elements[$name]) || isset($parent->excludes[$name])) {
- return false;
- }
- // check for exclusion
- for ($i = count($this->currentNesting) - 2; $i >= 0; $i--) {
- $node = $this->currentNesting[$i];
- $def = $this->htmlDefinition->info[$node->name];
- if (isset($def->excludes[$name])) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Iterator function, which starts with the next token and continues until
- * you reach the end of the input tokens.
- * @warning Please prevent previous references from interfering with this
- * functions by setting $i = null beforehand!
- * @param int $i Current integer index variable for inputTokens
- * @param HTMLPurifier_Token $current Current token variable.
- * Do NOT use $token, as that variable is also a reference
- * @return bool
- */
- protected function forward(&$i, &$current)
- {
- if ($i === null) {
- $i = count($this->inputZipper->back) - 1;
- } else {
- $i--;
- }
- if ($i < 0) {
- return false;
- }
- $current = $this->inputZipper->back[$i];
- return true;
- }
-
- /**
- * Similar to _forward, but accepts a third parameter $nesting (which
- * should be initialized at 0) and stops when we hit the end tag
- * for the node $this->inputIndex starts in.
- * @param int $i Current integer index variable for inputTokens
- * @param HTMLPurifier_Token $current Current token variable.
- * Do NOT use $token, as that variable is also a reference
- * @param int $nesting
- * @return bool
- */
- protected function forwardUntilEndToken(&$i, &$current, &$nesting)
- {
- $result = $this->forward($i, $current);
- if (!$result) {
- return false;
- }
- if ($nesting === null) {
- $nesting = 0;
- }
- if ($current instanceof HTMLPurifier_Token_Start) {
- $nesting++;
- } elseif ($current instanceof HTMLPurifier_Token_End) {
- if ($nesting <= 0) {
- return false;
- }
- $nesting--;
- }
- return true;
- }
-
- /**
- * Iterator function, starts with the previous token and continues until
- * you reach the beginning of input tokens.
- * @warning Please prevent previous references from interfering with this
- * functions by setting $i = null beforehand!
- * @param int $i Current integer index variable for inputTokens
- * @param HTMLPurifier_Token $current Current token variable.
- * Do NOT use $token, as that variable is also a reference
- * @return bool
- */
- protected function backward(&$i, &$current)
- {
- if ($i === null) {
- $i = count($this->inputZipper->front) - 1;
- } else {
- $i--;
- }
- if ($i < 0) {
- return false;
- }
- $current = $this->inputZipper->front[$i];
- return true;
- }
-
- /**
- * Handler that is called when a text token is processed
- */
- public function handleText(&$token)
- {
- }
-
- /**
- * Handler that is called when a start or empty token is processed
- */
- public function handleElement(&$token)
- {
- }
-
- /**
- * Handler that is called when an end token is processed
- */
- public function handleEnd(&$token)
- {
- $this->notifyEnd($token);
- }
-
- /**
- * Notifier that is called when an end token is processed
- * @param HTMLPurifier_Token $token Current token variable.
- * @note This differs from handlers in that the token is read-only
- * @deprecated
- */
- public function notifyEnd($token)
- {
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Injects tokens into the document while parsing for well-formedness.
+ * This enables "formatter-like" functionality such as auto-paragraphing,
+ * smiley-ification and linkification to take place.
+ *
+ * A note on how handlers create changes; this is done by assigning a new
+ * value to the $token reference. These values can take a variety of forms and
+ * are best described HTMLPurifier_Strategy_MakeWellFormed->processToken()
+ * documentation.
+ *
+ * @todo Allow injectors to request a re-run on their output. This
+ * would help if an operation is recursive.
+ */
+abstract class HTMLPurifier_Injector
+{
+
+ /**
+ * Advisory name of injector, this is for friendly error messages.
+ * @type string
+ */
+ public $name;
+
+ /**
+ * @type HTMLPurifier_HTMLDefinition
+ */
+ protected $htmlDefinition;
+
+ /**
+ * Reference to CurrentNesting variable in Context. This is an array
+ * list of tokens that we are currently "inside"
+ * @type array
+ */
+ protected $currentNesting;
+
+ /**
+ * Reference to current token.
+ * @type HTMLPurifier_Token
+ */
+ protected $currentToken;
+
+ /**
+ * Reference to InputZipper variable in Context.
+ * @type HTMLPurifier_Zipper
+ */
+ protected $inputZipper;
+
+ /**
+ * Array of elements and attributes this injector creates and therefore
+ * need to be allowed by the definition. Takes form of
+ * array('element' => array('attr', 'attr2'), 'element2')
+ * @type array
+ */
+ public $needed = array();
+
+ /**
+ * Number of elements to rewind backwards (relative).
+ * @type bool|int
+ */
+ protected $rewindOffset = false;
+
+ /**
+ * Rewind to a spot to re-perform processing. This is useful if you
+ * deleted a node, and now need to see if this change affected any
+ * earlier nodes. Rewinding does not affect other injectors, and can
+ * result in infinite loops if not used carefully.
+ * @param bool|int $offset
+ * @warning HTML Purifier will prevent you from fast-forwarding with this
+ * function.
+ */
+ public function rewindOffset($offset)
+ {
+ $this->rewindOffset = $offset;
+ }
+
+ /**
+ * Retrieves rewind offset, and then unsets it.
+ * @return bool|int
+ */
+ public function getRewindOffset()
+ {
+ $r = $this->rewindOffset;
+ $this->rewindOffset = false;
+ return $r;
+ }
+
+ /**
+ * Prepares the injector by giving it the config and context objects:
+ * this allows references to important variables to be made within
+ * the injector. This function also checks if the HTML environment
+ * will work with the Injector (see checkNeeded()).
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string Boolean false if success, string of missing needed element/attribute if failure
+ */
+ public function prepare($config, $context)
+ {
+ $this->htmlDefinition = $config->getHTMLDefinition();
+ // Even though this might fail, some unit tests ignore this and
+ // still test checkNeeded, so be careful. Maybe get rid of that
+ // dependency.
+ $result = $this->checkNeeded($config);
+ if ($result !== false) {
+ return $result;
+ }
+ $this->currentNesting =& $context->get('CurrentNesting');
+ $this->currentToken =& $context->get('CurrentToken');
+ $this->inputZipper =& $context->get('InputZipper');
+ return false;
+ }
+
+ /**
+ * This function checks if the HTML environment
+ * will work with the Injector: if p tags are not allowed, the
+ * Auto-Paragraphing injector should not be enabled.
+ * @param HTMLPurifier_Config $config
+ * @return bool|string Boolean false if success, string of missing needed element/attribute if failure
+ */
+ public function checkNeeded($config)
+ {
+ $def = $config->getHTMLDefinition();
+ foreach ($this->needed as $element => $attributes) {
+ if (is_int($element)) {
+ $element = $attributes;
+ }
+ if (!isset($def->info[$element])) {
+ return $element;
+ }
+ if (!is_array($attributes)) {
+ continue;
+ }
+ foreach ($attributes as $name) {
+ if (!isset($def->info[$element]->attr[$name])) {
+ return "$element.$name";
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Tests if the context node allows a certain element
+ * @param string $name Name of element to test for
+ * @return bool True if element is allowed, false if it is not
+ */
+ public function allowsElement($name)
+ {
+ if (!empty($this->currentNesting)) {
+ $parent_token = array_pop($this->currentNesting);
+ $this->currentNesting[] = $parent_token;
+ $parent = $this->htmlDefinition->info[$parent_token->name];
+ } else {
+ $parent = $this->htmlDefinition->info_parent_def;
+ }
+ if (!isset($parent->child->elements[$name]) || isset($parent->excludes[$name])) {
+ return false;
+ }
+ // check for exclusion
+ for ($i = count($this->currentNesting) - 2; $i >= 0; $i--) {
+ $node = $this->currentNesting[$i];
+ $def = $this->htmlDefinition->info[$node->name];
+ if (isset($def->excludes[$name])) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Iterator function, which starts with the next token and continues until
+ * you reach the end of the input tokens.
+ * @warning Please prevent previous references from interfering with this
+ * functions by setting $i = null beforehand!
+ * @param int $i Current integer index variable for inputTokens
+ * @param HTMLPurifier_Token $current Current token variable.
+ * Do NOT use $token, as that variable is also a reference
+ * @return bool
+ */
+ protected function forward(&$i, &$current)
+ {
+ if ($i === null) {
+ $i = count($this->inputZipper->back) - 1;
+ } else {
+ $i--;
+ }
+ if ($i < 0) {
+ return false;
+ }
+ $current = $this->inputZipper->back[$i];
+ return true;
+ }
+
+ /**
+ * Similar to _forward, but accepts a third parameter $nesting (which
+ * should be initialized at 0) and stops when we hit the end tag
+ * for the node $this->inputIndex starts in.
+ * @param int $i Current integer index variable for inputTokens
+ * @param HTMLPurifier_Token $current Current token variable.
+ * Do NOT use $token, as that variable is also a reference
+ * @param int $nesting
+ * @return bool
+ */
+ protected function forwardUntilEndToken(&$i, &$current, &$nesting)
+ {
+ $result = $this->forward($i, $current);
+ if (!$result) {
+ return false;
+ }
+ if ($nesting === null) {
+ $nesting = 0;
+ }
+ if ($current instanceof HTMLPurifier_Token_Start) {
+ $nesting++;
+ } elseif ($current instanceof HTMLPurifier_Token_End) {
+ if ($nesting <= 0) {
+ return false;
+ }
+ $nesting--;
+ }
+ return true;
+ }
+
+ /**
+ * Iterator function, starts with the previous token and continues until
+ * you reach the beginning of input tokens.
+ * @warning Please prevent previous references from interfering with this
+ * functions by setting $i = null beforehand!
+ * @param int $i Current integer index variable for inputTokens
+ * @param HTMLPurifier_Token $current Current token variable.
+ * Do NOT use $token, as that variable is also a reference
+ * @return bool
+ */
+ protected function backward(&$i, &$current)
+ {
+ if ($i === null) {
+ $i = count($this->inputZipper->front) - 1;
+ } else {
+ $i--;
+ }
+ if ($i < 0) {
+ return false;
+ }
+ $current = $this->inputZipper->front[$i];
+ return true;
+ }
+
+ /**
+ * Handler that is called when a text token is processed
+ */
+ public function handleText(&$token)
+ {
+ }
+
+ /**
+ * Handler that is called when a start or empty token is processed
+ */
+ public function handleElement(&$token)
+ {
+ }
+
+ /**
+ * Handler that is called when an end token is processed
+ */
+ public function handleEnd(&$token)
+ {
+ $this->notifyEnd($token);
+ }
+
+ /**
+ * Notifier that is called when an end token is processed
+ * @param HTMLPurifier_Token $token Current token variable.
+ * @note This differs from handlers in that the token is read-only
+ * @deprecated
+ */
+ public function notifyEnd($token)
+ {
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/AutoParagraph.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/AutoParagraph.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/AutoParagraph.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/AutoParagraph.php
index d3ec44f..4afdd12 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/AutoParagraph.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/AutoParagraph.php
@@ -1,356 +1,356 @@
-<?php
-
-/**
- * Injector that auto paragraphs text in the root node based on
- * double-spacing.
- * @todo Ensure all states are unit tested, including variations as well.
- * @todo Make a graph of the flow control for this Injector.
- */
-class HTMLPurifier_Injector_AutoParagraph extends HTMLPurifier_Injector
-{
- /**
- * @type string
- */
- public $name = 'AutoParagraph';
-
- /**
- * @type array
- */
- public $needed = array('p');
-
- /**
- * @return HTMLPurifier_Token_Start
- */
- private function _pStart()
- {
- $par = new HTMLPurifier_Token_Start('p');
- $par->armor['MakeWellFormed_TagClosedError'] = true;
- return $par;
- }
-
- /**
- * @param HTMLPurifier_Token_Text $token
- */
- public function handleText(&$token)
- {
- $text = $token->data;
- // Does the current parent allow <p> tags?
- if ($this->allowsElement('p')) {
- if (empty($this->currentNesting) || strpos($text, "\n\n") !== false) {
- // Note that we have differing behavior when dealing with text
- // in the anonymous root node, or a node inside the document.
- // If the text as a double-newline, the treatment is the same;
- // if it doesn't, see the next if-block if you're in the document.
-
- $i = $nesting = null;
- if (!$this->forwardUntilEndToken($i, $current, $nesting) && $token->is_whitespace) {
- // State 1.1: ... ^ (whitespace, then document end)
- // ----
- // This is a degenerate case
- } else {
- if (!$token->is_whitespace || $this->_isInline($current)) {
- // State 1.2: PAR1
- // ----
-
- // State 1.3: PAR1\n\nPAR2
- // ------------
-
- // State 1.4: <div>PAR1\n\nPAR2 (see State 2)
- // ------------
- $token = array($this->_pStart());
- $this->_splitText($text, $token);
- } else {
- // State 1.5: \n<hr />
- // --
- }
- }
- } else {
- // State 2: <div>PAR1... (similar to 1.4)
- // ----
-
- // We're in an element that allows paragraph tags, but we're not
- // sure if we're going to need them.
- if ($this->_pLookAhead()) {
- // State 2.1: <div>PAR1<b>PAR1\n\nPAR2
- // ----
- // Note: This will always be the first child, since any
- // previous inline element would have triggered this very
- // same routine, and found the double newline. One possible
- // exception would be a comment.
- $token = array($this->_pStart(), $token);
- } else {
- // State 2.2.1: <div>PAR1<div>
- // ----
-
- // State 2.2.2: <div>PAR1<b>PAR1</b></div>
- // ----
- }
- }
- // Is the current parent a <p> tag?
- } elseif (!empty($this->currentNesting) &&
- $this->currentNesting[count($this->currentNesting) - 1]->name == 'p') {
- // State 3.1: ...<p>PAR1
- // ----
-
- // State 3.2: ...<p>PAR1\n\nPAR2
- // ------------
- $token = array();
- $this->_splitText($text, $token);
- // Abort!
- } else {
- // State 4.1: ...<b>PAR1
- // ----
-
- // State 4.2: ...<b>PAR1\n\nPAR2
- // ------------
- }
- }
-
- /**
- * @param HTMLPurifier_Token $token
- */
- public function handleElement(&$token)
- {
- // We don't have to check if we're already in a <p> tag for block
- // tokens, because the tag would have been autoclosed by MakeWellFormed.
- if ($this->allowsElement('p')) {
- if (!empty($this->currentNesting)) {
- if ($this->_isInline($token)) {
- // State 1: <div>...<b>
- // ---
- // Check if this token is adjacent to the parent token
- // (seek backwards until token isn't whitespace)
- $i = null;
- $this->backward($i, $prev);
-
- if (!$prev instanceof HTMLPurifier_Token_Start) {
- // Token wasn't adjacent
- if ($prev instanceof HTMLPurifier_Token_Text &&
- substr($prev->data, -2) === "\n\n"
- ) {
- // State 1.1.4: <div><p>PAR1</p>\n\n<b>
- // ---
- // Quite frankly, this should be handled by splitText
- $token = array($this->_pStart(), $token);
- } else {
- // State 1.1.1: <div><p>PAR1</p><b>
- // ---
- // State 1.1.2: <div><br /><b>
- // ---
- // State 1.1.3: <div>PAR<b>
- // ---
- }
- } else {
- // State 1.2.1: <div><b>
- // ---
- // Lookahead to see if <p> is needed.
- if ($this->_pLookAhead()) {
- // State 1.3.1: <div><b>PAR1\n\nPAR2
- // ---
- $token = array($this->_pStart(), $token);
- } else {
- // State 1.3.2: <div><b>PAR1</b></div>
- // ---
-
- // State 1.3.3: <div><b>PAR1</b><div></div>\n\n</div>
- // ---
- }
- }
- } else {
- // State 2.3: ...<div>
- // -----
- }
- } else {
- if ($this->_isInline($token)) {
- // State 3.1: <b>
- // ---
- // This is where the {p} tag is inserted, not reflected in
- // inputTokens yet, however.
- $token = array($this->_pStart(), $token);
- } else {
- // State 3.2: <div>
- // -----
- }
-
- $i = null;
- if ($this->backward($i, $prev)) {
- if (!$prev instanceof HTMLPurifier_Token_Text) {
- // State 3.1.1: ...</p>{p}<b>
- // ---
- // State 3.2.1: ...</p><div>
- // -----
- if (!is_array($token)) {
- $token = array($token);
- }
- array_unshift($token, new HTMLPurifier_Token_Text("\n\n"));
- } else {
- // State 3.1.2: ...</p>\n\n{p}<b>
- // ---
- // State 3.2.2: ...</p>\n\n<div>
- // -----
- // Note: PAR<ELEM> cannot occur because PAR would have been
- // wrapped in <p> tags.
- }
- }
- }
- } else {
- // State 2.2: <ul><li>
- // ----
- // State 2.4: <p><b>
- // ---
- }
- }
-
- /**
- * Splits up a text in paragraph tokens and appends them
- * to the result stream that will replace the original
- * @param string $data String text data that will be processed
- * into paragraphs
- * @param HTMLPurifier_Token[] $result Reference to array of tokens that the
- * tags will be appended onto
- */
- private function _splitText($data, &$result)
- {
- $raw_paragraphs = explode("\n\n", $data);
- $paragraphs = array(); // without empty paragraphs
- $needs_start = false;
- $needs_end = false;
-
- $c = count($raw_paragraphs);
- if ($c == 1) {
- // There were no double-newlines, abort quickly. In theory this
- // should never happen.
- $result[] = new HTMLPurifier_Token_Text($data);
- return;
- }
- for ($i = 0; $i < $c; $i++) {
- $par = $raw_paragraphs[$i];
- if (trim($par) !== '') {
- $paragraphs[] = $par;
- } else {
- if ($i == 0) {
- // Double newline at the front
- if (empty($result)) {
- // The empty result indicates that the AutoParagraph
- // injector did not add any start paragraph tokens.
- // This means that we have been in a paragraph for
- // a while, and the newline means we should start a new one.
- $result[] = new HTMLPurifier_Token_End('p');
- $result[] = new HTMLPurifier_Token_Text("\n\n");
- // However, the start token should only be added if
- // there is more processing to be done (i.e. there are
- // real paragraphs in here). If there are none, the
- // next start paragraph tag will be handled by the
- // next call to the injector
- $needs_start = true;
- } else {
- // We just started a new paragraph!
- // Reinstate a double-newline for presentation's sake, since
- // it was in the source code.
- array_unshift($result, new HTMLPurifier_Token_Text("\n\n"));
- }
- } elseif ($i + 1 == $c) {
- // Double newline at the end
- // There should be a trailing </p> when we're finally done.
- $needs_end = true;
- }
- }
- }
-
- // Check if this was just a giant blob of whitespace. Move this earlier,
- // perhaps?
- if (empty($paragraphs)) {
- return;
- }
-
- // Add the start tag indicated by \n\n at the beginning of $data
- if ($needs_start) {
- $result[] = $this->_pStart();
- }
-
- // Append the paragraphs onto the result
- foreach ($paragraphs as $par) {
- $result[] = new HTMLPurifier_Token_Text($par);
- $result[] = new HTMLPurifier_Token_End('p');
- $result[] = new HTMLPurifier_Token_Text("\n\n");
- $result[] = $this->_pStart();
- }
-
- // Remove trailing start token; Injector will handle this later if
- // it was indeed needed. This prevents from needing to do a lookahead,
- // at the cost of a lookbehind later.
- array_pop($result);
-
- // If there is no need for an end tag, remove all of it and let
- // MakeWellFormed close it later.
- if (!$needs_end) {
- array_pop($result); // removes \n\n
- array_pop($result); // removes </p>
- }
- }
-
- /**
- * Returns true if passed token is inline (and, ergo, allowed in
- * paragraph tags)
- * @param HTMLPurifier_Token $token
- * @return bool
- */
- private function _isInline($token)
- {
- return isset($this->htmlDefinition->info['p']->child->elements[$token->name]);
- }
-
- /**
- * Looks ahead in the token list and determines whether or not we need
- * to insert a <p> tag.
- * @return bool
- */
- private function _pLookAhead()
- {
- if ($this->currentToken instanceof HTMLPurifier_Token_Start) {
- $nesting = 1;
- } else {
- $nesting = 0;
- }
- $ok = false;
- $i = null;
- while ($this->forwardUntilEndToken($i, $current, $nesting)) {
- $result = $this->_checkNeedsP($current);
- if ($result !== null) {
- $ok = $result;
- break;
- }
- }
- return $ok;
- }
-
- /**
- * Determines if a particular token requires an earlier inline token
- * to get a paragraph. This should be used with _forwardUntilEndToken
- * @param HTMLPurifier_Token $current
- * @return bool
- */
- private function _checkNeedsP($current)
- {
- if ($current instanceof HTMLPurifier_Token_Start) {
- if (!$this->_isInline($current)) {
- // <div>PAR1<div>
- // ----
- // Terminate early, since we hit a block element
- return false;
- }
- } elseif ($current instanceof HTMLPurifier_Token_Text) {
- if (strpos($current->data, "\n\n") !== false) {
- // <div>PAR1<b>PAR1\n\nPAR2
- // ----
- return true;
- } else {
- // <div>PAR1<b>PAR1...
- // ----
- }
- }
- return null;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Injector that auto paragraphs text in the root node based on
+ * double-spacing.
+ * @todo Ensure all states are unit tested, including variations as well.
+ * @todo Make a graph of the flow control for this Injector.
+ */
+class HTMLPurifier_Injector_AutoParagraph extends HTMLPurifier_Injector
+{
+ /**
+ * @type string
+ */
+ public $name = 'AutoParagraph';
+
+ /**
+ * @type array
+ */
+ public $needed = array('p');
+
+ /**
+ * @return HTMLPurifier_Token_Start
+ */
+ private function _pStart()
+ {
+ $par = new HTMLPurifier_Token_Start('p');
+ $par->armor['MakeWellFormed_TagClosedError'] = true;
+ return $par;
+ }
+
+ /**
+ * @param HTMLPurifier_Token_Text $token
+ */
+ public function handleText(&$token)
+ {
+ $text = $token->data;
+ // Does the current parent allow <p> tags?
+ if ($this->allowsElement('p')) {
+ if (empty($this->currentNesting) || strpos($text, "\n\n") !== false) {
+ // Note that we have differing behavior when dealing with text
+ // in the anonymous root node, or a node inside the document.
+ // If the text as a double-newline, the treatment is the same;
+ // if it doesn't, see the next if-block if you're in the document.
+
+ $i = $nesting = null;
+ if (!$this->forwardUntilEndToken($i, $current, $nesting) && $token->is_whitespace) {
+ // State 1.1: ... ^ (whitespace, then document end)
+ // ----
+ // This is a degenerate case
+ } else {
+ if (!$token->is_whitespace || $this->_isInline($current)) {
+ // State 1.2: PAR1
+ // ----
+
+ // State 1.3: PAR1\n\nPAR2
+ // ------------
+
+ // State 1.4: <div>PAR1\n\nPAR2 (see State 2)
+ // ------------
+ $token = array($this->_pStart());
+ $this->_splitText($text, $token);
+ } else {
+ // State 1.5: \n<hr />
+ // --
+ }
+ }
+ } else {
+ // State 2: <div>PAR1... (similar to 1.4)
+ // ----
+
+ // We're in an element that allows paragraph tags, but we're not
+ // sure if we're going to need them.
+ if ($this->_pLookAhead()) {
+ // State 2.1: <div>PAR1<b>PAR1\n\nPAR2
+ // ----
+ // Note: This will always be the first child, since any
+ // previous inline element would have triggered this very
+ // same routine, and found the double newline. One possible
+ // exception would be a comment.
+ $token = array($this->_pStart(), $token);
+ } else {
+ // State 2.2.1: <div>PAR1<div>
+ // ----
+
+ // State 2.2.2: <div>PAR1<b>PAR1</b></div>
+ // ----
+ }
+ }
+ // Is the current parent a <p> tag?
+ } elseif (!empty($this->currentNesting) &&
+ $this->currentNesting[count($this->currentNesting) - 1]->name == 'p') {
+ // State 3.1: ...<p>PAR1
+ // ----
+
+ // State 3.2: ...<p>PAR1\n\nPAR2
+ // ------------
+ $token = array();
+ $this->_splitText($text, $token);
+ // Abort!
+ } else {
+ // State 4.1: ...<b>PAR1
+ // ----
+
+ // State 4.2: ...<b>PAR1\n\nPAR2
+ // ------------
+ }
+ }
+
+ /**
+ * @param HTMLPurifier_Token $token
+ */
+ public function handleElement(&$token)
+ {
+ // We don't have to check if we're already in a <p> tag for block
+ // tokens, because the tag would have been autoclosed by MakeWellFormed.
+ if ($this->allowsElement('p')) {
+ if (!empty($this->currentNesting)) {
+ if ($this->_isInline($token)) {
+ // State 1: <div>...<b>
+ // ---
+ // Check if this token is adjacent to the parent token
+ // (seek backwards until token isn't whitespace)
+ $i = null;
+ $this->backward($i, $prev);
+
+ if (!$prev instanceof HTMLPurifier_Token_Start) {
+ // Token wasn't adjacent
+ if ($prev instanceof HTMLPurifier_Token_Text &&
+ substr($prev->data, -2) === "\n\n"
+ ) {
+ // State 1.1.4: <div><p>PAR1</p>\n\n<b>
+ // ---
+ // Quite frankly, this should be handled by splitText
+ $token = array($this->_pStart(), $token);
+ } else {
+ // State 1.1.1: <div><p>PAR1</p><b>
+ // ---
+ // State 1.1.2: <div><br /><b>
+ // ---
+ // State 1.1.3: <div>PAR<b>
+ // ---
+ }
+ } else {
+ // State 1.2.1: <div><b>
+ // ---
+ // Lookahead to see if <p> is needed.
+ if ($this->_pLookAhead()) {
+ // State 1.3.1: <div><b>PAR1\n\nPAR2
+ // ---
+ $token = array($this->_pStart(), $token);
+ } else {
+ // State 1.3.2: <div><b>PAR1</b></div>
+ // ---
+
+ // State 1.3.3: <div><b>PAR1</b><div></div>\n\n</div>
+ // ---
+ }
+ }
+ } else {
+ // State 2.3: ...<div>
+ // -----
+ }
+ } else {
+ if ($this->_isInline($token)) {
+ // State 3.1: <b>
+ // ---
+ // This is where the {p} tag is inserted, not reflected in
+ // inputTokens yet, however.
+ $token = array($this->_pStart(), $token);
+ } else {
+ // State 3.2: <div>
+ // -----
+ }
+
+ $i = null;
+ if ($this->backward($i, $prev)) {
+ if (!$prev instanceof HTMLPurifier_Token_Text) {
+ // State 3.1.1: ...</p>{p}<b>
+ // ---
+ // State 3.2.1: ...</p><div>
+ // -----
+ if (!is_array($token)) {
+ $token = array($token);
+ }
+ array_unshift($token, new HTMLPurifier_Token_Text("\n\n"));
+ } else {
+ // State 3.1.2: ...</p>\n\n{p}<b>
+ // ---
+ // State 3.2.2: ...</p>\n\n<div>
+ // -----
+ // Note: PAR<ELEM> cannot occur because PAR would have been
+ // wrapped in <p> tags.
+ }
+ }
+ }
+ } else {
+ // State 2.2: <ul><li>
+ // ----
+ // State 2.4: <p><b>
+ // ---
+ }
+ }
+
+ /**
+ * Splits up a text in paragraph tokens and appends them
+ * to the result stream that will replace the original
+ * @param string $data String text data that will be processed
+ * into paragraphs
+ * @param HTMLPurifier_Token[] $result Reference to array of tokens that the
+ * tags will be appended onto
+ */
+ private function _splitText($data, &$result)
+ {
+ $raw_paragraphs = explode("\n\n", $data);
+ $paragraphs = array(); // without empty paragraphs
+ $needs_start = false;
+ $needs_end = false;
+
+ $c = count($raw_paragraphs);
+ if ($c == 1) {
+ // There were no double-newlines, abort quickly. In theory this
+ // should never happen.
+ $result[] = new HTMLPurifier_Token_Text($data);
+ return;
+ }
+ for ($i = 0; $i < $c; $i++) {
+ $par = $raw_paragraphs[$i];
+ if (trim($par) !== '') {
+ $paragraphs[] = $par;
+ } else {
+ if ($i == 0) {
+ // Double newline at the front
+ if (empty($result)) {
+ // The empty result indicates that the AutoParagraph
+ // injector did not add any start paragraph tokens.
+ // This means that we have been in a paragraph for
+ // a while, and the newline means we should start a new one.
+ $result[] = new HTMLPurifier_Token_End('p');
+ $result[] = new HTMLPurifier_Token_Text("\n\n");
+ // However, the start token should only be added if
+ // there is more processing to be done (i.e. there are
+ // real paragraphs in here). If there are none, the
+ // next start paragraph tag will be handled by the
+ // next call to the injector
+ $needs_start = true;
+ } else {
+ // We just started a new paragraph!
+ // Reinstate a double-newline for presentation's sake, since
+ // it was in the source code.
+ array_unshift($result, new HTMLPurifier_Token_Text("\n\n"));
+ }
+ } elseif ($i + 1 == $c) {
+ // Double newline at the end
+ // There should be a trailing </p> when we're finally done.
+ $needs_end = true;
+ }
+ }
+ }
+
+ // Check if this was just a giant blob of whitespace. Move this earlier,
+ // perhaps?
+ if (empty($paragraphs)) {
+ return;
+ }
+
+ // Add the start tag indicated by \n\n at the beginning of $data
+ if ($needs_start) {
+ $result[] = $this->_pStart();
+ }
+
+ // Append the paragraphs onto the result
+ foreach ($paragraphs as $par) {
+ $result[] = new HTMLPurifier_Token_Text($par);
+ $result[] = new HTMLPurifier_Token_End('p');
+ $result[] = new HTMLPurifier_Token_Text("\n\n");
+ $result[] = $this->_pStart();
+ }
+
+ // Remove trailing start token; Injector will handle this later if
+ // it was indeed needed. This prevents from needing to do a lookahead,
+ // at the cost of a lookbehind later.
+ array_pop($result);
+
+ // If there is no need for an end tag, remove all of it and let
+ // MakeWellFormed close it later.
+ if (!$needs_end) {
+ array_pop($result); // removes \n\n
+ array_pop($result); // removes </p>
+ }
+ }
+
+ /**
+ * Returns true if passed token is inline (and, ergo, allowed in
+ * paragraph tags)
+ * @param HTMLPurifier_Token $token
+ * @return bool
+ */
+ private function _isInline($token)
+ {
+ return isset($this->htmlDefinition->info['p']->child->elements[$token->name]);
+ }
+
+ /**
+ * Looks ahead in the token list and determines whether or not we need
+ * to insert a <p> tag.
+ * @return bool
+ */
+ private function _pLookAhead()
+ {
+ if ($this->currentToken instanceof HTMLPurifier_Token_Start) {
+ $nesting = 1;
+ } else {
+ $nesting = 0;
+ }
+ $ok = false;
+ $i = null;
+ while ($this->forwardUntilEndToken($i, $current, $nesting)) {
+ $result = $this->_checkNeedsP($current);
+ if ($result !== null) {
+ $ok = $result;
+ break;
+ }
+ }
+ return $ok;
+ }
+
+ /**
+ * Determines if a particular token requires an earlier inline token
+ * to get a paragraph. This should be used with _forwardUntilEndToken
+ * @param HTMLPurifier_Token $current
+ * @return bool
+ */
+ private function _checkNeedsP($current)
+ {
+ if ($current instanceof HTMLPurifier_Token_Start) {
+ if (!$this->_isInline($current)) {
+ // <div>PAR1<div>
+ // ----
+ // Terminate early, since we hit a block element
+ return false;
+ }
+ } elseif ($current instanceof HTMLPurifier_Token_Text) {
+ if (strpos($current->data, "\n\n") !== false) {
+ // <div>PAR1<b>PAR1\n\nPAR2
+ // ----
+ return true;
+ } else {
+ // <div>PAR1<b>PAR1...
+ // ----
+ }
+ }
+ return null;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/DisplayLinkURI.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/DisplayLinkURI.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/DisplayLinkURI.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/DisplayLinkURI.php
index 9f90448..c19b1bc 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/DisplayLinkURI.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/DisplayLinkURI.php
@@ -1,40 +1,40 @@
-<?php
-
-/**
- * Injector that displays the URL of an anchor instead of linking to it, in addition to showing the text of the link.
- */
-class HTMLPurifier_Injector_DisplayLinkURI extends HTMLPurifier_Injector
-{
- /**
- * @type string
- */
- public $name = 'DisplayLinkURI';
-
- /**
- * @type array
- */
- public $needed = array('a');
-
- /**
- * @param $token
- */
- public function handleElement(&$token)
- {
- }
-
- /**
- * @param HTMLPurifier_Token $token
- */
- public function handleEnd(&$token)
- {
- if (isset($token->start->attr['href'])) {
- $url = $token->start->attr['href'];
- unset($token->start->attr['href']);
- $token = array($token, new HTMLPurifier_Token_Text(" ($url)"));
- } else {
- // nothing to display
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Injector that displays the URL of an anchor instead of linking to it, in addition to showing the text of the link.
+ */
+class HTMLPurifier_Injector_DisplayLinkURI extends HTMLPurifier_Injector
+{
+ /**
+ * @type string
+ */
+ public $name = 'DisplayLinkURI';
+
+ /**
+ * @type array
+ */
+ public $needed = array('a');
+
+ /**
+ * @param $token
+ */
+ public function handleElement(&$token)
+ {
+ }
+
+ /**
+ * @param HTMLPurifier_Token $token
+ */
+ public function handleEnd(&$token)
+ {
+ if (isset($token->start->attr['href'])) {
+ $url = $token->start->attr['href'];
+ unset($token->start->attr['href']);
+ $token = array($token, new HTMLPurifier_Token_Text(" ($url)"));
+ } else {
+ // nothing to display
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/Linkify.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/Linkify.php
similarity index 69%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/Linkify.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/Linkify.php
index 5eed3c1..74f83ea 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/Linkify.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/Linkify.php
@@ -1,59 +1,64 @@
-<?php
-
-/**
- * Injector that converts http, https and ftp text URLs to actual links.
- */
-class HTMLPurifier_Injector_Linkify extends HTMLPurifier_Injector
-{
- /**
- * @type string
- */
- public $name = 'Linkify';
-
- /**
- * @type array
- */
- public $needed = array('a' => array('href'));
-
- /**
- * @param HTMLPurifier_Token $token
- */
- public function handleText(&$token)
- {
- if (!$this->allowsElement('a')) {
- return;
- }
-
- if (strpos($token->data, '://') === false) {
- // our really quick heuristic failed, abort
- // this may not work so well if we want to match things like
- // "google.com", but then again, most people don't
- return;
- }
-
- // there is/are URL(s). Let's split the string:
- // Note: this regex is extremely permissive
- $bits = preg_split('#((?:https?|ftp)://[^\s\'",<>()]+)#Su', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
-
-
- $token = array();
-
- // $i = index
- // $c = count
- // $l = is link
- for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
- if (!$l) {
- if ($bits[$i] === '') {
- continue;
- }
- $token[] = new HTMLPurifier_Token_Text($bits[$i]);
- } else {
- $token[] = new HTMLPurifier_Token_Start('a', array('href' => $bits[$i]));
- $token[] = new HTMLPurifier_Token_Text($bits[$i]);
- $token[] = new HTMLPurifier_Token_End('a');
- }
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Injector that converts http, https and ftp text URLs to actual links.
+ */
+class HTMLPurifier_Injector_Linkify extends HTMLPurifier_Injector
+{
+ /**
+ * @type string
+ */
+ public $name = 'Linkify';
+
+ /**
+ * @type array
+ */
+ public $needed = array('a' => array('href'));
+
+ /**
+ * @param HTMLPurifier_Token $token
+ */
+ public function handleText(&$token)
+ {
+ if (!$this->allowsElement('a')) {
+ return;
+ }
+
+ if (strpos($token->data, '://') === false) {
+ // our really quick heuristic failed, abort
+ // this may not work so well if we want to match things like
+ // "google.com", but then again, most people don't
+ return;
+ }
+
+ // there is/are URL(s). Let's split the string.
+ // We use this regex:
+ // https://gist.github.com/gruber/249502
+ // but with @cscott's backtracking fix and also
+ // the Unicode characters un-Unicodified.
+ $bits = preg_split(
+ '/\\b((?:[a-z][\\w\\-]+:(?:\\/{1,3}|[a-z0-9%])|www\\d{0,3}[.]|[a-z0-9.\\-]+[.][a-z]{2,4}\\/)(?:[^\\s()<>]|\\((?:[^\\s()<>]|(?:\\([^\\s()<>]+\\)))*\\))+(?:\\((?:[^\\s()<>]|(?:\\([^\\s()<>]+\\)))*\\)|[^\\s`!()\\[\\]{};:\'".,<>?\x{00ab}\x{00bb}\x{201c}\x{201d}\x{2018}\x{2019}]))/iu',
+ $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+
+ $token = array();
+
+ // $i = index
+ // $c = count
+ // $l = is link
+ for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
+ if (!$l) {
+ if ($bits[$i] === '') {
+ continue;
+ }
+ $token[] = new HTMLPurifier_Token_Text($bits[$i]);
+ } else {
+ $token[] = new HTMLPurifier_Token_Start('a', array('href' => $bits[$i]));
+ $token[] = new HTMLPurifier_Token_Text($bits[$i]);
+ $token[] = new HTMLPurifier_Token_End('a');
+ }
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/PurifierLinkify.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/PurifierLinkify.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/PurifierLinkify.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/PurifierLinkify.php
index d7dd7d9..cb9046f 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/PurifierLinkify.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/PurifierLinkify.php
@@ -1,71 +1,71 @@
-<?php
-
-/**
- * Injector that converts configuration directive syntax %Namespace.Directive
- * to links
- */
-class HTMLPurifier_Injector_PurifierLinkify extends HTMLPurifier_Injector
-{
- /**
- * @type string
- */
- public $name = 'PurifierLinkify';
-
- /**
- * @type string
- */
- public $docURL;
-
- /**
- * @type array
- */
- public $needed = array('a' => array('href'));
-
- /**
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return string
- */
- public function prepare($config, $context)
- {
- $this->docURL = $config->get('AutoFormat.PurifierLinkify.DocURL');
- return parent::prepare($config, $context);
- }
-
- /**
- * @param HTMLPurifier_Token $token
- */
- public function handleText(&$token)
- {
- if (!$this->allowsElement('a')) {
- return;
- }
- if (strpos($token->data, '%') === false) {
- return;
- }
-
- $bits = preg_split('#%([a-z0-9]+\.[a-z0-9]+)#Si', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
- $token = array();
-
- // $i = index
- // $c = count
- // $l = is link
- for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
- if (!$l) {
- if ($bits[$i] === '') {
- continue;
- }
- $token[] = new HTMLPurifier_Token_Text($bits[$i]);
- } else {
- $token[] = new HTMLPurifier_Token_Start(
- 'a',
- array('href' => str_replace('%s', $bits[$i], $this->docURL))
- );
- $token[] = new HTMLPurifier_Token_Text('%' . $bits[$i]);
- $token[] = new HTMLPurifier_Token_End('a');
- }
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Injector that converts configuration directive syntax %Namespace.Directive
+ * to links
+ */
+class HTMLPurifier_Injector_PurifierLinkify extends HTMLPurifier_Injector
+{
+ /**
+ * @type string
+ */
+ public $name = 'PurifierLinkify';
+
+ /**
+ * @type string
+ */
+ public $docURL;
+
+ /**
+ * @type array
+ */
+ public $needed = array('a' => array('href'));
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return string
+ */
+ public function prepare($config, $context)
+ {
+ $this->docURL = $config->get('AutoFormat.PurifierLinkify.DocURL');
+ return parent::prepare($config, $context);
+ }
+
+ /**
+ * @param HTMLPurifier_Token $token
+ */
+ public function handleText(&$token)
+ {
+ if (!$this->allowsElement('a')) {
+ return;
+ }
+ if (strpos($token->data, '%') === false) {
+ return;
+ }
+
+ $bits = preg_split('#%([a-z0-9]+\.[a-z0-9]+)#Si', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
+ $token = array();
+
+ // $i = index
+ // $c = count
+ // $l = is link
+ for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
+ if (!$l) {
+ if ($bits[$i] === '') {
+ continue;
+ }
+ $token[] = new HTMLPurifier_Token_Text($bits[$i]);
+ } else {
+ $token[] = new HTMLPurifier_Token_Start(
+ 'a',
+ array('href' => str_replace('%s', $bits[$i], $this->docURL))
+ );
+ $token[] = new HTMLPurifier_Token_Text('%' . $bits[$i]);
+ $token[] = new HTMLPurifier_Token_End('a');
+ }
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/RemoveEmpty.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/RemoveEmpty.php
similarity index 81%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/RemoveEmpty.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/RemoveEmpty.php
index 55669d1..0ebc477 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/RemoveEmpty.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/RemoveEmpty.php
@@ -1,101 +1,112 @@
-<?php
-
-class HTMLPurifier_Injector_RemoveEmpty extends HTMLPurifier_Injector
-{
- /**
- * @type HTMLPurifier_Context
- */
- private $context;
-
- /**
- * @type HTMLPurifier_Config
- */
- private $config;
-
- /**
- * @type HTMLPurifier_AttrValidator
- */
- private $attrValidator;
-
- /**
- * @type bool
- */
- private $removeNbsp;
-
- /**
- * @type bool
- */
- private $removeNbspExceptions;
-
- /**
- * @type array
- * TODO: make me configurable
- */
- private $_exclude = array('colgroup' => 1, 'th' => 1, 'td' => 1, 'iframe' => 1);
-
- /**
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return void
- */
- public function prepare($config, $context)
- {
- parent::prepare($config, $context);
- $this->config = $config;
- $this->context = $context;
- $this->removeNbsp = $config->get('AutoFormat.RemoveEmpty.RemoveNbsp');
- $this->removeNbspExceptions = $config->get('AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions');
- $this->attrValidator = new HTMLPurifier_AttrValidator();
- }
-
- /**
- * @param HTMLPurifier_Token $token
- */
- public function handleElement(&$token)
- {
- if (!$token instanceof HTMLPurifier_Token_Start) {
- return;
- }
- $next = false;
- $deleted = 1; // the current tag
- for ($i = count($this->inputZipper->back) - 1; $i >= 0; $i--, $deleted++) {
- $next = $this->inputZipper->back[$i];
- if ($next instanceof HTMLPurifier_Token_Text) {
- if ($next->is_whitespace) {
- continue;
- }
- if ($this->removeNbsp && !isset($this->removeNbspExceptions[$token->name])) {
- $plain = str_replace("\xC2\xA0", "", $next->data);
- $isWsOrNbsp = $plain === '' || ctype_space($plain);
- if ($isWsOrNbsp) {
- continue;
- }
- }
- }
- break;
- }
- if (!$next || ($next instanceof HTMLPurifier_Token_End && $next->name == $token->name)) {
- if (isset($this->_exclude[$token->name])) {
- return;
- }
- $this->attrValidator->validateToken($token, $this->config, $this->context);
- $token->armor['ValidateAttributes'] = true;
- if (isset($token->attr['id']) || isset($token->attr['name'])) {
- return;
- }
- $token = $deleted + 1;
- for ($b = 0, $c = count($this->inputZipper->front); $b < $c; $b++) {
- $prev = $this->inputZipper->front[$b];
- if ($prev instanceof HTMLPurifier_Token_Text && $prev->is_whitespace) {
- continue;
- }
- break;
- }
- // This is safe because we removed the token that triggered this.
- $this->rewindOffset($b+$deleted);
- return;
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_Injector_RemoveEmpty extends HTMLPurifier_Injector
+{
+ /**
+ * @type HTMLPurifier_Context
+ */
+ private $context;
+
+ /**
+ * @type HTMLPurifier_Config
+ */
+ private $config;
+
+ /**
+ * @type HTMLPurifier_AttrValidator
+ */
+ private $attrValidator;
+
+ /**
+ * @type bool
+ */
+ private $removeNbsp;
+
+ /**
+ * @type bool
+ */
+ private $removeNbspExceptions;
+
+ /**
+ * Cached contents of %AutoFormat.RemoveEmpty.Predicate
+ * @type array
+ */
+ private $exclude;
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return void
+ */
+ public function prepare($config, $context)
+ {
+ parent::prepare($config, $context);
+ $this->config = $config;
+ $this->context = $context;
+ $this->removeNbsp = $config->get('AutoFormat.RemoveEmpty.RemoveNbsp');
+ $this->removeNbspExceptions = $config->get('AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions');
+ $this->exclude = $config->get('AutoFormat.RemoveEmpty.Predicate');
+ foreach ($this->exclude as $key => $attrs) {
+ if (!is_array($attrs)) {
+ // HACK, see HTMLPurifier/Printer/ConfigForm.php
+ $this->exclude[$key] = explode(';', $attrs);
+ }
+ }
+ $this->attrValidator = new HTMLPurifier_AttrValidator();
+ }
+
+ /**
+ * @param HTMLPurifier_Token $token
+ */
+ public function handleElement(&$token)
+ {
+ if (!$token instanceof HTMLPurifier_Token_Start) {
+ return;
+ }
+ $next = false;
+ $deleted = 1; // the current tag
+ for ($i = count($this->inputZipper->back) - 1; $i >= 0; $i--, $deleted++) {
+ $next = $this->inputZipper->back[$i];
+ if ($next instanceof HTMLPurifier_Token_Text) {
+ if ($next->is_whitespace) {
+ continue;
+ }
+ if ($this->removeNbsp && !isset($this->removeNbspExceptions[$token->name])) {
+ $plain = str_replace("\xC2\xA0", "", $next->data);
+ $isWsOrNbsp = $plain === '' || ctype_space($plain);
+ if ($isWsOrNbsp) {
+ continue;
+ }
+ }
+ }
+ break;
+ }
+ if (!$next || ($next instanceof HTMLPurifier_Token_End && $next->name == $token->name)) {
+ $this->attrValidator->validateToken($token, $this->config, $this->context);
+ $token->armor['ValidateAttributes'] = true;
+ if (isset($this->exclude[$token->name])) {
+ $r = true;
+ foreach ($this->exclude[$token->name] as $elem) {
+ if (!isset($token->attr[$elem])) $r = false;
+ }
+ if ($r) return;
+ }
+ if (isset($token->attr['id']) || isset($token->attr['name'])) {
+ return;
+ }
+ $token = $deleted + 1;
+ for ($b = 0, $c = count($this->inputZipper->front); $b < $c; $b++) {
+ $prev = $this->inputZipper->front[$b];
+ if ($prev instanceof HTMLPurifier_Token_Text && $prev->is_whitespace) {
+ continue;
+ }
+ break;
+ }
+ // This is safe because we removed the token that triggered this.
+ $this->rewindOffset($b+$deleted);
+ return;
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
index 270b7f8..9ee7aa8 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
@@ -1,84 +1,84 @@
-<?php
-
-/**
- * Injector that removes spans with no attributes
- */
-class HTMLPurifier_Injector_RemoveSpansWithoutAttributes extends HTMLPurifier_Injector
-{
- /**
- * @type string
- */
- public $name = 'RemoveSpansWithoutAttributes';
-
- /**
- * @type array
- */
- public $needed = array('span');
-
- /**
- * @type HTMLPurifier_AttrValidator
- */
- private $attrValidator;
-
- /**
- * Used by AttrValidator.
- * @type HTMLPurifier_Config
- */
- private $config;
-
- /**
- * @type HTMLPurifier_Context
- */
- private $context;
-
- public function prepare($config, $context)
- {
- $this->attrValidator = new HTMLPurifier_AttrValidator();
- $this->config = $config;
- $this->context = $context;
- return parent::prepare($config, $context);
- }
-
- /**
- * @param HTMLPurifier_Token $token
- */
- public function handleElement(&$token)
- {
- if ($token->name !== 'span' || !$token instanceof HTMLPurifier_Token_Start) {
- return;
- }
-
- // We need to validate the attributes now since this doesn't normally
- // happen until after MakeWellFormed. If all the attributes are removed
- // the span needs to be removed too.
- $this->attrValidator->validateToken($token, $this->config, $this->context);
- $token->armor['ValidateAttributes'] = true;
-
- if (!empty($token->attr)) {
- return;
- }
-
- $nesting = 0;
- while ($this->forwardUntilEndToken($i, $current, $nesting)) {
- }
-
- if ($current instanceof HTMLPurifier_Token_End && $current->name === 'span') {
- // Mark closing span tag for deletion
- $current->markForDeletion = true;
- // Delete open span tag
- $token = false;
- }
- }
-
- /**
- * @param HTMLPurifier_Token $token
- */
- public function handleEnd(&$token)
- {
- if ($token->markForDeletion) {
- $token = false;
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Injector that removes spans with no attributes
+ */
+class HTMLPurifier_Injector_RemoveSpansWithoutAttributes extends HTMLPurifier_Injector
+{
+ /**
+ * @type string
+ */
+ public $name = 'RemoveSpansWithoutAttributes';
+
+ /**
+ * @type array
+ */
+ public $needed = array('span');
+
+ /**
+ * @type HTMLPurifier_AttrValidator
+ */
+ private $attrValidator;
+
+ /**
+ * Used by AttrValidator.
+ * @type HTMLPurifier_Config
+ */
+ private $config;
+
+ /**
+ * @type HTMLPurifier_Context
+ */
+ private $context;
+
+ public function prepare($config, $context)
+ {
+ $this->attrValidator = new HTMLPurifier_AttrValidator();
+ $this->config = $config;
+ $this->context = $context;
+ return parent::prepare($config, $context);
+ }
+
+ /**
+ * @param HTMLPurifier_Token $token
+ */
+ public function handleElement(&$token)
+ {
+ if ($token->name !== 'span' || !$token instanceof HTMLPurifier_Token_Start) {
+ return;
+ }
+
+ // We need to validate the attributes now since this doesn't normally
+ // happen until after MakeWellFormed. If all the attributes are removed
+ // the span needs to be removed too.
+ $this->attrValidator->validateToken($token, $this->config, $this->context);
+ $token->armor['ValidateAttributes'] = true;
+
+ if (!empty($token->attr)) {
+ return;
+ }
+
+ $nesting = 0;
+ while ($this->forwardUntilEndToken($i, $current, $nesting)) {
+ }
+
+ if ($current instanceof HTMLPurifier_Token_End && $current->name === 'span') {
+ // Mark closing span tag for deletion
+ $current->markForDeletion = true;
+ // Delete open span tag
+ $token = false;
+ }
+ }
+
+ /**
+ * @param HTMLPurifier_Token $token
+ */
+ public function handleEnd(&$token)
+ {
+ if ($token->markForDeletion) {
+ $token = false;
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/SafeObject.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/SafeObject.php
similarity index 91%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/SafeObject.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/SafeObject.php
index 8450948..317f786 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Injector/SafeObject.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Injector/SafeObject.php
@@ -1,121 +1,124 @@
-<?php
-
-/**
- * Adds important param elements to inside of object in order to make
- * things safe.
- */
-class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector
-{
- /**
- * @type string
- */
- public $name = 'SafeObject';
-
- /**
- * @type array
- */
- public $needed = array('object', 'param');
-
- /**
- * @type array
- */
- protected $objectStack = array();
-
- /**
- * @type array
- */
- protected $paramStack = array();
-
- /**
- * Keep this synchronized with AttrTransform/SafeParam.php.
- * @type array
- */
- protected $addParam = array(
- 'allowScriptAccess' => 'never',
- 'allowNetworking' => 'internal',
- );
-
- /**
- * @type array
- */
- protected $allowedParam = array(
- 'wmode' => true,
- 'movie' => true,
- 'flashvars' => true,
- 'src' => true,
- 'allowFullScreen' => true, // if omitted, assume to be 'false'
- );
-
- /**
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return void
- */
- public function prepare($config, $context)
- {
- parent::prepare($config, $context);
- }
-
- /**
- * @param HTMLPurifier_Token $token
- */
- public function handleElement(&$token)
- {
- if ($token->name == 'object') {
- $this->objectStack[] = $token;
- $this->paramStack[] = array();
- $new = array($token);
- foreach ($this->addParam as $name => $value) {
- $new[] = new HTMLPurifier_Token_Empty('param', array('name' => $name, 'value' => $value));
- }
- $token = $new;
- } elseif ($token->name == 'param') {
- $nest = count($this->currentNesting) - 1;
- if ($nest >= 0 && $this->currentNesting[$nest]->name === 'object') {
- $i = count($this->objectStack) - 1;
- if (!isset($token->attr['name'])) {
- $token = false;
- return;
- }
- $n = $token->attr['name'];
- // We need this fix because YouTube doesn't supply a data
- // attribute, which we need if a type is specified. This is
- // *very* Flash specific.
- if (!isset($this->objectStack[$i]->attr['data']) &&
- ($token->attr['name'] == 'movie' || $token->attr['name'] == 'src')
- ) {
- $this->objectStack[$i]->attr['data'] = $token->attr['value'];
- }
- // Check if the parameter is the correct value but has not
- // already been added
- if (!isset($this->paramStack[$i][$n]) &&
- isset($this->addParam[$n]) &&
- $token->attr['name'] === $this->addParam[$n]) {
- // keep token, and add to param stack
- $this->paramStack[$i][$n] = true;
- } elseif (isset($this->allowedParam[$n])) {
- // keep token, don't do anything to it
- // (could possibly check for duplicates here)
- } else {
- $token = false;
- }
- } else {
- // not directly inside an object, DENY!
- $token = false;
- }
- }
- }
-
- public function handleEnd(&$token)
- {
- // This is the WRONG way of handling the object and param stacks;
- // we should be inserting them directly on the relevant object tokens
- // so that the global stack handling handles it.
- if ($token->name == 'object') {
- array_pop($this->objectStack);
- array_pop($this->paramStack);
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Adds important param elements to inside of object in order to make
+ * things safe.
+ */
+class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector
+{
+ /**
+ * @type string
+ */
+ public $name = 'SafeObject';
+
+ /**
+ * @type array
+ */
+ public $needed = array('object', 'param');
+
+ /**
+ * @type array
+ */
+ protected $objectStack = array();
+
+ /**
+ * @type array
+ */
+ protected $paramStack = array();
+
+ /**
+ * Keep this synchronized with AttrTransform/SafeParam.php.
+ * @type array
+ */
+ protected $addParam = array(
+ 'allowScriptAccess' => 'never',
+ 'allowNetworking' => 'internal',
+ );
+
+ /**
+ * These are all lower-case keys.
+ * @type array
+ */
+ protected $allowedParam = array(
+ 'wmode' => true,
+ 'movie' => true,
+ 'flashvars' => true,
+ 'src' => true,
+ 'allowfullscreen' => true, // if omitted, assume to be 'false'
+ );
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return void
+ */
+ public function prepare($config, $context)
+ {
+ parent::prepare($config, $context);
+ }
+
+ /**
+ * @param HTMLPurifier_Token $token
+ */
+ public function handleElement(&$token)
+ {
+ if ($token->name == 'object') {
+ $this->objectStack[] = $token;
+ $this->paramStack[] = array();
+ $new = array($token);
+ foreach ($this->addParam as $name => $value) {
+ $new[] = new HTMLPurifier_Token_Empty('param', array('name' => $name, 'value' => $value));
+ }
+ $token = $new;
+ } elseif ($token->name == 'param') {
+ $nest = count($this->currentNesting) - 1;
+ if ($nest >= 0 && $this->currentNesting[$nest]->name === 'object') {
+ $i = count($this->objectStack) - 1;
+ if (!isset($token->attr['name'])) {
+ $token = false;
+ return;
+ }
+ $n = $token->attr['name'];
+ // We need this fix because YouTube doesn't supply a data
+ // attribute, which we need if a type is specified. This is
+ // *very* Flash specific.
+ if (!isset($this->objectStack[$i]->attr['data']) &&
+ ($token->attr['name'] == 'movie' || $token->attr['name'] == 'src')
+ ) {
+ $this->objectStack[$i]->attr['data'] = $token->attr['value'];
+ }
+ // Check if the parameter is the correct value but has not
+ // already been added
+ if (!isset($this->paramStack[$i][$n]) &&
+ isset($this->addParam[$n]) &&
+ $token->attr['name'] === $this->addParam[$n]) {
+ // keep token, and add to param stack
+ $this->paramStack[$i][$n] = true;
+ } elseif (isset($this->allowedParam[strtolower($n)])) {
+ // keep token, don't do anything to it
+ // (could possibly check for duplicates here)
+ // Note: In principle, parameters should be case sensitive.
+ // But it seems they are not really; so accept any case.
+ } else {
+ $token = false;
+ }
+ } else {
+ // not directly inside an object, DENY!
+ $token = false;
+ }
+ }
+ }
+
+ public function handleEnd(&$token)
+ {
+ // This is the WRONG way of handling the object and param stacks;
+ // we should be inserting them directly on the relevant object tokens
+ // so that the global stack handling handles it.
+ if ($token->name == 'object') {
+ array_pop($this->objectStack);
+ array_pop($this->paramStack);
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Language.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Language.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Language.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Language.php
index 35a13f7..65277dd 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Language.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Language.php
@@ -1,204 +1,204 @@
-<?php
-
-/**
- * Represents a language and defines localizable string formatting and
- * other functions, as well as the localized messages for HTML Purifier.
- */
-class HTMLPurifier_Language
-{
-
- /**
- * ISO 639 language code of language. Prefers shortest possible version.
- * @type string
- */
- public $code = 'en';
-
- /**
- * Fallback language code.
- * @type bool|string
- */
- public $fallback = false;
-
- /**
- * Array of localizable messages.
- * @type array
- */
- public $messages = array();
-
- /**
- * Array of localizable error codes.
- * @type array
- */
- public $errorNames = array();
-
- /**
- * True if no message file was found for this language, so English
- * is being used instead. Check this if you'd like to notify the
- * user that they've used a non-supported language.
- * @type bool
- */
- public $error = false;
-
- /**
- * Has the language object been loaded yet?
- * @type bool
- * @todo Make it private, fix usage in HTMLPurifier_LanguageTest
- */
- public $_loaded = false;
-
- /**
- * @type HTMLPurifier_Config
- */
- protected $config;
-
- /**
- * @type HTMLPurifier_Context
- */
- protected $context;
-
- /**
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- */
- public function __construct($config, $context)
- {
- $this->config = $config;
- $this->context = $context;
- }
-
- /**
- * Loads language object with necessary info from factory cache
- * @note This is a lazy loader
- */
- public function load()
- {
- if ($this->_loaded) {
- return;
- }
- $factory = HTMLPurifier_LanguageFactory::instance();
- $factory->loadLanguage($this->code);
- foreach ($factory->keys as $key) {
- $this->$key = $factory->cache[$this->code][$key];
- }
- $this->_loaded = true;
- }
-
- /**
- * Retrieves a localised message.
- * @param string $key string identifier of message
- * @return string localised message
- */
- public function getMessage($key)
- {
- if (!$this->_loaded) {
- $this->load();
- }
- if (!isset($this->messages[$key])) {
- return "[$key]";
- }
- return $this->messages[$key];
- }
-
- /**
- * Retrieves a localised error name.
- * @param int $int error number, corresponding to PHP's error reporting
- * @return string localised message
- */
- public function getErrorName($int)
- {
- if (!$this->_loaded) {
- $this->load();
- }
- if (!isset($this->errorNames[$int])) {
- return "[Error: $int]";
- }
- return $this->errorNames[$int];
- }
-
- /**
- * Converts an array list into a string readable representation
- * @param array $array
- * @return string
- */
- public function listify($array)
- {
- $sep = $this->getMessage('Item separator');
- $sep_last = $this->getMessage('Item separator last');
- $ret = '';
- for ($i = 0, $c = count($array); $i < $c; $i++) {
- if ($i == 0) {
- } elseif ($i + 1 < $c) {
- $ret .= $sep;
- } else {
- $ret .= $sep_last;
- }
- $ret .= $array[$i];
- }
- return $ret;
- }
-
- /**
- * Formats a localised message with passed parameters
- * @param string $key string identifier of message
- * @param array $args Parameters to substitute in
- * @return string localised message
- * @todo Implement conditionals? Right now, some messages make
- * reference to line numbers, but those aren't always available
- */
- public function formatMessage($key, $args = array())
- {
- if (!$this->_loaded) {
- $this->load();
- }
- if (!isset($this->messages[$key])) {
- return "[$key]";
- }
- $raw = $this->messages[$key];
- $subst = array();
- $generator = false;
- foreach ($args as $i => $value) {
- if (is_object($value)) {
- if ($value instanceof HTMLPurifier_Token) {
- // factor this out some time
- if (!$generator) {
- $generator = $this->context->get('Generator');
- }
- if (isset($value->name)) {
- $subst['$'.$i.'.Name'] = $value->name;
- }
- if (isset($value->data)) {
- $subst['$'.$i.'.Data'] = $value->data;
- }
- $subst['$'.$i.'.Compact'] =
- $subst['$'.$i.'.Serialized'] = $generator->generateFromToken($value);
- // a more complex algorithm for compact representation
- // could be introduced for all types of tokens. This
- // may need to be factored out into a dedicated class
- if (!empty($value->attr)) {
- $stripped_token = clone $value;
- $stripped_token->attr = array();
- $subst['$'.$i.'.Compact'] = $generator->generateFromToken($stripped_token);
- }
- $subst['$'.$i.'.Line'] = $value->line ? $value->line : 'unknown';
- }
- continue;
- } elseif (is_array($value)) {
- $keys = array_keys($value);
- if (array_keys($keys) === $keys) {
- // list
- $subst['$'.$i] = $this->listify($value);
- } else {
- // associative array
- // no $i implementation yet, sorry
- $subst['$'.$i.'.Keys'] = $this->listify($keys);
- $subst['$'.$i.'.Values'] = $this->listify(array_values($value));
- }
- continue;
- }
- $subst['$' . $i] = $value;
- }
- return strtr($raw, $subst);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Represents a language and defines localizable string formatting and
+ * other functions, as well as the localized messages for HTML Purifier.
+ */
+class HTMLPurifier_Language
+{
+
+ /**
+ * ISO 639 language code of language. Prefers shortest possible version.
+ * @type string
+ */
+ public $code = 'en';
+
+ /**
+ * Fallback language code.
+ * @type bool|string
+ */
+ public $fallback = false;
+
+ /**
+ * Array of localizable messages.
+ * @type array
+ */
+ public $messages = array();
+
+ /**
+ * Array of localizable error codes.
+ * @type array
+ */
+ public $errorNames = array();
+
+ /**
+ * True if no message file was found for this language, so English
+ * is being used instead. Check this if you'd like to notify the
+ * user that they've used a non-supported language.
+ * @type bool
+ */
+ public $error = false;
+
+ /**
+ * Has the language object been loaded yet?
+ * @type bool
+ * @todo Make it private, fix usage in HTMLPurifier_LanguageTest
+ */
+ public $_loaded = false;
+
+ /**
+ * @type HTMLPurifier_Config
+ */
+ protected $config;
+
+ /**
+ * @type HTMLPurifier_Context
+ */
+ protected $context;
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ */
+ public function __construct($config, $context)
+ {
+ $this->config = $config;
+ $this->context = $context;
+ }
+
+ /**
+ * Loads language object with necessary info from factory cache
+ * @note This is a lazy loader
+ */
+ public function load()
+ {
+ if ($this->_loaded) {
+ return;
+ }
+ $factory = HTMLPurifier_LanguageFactory::instance();
+ $factory->loadLanguage($this->code);
+ foreach ($factory->keys as $key) {
+ $this->$key = $factory->cache[$this->code][$key];
+ }
+ $this->_loaded = true;
+ }
+
+ /**
+ * Retrieves a localised message.
+ * @param string $key string identifier of message
+ * @return string localised message
+ */
+ public function getMessage($key)
+ {
+ if (!$this->_loaded) {
+ $this->load();
+ }
+ if (!isset($this->messages[$key])) {
+ return "[$key]";
+ }
+ return $this->messages[$key];
+ }
+
+ /**
+ * Retrieves a localised error name.
+ * @param int $int error number, corresponding to PHP's error reporting
+ * @return string localised message
+ */
+ public function getErrorName($int)
+ {
+ if (!$this->_loaded) {
+ $this->load();
+ }
+ if (!isset($this->errorNames[$int])) {
+ return "[Error: $int]";
+ }
+ return $this->errorNames[$int];
+ }
+
+ /**
+ * Converts an array list into a string readable representation
+ * @param array $array
+ * @return string
+ */
+ public function listify($array)
+ {
+ $sep = $this->getMessage('Item separator');
+ $sep_last = $this->getMessage('Item separator last');
+ $ret = '';
+ for ($i = 0, $c = count($array); $i < $c; $i++) {
+ if ($i == 0) {
+ } elseif ($i + 1 < $c) {
+ $ret .= $sep;
+ } else {
+ $ret .= $sep_last;
+ }
+ $ret .= $array[$i];
+ }
+ return $ret;
+ }
+
+ /**
+ * Formats a localised message with passed parameters
+ * @param string $key string identifier of message
+ * @param array $args Parameters to substitute in
+ * @return string localised message
+ * @todo Implement conditionals? Right now, some messages make
+ * reference to line numbers, but those aren't always available
+ */
+ public function formatMessage($key, $args = array())
+ {
+ if (!$this->_loaded) {
+ $this->load();
+ }
+ if (!isset($this->messages[$key])) {
+ return "[$key]";
+ }
+ $raw = $this->messages[$key];
+ $subst = array();
+ $generator = false;
+ foreach ($args as $i => $value) {
+ if (is_object($value)) {
+ if ($value instanceof HTMLPurifier_Token) {
+ // factor this out some time
+ if (!$generator) {
+ $generator = $this->context->get('Generator');
+ }
+ if (isset($value->name)) {
+ $subst['$'.$i.'.Name'] = $value->name;
+ }
+ if (isset($value->data)) {
+ $subst['$'.$i.'.Data'] = $value->data;
+ }
+ $subst['$'.$i.'.Compact'] =
+ $subst['$'.$i.'.Serialized'] = $generator->generateFromToken($value);
+ // a more complex algorithm for compact representation
+ // could be introduced for all types of tokens. This
+ // may need to be factored out into a dedicated class
+ if (!empty($value->attr)) {
+ $stripped_token = clone $value;
+ $stripped_token->attr = array();
+ $subst['$'.$i.'.Compact'] = $generator->generateFromToken($stripped_token);
+ }
+ $subst['$'.$i.'.Line'] = $value->line ? $value->line : 'unknown';
+ }
+ continue;
+ } elseif (is_array($value)) {
+ $keys = array_keys($value);
+ if (array_keys($keys) === $keys) {
+ // list
+ $subst['$'.$i] = $this->listify($value);
+ } else {
+ // associative array
+ // no $i implementation yet, sorry
+ $subst['$'.$i.'.Keys'] = $this->listify($keys);
+ $subst['$'.$i.'.Values'] = $this->listify(array_values($value));
+ }
+ continue;
+ }
+ $subst['$' . $i] = $value;
+ }
+ return strtr($raw, $subst);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Language/classes/en-x-test.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Language/classes/en-x-test.php
similarity index 93%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Language/classes/en-x-test.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Language/classes/en-x-test.php
index a6f8d16..8828f5c 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Language/classes/en-x-test.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Language/classes/en-x-test.php
@@ -1,9 +1,9 @@
-<?php
-
-// private class for unit testing
-
-class HTMLPurifier_Language_en_x_test extends HTMLPurifier_Language
-{
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+// private class for unit testing
+
+class HTMLPurifier_Language_en_x_test extends HTMLPurifier_Language
+{
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Language/messages/en-x-test.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Language/messages/en-x-test.php
similarity index 93%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Language/messages/en-x-test.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Language/messages/en-x-test.php
index e6a174a..1c046f3 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Language/messages/en-x-test.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Language/messages/en-x-test.php
@@ -1,11 +1,11 @@
-<?php
-
-// private language message file for unit testing purposes
-
-$fallback = 'en';
-
-$messages = array(
- 'HTMLPurifier' => 'HTML Purifier X'
-);
-
-// vim: et sw=4 sts=4
+<?php
+
+// private language message file for unit testing purposes
+
+$fallback = 'en';
+
+$messages = array(
+ 'HTMLPurifier' => 'HTML Purifier X'
+);
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Language/messages/en-x-testmini.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Language/messages/en-x-testmini.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Language/messages/en-x-testmini.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Language/messages/en-x-testmini.php
index ed8560f..806c83f 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Language/messages/en-x-testmini.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Language/messages/en-x-testmini.php
@@ -1,12 +1,12 @@
-<?php
-
-// private language message file for unit testing purposes
-// this language file has no class associated with it
-
-$fallback = 'en';
-
-$messages = array(
- 'HTMLPurifier' => 'HTML Purifier XNone'
-);
-
-// vim: et sw=4 sts=4
+<?php
+
+// private language message file for unit testing purposes
+// this language file has no class associated with it
+
+$fallback = 'en';
+
+$messages = array(
+ 'HTMLPurifier' => 'HTML Purifier XNone'
+);
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Language/messages/en.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Language/messages/en.php
similarity index 98%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Language/messages/en.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Language/messages/en.php
index 1fa30bd..c7f197e 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Language/messages/en.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Language/messages/en.php
@@ -1,55 +1,55 @@
-<?php
-
-$fallback = false;
-
-$messages = array(
-
- 'HTMLPurifier' => 'HTML Purifier',
-// for unit testing purposes
- 'LanguageFactoryTest: Pizza' => 'Pizza',
- 'LanguageTest: List' => '$1',
- 'LanguageTest: Hash' => '$1.Keys; $1.Values',
- 'Item separator' => ', ',
- 'Item separator last' => ' and ', // non-Harvard style
-
- 'ErrorCollector: No errors' => 'No errors detected. However, because error reporting is still incomplete, there may have been errors that the error collector was not notified of; please inspect the output HTML carefully.',
- 'ErrorCollector: At line' => ' at line $line',
- 'ErrorCollector: Incidental errors' => 'Incidental errors',
- 'Lexer: Unclosed comment' => 'Unclosed comment',
- 'Lexer: Unescaped lt' => 'Unescaped less-than sign (<) should be <',
- 'Lexer: Missing gt' => 'Missing greater-than sign (>), previous less-than sign (<) should be escaped',
- 'Lexer: Missing attribute key' => 'Attribute declaration has no key',
- 'Lexer: Missing end quote' => 'Attribute declaration has no end quote',
- 'Lexer: Extracted body' => 'Removed document metadata tags',
- 'Strategy_RemoveForeignElements: Tag transform' => '<$1> element transformed into $CurrentToken.Serialized',
- 'Strategy_RemoveForeignElements: Missing required attribute' => '$CurrentToken.Compact element missing required attribute $1',
- 'Strategy_RemoveForeignElements: Foreign element to text' => 'Unrecognized $CurrentToken.Serialized tag converted to text',
- 'Strategy_RemoveForeignElements: Foreign element removed' => 'Unrecognized $CurrentToken.Serialized tag removed',
- 'Strategy_RemoveForeignElements: Comment removed' => 'Comment containing "$CurrentToken.Data" removed',
- 'Strategy_RemoveForeignElements: Foreign meta element removed' => 'Unrecognized $CurrentToken.Serialized meta tag and all descendants removed',
- 'Strategy_RemoveForeignElements: Token removed to end' => 'Tags and text starting from $1 element where removed to end',
- 'Strategy_RemoveForeignElements: Trailing hyphen in comment removed' => 'Trailing hyphen(s) in comment removed',
- 'Strategy_RemoveForeignElements: Hyphens in comment collapsed' => 'Double hyphens in comments are not allowed, and were collapsed into single hyphens',
- 'Strategy_MakeWellFormed: Unnecessary end tag removed' => 'Unnecessary $CurrentToken.Serialized tag removed',
- 'Strategy_MakeWellFormed: Unnecessary end tag to text' => 'Unnecessary $CurrentToken.Serialized tag converted to text',
- 'Strategy_MakeWellFormed: Tag auto closed' => '$1.Compact started on line $1.Line auto-closed by $CurrentToken.Compact',
- 'Strategy_MakeWellFormed: Tag carryover' => '$1.Compact started on line $1.Line auto-continued into $CurrentToken.Compact',
- 'Strategy_MakeWellFormed: Stray end tag removed' => 'Stray $CurrentToken.Serialized tag removed',
- 'Strategy_MakeWellFormed: Stray end tag to text' => 'Stray $CurrentToken.Serialized tag converted to text',
- 'Strategy_MakeWellFormed: Tag closed by element end' => '$1.Compact tag started on line $1.Line closed by end of $CurrentToken.Serialized',
- 'Strategy_MakeWellFormed: Tag closed by document end' => '$1.Compact tag started on line $1.Line closed by end of document',
- 'Strategy_FixNesting: Node removed' => '$CurrentToken.Compact node removed',
- 'Strategy_FixNesting: Node excluded' => '$CurrentToken.Compact node removed due to descendant exclusion by ancestor element',
- 'Strategy_FixNesting: Node reorganized' => 'Contents of $CurrentToken.Compact node reorganized to enforce its content model',
- 'Strategy_FixNesting: Node contents removed' => 'Contents of $CurrentToken.Compact node removed',
- 'AttrValidator: Attributes transformed' => 'Attributes on $CurrentToken.Compact transformed from $1.Keys to $2.Keys',
- 'AttrValidator: Attribute removed' => '$CurrentAttr.Name attribute on $CurrentToken.Compact removed',
-);
-
-$errorNames = array(
- E_ERROR => 'Error',
- E_WARNING => 'Warning',
- E_NOTICE => 'Notice'
-);
-
-// vim: et sw=4 sts=4
+<?php
+
+$fallback = false;
+
+$messages = array(
+
+ 'HTMLPurifier' => 'HTML Purifier',
+// for unit testing purposes
+ 'LanguageFactoryTest: Pizza' => 'Pizza',
+ 'LanguageTest: List' => '$1',
+ 'LanguageTest: Hash' => '$1.Keys; $1.Values',
+ 'Item separator' => ', ',
+ 'Item separator last' => ' and ', // non-Harvard style
+
+ 'ErrorCollector: No errors' => 'No errors detected. However, because error reporting is still incomplete, there may have been errors that the error collector was not notified of; please inspect the output HTML carefully.',
+ 'ErrorCollector: At line' => ' at line $line',
+ 'ErrorCollector: Incidental errors' => 'Incidental errors',
+ 'Lexer: Unclosed comment' => 'Unclosed comment',
+ 'Lexer: Unescaped lt' => 'Unescaped less-than sign (<) should be <',
+ 'Lexer: Missing gt' => 'Missing greater-than sign (>), previous less-than sign (<) should be escaped',
+ 'Lexer: Missing attribute key' => 'Attribute declaration has no key',
+ 'Lexer: Missing end quote' => 'Attribute declaration has no end quote',
+ 'Lexer: Extracted body' => 'Removed document metadata tags',
+ 'Strategy_RemoveForeignElements: Tag transform' => '<$1> element transformed into $CurrentToken.Serialized',
+ 'Strategy_RemoveForeignElements: Missing required attribute' => '$CurrentToken.Compact element missing required attribute $1',
+ 'Strategy_RemoveForeignElements: Foreign element to text' => 'Unrecognized $CurrentToken.Serialized tag converted to text',
+ 'Strategy_RemoveForeignElements: Foreign element removed' => 'Unrecognized $CurrentToken.Serialized tag removed',
+ 'Strategy_RemoveForeignElements: Comment removed' => 'Comment containing "$CurrentToken.Data" removed',
+ 'Strategy_RemoveForeignElements: Foreign meta element removed' => 'Unrecognized $CurrentToken.Serialized meta tag and all descendants removed',
+ 'Strategy_RemoveForeignElements: Token removed to end' => 'Tags and text starting from $1 element where removed to end',
+ 'Strategy_RemoveForeignElements: Trailing hyphen in comment removed' => 'Trailing hyphen(s) in comment removed',
+ 'Strategy_RemoveForeignElements: Hyphens in comment collapsed' => 'Double hyphens in comments are not allowed, and were collapsed into single hyphens',
+ 'Strategy_MakeWellFormed: Unnecessary end tag removed' => 'Unnecessary $CurrentToken.Serialized tag removed',
+ 'Strategy_MakeWellFormed: Unnecessary end tag to text' => 'Unnecessary $CurrentToken.Serialized tag converted to text',
+ 'Strategy_MakeWellFormed: Tag auto closed' => '$1.Compact started on line $1.Line auto-closed by $CurrentToken.Compact',
+ 'Strategy_MakeWellFormed: Tag carryover' => '$1.Compact started on line $1.Line auto-continued into $CurrentToken.Compact',
+ 'Strategy_MakeWellFormed: Stray end tag removed' => 'Stray $CurrentToken.Serialized tag removed',
+ 'Strategy_MakeWellFormed: Stray end tag to text' => 'Stray $CurrentToken.Serialized tag converted to text',
+ 'Strategy_MakeWellFormed: Tag closed by element end' => '$1.Compact tag started on line $1.Line closed by end of $CurrentToken.Serialized',
+ 'Strategy_MakeWellFormed: Tag closed by document end' => '$1.Compact tag started on line $1.Line closed by end of document',
+ 'Strategy_FixNesting: Node removed' => '$CurrentToken.Compact node removed',
+ 'Strategy_FixNesting: Node excluded' => '$CurrentToken.Compact node removed due to descendant exclusion by ancestor element',
+ 'Strategy_FixNesting: Node reorganized' => 'Contents of $CurrentToken.Compact node reorganized to enforce its content model',
+ 'Strategy_FixNesting: Node contents removed' => 'Contents of $CurrentToken.Compact node removed',
+ 'AttrValidator: Attributes transformed' => 'Attributes on $CurrentToken.Compact transformed from $1.Keys to $2.Keys',
+ 'AttrValidator: Attribute removed' => '$CurrentAttr.Name attribute on $CurrentToken.Compact removed',
+);
+
+$errorNames = array(
+ E_ERROR => 'Error',
+ E_WARNING => 'Warning',
+ E_NOTICE => 'Notice'
+);
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/LanguageFactory.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/LanguageFactory.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/LanguageFactory.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/LanguageFactory.php
index e3e7a3b..4e35272 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/LanguageFactory.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/LanguageFactory.php
@@ -1,209 +1,209 @@
-<?php
-
-/**
- * Class responsible for generating HTMLPurifier_Language objects, managing
- * caching and fallbacks.
- * @note Thanks to MediaWiki for the general logic, although this version
- * has been entirely rewritten
- * @todo Serialized cache for languages
- */
-class HTMLPurifier_LanguageFactory
-{
-
- /**
- * Cache of language code information used to load HTMLPurifier_Language objects.
- * Structure is: $factory->cache[$language_code][$key] = $value
- * @type array
- */
- public $cache;
-
- /**
- * Valid keys in the HTMLPurifier_Language object. Designates which
- * variables to slurp out of a message file.
- * @type array
- */
- public $keys = array('fallback', 'messages', 'errorNames');
-
- /**
- * Instance to validate language codes.
- * @type HTMLPurifier_AttrDef_Lang
- *
- */
- protected $validator;
-
- /**
- * Cached copy of dirname(__FILE__), directory of current file without
- * trailing slash.
- * @type string
- */
- protected $dir;
-
- /**
- * Keys whose contents are a hash map and can be merged.
- * @type array
- */
- protected $mergeable_keys_map = array('messages' => true, 'errorNames' => true);
-
- /**
- * Keys whose contents are a list and can be merged.
- * @value array lookup
- */
- protected $mergeable_keys_list = array();
-
- /**
- * Retrieve sole instance of the factory.
- * @param HTMLPurifier_LanguageFactory $prototype Optional prototype to overload sole instance with,
- * or bool true to reset to default factory.
- * @return HTMLPurifier_LanguageFactory
- */
- public static function instance($prototype = null)
- {
- static $instance = null;
- if ($prototype !== null) {
- $instance = $prototype;
- } elseif ($instance === null || $prototype == true) {
- $instance = new HTMLPurifier_LanguageFactory();
- $instance->setup();
- }
- return $instance;
- }
-
- /**
- * Sets up the singleton, much like a constructor
- * @note Prevents people from getting this outside of the singleton
- */
- public function setup()
- {
- $this->validator = new HTMLPurifier_AttrDef_Lang();
- $this->dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier';
- }
-
- /**
- * Creates a language object, handles class fallbacks
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @param bool|string $code Code to override configuration with. Private parameter.
- * @return HTMLPurifier_Language
- */
- public function create($config, $context, $code = false)
- {
- // validate language code
- if ($code === false) {
- $code = $this->validator->validate(
- $config->get('Core.Language'),
- $config,
- $context
- );
- } else {
- $code = $this->validator->validate($code, $config, $context);
- }
- if ($code === false) {
- $code = 'en'; // malformed code becomes English
- }
-
- $pcode = str_replace('-', '_', $code); // make valid PHP classname
- static $depth = 0; // recursion protection
-
- if ($code == 'en') {
- $lang = new HTMLPurifier_Language($config, $context);
- } else {
- $class = 'HTMLPurifier_Language_' . $pcode;
- $file = $this->dir . '/Language/classes/' . $code . '.php';
- if (file_exists($file) || class_exists($class, false)) {
- $lang = new $class($config, $context);
- } else {
- // Go fallback
- $raw_fallback = $this->getFallbackFor($code);
- $fallback = $raw_fallback ? $raw_fallback : 'en';
- $depth++;
- $lang = $this->create($config, $context, $fallback);
- if (!$raw_fallback) {
- $lang->error = true;
- }
- $depth--;
- }
- }
- $lang->code = $code;
- return $lang;
- }
-
- /**
- * Returns the fallback language for language
- * @note Loads the original language into cache
- * @param string $code language code
- * @return string|bool
- */
- public function getFallbackFor($code)
- {
- $this->loadLanguage($code);
- return $this->cache[$code]['fallback'];
- }
-
- /**
- * Loads language into the cache, handles message file and fallbacks
- * @param string $code language code
- */
- public function loadLanguage($code)
- {
- static $languages_seen = array(); // recursion guard
-
- // abort if we've already loaded it
- if (isset($this->cache[$code])) {
- return;
- }
-
- // generate filename
- $filename = $this->dir . '/Language/messages/' . $code . '.php';
-
- // default fallback : may be overwritten by the ensuing include
- $fallback = ($code != 'en') ? 'en' : false;
-
- // load primary localisation
- if (!file_exists($filename)) {
- // skip the include: will rely solely on fallback
- $filename = $this->dir . '/Language/messages/en.php';
- $cache = array();
- } else {
- include $filename;
- $cache = compact($this->keys);
- }
-
- // load fallback localisation
- if (!empty($fallback)) {
-
- // infinite recursion guard
- if (isset($languages_seen[$code])) {
- trigger_error(
- 'Circular fallback reference in language ' .
- $code,
- E_USER_ERROR
- );
- $fallback = 'en';
- }
- $language_seen[$code] = true;
-
- // load the fallback recursively
- $this->loadLanguage($fallback);
- $fallback_cache = $this->cache[$fallback];
-
- // merge fallback with current language
- foreach ($this->keys as $key) {
- if (isset($cache[$key]) && isset($fallback_cache[$key])) {
- if (isset($this->mergeable_keys_map[$key])) {
- $cache[$key] = $cache[$key] + $fallback_cache[$key];
- } elseif (isset($this->mergeable_keys_list[$key])) {
- $cache[$key] = array_merge($fallback_cache[$key], $cache[$key]);
- }
- } else {
- $cache[$key] = $fallback_cache[$key];
- }
- }
- }
-
- // save to cache for later retrieval
- $this->cache[$code] = $cache;
- return;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Class responsible for generating HTMLPurifier_Language objects, managing
+ * caching and fallbacks.
+ * @note Thanks to MediaWiki for the general logic, although this version
+ * has been entirely rewritten
+ * @todo Serialized cache for languages
+ */
+class HTMLPurifier_LanguageFactory
+{
+
+ /**
+ * Cache of language code information used to load HTMLPurifier_Language objects.
+ * Structure is: $factory->cache[$language_code][$key] = $value
+ * @type array
+ */
+ public $cache;
+
+ /**
+ * Valid keys in the HTMLPurifier_Language object. Designates which
+ * variables to slurp out of a message file.
+ * @type array
+ */
+ public $keys = array('fallback', 'messages', 'errorNames');
+
+ /**
+ * Instance to validate language codes.
+ * @type HTMLPurifier_AttrDef_Lang
+ *
+ */
+ protected $validator;
+
+ /**
+ * Cached copy of dirname(__FILE__), directory of current file without
+ * trailing slash.
+ * @type string
+ */
+ protected $dir;
+
+ /**
+ * Keys whose contents are a hash map and can be merged.
+ * @type array
+ */
+ protected $mergeable_keys_map = array('messages' => true, 'errorNames' => true);
+
+ /**
+ * Keys whose contents are a list and can be merged.
+ * @value array lookup
+ */
+ protected $mergeable_keys_list = array();
+
+ /**
+ * Retrieve sole instance of the factory.
+ * @param HTMLPurifier_LanguageFactory $prototype Optional prototype to overload sole instance with,
+ * or bool true to reset to default factory.
+ * @return HTMLPurifier_LanguageFactory
+ */
+ public static function instance($prototype = null)
+ {
+ static $instance = null;
+ if ($prototype !== null) {
+ $instance = $prototype;
+ } elseif ($instance === null || $prototype == true) {
+ $instance = new HTMLPurifier_LanguageFactory();
+ $instance->setup();
+ }
+ return $instance;
+ }
+
+ /**
+ * Sets up the singleton, much like a constructor
+ * @note Prevents people from getting this outside of the singleton
+ */
+ public function setup()
+ {
+ $this->validator = new HTMLPurifier_AttrDef_Lang();
+ $this->dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier';
+ }
+
+ /**
+ * Creates a language object, handles class fallbacks
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @param bool|string $code Code to override configuration with. Private parameter.
+ * @return HTMLPurifier_Language
+ */
+ public function create($config, $context, $code = false)
+ {
+ // validate language code
+ if ($code === false) {
+ $code = $this->validator->validate(
+ $config->get('Core.Language'),
+ $config,
+ $context
+ );
+ } else {
+ $code = $this->validator->validate($code, $config, $context);
+ }
+ if ($code === false) {
+ $code = 'en'; // malformed code becomes English
+ }
+
+ $pcode = str_replace('-', '_', $code); // make valid PHP classname
+ static $depth = 0; // recursion protection
+
+ if ($code == 'en') {
+ $lang = new HTMLPurifier_Language($config, $context);
+ } else {
+ $class = 'HTMLPurifier_Language_' . $pcode;
+ $file = $this->dir . '/Language/classes/' . $code . '.php';
+ if (file_exists($file) || class_exists($class, false)) {
+ $lang = new $class($config, $context);
+ } else {
+ // Go fallback
+ $raw_fallback = $this->getFallbackFor($code);
+ $fallback = $raw_fallback ? $raw_fallback : 'en';
+ $depth++;
+ $lang = $this->create($config, $context, $fallback);
+ if (!$raw_fallback) {
+ $lang->error = true;
+ }
+ $depth--;
+ }
+ }
+ $lang->code = $code;
+ return $lang;
+ }
+
+ /**
+ * Returns the fallback language for language
+ * @note Loads the original language into cache
+ * @param string $code language code
+ * @return string|bool
+ */
+ public function getFallbackFor($code)
+ {
+ $this->loadLanguage($code);
+ return $this->cache[$code]['fallback'];
+ }
+
+ /**
+ * Loads language into the cache, handles message file and fallbacks
+ * @param string $code language code
+ */
+ public function loadLanguage($code)
+ {
+ static $languages_seen = array(); // recursion guard
+
+ // abort if we've already loaded it
+ if (isset($this->cache[$code])) {
+ return;
+ }
+
+ // generate filename
+ $filename = $this->dir . '/Language/messages/' . $code . '.php';
+
+ // default fallback : may be overwritten by the ensuing include
+ $fallback = ($code != 'en') ? 'en' : false;
+
+ // load primary localisation
+ if (!file_exists($filename)) {
+ // skip the include: will rely solely on fallback
+ $filename = $this->dir . '/Language/messages/en.php';
+ $cache = array();
+ } else {
+ include $filename;
+ $cache = compact($this->keys);
+ }
+
+ // load fallback localisation
+ if (!empty($fallback)) {
+
+ // infinite recursion guard
+ if (isset($languages_seen[$code])) {
+ trigger_error(
+ 'Circular fallback reference in language ' .
+ $code,
+ E_USER_ERROR
+ );
+ $fallback = 'en';
+ }
+ $language_seen[$code] = true;
+
+ // load the fallback recursively
+ $this->loadLanguage($fallback);
+ $fallback_cache = $this->cache[$fallback];
+
+ // merge fallback with current language
+ foreach ($this->keys as $key) {
+ if (isset($cache[$key]) && isset($fallback_cache[$key])) {
+ if (isset($this->mergeable_keys_map[$key])) {
+ $cache[$key] = $cache[$key] + $fallback_cache[$key];
+ } elseif (isset($this->mergeable_keys_list[$key])) {
+ $cache[$key] = array_merge($fallback_cache[$key], $cache[$key]);
+ }
+ } else {
+ $cache[$key] = $fallback_cache[$key];
+ }
+ }
+ }
+
+ // save to cache for later retrieval
+ $this->cache[$code] = $cache;
+ return;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Length.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Length.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Length.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Length.php
index 149fcf4..bbfbe66 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Length.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Length.php
@@ -1,160 +1,160 @@
-<?php
-
-/**
- * Represents a measurable length, with a string numeric magnitude
- * and a unit. This object is immutable.
- */
-class HTMLPurifier_Length
-{
-
- /**
- * String numeric magnitude.
- * @type string
- */
- protected $n;
-
- /**
- * String unit. False is permitted if $n = 0.
- * @type string|bool
- */
- protected $unit;
-
- /**
- * Whether or not this length is valid. Null if not calculated yet.
- * @type bool
- */
- protected $isValid;
-
- /**
- * Array Lookup array of units recognized by CSS 2.1
- * @type array
- */
- protected static $allowedUnits = array(
- 'em' => true, 'ex' => true, 'px' => true, 'in' => true,
- 'cm' => true, 'mm' => true, 'pt' => true, 'pc' => true
- );
-
- /**
- * @param string $n Magnitude
- * @param bool|string $u Unit
- */
- public function __construct($n = '0', $u = false)
- {
- $this->n = (string) $n;
- $this->unit = $u !== false ? (string) $u : false;
- }
-
- /**
- * @param string $s Unit string, like '2em' or '3.4in'
- * @return HTMLPurifier_Length
- * @warning Does not perform validation.
- */
- public static function make($s)
- {
- if ($s instanceof HTMLPurifier_Length) {
- return $s;
- }
- $n_length = strspn($s, '1234567890.+-');
- $n = substr($s, 0, $n_length);
- $unit = substr($s, $n_length);
- if ($unit === '') {
- $unit = false;
- }
- return new HTMLPurifier_Length($n, $unit);
- }
-
- /**
- * Validates the number and unit.
- * @return bool
- */
- protected function validate()
- {
- // Special case:
- if ($this->n === '+0' || $this->n === '-0') {
- $this->n = '0';
- }
- if ($this->n === '0' && $this->unit === false) {
- return true;
- }
- if (!ctype_lower($this->unit)) {
- $this->unit = strtolower($this->unit);
- }
- if (!isset(HTMLPurifier_Length::$allowedUnits[$this->unit])) {
- return false;
- }
- // Hack:
- $def = new HTMLPurifier_AttrDef_CSS_Number();
- $result = $def->validate($this->n, false, false);
- if ($result === false) {
- return false;
- }
- $this->n = $result;
- return true;
- }
-
- /**
- * Returns string representation of number.
- * @return string
- */
- public function toString()
- {
- if (!$this->isValid()) {
- return false;
- }
- return $this->n . $this->unit;
- }
-
- /**
- * Retrieves string numeric magnitude.
- * @return string
- */
- public function getN()
- {
- return $this->n;
- }
-
- /**
- * Retrieves string unit.
- * @return string
- */
- public function getUnit()
- {
- return $this->unit;
- }
-
- /**
- * Returns true if this length unit is valid.
- * @return bool
- */
- public function isValid()
- {
- if ($this->isValid === null) {
- $this->isValid = $this->validate();
- }
- return $this->isValid;
- }
-
- /**
- * Compares two lengths, and returns 1 if greater, -1 if less and 0 if equal.
- * @param HTMLPurifier_Length $l
- * @return int
- * @warning If both values are too large or small, this calculation will
- * not work properly
- */
- public function compareTo($l)
- {
- if ($l === false) {
- return false;
- }
- if ($l->unit !== $this->unit) {
- $converter = new HTMLPurifier_UnitConverter();
- $l = $converter->convert($l, $this->unit);
- if ($l === false) {
- return false;
- }
- }
- return $this->n - $l->n;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Represents a measurable length, with a string numeric magnitude
+ * and a unit. This object is immutable.
+ */
+class HTMLPurifier_Length
+{
+
+ /**
+ * String numeric magnitude.
+ * @type string
+ */
+ protected $n;
+
+ /**
+ * String unit. False is permitted if $n = 0.
+ * @type string|bool
+ */
+ protected $unit;
+
+ /**
+ * Whether or not this length is valid. Null if not calculated yet.
+ * @type bool
+ */
+ protected $isValid;
+
+ /**
+ * Array Lookup array of units recognized by CSS 2.1
+ * @type array
+ */
+ protected static $allowedUnits = array(
+ 'em' => true, 'ex' => true, 'px' => true, 'in' => true,
+ 'cm' => true, 'mm' => true, 'pt' => true, 'pc' => true
+ );
+
+ /**
+ * @param string $n Magnitude
+ * @param bool|string $u Unit
+ */
+ public function __construct($n = '0', $u = false)
+ {
+ $this->n = (string) $n;
+ $this->unit = $u !== false ? (string) $u : false;
+ }
+
+ /**
+ * @param string $s Unit string, like '2em' or '3.4in'
+ * @return HTMLPurifier_Length
+ * @warning Does not perform validation.
+ */
+ public static function make($s)
+ {
+ if ($s instanceof HTMLPurifier_Length) {
+ return $s;
+ }
+ $n_length = strspn($s, '1234567890.+-');
+ $n = substr($s, 0, $n_length);
+ $unit = substr($s, $n_length);
+ if ($unit === '') {
+ $unit = false;
+ }
+ return new HTMLPurifier_Length($n, $unit);
+ }
+
+ /**
+ * Validates the number and unit.
+ * @return bool
+ */
+ protected function validate()
+ {
+ // Special case:
+ if ($this->n === '+0' || $this->n === '-0') {
+ $this->n = '0';
+ }
+ if ($this->n === '0' && $this->unit === false) {
+ return true;
+ }
+ if (!ctype_lower($this->unit)) {
+ $this->unit = strtolower($this->unit);
+ }
+ if (!isset(HTMLPurifier_Length::$allowedUnits[$this->unit])) {
+ return false;
+ }
+ // Hack:
+ $def = new HTMLPurifier_AttrDef_CSS_Number();
+ $result = $def->validate($this->n, false, false);
+ if ($result === false) {
+ return false;
+ }
+ $this->n = $result;
+ return true;
+ }
+
+ /**
+ * Returns string representation of number.
+ * @return string
+ */
+ public function toString()
+ {
+ if (!$this->isValid()) {
+ return false;
+ }
+ return $this->n . $this->unit;
+ }
+
+ /**
+ * Retrieves string numeric magnitude.
+ * @return string
+ */
+ public function getN()
+ {
+ return $this->n;
+ }
+
+ /**
+ * Retrieves string unit.
+ * @return string
+ */
+ public function getUnit()
+ {
+ return $this->unit;
+ }
+
+ /**
+ * Returns true if this length unit is valid.
+ * @return bool
+ */
+ public function isValid()
+ {
+ if ($this->isValid === null) {
+ $this->isValid = $this->validate();
+ }
+ return $this->isValid;
+ }
+
+ /**
+ * Compares two lengths, and returns 1 if greater, -1 if less and 0 if equal.
+ * @param HTMLPurifier_Length $l
+ * @return int
+ * @warning If both values are too large or small, this calculation will
+ * not work properly
+ */
+ public function compareTo($l)
+ {
+ if ($l === false) {
+ return false;
+ }
+ if ($l->unit !== $this->unit) {
+ $converter = new HTMLPurifier_UnitConverter();
+ $l = $converter->convert($l, $this->unit);
+ if ($l === false) {
+ return false;
+ }
+ }
+ return $this->n - $l->n;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Lexer.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Lexer.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Lexer.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Lexer.php
index 2a9a9d6..44c5c65 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Lexer.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Lexer.php
@@ -1,357 +1,362 @@
-<?php
-
-/**
- * Forgivingly lexes HTML (SGML-style) markup into tokens.
- *
- * A lexer parses a string of SGML-style markup and converts them into
- * corresponding tokens. It doesn't check for well-formedness, although its
- * internal mechanism may make this automatic (such as the case of
- * HTMLPurifier_Lexer_DOMLex). There are several implementations to choose
- * from.
- *
- * A lexer is HTML-oriented: it might work with XML, but it's not
- * recommended, as we adhere to a subset of the specification for optimization
- * reasons. This might change in the future. Also, most tokenizers are not
- * expected to handle DTDs or PIs.
- *
- * This class should not be directly instantiated, but you may use create() to
- * retrieve a default copy of the lexer. Being a supertype, this class
- * does not actually define any implementation, but offers commonly used
- * convenience functions for subclasses.
- *
- * @note The unit tests will instantiate this class for testing purposes, as
- * many of the utility functions require a class to be instantiated.
- * This means that, even though this class is not runnable, it will
- * not be declared abstract.
- *
- * @par
- *
- * @note
- * We use tokens rather than create a DOM representation because DOM would:
- *
- * @par
- * -# Require more processing and memory to create,
- * -# Is not streamable, and
- * -# Has the entire document structure (html and body not needed).
- *
- * @par
- * However, DOM is helpful in that it makes it easy to move around nodes
- * without a lot of lookaheads to see when a tag is closed. This is a
- * limitation of the token system and some workarounds would be nice.
- */
-class HTMLPurifier_Lexer
-{
-
- /**
- * Whether or not this lexer implements line-number/column-number tracking.
- * If it does, set to true.
- */
- public $tracksLineNumbers = false;
-
- // -- STATIC ----------------------------------------------------------
-
- /**
- * Retrieves or sets the default Lexer as a Prototype Factory.
- *
- * By default HTMLPurifier_Lexer_DOMLex will be returned. There are
- * a few exceptions involving special features that only DirectLex
- * implements.
- *
- * @note The behavior of this class has changed, rather than accepting
- * a prototype object, it now accepts a configuration object.
- * To specify your own prototype, set %Core.LexerImpl to it.
- * This change in behavior de-singletonizes the lexer object.
- *
- * @param HTMLPurifier_Config $config
- * @return HTMLPurifier_Lexer
- * @throws HTMLPurifier_Exception
- */
- public static function create($config)
- {
- if (!($config instanceof HTMLPurifier_Config)) {
- $lexer = $config;
- trigger_error(
- "Passing a prototype to
- HTMLPurifier_Lexer::create() is deprecated, please instead
- use %Core.LexerImpl",
- E_USER_WARNING
- );
- } else {
- $lexer = $config->get('Core.LexerImpl');
- }
-
- $needs_tracking =
- $config->get('Core.MaintainLineNumbers') ||
- $config->get('Core.CollectErrors');
-
- $inst = null;
- if (is_object($lexer)) {
- $inst = $lexer;
- } else {
- if (is_null($lexer)) {
- do {
- // auto-detection algorithm
- if ($needs_tracking) {
- $lexer = 'DirectLex';
- break;
- }
-
- if (class_exists('DOMDocument') &&
- method_exists('DOMDocument', 'loadHTML') &&
- !extension_loaded('domxml')
- ) {
- // check for DOM support, because while it's part of the
- // core, it can be disabled compile time. Also, the PECL
- // domxml extension overrides the default DOM, and is evil
- // and nasty and we shan't bother to support it
- $lexer = 'DOMLex';
- } else {
- $lexer = 'DirectLex';
- }
- } while (0);
- } // do..while so we can break
-
- // instantiate recognized string names
- switch ($lexer) {
- case 'DOMLex':
- $inst = new HTMLPurifier_Lexer_DOMLex();
- break;
- case 'DirectLex':
- $inst = new HTMLPurifier_Lexer_DirectLex();
- break;
- case 'PH5P':
- $inst = new HTMLPurifier_Lexer_PH5P();
- break;
- default:
- throw new HTMLPurifier_Exception(
- "Cannot instantiate unrecognized Lexer type " .
- htmlspecialchars($lexer)
- );
- }
- }
-
- if (!$inst) {
- throw new HTMLPurifier_Exception('No lexer was instantiated');
- }
-
- // once PHP DOM implements native line numbers, or we
- // hack out something using XSLT, remove this stipulation
- if ($needs_tracking && !$inst->tracksLineNumbers) {
- throw new HTMLPurifier_Exception(
- 'Cannot use lexer that does not support line numbers with ' .
- 'Core.MaintainLineNumbers or Core.CollectErrors (use DirectLex instead)'
- );
- }
-
- return $inst;
-
- }
-
- // -- CONVENIENCE MEMBERS ---------------------------------------------
-
- public function __construct()
- {
- $this->_entity_parser = new HTMLPurifier_EntityParser();
- }
-
- /**
- * Most common entity to raw value conversion table for special entities.
- * @type array
- */
- protected $_special_entity2str =
- array(
- '"' => '"',
- '&' => '&',
- '<' => '<',
- '>' => '>',
- ''' => "'",
- ''' => "'",
- ''' => "'"
- );
-
- /**
- * Parses special entities into the proper characters.
- *
- * This string will translate escaped versions of the special characters
- * into the correct ones.
- *
- * @warning
- * You should be able to treat the output of this function as
- * completely parsed, but that's only because all other entities should
- * have been handled previously in substituteNonSpecialEntities()
- *
- * @param string $string String character data to be parsed.
- * @return string Parsed character data.
- */
- public function parseData($string)
- {
- // following functions require at least one character
- if ($string === '') {
- return '';
- }
-
- // subtracts amps that cannot possibly be escaped
- $num_amp = substr_count($string, '&') - substr_count($string, '& ') -
- ($string[strlen($string) - 1] === '&' ? 1 : 0);
-
- if (!$num_amp) {
- return $string;
- } // abort if no entities
- $num_esc_amp = substr_count($string, '&');
- $string = strtr($string, $this->_special_entity2str);
-
- // code duplication for sake of optimization, see above
- $num_amp_2 = substr_count($string, '&') - substr_count($string, '& ') -
- ($string[strlen($string) - 1] === '&' ? 1 : 0);
-
- if ($num_amp_2 <= $num_esc_amp) {
- return $string;
- }
-
- // hmm... now we have some uncommon entities. Use the callback.
- $string = $this->_entity_parser->substituteSpecialEntities($string);
- return $string;
- }
-
- /**
- * Lexes an HTML string into tokens.
- * @param $string String HTML.
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return HTMLPurifier_Token[] array representation of HTML.
- */
- public function tokenizeHTML($string, $config, $context)
- {
- trigger_error('Call to abstract class', E_USER_ERROR);
- }
-
- /**
- * Translates CDATA sections into regular sections (through escaping).
- * @param string $string HTML string to process.
- * @return string HTML with CDATA sections escaped.
- */
- protected static function escapeCDATA($string)
- {
- return preg_replace_callback(
- '/<!\[CDATA\[(.+?)\]\]>/s',
- array('HTMLPurifier_Lexer', 'CDATACallback'),
- $string
- );
- }
-
- /**
- * Special CDATA case that is especially convoluted for <script>
- * @param string $string HTML string to process.
- * @return string HTML with CDATA sections escaped.
- */
- protected static function escapeCommentedCDATA($string)
- {
- return preg_replace_callback(
- '#<!--//--><!\[CDATA\[//><!--(.+?)//--><!\]\]>#s',
- array('HTMLPurifier_Lexer', 'CDATACallback'),
- $string
- );
- }
-
- /**
- * Special Internet Explorer conditional comments should be removed.
- * @param string $string HTML string to process.
- * @return string HTML with conditional comments removed.
- */
- protected static function removeIEConditional($string)
- {
- return preg_replace(
- '#<!--\[if [^>]+\]>.*?<!\[endif\]-->#si', // probably should generalize for all strings
- '',
- $string
- );
- }
-
- /**
- * Callback function for escapeCDATA() that does the work.
- *
- * @warning Though this is public in order to let the callback happen,
- * calling it directly is not recommended.
- * @param array $matches PCRE matches array, with index 0 the entire match
- * and 1 the inside of the CDATA section.
- * @return string Escaped internals of the CDATA section.
- */
- protected static function CDATACallback($matches)
- {
- // not exactly sure why the character set is needed, but whatever
- return htmlspecialchars($matches[1], ENT_COMPAT, 'UTF-8');
- }
-
- /**
- * Takes a piece of HTML and normalizes it by converting entities, fixing
- * encoding, extracting bits, and other good stuff.
- * @param string $html HTML.
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return string
- * @todo Consider making protected
- */
- public function normalize($html, $config, $context)
- {
- // normalize newlines to \n
- if ($config->get('Core.NormalizeNewlines')) {
- $html = str_replace("\r\n", "\n", $html);
- $html = str_replace("\r", "\n", $html);
- }
-
- if ($config->get('HTML.Trusted')) {
- // escape convoluted CDATA
- $html = $this->escapeCommentedCDATA($html);
- }
-
- // escape CDATA
- $html = $this->escapeCDATA($html);
-
- $html = $this->removeIEConditional($html);
-
- // extract body from document if applicable
- if ($config->get('Core.ConvertDocumentToFragment')) {
- $e = false;
- if ($config->get('Core.CollectErrors')) {
- $e =& $context->get('ErrorCollector');
- }
- $new_html = $this->extractBody($html);
- if ($e && $new_html != $html) {
- $e->send(E_WARNING, 'Lexer: Extracted body');
- }
- $html = $new_html;
- }
-
- // expand entities that aren't the big five
- $html = $this->_entity_parser->substituteNonSpecialEntities($html);
-
- // clean into wellformed UTF-8 string for an SGML context: this has
- // to be done after entity expansion because the entities sometimes
- // represent non-SGML characters (horror, horror!)
- $html = HTMLPurifier_Encoder::cleanUTF8($html);
-
- // if processing instructions are to removed, remove them now
- if ($config->get('Core.RemoveProcessingInstructions')) {
- $html = preg_replace('#<\?.+?\?>#s', '', $html);
- }
-
- return $html;
- }
-
- /**
- * Takes a string of HTML (fragment or document) and returns the content
- * @todo Consider making protected
- */
- public function extractBody($html)
- {
- $matches = array();
- $result = preg_match('!<body[^>]*>(.*)</body>!is', $html, $matches);
- if ($result) {
- return $matches[1];
- } else {
- return $html;
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Forgivingly lexes HTML (SGML-style) markup into tokens.
+ *
+ * A lexer parses a string of SGML-style markup and converts them into
+ * corresponding tokens. It doesn't check for well-formedness, although its
+ * internal mechanism may make this automatic (such as the case of
+ * HTMLPurifier_Lexer_DOMLex). There are several implementations to choose
+ * from.
+ *
+ * A lexer is HTML-oriented: it might work with XML, but it's not
+ * recommended, as we adhere to a subset of the specification for optimization
+ * reasons. This might change in the future. Also, most tokenizers are not
+ * expected to handle DTDs or PIs.
+ *
+ * This class should not be directly instantiated, but you may use create() to
+ * retrieve a default copy of the lexer. Being a supertype, this class
+ * does not actually define any implementation, but offers commonly used
+ * convenience functions for subclasses.
+ *
+ * @note The unit tests will instantiate this class for testing purposes, as
+ * many of the utility functions require a class to be instantiated.
+ * This means that, even though this class is not runnable, it will
+ * not be declared abstract.
+ *
+ * @par
+ *
+ * @note
+ * We use tokens rather than create a DOM representation because DOM would:
+ *
+ * @par
+ * -# Require more processing and memory to create,
+ * -# Is not streamable, and
+ * -# Has the entire document structure (html and body not needed).
+ *
+ * @par
+ * However, DOM is helpful in that it makes it easy to move around nodes
+ * without a lot of lookaheads to see when a tag is closed. This is a
+ * limitation of the token system and some workarounds would be nice.
+ */
+class HTMLPurifier_Lexer
+{
+
+ /**
+ * Whether or not this lexer implements line-number/column-number tracking.
+ * If it does, set to true.
+ */
+ public $tracksLineNumbers = false;
+
+ // -- STATIC ----------------------------------------------------------
+
+ /**
+ * Retrieves or sets the default Lexer as a Prototype Factory.
+ *
+ * By default HTMLPurifier_Lexer_DOMLex will be returned. There are
+ * a few exceptions involving special features that only DirectLex
+ * implements.
+ *
+ * @note The behavior of this class has changed, rather than accepting
+ * a prototype object, it now accepts a configuration object.
+ * To specify your own prototype, set %Core.LexerImpl to it.
+ * This change in behavior de-singletonizes the lexer object.
+ *
+ * @param HTMLPurifier_Config $config
+ * @return HTMLPurifier_Lexer
+ * @throws HTMLPurifier_Exception
+ */
+ public static function create($config)
+ {
+ if (!($config instanceof HTMLPurifier_Config)) {
+ $lexer = $config;
+ trigger_error(
+ "Passing a prototype to
+ HTMLPurifier_Lexer::create() is deprecated, please instead
+ use %Core.LexerImpl",
+ E_USER_WARNING
+ );
+ } else {
+ $lexer = $config->get('Core.LexerImpl');
+ }
+
+ $needs_tracking =
+ $config->get('Core.MaintainLineNumbers') ||
+ $config->get('Core.CollectErrors');
+
+ $inst = null;
+ if (is_object($lexer)) {
+ $inst = $lexer;
+ } else {
+ if (is_null($lexer)) {
+ do {
+ // auto-detection algorithm
+ if ($needs_tracking) {
+ $lexer = 'DirectLex';
+ break;
+ }
+
+ if (class_exists('DOMDocument') &&
+ method_exists('DOMDocument', 'loadHTML') &&
+ !extension_loaded('domxml')
+ ) {
+ // check for DOM support, because while it's part of the
+ // core, it can be disabled compile time. Also, the PECL
+ // domxml extension overrides the default DOM, and is evil
+ // and nasty and we shan't bother to support it
+ $lexer = 'DOMLex';
+ } else {
+ $lexer = 'DirectLex';
+ }
+ } while (0);
+ } // do..while so we can break
+
+ // instantiate recognized string names
+ switch ($lexer) {
+ case 'DOMLex':
+ $inst = new HTMLPurifier_Lexer_DOMLex();
+ break;
+ case 'DirectLex':
+ $inst = new HTMLPurifier_Lexer_DirectLex();
+ break;
+ case 'PH5P':
+ $inst = new HTMLPurifier_Lexer_PH5P();
+ break;
+ default:
+ throw new HTMLPurifier_Exception(
+ "Cannot instantiate unrecognized Lexer type " .
+ htmlspecialchars($lexer)
+ );
+ }
+ }
+
+ if (!$inst) {
+ throw new HTMLPurifier_Exception('No lexer was instantiated');
+ }
+
+ // once PHP DOM implements native line numbers, or we
+ // hack out something using XSLT, remove this stipulation
+ if ($needs_tracking && !$inst->tracksLineNumbers) {
+ throw new HTMLPurifier_Exception(
+ 'Cannot use lexer that does not support line numbers with ' .
+ 'Core.MaintainLineNumbers or Core.CollectErrors (use DirectLex instead)'
+ );
+ }
+
+ return $inst;
+
+ }
+
+ // -- CONVENIENCE MEMBERS ---------------------------------------------
+
+ public function __construct()
+ {
+ $this->_entity_parser = new HTMLPurifier_EntityParser();
+ }
+
+ /**
+ * Most common entity to raw value conversion table for special entities.
+ * @type array
+ */
+ protected $_special_entity2str =
+ array(
+ '"' => '"',
+ '&' => '&',
+ '<' => '<',
+ '>' => '>',
+ ''' => "'",
+ ''' => "'",
+ ''' => "'"
+ );
+
+ /**
+ * Parses special entities into the proper characters.
+ *
+ * This string will translate escaped versions of the special characters
+ * into the correct ones.
+ *
+ * @warning
+ * You should be able to treat the output of this function as
+ * completely parsed, but that's only because all other entities should
+ * have been handled previously in substituteNonSpecialEntities()
+ *
+ * @param string $string String character data to be parsed.
+ * @return string Parsed character data.
+ */
+ public function parseData($string)
+ {
+ // following functions require at least one character
+ if ($string === '') {
+ return '';
+ }
+
+ // subtracts amps that cannot possibly be escaped
+ $num_amp = substr_count($string, '&') - substr_count($string, '& ') -
+ ($string[strlen($string) - 1] === '&' ? 1 : 0);
+
+ if (!$num_amp) {
+ return $string;
+ } // abort if no entities
+ $num_esc_amp = substr_count($string, '&');
+ $string = strtr($string, $this->_special_entity2str);
+
+ // code duplication for sake of optimization, see above
+ $num_amp_2 = substr_count($string, '&') - substr_count($string, '& ') -
+ ($string[strlen($string) - 1] === '&' ? 1 : 0);
+
+ if ($num_amp_2 <= $num_esc_amp) {
+ return $string;
+ }
+
+ // hmm... now we have some uncommon entities. Use the callback.
+ $string = $this->_entity_parser->substituteSpecialEntities($string);
+ return $string;
+ }
+
+ /**
+ * Lexes an HTML string into tokens.
+ * @param $string String HTML.
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return HTMLPurifier_Token[] array representation of HTML.
+ */
+ public function tokenizeHTML($string, $config, $context)
+ {
+ trigger_error('Call to abstract class', E_USER_ERROR);
+ }
+
+ /**
+ * Translates CDATA sections into regular sections (through escaping).
+ * @param string $string HTML string to process.
+ * @return string HTML with CDATA sections escaped.
+ */
+ protected static function escapeCDATA($string)
+ {
+ return preg_replace_callback(
+ '/<!\[CDATA\[(.+?)\]\]>/s',
+ array('HTMLPurifier_Lexer', 'CDATACallback'),
+ $string
+ );
+ }
+
+ /**
+ * Special CDATA case that is especially convoluted for <script>
+ * @param string $string HTML string to process.
+ * @return string HTML with CDATA sections escaped.
+ */
+ protected static function escapeCommentedCDATA($string)
+ {
+ return preg_replace_callback(
+ '#<!--//--><!\[CDATA\[//><!--(.+?)//--><!\]\]>#s',
+ array('HTMLPurifier_Lexer', 'CDATACallback'),
+ $string
+ );
+ }
+
+ /**
+ * Special Internet Explorer conditional comments should be removed.
+ * @param string $string HTML string to process.
+ * @return string HTML with conditional comments removed.
+ */
+ protected static function removeIEConditional($string)
+ {
+ return preg_replace(
+ '#<!--\[if [^>]+\]>.*?<!\[endif\]-->#si', // probably should generalize for all strings
+ '',
+ $string
+ );
+ }
+
+ /**
+ * Callback function for escapeCDATA() that does the work.
+ *
+ * @warning Though this is public in order to let the callback happen,
+ * calling it directly is not recommended.
+ * @param array $matches PCRE matches array, with index 0 the entire match
+ * and 1 the inside of the CDATA section.
+ * @return string Escaped internals of the CDATA section.
+ */
+ protected static function CDATACallback($matches)
+ {
+ // not exactly sure why the character set is needed, but whatever
+ return htmlspecialchars($matches[1], ENT_COMPAT, 'UTF-8');
+ }
+
+ /**
+ * Takes a piece of HTML and normalizes it by converting entities, fixing
+ * encoding, extracting bits, and other good stuff.
+ * @param string $html HTML.
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return string
+ * @todo Consider making protected
+ */
+ public function normalize($html, $config, $context)
+ {
+ // normalize newlines to \n
+ if ($config->get('Core.NormalizeNewlines')) {
+ $html = str_replace("\r\n", "\n", $html);
+ $html = str_replace("\r", "\n", $html);
+ }
+
+ if ($config->get('HTML.Trusted')) {
+ // escape convoluted CDATA
+ $html = $this->escapeCommentedCDATA($html);
+ }
+
+ // escape CDATA
+ $html = $this->escapeCDATA($html);
+
+ $html = $this->removeIEConditional($html);
+
+ // extract body from document if applicable
+ if ($config->get('Core.ConvertDocumentToFragment')) {
+ $e = false;
+ if ($config->get('Core.CollectErrors')) {
+ $e =& $context->get('ErrorCollector');
+ }
+ $new_html = $this->extractBody($html);
+ if ($e && $new_html != $html) {
+ $e->send(E_WARNING, 'Lexer: Extracted body');
+ }
+ $html = $new_html;
+ }
+
+ // expand entities that aren't the big five
+ $html = $this->_entity_parser->substituteNonSpecialEntities($html);
+
+ // clean into wellformed UTF-8 string for an SGML context: this has
+ // to be done after entity expansion because the entities sometimes
+ // represent non-SGML characters (horror, horror!)
+ $html = HTMLPurifier_Encoder::cleanUTF8($html);
+
+ // if processing instructions are to removed, remove them now
+ if ($config->get('Core.RemoveProcessingInstructions')) {
+ $html = preg_replace('#<\?.+?\?>#s', '', $html);
+ }
+
+ return $html;
+ }
+
+ /**
+ * Takes a string of HTML (fragment or document) and returns the content
+ * @todo Consider making protected
+ */
+ public function extractBody($html)
+ {
+ $matches = array();
+ $result = preg_match('|(.*?)<body[^>]*>(.*)</body>|is', $html, $matches);
+ if ($result) {
+ // Make sure it's not in a comment
+ $comment_start = strrpos($matches[1], '<!--');
+ $comment_end = strrpos($matches[1], '-->');
+ if ($comment_start === false ||
+ ($comment_end !== false && $comment_end > $comment_start)) {
+ return $matches[2];
+ }
+ }
+ return $html;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Lexer/DOMLex.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Lexer/DOMLex.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Lexer/DOMLex.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Lexer/DOMLex.php
index b13e6c5..b818192 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Lexer/DOMLex.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Lexer/DOMLex.php
@@ -1,280 +1,279 @@
-<?php
-
-/**
- * Parser that uses PHP 5's DOM extension (part of the core).
- *
- * In PHP 5, the DOM XML extension was revamped into DOM and added to the core.
- * It gives us a forgiving HTML parser, which we use to transform the HTML
- * into a DOM, and then into the tokens. It is blazingly fast (for large
- * documents, it performs twenty times faster than
- * HTMLPurifier_Lexer_DirectLex,and is the default choice for PHP 5.
- *
- * @note Any empty elements will have empty tokens associated with them, even if
- * this is prohibited by the spec. This is cannot be fixed until the spec
- * comes into play.
- *
- * @note PHP's DOM extension does not actually parse any entities, we use
- * our own function to do that.
- *
- * @warning DOM tends to drop whitespace, which may wreak havoc on indenting.
- * If this is a huge problem, due to the fact that HTML is hand
- * edited and you are unable to get a parser cache that caches the
- * the output of HTML Purifier while keeping the original HTML lying
- * around, you may want to run Tidy on the resulting output or use
- * HTMLPurifier_DirectLex
- */
-
-class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
-{
-
- /**
- * @type HTMLPurifier_TokenFactory
- */
- private $factory;
-
- public function __construct()
- {
- // setup the factory
- parent::__construct();
- $this->factory = new HTMLPurifier_TokenFactory();
- }
-
- /**
- * @param string $html
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return HTMLPurifier_Token[]
- */
- public function tokenizeHTML($html, $config, $context)
- {
- $html = $this->normalize($html, $config, $context);
-
- // attempt to armor stray angled brackets that cannot possibly
- // form tags and thus are probably being used as emoticons
- if ($config->get('Core.AggressivelyFixLt')) {
- $char = '[^a-z!\/]';
- $comment = "/<!--(.*?)(-->|\z)/is";
- $html = preg_replace_callback($comment, array($this, 'callbackArmorCommentEntities'), $html);
- do {
- $old = $html;
- $html = preg_replace("/<($char)/i", '<\\1', $html);
- } while ($html !== $old);
- $html = preg_replace_callback($comment, array($this, 'callbackUndoCommentSubst'), $html); // fix comments
- }
-
- // preprocess html, essential for UTF-8
- $html = $this->wrapHTML($html, $config, $context);
-
- $doc = new DOMDocument();
- $doc->encoding = 'UTF-8'; // theoretically, the above has this covered
-
- set_error_handler(array($this, 'muteErrorHandler'));
- $doc->loadHTML($html);
- restore_error_handler();
-
- $tokens = array();
- $this->tokenizeDOM(
- $doc->getElementsByTagName('html')->item(0)-> // <html>
- getElementsByTagName('body')->item(0)-> // <body>
- getElementsByTagName('div')->item(0), // <div>
- $tokens
- );
- return $tokens;
- }
-
- /**
- * Iterative function that tokenizes a node, putting it into an accumulator.
- * To iterate is human, to recurse divine - L. Peter Deutsch
- * @param DOMNode $node DOMNode to be tokenized.
- * @param HTMLPurifier_Token[] $tokens Array-list of already tokenized tokens.
- * @return HTMLPurifier_Token of node appended to previously passed tokens.
- */
- protected function tokenizeDOM($node, &$tokens)
- {
- $level = 0;
- $nodes = array($level => new HTMLPurifier_Queue(array($node)));
- $closingNodes = array();
- do {
- while (!$nodes[$level]->isEmpty()) {
- $node = $nodes[$level]->shift(); // FIFO
- $collect = $level > 0 ? true : false;
- $needEndingTag = $this->createStartNode($node, $tokens, $collect);
- if ($needEndingTag) {
- $closingNodes[$level][] = $node;
- }
- if ($node->childNodes && $node->childNodes->length) {
- $level++;
- $nodes[$level] = new HTMLPurifier_Queue();
- foreach ($node->childNodes as $childNode) {
- $nodes[$level]->push($childNode);
- }
- }
- }
- $level--;
- if ($level && isset($closingNodes[$level])) {
- while ($node = array_pop($closingNodes[$level])) {
- $this->createEndNode($node, $tokens);
- }
- }
- } while ($level > 0);
- }
-
- /**
- * @param DOMNode $node DOMNode to be tokenized.
- * @param HTMLPurifier_Token[] $tokens Array-list of already tokenized tokens.
- * @param bool $collect Says whether or start and close are collected, set to
- * false at first recursion because it's the implicit DIV
- * tag you're dealing with.
- * @return bool if the token needs an endtoken
- * @todo data and tagName properties don't seem to exist in DOMNode?
- */
- protected function createStartNode($node, &$tokens, $collect)
- {
- // intercept non element nodes. WE MUST catch all of them,
- // but we're not getting the character reference nodes because
- // those should have been preprocessed
- if ($node->nodeType === XML_TEXT_NODE) {
- $tokens[] = $this->factory->createText($node->data);
- return false;
- } elseif ($node->nodeType === XML_CDATA_SECTION_NODE) {
- // undo libxml's special treatment of <script> and <style> tags
- $last = end($tokens);
- $data = $node->data;
- // (note $node->tagname is already normalized)
- if ($last instanceof HTMLPurifier_Token_Start && ($last->name == 'script' || $last->name == 'style')) {
- $new_data = trim($data);
- if (substr($new_data, 0, 4) === '<!--') {
- $data = substr($new_data, 4);
- if (substr($data, -3) === '-->') {
- $data = substr($data, 0, -3);
- } else {
- // Highly suspicious! Not sure what to do...
- }
- }
- }
- $tokens[] = $this->factory->createText($this->parseData($data));
- return false;
- } elseif ($node->nodeType === XML_COMMENT_NODE) {
- // this is code is only invoked for comments in script/style in versions
- // of libxml pre-2.6.28 (regular comments, of course, are still
- // handled regularly)
- $tokens[] = $this->factory->createComment($node->data);
- return false;
- } elseif ($node->nodeType !== XML_ELEMENT_NODE) {
- // not-well tested: there may be other nodes we have to grab
- return false;
- }
-
- $attr = $node->hasAttributes() ? $this->transformAttrToAssoc($node->attributes) : array();
-
- // We still have to make sure that the element actually IS empty
- if (!$node->childNodes->length) {
- if ($collect) {
- $tokens[] = $this->factory->createEmpty($node->tagName, $attr);
- }
- return false;
- } else {
- if ($collect) {
- $tokens[] = $this->factory->createStart(
- $tag_name = $node->tagName, // somehow, it get's dropped
- $attr
- );
- }
- return true;
- }
- }
-
- /**
- * @param DOMNode $node
- * @param HTMLPurifier_Token[] $tokens
- */
- protected function createEndNode($node, &$tokens)
- {
- $tokens[] = $this->factory->createEnd($node->tagName);
- }
-
-
- /**
- * Converts a DOMNamedNodeMap of DOMAttr objects into an assoc array.
- *
- * @param DOMNamedNodeMap $node_map DOMNamedNodeMap of DOMAttr objects.
- * @return array Associative array of attributes.
- */
- protected function transformAttrToAssoc($node_map)
- {
- // NamedNodeMap is documented very well, so we're using undocumented
- // features, namely, the fact that it implements Iterator and
- // has a ->length attribute
- if ($node_map->length === 0) {
- return array();
- }
- $array = array();
- foreach ($node_map as $attr) {
- $array[$attr->name] = $attr->value;
- }
- return $array;
- }
-
- /**
- * An error handler that mutes all errors
- * @param int $errno
- * @param string $errstr
- */
- public function muteErrorHandler($errno, $errstr)
- {
- }
-
- /**
- * Callback function for undoing escaping of stray angled brackets
- * in comments
- * @param array $matches
- * @return string
- */
- public function callbackUndoCommentSubst($matches)
- {
- return '<!--' . strtr($matches[1], array('&' => '&', '<' => '<')) . $matches[2];
- }
-
- /**
- * Callback function that entity-izes ampersands in comments so that
- * callbackUndoCommentSubst doesn't clobber them
- * @param array $matches
- * @return string
- */
- public function callbackArmorCommentEntities($matches)
- {
- return '<!--' . str_replace('&', '&', $matches[1]) . $matches[2];
- }
-
- /**
- * Wraps an HTML fragment in the necessary HTML
- * @param string $html
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return string
- */
- protected function wrapHTML($html, $config, $context)
- {
- $def = $config->getDefinition('HTML');
- $ret = '';
-
- if (!empty($def->doctype->dtdPublic) || !empty($def->doctype->dtdSystem)) {
- $ret .= '<!DOCTYPE html ';
- if (!empty($def->doctype->dtdPublic)) {
- $ret .= 'PUBLIC "' . $def->doctype->dtdPublic . '" ';
- }
- if (!empty($def->doctype->dtdSystem)) {
- $ret .= '"' . $def->doctype->dtdSystem . '" ';
- }
- $ret .= '>';
- }
-
- $ret .= '<html><head>';
- $ret .= '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
- // No protection if $html contains a stray </div>!
- $ret .= '</head><body><div>' . $html . '</div></body></html>';
- return $ret;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Parser that uses PHP 5's DOM extension (part of the core).
+ *
+ * In PHP 5, the DOM XML extension was revamped into DOM and added to the core.
+ * It gives us a forgiving HTML parser, which we use to transform the HTML
+ * into a DOM, and then into the tokens. It is blazingly fast (for large
+ * documents, it performs twenty times faster than
+ * HTMLPurifier_Lexer_DirectLex,and is the default choice for PHP 5.
+ *
+ * @note Any empty elements will have empty tokens associated with them, even if
+ * this is prohibited by the spec. This is cannot be fixed until the spec
+ * comes into play.
+ *
+ * @note PHP's DOM extension does not actually parse any entities, we use
+ * our own function to do that.
+ *
+ * @warning DOM tends to drop whitespace, which may wreak havoc on indenting.
+ * If this is a huge problem, due to the fact that HTML is hand
+ * edited and you are unable to get a parser cache that caches the
+ * the output of HTML Purifier while keeping the original HTML lying
+ * around, you may want to run Tidy on the resulting output or use
+ * HTMLPurifier_DirectLex
+ */
+
+class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
+{
+
+ /**
+ * @type HTMLPurifier_TokenFactory
+ */
+ private $factory;
+
+ public function __construct()
+ {
+ // setup the factory
+ parent::__construct();
+ $this->factory = new HTMLPurifier_TokenFactory();
+ }
+
+ /**
+ * @param string $html
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return HTMLPurifier_Token[]
+ */
+ public function tokenizeHTML($html, $config, $context)
+ {
+ $html = $this->normalize($html, $config, $context);
+
+ // attempt to armor stray angled brackets that cannot possibly
+ // form tags and thus are probably being used as emoticons
+ if ($config->get('Core.AggressivelyFixLt')) {
+ $char = '[^a-z!\/]';
+ $comment = "/<!--(.*?)(-->|\z)/is";
+ $html = preg_replace_callback($comment, array($this, 'callbackArmorCommentEntities'), $html);
+ do {
+ $old = $html;
+ $html = preg_replace("/<($char)/i", '<\\1', $html);
+ } while ($html !== $old);
+ $html = preg_replace_callback($comment, array($this, 'callbackUndoCommentSubst'), $html); // fix comments
+ }
+
+ // preprocess html, essential for UTF-8
+ $html = $this->wrapHTML($html, $config, $context);
+
+ $doc = new DOMDocument();
+ $doc->encoding = 'UTF-8'; // theoretically, the above has this covered
+
+ set_error_handler(array($this, 'muteErrorHandler'));
+ $doc->loadHTML($html);
+ restore_error_handler();
+
+ $tokens = array();
+ $this->tokenizeDOM(
+ $doc->getElementsByTagName('html')->item(0)-> // <html>
+ getElementsByTagName('body')->item(0), // <body>
+ $tokens
+ );
+ return $tokens;
+ }
+
+ /**
+ * Iterative function that tokenizes a node, putting it into an accumulator.
+ * To iterate is human, to recurse divine - L. Peter Deutsch
+ * @param DOMNode $node DOMNode to be tokenized.
+ * @param HTMLPurifier_Token[] $tokens Array-list of already tokenized tokens.
+ * @return HTMLPurifier_Token of node appended to previously passed tokens.
+ */
+ protected function tokenizeDOM($node, &$tokens)
+ {
+ $level = 0;
+ $nodes = array($level => new HTMLPurifier_Queue(array($node)));
+ $closingNodes = array();
+ do {
+ while (!$nodes[$level]->isEmpty()) {
+ $node = $nodes[$level]->shift(); // FIFO
+ $collect = $level > 0 ? true : false;
+ $needEndingTag = $this->createStartNode($node, $tokens, $collect);
+ if ($needEndingTag) {
+ $closingNodes[$level][] = $node;
+ }
+ if ($node->childNodes && $node->childNodes->length) {
+ $level++;
+ $nodes[$level] = new HTMLPurifier_Queue();
+ foreach ($node->childNodes as $childNode) {
+ $nodes[$level]->push($childNode);
+ }
+ }
+ }
+ $level--;
+ if ($level && isset($closingNodes[$level])) {
+ while ($node = array_pop($closingNodes[$level])) {
+ $this->createEndNode($node, $tokens);
+ }
+ }
+ } while ($level > 0);
+ }
+
+ /**
+ * @param DOMNode $node DOMNode to be tokenized.
+ * @param HTMLPurifier_Token[] $tokens Array-list of already tokenized tokens.
+ * @param bool $collect Says whether or start and close are collected, set to
+ * false at first recursion because it's the implicit DIV
+ * tag you're dealing with.
+ * @return bool if the token needs an endtoken
+ * @todo data and tagName properties don't seem to exist in DOMNode?
+ */
+ protected function createStartNode($node, &$tokens, $collect)
+ {
+ // intercept non element nodes. WE MUST catch all of them,
+ // but we're not getting the character reference nodes because
+ // those should have been preprocessed
+ if ($node->nodeType === XML_TEXT_NODE) {
+ $tokens[] = $this->factory->createText($node->data);
+ return false;
+ } elseif ($node->nodeType === XML_CDATA_SECTION_NODE) {
+ // undo libxml's special treatment of <script> and <style> tags
+ $last = end($tokens);
+ $data = $node->data;
+ // (note $node->tagname is already normalized)
+ if ($last instanceof HTMLPurifier_Token_Start && ($last->name == 'script' || $last->name == 'style')) {
+ $new_data = trim($data);
+ if (substr($new_data, 0, 4) === '<!--') {
+ $data = substr($new_data, 4);
+ if (substr($data, -3) === '-->') {
+ $data = substr($data, 0, -3);
+ } else {
+ // Highly suspicious! Not sure what to do...
+ }
+ }
+ }
+ $tokens[] = $this->factory->createText($this->parseData($data));
+ return false;
+ } elseif ($node->nodeType === XML_COMMENT_NODE) {
+ // this is code is only invoked for comments in script/style in versions
+ // of libxml pre-2.6.28 (regular comments, of course, are still
+ // handled regularly)
+ $tokens[] = $this->factory->createComment($node->data);
+ return false;
+ } elseif ($node->nodeType !== XML_ELEMENT_NODE) {
+ // not-well tested: there may be other nodes we have to grab
+ return false;
+ }
+
+ $attr = $node->hasAttributes() ? $this->transformAttrToAssoc($node->attributes) : array();
+
+ // We still have to make sure that the element actually IS empty
+ if (!$node->childNodes->length) {
+ if ($collect) {
+ $tokens[] = $this->factory->createEmpty($node->tagName, $attr);
+ }
+ return false;
+ } else {
+ if ($collect) {
+ $tokens[] = $this->factory->createStart(
+ $tag_name = $node->tagName, // somehow, it get's dropped
+ $attr
+ );
+ }
+ return true;
+ }
+ }
+
+ /**
+ * @param DOMNode $node
+ * @param HTMLPurifier_Token[] $tokens
+ */
+ protected function createEndNode($node, &$tokens)
+ {
+ $tokens[] = $this->factory->createEnd($node->tagName);
+ }
+
+
+ /**
+ * Converts a DOMNamedNodeMap of DOMAttr objects into an assoc array.
+ *
+ * @param DOMNamedNodeMap $node_map DOMNamedNodeMap of DOMAttr objects.
+ * @return array Associative array of attributes.
+ */
+ protected function transformAttrToAssoc($node_map)
+ {
+ // NamedNodeMap is documented very well, so we're using undocumented
+ // features, namely, the fact that it implements Iterator and
+ // has a ->length attribute
+ if ($node_map->length === 0) {
+ return array();
+ }
+ $array = array();
+ foreach ($node_map as $attr) {
+ $array[$attr->name] = $attr->value;
+ }
+ return $array;
+ }
+
+ /**
+ * An error handler that mutes all errors
+ * @param int $errno
+ * @param string $errstr
+ */
+ public function muteErrorHandler($errno, $errstr)
+ {
+ }
+
+ /**
+ * Callback function for undoing escaping of stray angled brackets
+ * in comments
+ * @param array $matches
+ * @return string
+ */
+ public function callbackUndoCommentSubst($matches)
+ {
+ return '<!--' . strtr($matches[1], array('&' => '&', '<' => '<')) . $matches[2];
+ }
+
+ /**
+ * Callback function that entity-izes ampersands in comments so that
+ * callbackUndoCommentSubst doesn't clobber them
+ * @param array $matches
+ * @return string
+ */
+ public function callbackArmorCommentEntities($matches)
+ {
+ return '<!--' . str_replace('&', '&', $matches[1]) . $matches[2];
+ }
+
+ /**
+ * Wraps an HTML fragment in the necessary HTML
+ * @param string $html
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return string
+ */
+ protected function wrapHTML($html, $config, $context)
+ {
+ $def = $config->getDefinition('HTML');
+ $ret = '';
+
+ if (!empty($def->doctype->dtdPublic) || !empty($def->doctype->dtdSystem)) {
+ $ret .= '<!DOCTYPE html ';
+ if (!empty($def->doctype->dtdPublic)) {
+ $ret .= 'PUBLIC "' . $def->doctype->dtdPublic . '" ';
+ }
+ if (!empty($def->doctype->dtdSystem)) {
+ $ret .= '"' . $def->doctype->dtdSystem . '" ';
+ }
+ $ret .= '>';
+ }
+
+ $ret .= '<html><head>';
+ $ret .= '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
+ // No protection if $html contains a stray </div>!
+ $ret .= '</head><body>' . $html . '</body></html>';
+ return $ret;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Lexer/DirectLex.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Lexer/DirectLex.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Lexer/DirectLex.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Lexer/DirectLex.php
index a07f497..746b6e3 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Lexer/DirectLex.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Lexer/DirectLex.php
@@ -1,539 +1,539 @@
-<?php
-
-/**
- * Our in-house implementation of a parser.
- *
- * A pure PHP parser, DirectLex has absolutely no dependencies, making
- * it a reasonably good default for PHP4. Written with efficiency in mind,
- * it can be four times faster than HTMLPurifier_Lexer_PEARSax3, although it
- * pales in comparison to HTMLPurifier_Lexer_DOMLex.
- *
- * @todo Reread XML spec and document differences.
- */
-class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
-{
- /**
- * @type bool
- */
- public $tracksLineNumbers = true;
-
- /**
- * Whitespace characters for str(c)spn.
- * @type string
- */
- protected $_whitespace = "\x20\x09\x0D\x0A";
-
- /**
- * Callback function for script CDATA fudge
- * @param array $matches, in form of array(opening tag, contents, closing tag)
- * @return string
- */
- protected function scriptCallback($matches)
- {
- return $matches[1] . htmlspecialchars($matches[2], ENT_COMPAT, 'UTF-8') . $matches[3];
- }
-
- /**
- * @param String $html
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array|HTMLPurifier_Token[]
- */
- public function tokenizeHTML($html, $config, $context)
- {
- // special normalization for script tags without any armor
- // our "armor" heurstic is a < sign any number of whitespaces after
- // the first script tag
- if ($config->get('HTML.Trusted')) {
- $html = preg_replace_callback(
- '#(<script[^>]*>)(\s*[^<].+?)(</script>)#si',
- array($this, 'scriptCallback'),
- $html
- );
- }
-
- $html = $this->normalize($html, $config, $context);
-
- $cursor = 0; // our location in the text
- $inside_tag = false; // whether or not we're parsing the inside of a tag
- $array = array(); // result array
-
- // This is also treated to mean maintain *column* numbers too
- $maintain_line_numbers = $config->get('Core.MaintainLineNumbers');
-
- if ($maintain_line_numbers === null) {
- // automatically determine line numbering by checking
- // if error collection is on
- $maintain_line_numbers = $config->get('Core.CollectErrors');
- }
-
- if ($maintain_line_numbers) {
- $current_line = 1;
- $current_col = 0;
- $length = strlen($html);
- } else {
- $current_line = false;
- $current_col = false;
- $length = false;
- }
- $context->register('CurrentLine', $current_line);
- $context->register('CurrentCol', $current_col);
- $nl = "\n";
- // how often to manually recalculate. This will ALWAYS be right,
- // but it's pretty wasteful. Set to 0 to turn off
- $synchronize_interval = $config->get('Core.DirectLexLineNumberSyncInterval');
-
- $e = false;
- if ($config->get('Core.CollectErrors')) {
- $e =& $context->get('ErrorCollector');
- }
-
- // for testing synchronization
- $loops = 0;
-
- while (++$loops) {
- // $cursor is either at the start of a token, or inside of
- // a tag (i.e. there was a < immediately before it), as indicated
- // by $inside_tag
-
- if ($maintain_line_numbers) {
- // $rcursor, however, is always at the start of a token.
- $rcursor = $cursor - (int)$inside_tag;
-
- // Column number is cheap, so we calculate it every round.
- // We're interested at the *end* of the newline string, so
- // we need to add strlen($nl) == 1 to $nl_pos before subtracting it
- // from our "rcursor" position.
- $nl_pos = strrpos($html, $nl, $rcursor - $length);
- $current_col = $rcursor - (is_bool($nl_pos) ? 0 : $nl_pos + 1);
-
- // recalculate lines
- if ($synchronize_interval && // synchronization is on
- $cursor > 0 && // cursor is further than zero
- $loops % $synchronize_interval === 0) { // time to synchronize!
- $current_line = 1 + $this->substrCount($html, $nl, 0, $cursor);
- }
- }
-
- $position_next_lt = strpos($html, '<', $cursor);
- $position_next_gt = strpos($html, '>', $cursor);
-
- // triggers on "<b>asdf</b>" but not "asdf <b></b>"
- // special case to set up context
- if ($position_next_lt === $cursor) {
- $inside_tag = true;
- $cursor++;
- }
-
- if (!$inside_tag && $position_next_lt !== false) {
- // We are not inside tag and there still is another tag to parse
- $token = new
- HTMLPurifier_Token_Text(
- $this->parseData(
- substr(
- $html,
- $cursor,
- $position_next_lt - $cursor
- )
- )
- );
- if ($maintain_line_numbers) {
- $token->rawPosition($current_line, $current_col);
- $current_line += $this->substrCount($html, $nl, $cursor, $position_next_lt - $cursor);
- }
- $array[] = $token;
- $cursor = $position_next_lt + 1;
- $inside_tag = true;
- continue;
- } elseif (!$inside_tag) {
- // We are not inside tag but there are no more tags
- // If we're already at the end, break
- if ($cursor === strlen($html)) {
- break;
- }
- // Create Text of rest of string
- $token = new
- HTMLPurifier_Token_Text(
- $this->parseData(
- substr(
- $html,
- $cursor
- )
- )
- );
- if ($maintain_line_numbers) {
- $token->rawPosition($current_line, $current_col);
- }
- $array[] = $token;
- break;
- } elseif ($inside_tag && $position_next_gt !== false) {
- // We are in tag and it is well formed
- // Grab the internals of the tag
- $strlen_segment = $position_next_gt - $cursor;
-
- if ($strlen_segment < 1) {
- // there's nothing to process!
- $token = new HTMLPurifier_Token_Text('<');
- $cursor++;
- continue;
- }
-
- $segment = substr($html, $cursor, $strlen_segment);
-
- if ($segment === false) {
- // somehow, we attempted to access beyond the end of
- // the string, defense-in-depth, reported by Nate Abele
- break;
- }
-
- // Check if it's a comment
- if (substr($segment, 0, 3) === '!--') {
- // re-determine segment length, looking for -->
- $position_comment_end = strpos($html, '-->', $cursor);
- if ($position_comment_end === false) {
- // uh oh, we have a comment that extends to
- // infinity. Can't be helped: set comment
- // end position to end of string
- if ($e) {
- $e->send(E_WARNING, 'Lexer: Unclosed comment');
- }
- $position_comment_end = strlen($html);
- $end = true;
- } else {
- $end = false;
- }
- $strlen_segment = $position_comment_end - $cursor;
- $segment = substr($html, $cursor, $strlen_segment);
- $token = new
- HTMLPurifier_Token_Comment(
- substr(
- $segment,
- 3,
- $strlen_segment - 3
- )
- );
- if ($maintain_line_numbers) {
- $token->rawPosition($current_line, $current_col);
- $current_line += $this->substrCount($html, $nl, $cursor, $strlen_segment);
- }
- $array[] = $token;
- $cursor = $end ? $position_comment_end : $position_comment_end + 3;
- $inside_tag = false;
- continue;
- }
-
- // Check if it's an end tag
- $is_end_tag = (strpos($segment, '/') === 0);
- if ($is_end_tag) {
- $type = substr($segment, 1);
- $token = new HTMLPurifier_Token_End($type);
- if ($maintain_line_numbers) {
- $token->rawPosition($current_line, $current_col);
- $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
- }
- $array[] = $token;
- $inside_tag = false;
- $cursor = $position_next_gt + 1;
- continue;
- }
-
- // Check leading character is alnum, if not, we may
- // have accidently grabbed an emoticon. Translate into
- // text and go our merry way
- if (!ctype_alpha($segment[0])) {
- // XML: $segment[0] !== '_' && $segment[0] !== ':'
- if ($e) {
- $e->send(E_NOTICE, 'Lexer: Unescaped lt');
- }
- $token = new HTMLPurifier_Token_Text('<');
- if ($maintain_line_numbers) {
- $token->rawPosition($current_line, $current_col);
- $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
- }
- $array[] = $token;
- $inside_tag = false;
- continue;
- }
-
- // Check if it is explicitly self closing, if so, remove
- // trailing slash. Remember, we could have a tag like <br>, so
- // any later token processing scripts must convert improperly
- // classified EmptyTags from StartTags.
- $is_self_closing = (strrpos($segment, '/') === $strlen_segment - 1);
- if ($is_self_closing) {
- $strlen_segment--;
- $segment = substr($segment, 0, $strlen_segment);
- }
-
- // Check if there are any attributes
- $position_first_space = strcspn($segment, $this->_whitespace);
-
- if ($position_first_space >= $strlen_segment) {
- if ($is_self_closing) {
- $token = new HTMLPurifier_Token_Empty($segment);
- } else {
- $token = new HTMLPurifier_Token_Start($segment);
- }
- if ($maintain_line_numbers) {
- $token->rawPosition($current_line, $current_col);
- $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
- }
- $array[] = $token;
- $inside_tag = false;
- $cursor = $position_next_gt + 1;
- continue;
- }
-
- // Grab out all the data
- $type = substr($segment, 0, $position_first_space);
- $attribute_string =
- trim(
- substr(
- $segment,
- $position_first_space
- )
- );
- if ($attribute_string) {
- $attr = $this->parseAttributeString(
- $attribute_string,
- $config,
- $context
- );
- } else {
- $attr = array();
- }
-
- if ($is_self_closing) {
- $token = new HTMLPurifier_Token_Empty($type, $attr);
- } else {
- $token = new HTMLPurifier_Token_Start($type, $attr);
- }
- if ($maintain_line_numbers) {
- $token->rawPosition($current_line, $current_col);
- $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
- }
- $array[] = $token;
- $cursor = $position_next_gt + 1;
- $inside_tag = false;
- continue;
- } else {
- // inside tag, but there's no ending > sign
- if ($e) {
- $e->send(E_WARNING, 'Lexer: Missing gt');
- }
- $token = new
- HTMLPurifier_Token_Text(
- '<' .
- $this->parseData(
- substr($html, $cursor)
- )
- );
- if ($maintain_line_numbers) {
- $token->rawPosition($current_line, $current_col);
- }
- // no cursor scroll? Hmm...
- $array[] = $token;
- break;
- }
- break;
- }
-
- $context->destroy('CurrentLine');
- $context->destroy('CurrentCol');
- return $array;
- }
-
- /**
- * PHP 5.0.x compatible substr_count that implements offset and length
- * @param string $haystack
- * @param string $needle
- * @param int $offset
- * @param int $length
- * @return int
- */
- protected function substrCount($haystack, $needle, $offset, $length)
- {
- static $oldVersion;
- if ($oldVersion === null) {
- $oldVersion = version_compare(PHP_VERSION, '5.1', '<');
- }
- if ($oldVersion) {
- $haystack = substr($haystack, $offset, $length);
- return substr_count($haystack, $needle);
- } else {
- return substr_count($haystack, $needle, $offset, $length);
- }
- }
-
- /**
- * Takes the inside of an HTML tag and makes an assoc array of attributes.
- *
- * @param string $string Inside of tag excluding name.
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array Assoc array of attributes.
- */
- public function parseAttributeString($string, $config, $context)
- {
- $string = (string)$string; // quick typecast
-
- if ($string == '') {
- return array();
- } // no attributes
-
- $e = false;
- if ($config->get('Core.CollectErrors')) {
- $e =& $context->get('ErrorCollector');
- }
-
- // let's see if we can abort as quickly as possible
- // one equal sign, no spaces => one attribute
- $num_equal = substr_count($string, '=');
- $has_space = strpos($string, ' ');
- if ($num_equal === 0 && !$has_space) {
- // bool attribute
- return array($string => $string);
- } elseif ($num_equal === 1 && !$has_space) {
- // only one attribute
- list($key, $quoted_value) = explode('=', $string);
- $quoted_value = trim($quoted_value);
- if (!$key) {
- if ($e) {
- $e->send(E_ERROR, 'Lexer: Missing attribute key');
- }
- return array();
- }
- if (!$quoted_value) {
- return array($key => '');
- }
- $first_char = @$quoted_value[0];
- $last_char = @$quoted_value[strlen($quoted_value) - 1];
-
- $same_quote = ($first_char == $last_char);
- $open_quote = ($first_char == '"' || $first_char == "'");
-
- if ($same_quote && $open_quote) {
- // well behaved
- $value = substr($quoted_value, 1, strlen($quoted_value) - 2);
- } else {
- // not well behaved
- if ($open_quote) {
- if ($e) {
- $e->send(E_ERROR, 'Lexer: Missing end quote');
- }
- $value = substr($quoted_value, 1);
- } else {
- $value = $quoted_value;
- }
- }
- if ($value === false) {
- $value = '';
- }
- return array($key => $this->parseData($value));
- }
-
- // setup loop environment
- $array = array(); // return assoc array of attributes
- $cursor = 0; // current position in string (moves forward)
- $size = strlen($string); // size of the string (stays the same)
-
- // if we have unquoted attributes, the parser expects a terminating
- // space, so let's guarantee that there's always a terminating space.
- $string .= ' ';
-
- $old_cursor = -1;
- while ($cursor < $size) {
- if ($old_cursor >= $cursor) {
- throw new Exception("Infinite loop detected");
- }
- $old_cursor = $cursor;
-
- $cursor += ($value = strspn($string, $this->_whitespace, $cursor));
- // grab the key
-
- $key_begin = $cursor; //we're currently at the start of the key
-
- // scroll past all characters that are the key (not whitespace or =)
- $cursor += strcspn($string, $this->_whitespace . '=', $cursor);
-
- $key_end = $cursor; // now at the end of the key
-
- $key = substr($string, $key_begin, $key_end - $key_begin);
-
- if (!$key) {
- if ($e) {
- $e->send(E_ERROR, 'Lexer: Missing attribute key');
- }
- $cursor += 1 + strcspn($string, $this->_whitespace, $cursor + 1); // prevent infinite loop
- continue; // empty key
- }
-
- // scroll past all whitespace
- $cursor += strspn($string, $this->_whitespace, $cursor);
-
- if ($cursor >= $size) {
- $array[$key] = $key;
- break;
- }
-
- // if the next character is an equal sign, we've got a regular
- // pair, otherwise, it's a bool attribute
- $first_char = @$string[$cursor];
-
- if ($first_char == '=') {
- // key="value"
-
- $cursor++;
- $cursor += strspn($string, $this->_whitespace, $cursor);
-
- if ($cursor === false) {
- $array[$key] = '';
- break;
- }
-
- // we might be in front of a quote right now
-
- $char = @$string[$cursor];
-
- if ($char == '"' || $char == "'") {
- // it's quoted, end bound is $char
- $cursor++;
- $value_begin = $cursor;
- $cursor = strpos($string, $char, $cursor);
- $value_end = $cursor;
- } else {
- // it's not quoted, end bound is whitespace
- $value_begin = $cursor;
- $cursor += strcspn($string, $this->_whitespace, $cursor);
- $value_end = $cursor;
- }
-
- // we reached a premature end
- if ($cursor === false) {
- $cursor = $size;
- $value_end = $cursor;
- }
-
- $value = substr($string, $value_begin, $value_end - $value_begin);
- if ($value === false) {
- $value = '';
- }
- $array[$key] = $this->parseData($value);
- $cursor++;
- } else {
- // boolattr
- if ($key !== '') {
- $array[$key] = $key;
- } else {
- // purely theoretical
- if ($e) {
- $e->send(E_ERROR, 'Lexer: Missing attribute key');
- }
- }
- }
- }
- return $array;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Our in-house implementation of a parser.
+ *
+ * A pure PHP parser, DirectLex has absolutely no dependencies, making
+ * it a reasonably good default for PHP4. Written with efficiency in mind,
+ * it can be four times faster than HTMLPurifier_Lexer_PEARSax3, although it
+ * pales in comparison to HTMLPurifier_Lexer_DOMLex.
+ *
+ * @todo Reread XML spec and document differences.
+ */
+class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
+{
+ /**
+ * @type bool
+ */
+ public $tracksLineNumbers = true;
+
+ /**
+ * Whitespace characters for str(c)spn.
+ * @type string
+ */
+ protected $_whitespace = "\x20\x09\x0D\x0A";
+
+ /**
+ * Callback function for script CDATA fudge
+ * @param array $matches, in form of array(opening tag, contents, closing tag)
+ * @return string
+ */
+ protected function scriptCallback($matches)
+ {
+ return $matches[1] . htmlspecialchars($matches[2], ENT_COMPAT, 'UTF-8') . $matches[3];
+ }
+
+ /**
+ * @param String $html
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array|HTMLPurifier_Token[]
+ */
+ public function tokenizeHTML($html, $config, $context)
+ {
+ // special normalization for script tags without any armor
+ // our "armor" heurstic is a < sign any number of whitespaces after
+ // the first script tag
+ if ($config->get('HTML.Trusted')) {
+ $html = preg_replace_callback(
+ '#(<script[^>]*>)(\s*[^<].+?)(</script>)#si',
+ array($this, 'scriptCallback'),
+ $html
+ );
+ }
+
+ $html = $this->normalize($html, $config, $context);
+
+ $cursor = 0; // our location in the text
+ $inside_tag = false; // whether or not we're parsing the inside of a tag
+ $array = array(); // result array
+
+ // This is also treated to mean maintain *column* numbers too
+ $maintain_line_numbers = $config->get('Core.MaintainLineNumbers');
+
+ if ($maintain_line_numbers === null) {
+ // automatically determine line numbering by checking
+ // if error collection is on
+ $maintain_line_numbers = $config->get('Core.CollectErrors');
+ }
+
+ if ($maintain_line_numbers) {
+ $current_line = 1;
+ $current_col = 0;
+ $length = strlen($html);
+ } else {
+ $current_line = false;
+ $current_col = false;
+ $length = false;
+ }
+ $context->register('CurrentLine', $current_line);
+ $context->register('CurrentCol', $current_col);
+ $nl = "\n";
+ // how often to manually recalculate. This will ALWAYS be right,
+ // but it's pretty wasteful. Set to 0 to turn off
+ $synchronize_interval = $config->get('Core.DirectLexLineNumberSyncInterval');
+
+ $e = false;
+ if ($config->get('Core.CollectErrors')) {
+ $e =& $context->get('ErrorCollector');
+ }
+
+ // for testing synchronization
+ $loops = 0;
+
+ while (++$loops) {
+ // $cursor is either at the start of a token, or inside of
+ // a tag (i.e. there was a < immediately before it), as indicated
+ // by $inside_tag
+
+ if ($maintain_line_numbers) {
+ // $rcursor, however, is always at the start of a token.
+ $rcursor = $cursor - (int)$inside_tag;
+
+ // Column number is cheap, so we calculate it every round.
+ // We're interested at the *end* of the newline string, so
+ // we need to add strlen($nl) == 1 to $nl_pos before subtracting it
+ // from our "rcursor" position.
+ $nl_pos = strrpos($html, $nl, $rcursor - $length);
+ $current_col = $rcursor - (is_bool($nl_pos) ? 0 : $nl_pos + 1);
+
+ // recalculate lines
+ if ($synchronize_interval && // synchronization is on
+ $cursor > 0 && // cursor is further than zero
+ $loops % $synchronize_interval === 0) { // time to synchronize!
+ $current_line = 1 + $this->substrCount($html, $nl, 0, $cursor);
+ }
+ }
+
+ $position_next_lt = strpos($html, '<', $cursor);
+ $position_next_gt = strpos($html, '>', $cursor);
+
+ // triggers on "<b>asdf</b>" but not "asdf <b></b>"
+ // special case to set up context
+ if ($position_next_lt === $cursor) {
+ $inside_tag = true;
+ $cursor++;
+ }
+
+ if (!$inside_tag && $position_next_lt !== false) {
+ // We are not inside tag and there still is another tag to parse
+ $token = new
+ HTMLPurifier_Token_Text(
+ $this->parseData(
+ substr(
+ $html,
+ $cursor,
+ $position_next_lt - $cursor
+ )
+ )
+ );
+ if ($maintain_line_numbers) {
+ $token->rawPosition($current_line, $current_col);
+ $current_line += $this->substrCount($html, $nl, $cursor, $position_next_lt - $cursor);
+ }
+ $array[] = $token;
+ $cursor = $position_next_lt + 1;
+ $inside_tag = true;
+ continue;
+ } elseif (!$inside_tag) {
+ // We are not inside tag but there are no more tags
+ // If we're already at the end, break
+ if ($cursor === strlen($html)) {
+ break;
+ }
+ // Create Text of rest of string
+ $token = new
+ HTMLPurifier_Token_Text(
+ $this->parseData(
+ substr(
+ $html,
+ $cursor
+ )
+ )
+ );
+ if ($maintain_line_numbers) {
+ $token->rawPosition($current_line, $current_col);
+ }
+ $array[] = $token;
+ break;
+ } elseif ($inside_tag && $position_next_gt !== false) {
+ // We are in tag and it is well formed
+ // Grab the internals of the tag
+ $strlen_segment = $position_next_gt - $cursor;
+
+ if ($strlen_segment < 1) {
+ // there's nothing to process!
+ $token = new HTMLPurifier_Token_Text('<');
+ $cursor++;
+ continue;
+ }
+
+ $segment = substr($html, $cursor, $strlen_segment);
+
+ if ($segment === false) {
+ // somehow, we attempted to access beyond the end of
+ // the string, defense-in-depth, reported by Nate Abele
+ break;
+ }
+
+ // Check if it's a comment
+ if (substr($segment, 0, 3) === '!--') {
+ // re-determine segment length, looking for -->
+ $position_comment_end = strpos($html, '-->', $cursor);
+ if ($position_comment_end === false) {
+ // uh oh, we have a comment that extends to
+ // infinity. Can't be helped: set comment
+ // end position to end of string
+ if ($e) {
+ $e->send(E_WARNING, 'Lexer: Unclosed comment');
+ }
+ $position_comment_end = strlen($html);
+ $end = true;
+ } else {
+ $end = false;
+ }
+ $strlen_segment = $position_comment_end - $cursor;
+ $segment = substr($html, $cursor, $strlen_segment);
+ $token = new
+ HTMLPurifier_Token_Comment(
+ substr(
+ $segment,
+ 3,
+ $strlen_segment - 3
+ )
+ );
+ if ($maintain_line_numbers) {
+ $token->rawPosition($current_line, $current_col);
+ $current_line += $this->substrCount($html, $nl, $cursor, $strlen_segment);
+ }
+ $array[] = $token;
+ $cursor = $end ? $position_comment_end : $position_comment_end + 3;
+ $inside_tag = false;
+ continue;
+ }
+
+ // Check if it's an end tag
+ $is_end_tag = (strpos($segment, '/') === 0);
+ if ($is_end_tag) {
+ $type = substr($segment, 1);
+ $token = new HTMLPurifier_Token_End($type);
+ if ($maintain_line_numbers) {
+ $token->rawPosition($current_line, $current_col);
+ $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
+ }
+ $array[] = $token;
+ $inside_tag = false;
+ $cursor = $position_next_gt + 1;
+ continue;
+ }
+
+ // Check leading character is alnum, if not, we may
+ // have accidently grabbed an emoticon. Translate into
+ // text and go our merry way
+ if (!ctype_alpha($segment[0])) {
+ // XML: $segment[0] !== '_' && $segment[0] !== ':'
+ if ($e) {
+ $e->send(E_NOTICE, 'Lexer: Unescaped lt');
+ }
+ $token = new HTMLPurifier_Token_Text('<');
+ if ($maintain_line_numbers) {
+ $token->rawPosition($current_line, $current_col);
+ $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
+ }
+ $array[] = $token;
+ $inside_tag = false;
+ continue;
+ }
+
+ // Check if it is explicitly self closing, if so, remove
+ // trailing slash. Remember, we could have a tag like <br>, so
+ // any later token processing scripts must convert improperly
+ // classified EmptyTags from StartTags.
+ $is_self_closing = (strrpos($segment, '/') === $strlen_segment - 1);
+ if ($is_self_closing) {
+ $strlen_segment--;
+ $segment = substr($segment, 0, $strlen_segment);
+ }
+
+ // Check if there are any attributes
+ $position_first_space = strcspn($segment, $this->_whitespace);
+
+ if ($position_first_space >= $strlen_segment) {
+ if ($is_self_closing) {
+ $token = new HTMLPurifier_Token_Empty($segment);
+ } else {
+ $token = new HTMLPurifier_Token_Start($segment);
+ }
+ if ($maintain_line_numbers) {
+ $token->rawPosition($current_line, $current_col);
+ $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
+ }
+ $array[] = $token;
+ $inside_tag = false;
+ $cursor = $position_next_gt + 1;
+ continue;
+ }
+
+ // Grab out all the data
+ $type = substr($segment, 0, $position_first_space);
+ $attribute_string =
+ trim(
+ substr(
+ $segment,
+ $position_first_space
+ )
+ );
+ if ($attribute_string) {
+ $attr = $this->parseAttributeString(
+ $attribute_string,
+ $config,
+ $context
+ );
+ } else {
+ $attr = array();
+ }
+
+ if ($is_self_closing) {
+ $token = new HTMLPurifier_Token_Empty($type, $attr);
+ } else {
+ $token = new HTMLPurifier_Token_Start($type, $attr);
+ }
+ if ($maintain_line_numbers) {
+ $token->rawPosition($current_line, $current_col);
+ $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
+ }
+ $array[] = $token;
+ $cursor = $position_next_gt + 1;
+ $inside_tag = false;
+ continue;
+ } else {
+ // inside tag, but there's no ending > sign
+ if ($e) {
+ $e->send(E_WARNING, 'Lexer: Missing gt');
+ }
+ $token = new
+ HTMLPurifier_Token_Text(
+ '<' .
+ $this->parseData(
+ substr($html, $cursor)
+ )
+ );
+ if ($maintain_line_numbers) {
+ $token->rawPosition($current_line, $current_col);
+ }
+ // no cursor scroll? Hmm...
+ $array[] = $token;
+ break;
+ }
+ break;
+ }
+
+ $context->destroy('CurrentLine');
+ $context->destroy('CurrentCol');
+ return $array;
+ }
+
+ /**
+ * PHP 5.0.x compatible substr_count that implements offset and length
+ * @param string $haystack
+ * @param string $needle
+ * @param int $offset
+ * @param int $length
+ * @return int
+ */
+ protected function substrCount($haystack, $needle, $offset, $length)
+ {
+ static $oldVersion;
+ if ($oldVersion === null) {
+ $oldVersion = version_compare(PHP_VERSION, '5.1', '<');
+ }
+ if ($oldVersion) {
+ $haystack = substr($haystack, $offset, $length);
+ return substr_count($haystack, $needle);
+ } else {
+ return substr_count($haystack, $needle, $offset, $length);
+ }
+ }
+
+ /**
+ * Takes the inside of an HTML tag and makes an assoc array of attributes.
+ *
+ * @param string $string Inside of tag excluding name.
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array Assoc array of attributes.
+ */
+ public function parseAttributeString($string, $config, $context)
+ {
+ $string = (string)$string; // quick typecast
+
+ if ($string == '') {
+ return array();
+ } // no attributes
+
+ $e = false;
+ if ($config->get('Core.CollectErrors')) {
+ $e =& $context->get('ErrorCollector');
+ }
+
+ // let's see if we can abort as quickly as possible
+ // one equal sign, no spaces => one attribute
+ $num_equal = substr_count($string, '=');
+ $has_space = strpos($string, ' ');
+ if ($num_equal === 0 && !$has_space) {
+ // bool attribute
+ return array($string => $string);
+ } elseif ($num_equal === 1 && !$has_space) {
+ // only one attribute
+ list($key, $quoted_value) = explode('=', $string);
+ $quoted_value = trim($quoted_value);
+ if (!$key) {
+ if ($e) {
+ $e->send(E_ERROR, 'Lexer: Missing attribute key');
+ }
+ return array();
+ }
+ if (!$quoted_value) {
+ return array($key => '');
+ }
+ $first_char = @$quoted_value[0];
+ $last_char = @$quoted_value[strlen($quoted_value) - 1];
+
+ $same_quote = ($first_char == $last_char);
+ $open_quote = ($first_char == '"' || $first_char == "'");
+
+ if ($same_quote && $open_quote) {
+ // well behaved
+ $value = substr($quoted_value, 1, strlen($quoted_value) - 2);
+ } else {
+ // not well behaved
+ if ($open_quote) {
+ if ($e) {
+ $e->send(E_ERROR, 'Lexer: Missing end quote');
+ }
+ $value = substr($quoted_value, 1);
+ } else {
+ $value = $quoted_value;
+ }
+ }
+ if ($value === false) {
+ $value = '';
+ }
+ return array($key => $this->parseData($value));
+ }
+
+ // setup loop environment
+ $array = array(); // return assoc array of attributes
+ $cursor = 0; // current position in string (moves forward)
+ $size = strlen($string); // size of the string (stays the same)
+
+ // if we have unquoted attributes, the parser expects a terminating
+ // space, so let's guarantee that there's always a terminating space.
+ $string .= ' ';
+
+ $old_cursor = -1;
+ while ($cursor < $size) {
+ if ($old_cursor >= $cursor) {
+ throw new Exception("Infinite loop detected");
+ }
+ $old_cursor = $cursor;
+
+ $cursor += ($value = strspn($string, $this->_whitespace, $cursor));
+ // grab the key
+
+ $key_begin = $cursor; //we're currently at the start of the key
+
+ // scroll past all characters that are the key (not whitespace or =)
+ $cursor += strcspn($string, $this->_whitespace . '=', $cursor);
+
+ $key_end = $cursor; // now at the end of the key
+
+ $key = substr($string, $key_begin, $key_end - $key_begin);
+
+ if (!$key) {
+ if ($e) {
+ $e->send(E_ERROR, 'Lexer: Missing attribute key');
+ }
+ $cursor += 1 + strcspn($string, $this->_whitespace, $cursor + 1); // prevent infinite loop
+ continue; // empty key
+ }
+
+ // scroll past all whitespace
+ $cursor += strspn($string, $this->_whitespace, $cursor);
+
+ if ($cursor >= $size) {
+ $array[$key] = $key;
+ break;
+ }
+
+ // if the next character is an equal sign, we've got a regular
+ // pair, otherwise, it's a bool attribute
+ $first_char = @$string[$cursor];
+
+ if ($first_char == '=') {
+ // key="value"
+
+ $cursor++;
+ $cursor += strspn($string, $this->_whitespace, $cursor);
+
+ if ($cursor === false) {
+ $array[$key] = '';
+ break;
+ }
+
+ // we might be in front of a quote right now
+
+ $char = @$string[$cursor];
+
+ if ($char == '"' || $char == "'") {
+ // it's quoted, end bound is $char
+ $cursor++;
+ $value_begin = $cursor;
+ $cursor = strpos($string, $char, $cursor);
+ $value_end = $cursor;
+ } else {
+ // it's not quoted, end bound is whitespace
+ $value_begin = $cursor;
+ $cursor += strcspn($string, $this->_whitespace, $cursor);
+ $value_end = $cursor;
+ }
+
+ // we reached a premature end
+ if ($cursor === false) {
+ $cursor = $size;
+ $value_end = $cursor;
+ }
+
+ $value = substr($string, $value_begin, $value_end - $value_begin);
+ if ($value === false) {
+ $value = '';
+ }
+ $array[$key] = $this->parseData($value);
+ $cursor++;
+ } else {
+ // boolattr
+ if ($key !== '') {
+ $array[$key] = $key;
+ } else {
+ // purely theoretical
+ if ($e) {
+ $e->send(E_ERROR, 'Lexer: Missing attribute key');
+ }
+ }
+ }
+ }
+ return $array;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Lexer/PH5P.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Lexer/PH5P.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Lexer/PH5P.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Lexer/PH5P.php
index 48b5f9a..ff4fa21 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Lexer/PH5P.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Lexer/PH5P.php
@@ -1,4788 +1,4787 @@
-<?php
-
-/**
- * Experimental HTML5-based parser using Jeroen van der Meer's PH5P library.
- * Occupies space in the HTML5 pseudo-namespace, which may cause conflicts.
- *
- * @note
- * Recent changes to PHP's DOM extension have resulted in some fatal
- * error conditions with the original version of PH5P. Pending changes,
- * this lexer will punt to DirectLex if DOM throws an exception.
- */
-
-class HTMLPurifier_Lexer_PH5P extends HTMLPurifier_Lexer_DOMLex
-{
- /**
- * @param string $html
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return HTMLPurifier_Token[]
- */
- public function tokenizeHTML($html, $config, $context)
- {
- $new_html = $this->normalize($html, $config, $context);
- $new_html = $this->wrapHTML($new_html, $config, $context);
- try {
- $parser = new HTML5($new_html);
- $doc = $parser->save();
- } catch (DOMException $e) {
- // Uh oh, it failed. Punt to DirectLex.
- $lexer = new HTMLPurifier_Lexer_DirectLex();
- $context->register('PH5PError', $e); // save the error, so we can detect it
- return $lexer->tokenizeHTML($html, $config, $context); // use original HTML
- }
- $tokens = array();
- $this->tokenizeDOM(
- $doc->getElementsByTagName('html')->item(0)-> // <html>
- getElementsByTagName('body')->item(0)-> // <body>
- getElementsByTagName('div')->item(0) // <div>
- ,
- $tokens
- );
- return $tokens;
- }
-}
-
-/*
-
-Copyright 2007 Jeroen van der Meer <http://jero.net/>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*/
-
-class HTML5
-{
- private $data;
- private $char;
- private $EOF;
- private $state;
- private $tree;
- private $token;
- private $content_model;
- private $escape = false;
- private $entities = array(
- 'AElig;',
- 'AElig',
- 'AMP;',
- 'AMP',
- 'Aacute;',
- 'Aacute',
- 'Acirc;',
- 'Acirc',
- 'Agrave;',
- 'Agrave',
- 'Alpha;',
- 'Aring;',
- 'Aring',
- 'Atilde;',
- 'Atilde',
- 'Auml;',
- 'Auml',
- 'Beta;',
- 'COPY;',
- 'COPY',
- 'Ccedil;',
- 'Ccedil',
- 'Chi;',
- 'Dagger;',
- 'Delta;',
- 'ETH;',
- 'ETH',
- 'Eacute;',
- 'Eacute',
- 'Ecirc;',
- 'Ecirc',
- 'Egrave;',
- 'Egrave',
- 'Epsilon;',
- 'Eta;',
- 'Euml;',
- 'Euml',
- 'GT;',
- 'GT',
- 'Gamma;',
- 'Iacute;',
- 'Iacute',
- 'Icirc;',
- 'Icirc',
- 'Igrave;',
- 'Igrave',
- 'Iota;',
- 'Iuml;',
- 'Iuml',
- 'Kappa;',
- 'LT;',
- 'LT',
- 'Lambda;',
- 'Mu;',
- 'Ntilde;',
- 'Ntilde',
- 'Nu;',
- 'OElig;',
- 'Oacute;',
- 'Oacute',
- 'Ocirc;',
- 'Ocirc',
- 'Ograve;',
- 'Ograve',
- 'Omega;',
- 'Omicron;',
- 'Oslash;',
- 'Oslash',
- 'Otilde;',
- 'Otilde',
- 'Ouml;',
- 'Ouml',
- 'Phi;',
- 'Pi;',
- 'Prime;',
- 'Psi;',
- 'QUOT;',
- 'QUOT',
- 'REG;',
- 'REG',
- 'Rho;',
- 'Scaron;',
- 'Sigma;',
- 'THORN;',
- 'THORN',
- 'TRADE;',
- 'Tau;',
- 'Theta;',
- 'Uacute;',
- 'Uacute',
- 'Ucirc;',
- 'Ucirc',
- 'Ugrave;',
- 'Ugrave',
- 'Upsilon;',
- 'Uuml;',
- 'Uuml',
- 'Xi;',
- 'Yacute;',
- 'Yacute',
- 'Yuml;',
- 'Zeta;',
- 'aacute;',
- 'aacute',
- 'acirc;',
- 'acirc',
- 'acute;',
- 'acute',
- 'aelig;',
- 'aelig',
- 'agrave;',
- 'agrave',
- 'alefsym;',
- 'alpha;',
- 'amp;',
- 'amp',
- 'and;',
- 'ang;',
- 'apos;',
- 'aring;',
- 'aring',
- 'asymp;',
- 'atilde;',
- 'atilde',
- 'auml;',
- 'auml',
- 'bdquo;',
- 'beta;',
- 'brvbar;',
- 'brvbar',
- 'bull;',
- 'cap;',
- 'ccedil;',
- 'ccedil',
- 'cedil;',
- 'cedil',
- 'cent;',
- 'cent',
- 'chi;',
- 'circ;',
- 'clubs;',
- 'cong;',
- 'copy;',
- 'copy',
- 'crarr;',
- 'cup;',
- 'curren;',
- 'curren',
- 'dArr;',
- 'dagger;',
- 'darr;',
- 'deg;',
- 'deg',
- 'delta;',
- 'diams;',
- 'divide;',
- 'divide',
- 'eacute;',
- 'eacute',
- 'ecirc;',
- 'ecirc',
- 'egrave;',
- 'egrave',
- 'empty;',
- 'emsp;',
- 'ensp;',
- 'epsilon;',
- 'equiv;',
- 'eta;',
- 'eth;',
- 'eth',
- 'euml;',
- 'euml',
- 'euro;',
- 'exist;',
- 'fnof;',
- 'forall;',
- 'frac12;',
- 'frac12',
- 'frac14;',
- 'frac14',
- 'frac34;',
- 'frac34',
- 'frasl;',
- 'gamma;',
- 'ge;',
- 'gt;',
- 'gt',
- 'hArr;',
- 'harr;',
- 'hearts;',
- 'hellip;',
- 'iacute;',
- 'iacute',
- 'icirc;',
- 'icirc',
- 'iexcl;',
- 'iexcl',
- 'igrave;',
- 'igrave',
- 'image;',
- 'infin;',
- 'int;',
- 'iota;',
- 'iquest;',
- 'iquest',
- 'isin;',
- 'iuml;',
- 'iuml',
- 'kappa;',
- 'lArr;',
- 'lambda;',
- 'lang;',
- 'laquo;',
- 'laquo',
- 'larr;',
- 'lceil;',
- 'ldquo;',
- 'le;',
- 'lfloor;',
- 'lowast;',
- 'loz;',
- 'lrm;',
- 'lsaquo;',
- 'lsquo;',
- 'lt;',
- 'lt',
- 'macr;',
- 'macr',
- 'mdash;',
- 'micro;',
- 'micro',
- 'middot;',
- 'middot',
- 'minus;',
- 'mu;',
- 'nabla;',
- 'nbsp;',
- 'nbsp',
- 'ndash;',
- 'ne;',
- 'ni;',
- 'not;',
- 'not',
- 'notin;',
- 'nsub;',
- 'ntilde;',
- 'ntilde',
- 'nu;',
- 'oacute;',
- 'oacute',
- 'ocirc;',
- 'ocirc',
- 'oelig;',
- 'ograve;',
- 'ograve',
- 'oline;',
- 'omega;',
- 'omicron;',
- 'oplus;',
- 'or;',
- 'ordf;',
- 'ordf',
- 'ordm;',
- 'ordm',
- 'oslash;',
- 'oslash',
- 'otilde;',
- 'otilde',
- 'otimes;',
- 'ouml;',
- 'ouml',
- 'para;',
- 'para',
- 'part;',
- 'permil;',
- 'perp;',
- 'phi;',
- 'pi;',
- 'piv;',
- 'plusmn;',
- 'plusmn',
- 'pound;',
- 'pound',
- 'prime;',
- 'prod;',
- 'prop;',
- 'psi;',
- 'quot;',
- 'quot',
- 'rArr;',
- 'radic;',
- 'rang;',
- 'raquo;',
- 'raquo',
- 'rarr;',
- 'rceil;',
- 'rdquo;',
- 'real;',
- 'reg;',
- 'reg',
- 'rfloor;',
- 'rho;',
- 'rlm;',
- 'rsaquo;',
- 'rsquo;',
- 'sbquo;',
- 'scaron;',
- 'sdot;',
- 'sect;',
- 'sect',
- 'shy;',
- 'shy',
- 'sigma;',
- 'sigmaf;',
- 'sim;',
- 'spades;',
- 'sub;',
- 'sube;',
- 'sum;',
- 'sup1;',
- 'sup1',
- 'sup2;',
- 'sup2',
- 'sup3;',
- 'sup3',
- 'sup;',
- 'supe;',
- 'szlig;',
- 'szlig',
- 'tau;',
- 'there4;',
- 'theta;',
- 'thetasym;',
- 'thinsp;',
- 'thorn;',
- 'thorn',
- 'tilde;',
- 'times;',
- 'times',
- 'trade;',
- 'uArr;',
- 'uacute;',
- 'uacute',
- 'uarr;',
- 'ucirc;',
- 'ucirc',
- 'ugrave;',
- 'ugrave',
- 'uml;',
- 'uml',
- 'upsih;',
- 'upsilon;',
- 'uuml;',
- 'uuml',
- 'weierp;',
- 'xi;',
- 'yacute;',
- 'yacute',
- 'yen;',
- 'yen',
- 'yuml;',
- 'yuml',
- 'zeta;',
- 'zwj;',
- 'zwnj;'
- );
-
- const PCDATA = 0;
- const RCDATA = 1;
- const CDATA = 2;
- const PLAINTEXT = 3;
-
- const DOCTYPE = 0;
- const STARTTAG = 1;
- const ENDTAG = 2;
- const COMMENT = 3;
- const CHARACTR = 4;
- const EOF = 5;
-
- public function __construct($data)
- {
- $this->data = $data;
- $this->char = -1;
- $this->EOF = strlen($data);
- $this->tree = new HTML5TreeConstructer;
- $this->content_model = self::PCDATA;
-
- $this->state = 'data';
-
- while ($this->state !== null) {
- $this->{$this->state . 'State'}();
- }
- }
-
- public function save()
- {
- return $this->tree->save();
- }
-
- private function char()
- {
- return ($this->char < $this->EOF)
- ? $this->data[$this->char]
- : false;
- }
-
- private function character($s, $l = 0)
- {
- if ($s + $l < $this->EOF) {
- if ($l === 0) {
- return $this->data[$s];
- } else {
- return substr($this->data, $s, $l);
- }
- }
- }
-
- private function characters($char_class, $start)
- {
- return preg_replace('#^([' . $char_class . ']+).*#s', '\\1', substr($this->data, $start));
- }
-
- private function dataState()
- {
- // Consume the next input character
- $this->char++;
- $char = $this->char();
-
- if ($char === '&' && ($this->content_model === self::PCDATA || $this->content_model === self::RCDATA)) {
- /* U+0026 AMPERSAND (&)
- When the content model flag is set to one of the PCDATA or RCDATA
- states: switch to the entity data state. Otherwise: treat it as per
- the "anything else" entry below. */
- $this->state = 'entityData';
-
- } elseif ($char === '-') {
- /* If the content model flag is set to either the RCDATA state or
- the CDATA state, and the escape flag is false, and there are at
- least three characters before this one in the input stream, and the
- last four characters in the input stream, including this one, are
- U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS,
- and U+002D HYPHEN-MINUS ("<!--"), then set the escape flag to true. */
- if (($this->content_model === self::RCDATA || $this->content_model ===
- self::CDATA) && $this->escape === false &&
- $this->char >= 3 && $this->character($this->char - 4, 4) === '<!--'
- ) {
- $this->escape = true;
- }
-
- /* In any case, emit the input character as a character token. Stay
- in the data state. */
- $this->emitToken(
- array(
- 'type' => self::CHARACTR,
- 'data' => $char
- )
- );
-
- /* U+003C LESS-THAN SIGN (<) */
- } elseif ($char === '<' && ($this->content_model === self::PCDATA ||
- (($this->content_model === self::RCDATA ||
- $this->content_model === self::CDATA) && $this->escape === false))
- ) {
- /* When the content model flag is set to the PCDATA state: switch
- to the tag open state.
-
- When the content model flag is set to either the RCDATA state or
- the CDATA state and the escape flag is false: switch to the tag
- open state.
-
- Otherwise: treat it as per the "anything else" entry below. */
- $this->state = 'tagOpen';
-
- /* U+003E GREATER-THAN SIGN (>) */
- } elseif ($char === '>') {
- /* If the content model flag is set to either the RCDATA state or
- the CDATA state, and the escape flag is true, and the last three
- characters in the input stream including this one are U+002D
- HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN ("-->"),
- set the escape flag to false. */
- if (($this->content_model === self::RCDATA ||
- $this->content_model === self::CDATA) && $this->escape === true &&
- $this->character($this->char, 3) === '-->'
- ) {
- $this->escape = false;
- }
-
- /* In any case, emit the input character as a character token.
- Stay in the data state. */
- $this->emitToken(
- array(
- 'type' => self::CHARACTR,
- 'data' => $char
- )
- );
-
- } elseif ($this->char === $this->EOF) {
- /* EOF
- Emit an end-of-file token. */
- $this->EOF();
-
- } elseif ($this->content_model === self::PLAINTEXT) {
- /* When the content model flag is set to the PLAINTEXT state
- THIS DIFFERS GREATLY FROM THE SPEC: Get the remaining characters of
- the text and emit it as a character token. */
- $this->emitToken(
- array(
- 'type' => self::CHARACTR,
- 'data' => substr($this->data, $this->char)
- )
- );
-
- $this->EOF();
-
- } else {
- /* Anything else
- THIS DIFFERS GREATLY FROM THE SPEC: Get as many character that
- otherwise would also be treated as a character token and emit it
- as a single character token. Stay in the data state. */
- $len = strcspn($this->data, '<&', $this->char);
- $char = substr($this->data, $this->char, $len);
- $this->char += $len - 1;
-
- $this->emitToken(
- array(
- 'type' => self::CHARACTR,
- 'data' => $char
- )
- );
-
- $this->state = 'data';
- }
- }
-
- private function entityDataState()
- {
- // Attempt to consume an entity.
- $entity = $this->entity();
-
- // If nothing is returned, emit a U+0026 AMPERSAND character token.
- // Otherwise, emit the character token that was returned.
- $char = (!$entity) ? '&' : $entity;
- $this->emitToken(
- array(
- 'type' => self::CHARACTR,
- 'data' => $char
- )
- );
-
- // Finally, switch to the data state.
- $this->state = 'data';
- }
-
- private function tagOpenState()
- {
- switch ($this->content_model) {
- case self::RCDATA:
- case self::CDATA:
- /* If the next input character is a U+002F SOLIDUS (/) character,
- consume it and switch to the close tag open state. If the next
- input character is not a U+002F SOLIDUS (/) character, emit a
- U+003C LESS-THAN SIGN character token and switch to the data
- state to process the next input character. */
- if ($this->character($this->char + 1) === '/') {
- $this->char++;
- $this->state = 'closeTagOpen';
-
- } else {
- $this->emitToken(
- array(
- 'type' => self::CHARACTR,
- 'data' => '<'
- )
- );
-
- $this->state = 'data';
- }
- break;
-
- case self::PCDATA:
- // If the content model flag is set to the PCDATA state
- // Consume the next input character:
- $this->char++;
- $char = $this->char();
-
- if ($char === '!') {
- /* U+0021 EXCLAMATION MARK (!)
- Switch to the markup declaration open state. */
- $this->state = 'markupDeclarationOpen';
-
- } elseif ($char === '/') {
- /* U+002F SOLIDUS (/)
- Switch to the close tag open state. */
- $this->state = 'closeTagOpen';
-
- } elseif (preg_match('/^[A-Za-z]$/', $char)) {
- /* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
- Create a new start tag token, set its tag name to the lowercase
- version of the input character (add 0x0020 to the character's code
- point), then switch to the tag name state. (Don't emit the token
- yet; further details will be filled in before it is emitted.) */
- $this->token = array(
- 'name' => strtolower($char),
- 'type' => self::STARTTAG,
- 'attr' => array()
- );
-
- $this->state = 'tagName';
-
- } elseif ($char === '>') {
- /* U+003E GREATER-THAN SIGN (>)
- Parse error. Emit a U+003C LESS-THAN SIGN character token and a
- U+003E GREATER-THAN SIGN character token. Switch to the data state. */
- $this->emitToken(
- array(
- 'type' => self::CHARACTR,
- 'data' => '<>'
- )
- );
-
- $this->state = 'data';
-
- } elseif ($char === '?') {
- /* U+003F QUESTION MARK (?)
- Parse error. Switch to the bogus comment state. */
- $this->state = 'bogusComment';
-
- } else {
- /* Anything else
- Parse error. Emit a U+003C LESS-THAN SIGN character token and
- reconsume the current input character in the data state. */
- $this->emitToken(
- array(
- 'type' => self::CHARACTR,
- 'data' => '<'
- )
- );
-
- $this->char--;
- $this->state = 'data';
- }
- break;
- }
- }
-
- private function closeTagOpenState()
- {
- $next_node = strtolower($this->characters('A-Za-z', $this->char + 1));
- $the_same = count($this->tree->stack) > 0 && $next_node === end($this->tree->stack)->nodeName;
-
- if (($this->content_model === self::RCDATA || $this->content_model === self::CDATA) &&
- (!$the_same || ($the_same && (!preg_match(
- '/[\t\n\x0b\x0c >\/]/',
- $this->character($this->char + 1 + strlen($next_node))
- ) || $this->EOF === $this->char)))
- ) {
- /* If the content model flag is set to the RCDATA or CDATA states then
- examine the next few characters. If they do not match the tag name of
- the last start tag token emitted (case insensitively), or if they do but
- they are not immediately followed by one of the following characters:
- * U+0009 CHARACTER TABULATION
- * U+000A LINE FEED (LF)
- * U+000B LINE TABULATION
- * U+000C FORM FEED (FF)
- * U+0020 SPACE
- * U+003E GREATER-THAN SIGN (>)
- * U+002F SOLIDUS (/)
- * EOF
- ...then there is a parse error. Emit a U+003C LESS-THAN SIGN character
- token, a U+002F SOLIDUS character token, and switch to the data state
- to process the next input character. */
- $this->emitToken(
- array(
- 'type' => self::CHARACTR,
- 'data' => '</'
- )
- );
-
- $this->state = 'data';
-
- } else {
- /* Otherwise, if the content model flag is set to the PCDATA state,
- or if the next few characters do match that tag name, consume the
- next input character: */
- $this->char++;
- $char = $this->char();
-
- if (preg_match('/^[A-Za-z]$/', $char)) {
- /* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
- Create a new end tag token, set its tag name to the lowercase version
- of the input character (add 0x0020 to the character's code point), then
- switch to the tag name state. (Don't emit the token yet; further details
- will be filled in before it is emitted.) */
- $this->token = array(
- 'name' => strtolower($char),
- 'type' => self::ENDTAG
- );
-
- $this->state = 'tagName';
-
- } elseif ($char === '>') {
- /* U+003E GREATER-THAN SIGN (>)
- Parse error. Switch to the data state. */
- $this->state = 'data';
-
- } elseif ($this->char === $this->EOF) {
- /* EOF
- Parse error. Emit a U+003C LESS-THAN SIGN character token and a U+002F
- SOLIDUS character token. Reconsume the EOF character in the data state. */
- $this->emitToken(
- array(
- 'type' => self::CHARACTR,
- 'data' => '</'
- )
- );
-
- $this->char--;
- $this->state = 'data';
-
- } else {
- /* Parse error. Switch to the bogus comment state. */
- $this->state = 'bogusComment';
- }
- }
- }
-
- private function tagNameState()
- {
- // Consume the next input character:
- $this->char++;
- $char = $this->character($this->char);
-
- if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- /* U+0009 CHARACTER TABULATION
- U+000A LINE FEED (LF)
- U+000B LINE TABULATION
- U+000C FORM FEED (FF)
- U+0020 SPACE
- Switch to the before attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } elseif ($char === '>') {
- /* U+003E GREATER-THAN SIGN (>)
- Emit the current tag token. Switch to the data state. */
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } elseif ($this->char === $this->EOF) {
- /* EOF
- Parse error. Emit the current tag token. Reconsume the EOF
- character in the data state. */
- $this->emitToken($this->token);
-
- $this->char--;
- $this->state = 'data';
-
- } elseif ($char === '/') {
- /* U+002F SOLIDUS (/)
- Parse error unless this is a permitted slash. Switch to the before
- attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } else {
- /* Anything else
- Append the current input character to the current tag token's tag name.
- Stay in the tag name state. */
- $this->token['name'] .= strtolower($char);
- $this->state = 'tagName';
- }
- }
-
- private function beforeAttributeNameState()
- {
- // Consume the next input character:
- $this->char++;
- $char = $this->character($this->char);
-
- if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- /* U+0009 CHARACTER TABULATION
- U+000A LINE FEED (LF)
- U+000B LINE TABULATION
- U+000C FORM FEED (FF)
- U+0020 SPACE
- Stay in the before attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } elseif ($char === '>') {
- /* U+003E GREATER-THAN SIGN (>)
- Emit the current tag token. Switch to the data state. */
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } elseif ($char === '/') {
- /* U+002F SOLIDUS (/)
- Parse error unless this is a permitted slash. Stay in the before
- attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } elseif ($this->char === $this->EOF) {
- /* EOF
- Parse error. Emit the current tag token. Reconsume the EOF
- character in the data state. */
- $this->emitToken($this->token);
-
- $this->char--;
- $this->state = 'data';
-
- } else {
- /* Anything else
- Start a new attribute in the current tag token. Set that attribute's
- name to the current input character, and its value to the empty string.
- Switch to the attribute name state. */
- $this->token['attr'][] = array(
- 'name' => strtolower($char),
- 'value' => null
- );
-
- $this->state = 'attributeName';
- }
- }
-
- private function attributeNameState()
- {
- // Consume the next input character:
- $this->char++;
- $char = $this->character($this->char);
-
- if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- /* U+0009 CHARACTER TABULATION
- U+000A LINE FEED (LF)
- U+000B LINE TABULATION
- U+000C FORM FEED (FF)
- U+0020 SPACE
- Stay in the before attribute name state. */
- $this->state = 'afterAttributeName';
-
- } elseif ($char === '=') {
- /* U+003D EQUALS SIGN (=)
- Switch to the before attribute value state. */
- $this->state = 'beforeAttributeValue';
-
- } elseif ($char === '>') {
- /* U+003E GREATER-THAN SIGN (>)
- Emit the current tag token. Switch to the data state. */
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } elseif ($char === '/' && $this->character($this->char + 1) !== '>') {
- /* U+002F SOLIDUS (/)
- Parse error unless this is a permitted slash. Switch to the before
- attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } elseif ($this->char === $this->EOF) {
- /* EOF
- Parse error. Emit the current tag token. Reconsume the EOF
- character in the data state. */
- $this->emitToken($this->token);
-
- $this->char--;
- $this->state = 'data';
-
- } else {
- /* Anything else
- Append the current input character to the current attribute's name.
- Stay in the attribute name state. */
- $last = count($this->token['attr']) - 1;
- $this->token['attr'][$last]['name'] .= strtolower($char);
-
- $this->state = 'attributeName';
- }
- }
-
- private function afterAttributeNameState()
- {
- // Consume the next input character:
- $this->char++;
- $char = $this->character($this->char);
-
- if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- /* U+0009 CHARACTER TABULATION
- U+000A LINE FEED (LF)
- U+000B LINE TABULATION
- U+000C FORM FEED (FF)
- U+0020 SPACE
- Stay in the after attribute name state. */
- $this->state = 'afterAttributeName';
-
- } elseif ($char === '=') {
- /* U+003D EQUALS SIGN (=)
- Switch to the before attribute value state. */
- $this->state = 'beforeAttributeValue';
-
- } elseif ($char === '>') {
- /* U+003E GREATER-THAN SIGN (>)
- Emit the current tag token. Switch to the data state. */
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } elseif ($char === '/' && $this->character($this->char + 1) !== '>') {
- /* U+002F SOLIDUS (/)
- Parse error unless this is a permitted slash. Switch to the
- before attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } elseif ($this->char === $this->EOF) {
- /* EOF
- Parse error. Emit the current tag token. Reconsume the EOF
- character in the data state. */
- $this->emitToken($this->token);
-
- $this->char--;
- $this->state = 'data';
-
- } else {
- /* Anything else
- Start a new attribute in the current tag token. Set that attribute's
- name to the current input character, and its value to the empty string.
- Switch to the attribute name state. */
- $this->token['attr'][] = array(
- 'name' => strtolower($char),
- 'value' => null
- );
-
- $this->state = 'attributeName';
- }
- }
-
- private function beforeAttributeValueState()
- {
- // Consume the next input character:
- $this->char++;
- $char = $this->character($this->char);
-
- if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- /* U+0009 CHARACTER TABULATION
- U+000A LINE FEED (LF)
- U+000B LINE TABULATION
- U+000C FORM FEED (FF)
- U+0020 SPACE
- Stay in the before attribute value state. */
- $this->state = 'beforeAttributeValue';
-
- } elseif ($char === '"') {
- /* U+0022 QUOTATION MARK (")
- Switch to the attribute value (double-quoted) state. */
- $this->state = 'attributeValueDoubleQuoted';
-
- } elseif ($char === '&') {
- /* U+0026 AMPERSAND (&)
- Switch to the attribute value (unquoted) state and reconsume
- this input character. */
- $this->char--;
- $this->state = 'attributeValueUnquoted';
-
- } elseif ($char === '\'') {
- /* U+0027 APOSTROPHE (')
- Switch to the attribute value (single-quoted) state. */
- $this->state = 'attributeValueSingleQuoted';
-
- } elseif ($char === '>') {
- /* U+003E GREATER-THAN SIGN (>)
- Emit the current tag token. Switch to the data state. */
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } else {
- /* Anything else
- Append the current input character to the current attribute's value.
- Switch to the attribute value (unquoted) state. */
- $last = count($this->token['attr']) - 1;
- $this->token['attr'][$last]['value'] .= $char;
-
- $this->state = 'attributeValueUnquoted';
- }
- }
-
- private function attributeValueDoubleQuotedState()
- {
- // Consume the next input character:
- $this->char++;
- $char = $this->character($this->char);
-
- if ($char === '"') {
- /* U+0022 QUOTATION MARK (")
- Switch to the before attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } elseif ($char === '&') {
- /* U+0026 AMPERSAND (&)
- Switch to the entity in attribute value state. */
- $this->entityInAttributeValueState('double');
-
- } elseif ($this->char === $this->EOF) {
- /* EOF
- Parse error. Emit the current tag token. Reconsume the character
- in the data state. */
- $this->emitToken($this->token);
-
- $this->char--;
- $this->state = 'data';
-
- } else {
- /* Anything else
- Append the current input character to the current attribute's value.
- Stay in the attribute value (double-quoted) state. */
- $last = count($this->token['attr']) - 1;
- $this->token['attr'][$last]['value'] .= $char;
-
- $this->state = 'attributeValueDoubleQuoted';
- }
- }
-
- private function attributeValueSingleQuotedState()
- {
- // Consume the next input character:
- $this->char++;
- $char = $this->character($this->char);
-
- if ($char === '\'') {
- /* U+0022 QUOTATION MARK (')
- Switch to the before attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } elseif ($char === '&') {
- /* U+0026 AMPERSAND (&)
- Switch to the entity in attribute value state. */
- $this->entityInAttributeValueState('single');
-
- } elseif ($this->char === $this->EOF) {
- /* EOF
- Parse error. Emit the current tag token. Reconsume the character
- in the data state. */
- $this->emitToken($this->token);
-
- $this->char--;
- $this->state = 'data';
-
- } else {
- /* Anything else
- Append the current input character to the current attribute's value.
- Stay in the attribute value (single-quoted) state. */
- $last = count($this->token['attr']) - 1;
- $this->token['attr'][$last]['value'] .= $char;
-
- $this->state = 'attributeValueSingleQuoted';
- }
- }
-
- private function attributeValueUnquotedState()
- {
- // Consume the next input character:
- $this->char++;
- $char = $this->character($this->char);
-
- if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- /* U+0009 CHARACTER TABULATION
- U+000A LINE FEED (LF)
- U+000B LINE TABULATION
- U+000C FORM FEED (FF)
- U+0020 SPACE
- Switch to the before attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } elseif ($char === '&') {
- /* U+0026 AMPERSAND (&)
- Switch to the entity in attribute value state. */
- $this->entityInAttributeValueState();
-
- } elseif ($char === '>') {
- /* U+003E GREATER-THAN SIGN (>)
- Emit the current tag token. Switch to the data state. */
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } else {
- /* Anything else
- Append the current input character to the current attribute's value.
- Stay in the attribute value (unquoted) state. */
- $last = count($this->token['attr']) - 1;
- $this->token['attr'][$last]['value'] .= $char;
-
- $this->state = 'attributeValueUnquoted';
- }
- }
-
- private function entityInAttributeValueState()
- {
- // Attempt to consume an entity.
- $entity = $this->entity();
-
- // If nothing is returned, append a U+0026 AMPERSAND character to the
- // current attribute's value. Otherwise, emit the character token that
- // was returned.
- $char = (!$entity)
- ? '&'
- : $entity;
-
- $last = count($this->token['attr']) - 1;
- $this->token['attr'][$last]['value'] .= $char;
- }
-
- private function bogusCommentState()
- {
- /* Consume every character up to the first U+003E GREATER-THAN SIGN
- character (>) or the end of the file (EOF), whichever comes first. Emit
- a comment token whose data is the concatenation of all the characters
- starting from and including the character that caused the state machine
- to switch into the bogus comment state, up to and including the last
- consumed character before the U+003E character, if any, or up to the
- end of the file otherwise. (If the comment was started by the end of
- the file (EOF), the token is empty.) */
- $data = $this->characters('^>', $this->char);
- $this->emitToken(
- array(
- 'data' => $data,
- 'type' => self::COMMENT
- )
- );
-
- $this->char += strlen($data);
-
- /* Switch to the data state. */
- $this->state = 'data';
-
- /* If the end of the file was reached, reconsume the EOF character. */
- if ($this->char === $this->EOF) {
- $this->char = $this->EOF - 1;
- }
- }
-
- private function markupDeclarationOpenState()
- {
- /* If the next two characters are both U+002D HYPHEN-MINUS (-)
- characters, consume those two characters, create a comment token whose
- data is the empty string, and switch to the comment state. */
- if ($this->character($this->char + 1, 2) === '--') {
- $this->char += 2;
- $this->state = 'comment';
- $this->token = array(
- 'data' => null,
- 'type' => self::COMMENT
- );
-
- /* Otherwise if the next seven chacacters are a case-insensitive match
- for the word "DOCTYPE", then consume those characters and switch to the
- DOCTYPE state. */
- } elseif (strtolower($this->character($this->char + 1, 7)) === 'doctype') {
- $this->char += 7;
- $this->state = 'doctype';
-
- /* Otherwise, is is a parse error. Switch to the bogus comment state.
- The next character that is consumed, if any, is the first character
- that will be in the comment. */
- } else {
- $this->char++;
- $this->state = 'bogusComment';
- }
- }
-
- private function commentState()
- {
- /* Consume the next input character: */
- $this->char++;
- $char = $this->char();
-
- /* U+002D HYPHEN-MINUS (-) */
- if ($char === '-') {
- /* Switch to the comment dash state */
- $this->state = 'commentDash';
-
- /* EOF */
- } elseif ($this->char === $this->EOF) {
- /* Parse error. Emit the comment token. Reconsume the EOF character
- in the data state. */
- $this->emitToken($this->token);
- $this->char--;
- $this->state = 'data';
-
- /* Anything else */
- } else {
- /* Append the input character to the comment token's data. Stay in
- the comment state. */
- $this->token['data'] .= $char;
- }
- }
-
- private function commentDashState()
- {
- /* Consume the next input character: */
- $this->char++;
- $char = $this->char();
-
- /* U+002D HYPHEN-MINUS (-) */
- if ($char === '-') {
- /* Switch to the comment end state */
- $this->state = 'commentEnd';
-
- /* EOF */
- } elseif ($this->char === $this->EOF) {
- /* Parse error. Emit the comment token. Reconsume the EOF character
- in the data state. */
- $this->emitToken($this->token);
- $this->char--;
- $this->state = 'data';
-
- /* Anything else */
- } else {
- /* Append a U+002D HYPHEN-MINUS (-) character and the input
- character to the comment token's data. Switch to the comment state. */
- $this->token['data'] .= '-' . $char;
- $this->state = 'comment';
- }
- }
-
- private function commentEndState()
- {
- /* Consume the next input character: */
- $this->char++;
- $char = $this->char();
-
- if ($char === '>') {
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } elseif ($char === '-') {
- $this->token['data'] .= '-';
-
- } elseif ($this->char === $this->EOF) {
- $this->emitToken($this->token);
- $this->char--;
- $this->state = 'data';
-
- } else {
- $this->token['data'] .= '--' . $char;
- $this->state = 'comment';
- }
- }
-
- private function doctypeState()
- {
- /* Consume the next input character: */
- $this->char++;
- $char = $this->char();
-
- if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- $this->state = 'beforeDoctypeName';
-
- } else {
- $this->char--;
- $this->state = 'beforeDoctypeName';
- }
- }
-
- private function beforeDoctypeNameState()
- {
- /* Consume the next input character: */
- $this->char++;
- $char = $this->char();
-
- if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- // Stay in the before DOCTYPE name state.
-
- } elseif (preg_match('/^[a-z]$/', $char)) {
- $this->token = array(
- 'name' => strtoupper($char),
- 'type' => self::DOCTYPE,
- 'error' => true
- );
-
- $this->state = 'doctypeName';
-
- } elseif ($char === '>') {
- $this->emitToken(
- array(
- 'name' => null,
- 'type' => self::DOCTYPE,
- 'error' => true
- )
- );
-
- $this->state = 'data';
-
- } elseif ($this->char === $this->EOF) {
- $this->emitToken(
- array(
- 'name' => null,
- 'type' => self::DOCTYPE,
- 'error' => true
- )
- );
-
- $this->char--;
- $this->state = 'data';
-
- } else {
- $this->token = array(
- 'name' => $char,
- 'type' => self::DOCTYPE,
- 'error' => true
- );
-
- $this->state = 'doctypeName';
- }
- }
-
- private function doctypeNameState()
- {
- /* Consume the next input character: */
- $this->char++;
- $char = $this->char();
-
- if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- $this->state = 'AfterDoctypeName';
-
- } elseif ($char === '>') {
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } elseif (preg_match('/^[a-z]$/', $char)) {
- $this->token['name'] .= strtoupper($char);
-
- } elseif ($this->char === $this->EOF) {
- $this->emitToken($this->token);
- $this->char--;
- $this->state = 'data';
-
- } else {
- $this->token['name'] .= $char;
- }
-
- $this->token['error'] = ($this->token['name'] === 'HTML')
- ? false
- : true;
- }
-
- private function afterDoctypeNameState()
- {
- /* Consume the next input character: */
- $this->char++;
- $char = $this->char();
-
- if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- // Stay in the DOCTYPE name state.
-
- } elseif ($char === '>') {
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } elseif ($this->char === $this->EOF) {
- $this->emitToken($this->token);
- $this->char--;
- $this->state = 'data';
-
- } else {
- $this->token['error'] = true;
- $this->state = 'bogusDoctype';
- }
- }
-
- private function bogusDoctypeState()
- {
- /* Consume the next input character: */
- $this->char++;
- $char = $this->char();
-
- if ($char === '>') {
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } elseif ($this->char === $this->EOF) {
- $this->emitToken($this->token);
- $this->char--;
- $this->state = 'data';
-
- } else {
- // Stay in the bogus DOCTYPE state.
- }
- }
-
- private function entity()
- {
- $start = $this->char;
-
- // This section defines how to consume an entity. This definition is
- // used when parsing entities in text and in attributes.
-
- // The behaviour depends on the identity of the next character (the
- // one immediately after the U+0026 AMPERSAND character):
-
- switch ($this->character($this->char + 1)) {
- // U+0023 NUMBER SIGN (#)
- case '#':
-
- // The behaviour further depends on the character after the
- // U+0023 NUMBER SIGN:
- switch ($this->character($this->char + 1)) {
- // U+0078 LATIN SMALL LETTER X
- // U+0058 LATIN CAPITAL LETTER X
- case 'x':
- case 'X':
- // Follow the steps below, but using the range of
- // characters U+0030 DIGIT ZERO through to U+0039 DIGIT
- // NINE, U+0061 LATIN SMALL LETTER A through to U+0066
- // LATIN SMALL LETTER F, and U+0041 LATIN CAPITAL LETTER
- // A, through to U+0046 LATIN CAPITAL LETTER F (in other
- // words, 0-9, A-F, a-f).
- $char = 1;
- $char_class = '0-9A-Fa-f';
- break;
-
- // Anything else
- default:
- // Follow the steps below, but using the range of
- // characters U+0030 DIGIT ZERO through to U+0039 DIGIT
- // NINE (i.e. just 0-9).
- $char = 0;
- $char_class = '0-9';
- break;
- }
-
- // Consume as many characters as match the range of characters
- // given above.
- $this->char++;
- $e_name = $this->characters($char_class, $this->char + $char + 1);
- $entity = $this->character($start, $this->char);
- $cond = strlen($e_name) > 0;
-
- // The rest of the parsing happens bellow.
- break;
-
- // Anything else
- default:
- // Consume the maximum number of characters possible, with the
- // consumed characters case-sensitively matching one of the
- // identifiers in the first column of the entities table.
- $e_name = $this->characters('0-9A-Za-z;', $this->char + 1);
- $len = strlen($e_name);
-
- for ($c = 1; $c <= $len; $c++) {
- $id = substr($e_name, 0, $c);
- $this->char++;
-
- if (in_array($id, $this->entities)) {
- if ($e_name[$c - 1] !== ';') {
- if ($c < $len && $e_name[$c] == ';') {
- $this->char++; // consume extra semicolon
- }
- }
- $entity = $id;
- break;
- }
- }
-
- $cond = isset($entity);
- // The rest of the parsing happens bellow.
- break;
- }
-
- if (!$cond) {
- // If no match can be made, then this is a parse error. No
- // characters are consumed, and nothing is returned.
- $this->char = $start;
- return false;
- }
-
- // Return a character token for the character corresponding to the
- // entity name (as given by the second column of the entities table).
- return html_entity_decode('&' . $entity . ';', ENT_QUOTES, 'UTF-8');
- }
-
- private function emitToken($token)
- {
- $emit = $this->tree->emitToken($token);
-
- if (is_int($emit)) {
- $this->content_model = $emit;
-
- } elseif ($token['type'] === self::ENDTAG) {
- $this->content_model = self::PCDATA;
- }
- }
-
- private function EOF()
- {
- $this->state = null;
- $this->tree->emitToken(
- array(
- 'type' => self::EOF
- )
- );
- }
-}
-
-class HTML5TreeConstructer
-{
- public $stack = array();
-
- private $phase;
- private $mode;
- private $dom;
- private $foster_parent = null;
- private $a_formatting = array();
-
- private $head_pointer = null;
- private $form_pointer = null;
-
- private $scoping = array('button', 'caption', 'html', 'marquee', 'object', 'table', 'td', 'th');
- private $formatting = array(
- 'a',
- 'b',
- 'big',
- 'em',
- 'font',
- 'i',
- 'nobr',
- 's',
- 'small',
- 'strike',
- 'strong',
- 'tt',
- 'u'
- );
- private $special = array(
- 'address',
- 'area',
- 'base',
- 'basefont',
- 'bgsound',
- 'blockquote',
- 'body',
- 'br',
- 'center',
- 'col',
- 'colgroup',
- 'dd',
- 'dir',
- 'div',
- 'dl',
- 'dt',
- 'embed',
- 'fieldset',
- 'form',
- 'frame',
- 'frameset',
- 'h1',
- 'h2',
- 'h3',
- 'h4',
- 'h5',
- 'h6',
- 'head',
- 'hr',
- 'iframe',
- 'image',
- 'img',
- 'input',
- 'isindex',
- 'li',
- 'link',
- 'listing',
- 'menu',
- 'meta',
- 'noembed',
- 'noframes',
- 'noscript',
- 'ol',
- 'optgroup',
- 'option',
- 'p',
- 'param',
- 'plaintext',
- 'pre',
- 'script',
- 'select',
- 'spacer',
- 'style',
- 'tbody',
- 'textarea',
- 'tfoot',
- 'thead',
- 'title',
- 'tr',
- 'ul',
- 'wbr'
- );
-
- // The different phases.
- const INIT_PHASE = 0;
- const ROOT_PHASE = 1;
- const MAIN_PHASE = 2;
- const END_PHASE = 3;
-
- // The different insertion modes for the main phase.
- const BEFOR_HEAD = 0;
- const IN_HEAD = 1;
- const AFTER_HEAD = 2;
- const IN_BODY = 3;
- const IN_TABLE = 4;
- const IN_CAPTION = 5;
- const IN_CGROUP = 6;
- const IN_TBODY = 7;
- const IN_ROW = 8;
- const IN_CELL = 9;
- const IN_SELECT = 10;
- const AFTER_BODY = 11;
- const IN_FRAME = 12;
- const AFTR_FRAME = 13;
-
- // The different types of elements.
- const SPECIAL = 0;
- const SCOPING = 1;
- const FORMATTING = 2;
- const PHRASING = 3;
-
- const MARKER = 0;
-
- public function __construct()
- {
- $this->phase = self::INIT_PHASE;
- $this->mode = self::BEFOR_HEAD;
- $this->dom = new DOMDocument;
-
- $this->dom->encoding = 'UTF-8';
- $this->dom->preserveWhiteSpace = true;
- $this->dom->substituteEntities = true;
- $this->dom->strictErrorChecking = false;
- }
-
- // Process tag tokens
- public function emitToken($token)
- {
- switch ($this->phase) {
- case self::INIT_PHASE:
- return $this->initPhase($token);
- break;
- case self::ROOT_PHASE:
- return $this->rootElementPhase($token);
- break;
- case self::MAIN_PHASE:
- return $this->mainPhase($token);
- break;
- case self::END_PHASE :
- return $this->trailingEndPhase($token);
- break;
- }
- }
-
- private function initPhase($token)
- {
- /* Initially, the tree construction stage must handle each token
- emitted from the tokenisation stage as follows: */
-
- /* A DOCTYPE token that is marked as being in error
- A comment token
- A start tag token
- An end tag token
- A character token that is not one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE
- An end-of-file token */
- if ((isset($token['error']) && $token['error']) ||
- $token['type'] === HTML5::COMMENT ||
- $token['type'] === HTML5::STARTTAG ||
- $token['type'] === HTML5::ENDTAG ||
- $token['type'] === HTML5::EOF ||
- ($token['type'] === HTML5::CHARACTR && isset($token['data']) &&
- !preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data']))
- ) {
- /* This specification does not define how to handle this case. In
- particular, user agents may ignore the entirety of this specification
- altogether for such documents, and instead invoke special parse modes
- with a greater emphasis on backwards compatibility. */
-
- $this->phase = self::ROOT_PHASE;
- return $this->rootElementPhase($token);
-
- /* A DOCTYPE token marked as being correct */
- } elseif (isset($token['error']) && !$token['error']) {
- /* Append a DocumentType node to the Document node, with the name
- attribute set to the name given in the DOCTYPE token (which will be
- "HTML"), and the other attributes specific to DocumentType objects
- set to null, empty lists, or the empty string as appropriate. */
- $doctype = new DOMDocumentType(null, null, 'HTML');
-
- /* Then, switch to the root element phase of the tree construction
- stage. */
- $this->phase = self::ROOT_PHASE;
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE */
- } elseif (isset($token['data']) && preg_match(
- '/^[\t\n\x0b\x0c ]+$/',
- $token['data']
- )
- ) {
- /* Append that character to the Document node. */
- $text = $this->dom->createTextNode($token['data']);
- $this->dom->appendChild($text);
- }
- }
-
- private function rootElementPhase($token)
- {
- /* After the initial phase, as each token is emitted from the tokenisation
- stage, it must be processed as described in this section. */
-
- /* A DOCTYPE token */
- if ($token['type'] === HTML5::DOCTYPE) {
- // Parse error. Ignore the token.
-
- /* A comment token */
- } elseif ($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the Document object with the data
- attribute set to the data given in the comment token. */
- $comment = $this->dom->createComment($token['data']);
- $this->dom->appendChild($comment);
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE */
- } elseif ($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
- ) {
- /* Append that character to the Document node. */
- $text = $this->dom->createTextNode($token['data']);
- $this->dom->appendChild($text);
-
- /* A character token that is not one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED
- (FF), or U+0020 SPACE
- A start tag token
- An end tag token
- An end-of-file token */
- } elseif (($token['type'] === HTML5::CHARACTR &&
- !preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) ||
- $token['type'] === HTML5::STARTTAG ||
- $token['type'] === HTML5::ENDTAG ||
- $token['type'] === HTML5::EOF
- ) {
- /* Create an HTMLElement node with the tag name html, in the HTML
- namespace. Append it to the Document object. Switch to the main
- phase and reprocess the current token. */
- $html = $this->dom->createElement('html');
- $this->dom->appendChild($html);
- $this->stack[] = $html;
-
- $this->phase = self::MAIN_PHASE;
- return $this->mainPhase($token);
- }
- }
-
- private function mainPhase($token)
- {
- /* Tokens in the main phase must be handled as follows: */
-
- /* A DOCTYPE token */
- if ($token['type'] === HTML5::DOCTYPE) {
- // Parse error. Ignore the token.
-
- /* A start tag token with the tag name "html" */
- } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'html') {
- /* If this start tag token was not the first start tag token, then
- it is a parse error. */
-
- /* For each attribute on the token, check to see if the attribute
- is already present on the top element of the stack of open elements.
- If it is not, add the attribute and its corresponding value to that
- element. */
- foreach ($token['attr'] as $attr) {
- if (!$this->stack[0]->hasAttribute($attr['name'])) {
- $this->stack[0]->setAttribute($attr['name'], $attr['value']);
- }
- }
-
- /* An end-of-file token */
- } elseif ($token['type'] === HTML5::EOF) {
- /* Generate implied end tags. */
- $this->generateImpliedEndTags();
-
- /* Anything else. */
- } else {
- /* Depends on the insertion mode: */
- switch ($this->mode) {
- case self::BEFOR_HEAD:
- return $this->beforeHead($token);
- break;
- case self::IN_HEAD:
- return $this->inHead($token);
- break;
- case self::AFTER_HEAD:
- return $this->afterHead($token);
- break;
- case self::IN_BODY:
- return $this->inBody($token);
- break;
- case self::IN_TABLE:
- return $this->inTable($token);
- break;
- case self::IN_CAPTION:
- return $this->inCaption($token);
- break;
- case self::IN_CGROUP:
- return $this->inColumnGroup($token);
- break;
- case self::IN_TBODY:
- return $this->inTableBody($token);
- break;
- case self::IN_ROW:
- return $this->inRow($token);
- break;
- case self::IN_CELL:
- return $this->inCell($token);
- break;
- case self::IN_SELECT:
- return $this->inSelect($token);
- break;
- case self::AFTER_BODY:
- return $this->afterBody($token);
- break;
- case self::IN_FRAME:
- return $this->inFrameset($token);
- break;
- case self::AFTR_FRAME:
- return $this->afterFrameset($token);
- break;
- case self::END_PHASE:
- return $this->trailingEndPhase($token);
- break;
- }
- }
- }
-
- private function beforeHead($token)
- {
- /* Handle the token as follows: */
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE */
- if ($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
- ) {
- /* Append the character to the current node. */
- $this->insertText($token['data']);
-
- /* A comment token */
- } elseif ($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the current node with the data attribute
- set to the data given in the comment token. */
- $this->insertComment($token['data']);
-
- /* A start tag token with the tag name "head" */
- } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'head') {
- /* Create an element for the token, append the new element to the
- current node and push it onto the stack of open elements. */
- $element = $this->insertElement($token);
-
- /* Set the head element pointer to this new element node. */
- $this->head_pointer = $element;
-
- /* Change the insertion mode to "in head". */
- $this->mode = self::IN_HEAD;
-
- /* A start tag token whose tag name is one of: "base", "link", "meta",
- "script", "style", "title". Or an end tag with the tag name "html".
- Or a character token that is not one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE. Or any other start tag token */
- } elseif ($token['type'] === HTML5::STARTTAG ||
- ($token['type'] === HTML5::ENDTAG && $token['name'] === 'html') ||
- ($token['type'] === HTML5::CHARACTR && !preg_match(
- '/^[\t\n\x0b\x0c ]$/',
- $token['data']
- ))
- ) {
- /* Act as if a start tag token with the tag name "head" and no
- attributes had been seen, then reprocess the current token. */
- $this->beforeHead(
- array(
- 'name' => 'head',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- )
- );
-
- return $this->inHead($token);
-
- /* Any other end tag */
- } elseif ($token['type'] === HTML5::ENDTAG) {
- /* Parse error. Ignore the token. */
- }
- }
-
- private function inHead($token)
- {
- /* Handle the token as follows: */
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE.
-
- THIS DIFFERS FROM THE SPEC: If the current node is either a title, style
- or script element, append the character to the current node regardless
- of its content. */
- if (($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) || (
- $token['type'] === HTML5::CHARACTR && in_array(
- end($this->stack)->nodeName,
- array('title', 'style', 'script')
- ))
- ) {
- /* Append the character to the current node. */
- $this->insertText($token['data']);
-
- /* A comment token */
- } elseif ($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the current node with the data attribute
- set to the data given in the comment token. */
- $this->insertComment($token['data']);
-
- } elseif ($token['type'] === HTML5::ENDTAG &&
- in_array($token['name'], array('title', 'style', 'script'))
- ) {
- array_pop($this->stack);
- return HTML5::PCDATA;
-
- /* A start tag with the tag name "title" */
- } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'title') {
- /* Create an element for the token and append the new element to the
- node pointed to by the head element pointer, or, if that is null
- (innerHTML case), to the current node. */
- if ($this->head_pointer !== null) {
- $element = $this->insertElement($token, false);
- $this->head_pointer->appendChild($element);
-
- } else {
- $element = $this->insertElement($token);
- }
-
- /* Switch the tokeniser's content model flag to the RCDATA state. */
- return HTML5::RCDATA;
-
- /* A start tag with the tag name "style" */
- } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'style') {
- /* Create an element for the token and append the new element to the
- node pointed to by the head element pointer, or, if that is null
- (innerHTML case), to the current node. */
- if ($this->head_pointer !== null) {
- $element = $this->insertElement($token, false);
- $this->head_pointer->appendChild($element);
-
- } else {
- $this->insertElement($token);
- }
-
- /* Switch the tokeniser's content model flag to the CDATA state. */
- return HTML5::CDATA;
-
- /* A start tag with the tag name "script" */
- } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'script') {
- /* Create an element for the token. */
- $element = $this->insertElement($token, false);
- $this->head_pointer->appendChild($element);
-
- /* Switch the tokeniser's content model flag to the CDATA state. */
- return HTML5::CDATA;
-
- /* A start tag with the tag name "base", "link", or "meta" */
- } elseif ($token['type'] === HTML5::STARTTAG && in_array(
- $token['name'],
- array('base', 'link', 'meta')
- )
- ) {
- /* Create an element for the token and append the new element to the
- node pointed to by the head element pointer, or, if that is null
- (innerHTML case), to the current node. */
- if ($this->head_pointer !== null) {
- $element = $this->insertElement($token, false);
- $this->head_pointer->appendChild($element);
- array_pop($this->stack);
-
- } else {
- $this->insertElement($token);
- }
-
- /* An end tag with the tag name "head" */
- } elseif ($token['type'] === HTML5::ENDTAG && $token['name'] === 'head') {
- /* If the current node is a head element, pop the current node off
- the stack of open elements. */
- if ($this->head_pointer->isSameNode(end($this->stack))) {
- array_pop($this->stack);
-
- /* Otherwise, this is a parse error. */
- } else {
- // k
- }
-
- /* Change the insertion mode to "after head". */
- $this->mode = self::AFTER_HEAD;
-
- /* A start tag with the tag name "head" or an end tag except "html". */
- } elseif (($token['type'] === HTML5::STARTTAG && $token['name'] === 'head') ||
- ($token['type'] === HTML5::ENDTAG && $token['name'] !== 'html')
- ) {
- // Parse error. Ignore the token.
-
- /* Anything else */
- } else {
- /* If the current node is a head element, act as if an end tag
- token with the tag name "head" had been seen. */
- if ($this->head_pointer->isSameNode(end($this->stack))) {
- $this->inHead(
- array(
- 'name' => 'head',
- 'type' => HTML5::ENDTAG
- )
- );
-
- /* Otherwise, change the insertion mode to "after head". */
- } else {
- $this->mode = self::AFTER_HEAD;
- }
-
- /* Then, reprocess the current token. */
- return $this->afterHead($token);
- }
- }
-
- private function afterHead($token)
- {
- /* Handle the token as follows: */
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE */
- if ($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
- ) {
- /* Append the character to the current node. */
- $this->insertText($token['data']);
-
- /* A comment token */
- } elseif ($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the current node with the data attribute
- set to the data given in the comment token. */
- $this->insertComment($token['data']);
-
- /* A start tag token with the tag name "body" */
- } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'body') {
- /* Insert a body element for the token. */
- $this->insertElement($token);
-
- /* Change the insertion mode to "in body". */
- $this->mode = self::IN_BODY;
-
- /* A start tag token with the tag name "frameset" */
- } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'frameset') {
- /* Insert a frameset element for the token. */
- $this->insertElement($token);
-
- /* Change the insertion mode to "in frameset". */
- $this->mode = self::IN_FRAME;
-
- /* A start tag token whose tag name is one of: "base", "link", "meta",
- "script", "style", "title" */
- } elseif ($token['type'] === HTML5::STARTTAG && in_array(
- $token['name'],
- array('base', 'link', 'meta', 'script', 'style', 'title')
- )
- ) {
- /* Parse error. Switch the insertion mode back to "in head" and
- reprocess the token. */
- $this->mode = self::IN_HEAD;
- return $this->inHead($token);
-
- /* Anything else */
- } else {
- /* Act as if a start tag token with the tag name "body" and no
- attributes had been seen, and then reprocess the current token. */
- $this->afterHead(
- array(
- 'name' => 'body',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- )
- );
-
- return $this->inBody($token);
- }
- }
-
- private function inBody($token)
- {
- /* Handle the token as follows: */
-
- switch ($token['type']) {
- /* A character token */
- case HTML5::CHARACTR:
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Append the token's character to the current node. */
- $this->insertText($token['data']);
- break;
-
- /* A comment token */
- case HTML5::COMMENT:
- /* Append a Comment node to the current node with the data
- attribute set to the data given in the comment token. */
- $this->insertComment($token['data']);
- break;
-
- case HTML5::STARTTAG:
- switch ($token['name']) {
- /* A start tag token whose tag name is one of: "script",
- "style" */
- case 'script':
- case 'style':
- /* Process the token as if the insertion mode had been "in
- head". */
- return $this->inHead($token);
- break;
-
- /* A start tag token whose tag name is one of: "base", "link",
- "meta", "title" */
- case 'base':
- case 'link':
- case 'meta':
- case 'title':
- /* Parse error. Process the token as if the insertion mode
- had been "in head". */
- return $this->inHead($token);
- break;
-
- /* A start tag token with the tag name "body" */
- case 'body':
- /* Parse error. If the second element on the stack of open
- elements is not a body element, or, if the stack of open
- elements has only one node on it, then ignore the token.
- (innerHTML case) */
- if (count($this->stack) === 1 || $this->stack[1]->nodeName !== 'body') {
- // Ignore
-
- /* Otherwise, for each attribute on the token, check to see
- if the attribute is already present on the body element (the
- second element) on the stack of open elements. If it is not,
- add the attribute and its corresponding value to that
- element. */
- } else {
- foreach ($token['attr'] as $attr) {
- if (!$this->stack[1]->hasAttribute($attr['name'])) {
- $this->stack[1]->setAttribute($attr['name'], $attr['value']);
- }
- }
- }
- break;
-
- /* A start tag whose tag name is one of: "address",
- "blockquote", "center", "dir", "div", "dl", "fieldset",
- "listing", "menu", "ol", "p", "ul" */
- case 'address':
- case 'blockquote':
- case 'center':
- case 'dir':
- case 'div':
- case 'dl':
- case 'fieldset':
- case 'listing':
- case 'menu':
- case 'ol':
- case 'p':
- case 'ul':
- /* If the stack of open elements has a p element in scope,
- then act as if an end tag with the tag name p had been
- seen. */
- if ($this->elementInScope('p')) {
- $this->emitToken(
- array(
- 'name' => 'p',
- 'type' => HTML5::ENDTAG
- )
- );
- }
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
- break;
-
- /* A start tag whose tag name is "form" */
- case 'form':
- /* If the form element pointer is not null, ignore the
- token with a parse error. */
- if ($this->form_pointer !== null) {
- // Ignore.
-
- /* Otherwise: */
- } else {
- /* If the stack of open elements has a p element in
- scope, then act as if an end tag with the tag name p
- had been seen. */
- if ($this->elementInScope('p')) {
- $this->emitToken(
- array(
- 'name' => 'p',
- 'type' => HTML5::ENDTAG
- )
- );
- }
-
- /* Insert an HTML element for the token, and set the
- form element pointer to point to the element created. */
- $element = $this->insertElement($token);
- $this->form_pointer = $element;
- }
- break;
-
- /* A start tag whose tag name is "li", "dd" or "dt" */
- case 'li':
- case 'dd':
- case 'dt':
- /* If the stack of open elements has a p element in scope,
- then act as if an end tag with the tag name p had been
- seen. */
- if ($this->elementInScope('p')) {
- $this->emitToken(
- array(
- 'name' => 'p',
- 'type' => HTML5::ENDTAG
- )
- );
- }
-
- $stack_length = count($this->stack) - 1;
-
- for ($n = $stack_length; 0 <= $n; $n--) {
- /* 1. Initialise node to be the current node (the
- bottommost node of the stack). */
- $stop = false;
- $node = $this->stack[$n];
- $cat = $this->getElementCategory($node->tagName);
-
- /* 2. If node is an li, dd or dt element, then pop all
- the nodes from the current node up to node, including
- node, then stop this algorithm. */
- if ($token['name'] === $node->tagName || ($token['name'] !== 'li'
- && ($node->tagName === 'dd' || $node->tagName === 'dt'))
- ) {
- for ($x = $stack_length; $x >= $n; $x--) {
- array_pop($this->stack);
- }
-
- break;
- }
-
- /* 3. If node is not in the formatting category, and is
- not in the phrasing category, and is not an address or
- div element, then stop this algorithm. */
- if ($cat !== self::FORMATTING && $cat !== self::PHRASING &&
- $node->tagName !== 'address' && $node->tagName !== 'div'
- ) {
- break;
- }
- }
-
- /* Finally, insert an HTML element with the same tag
- name as the token's. */
- $this->insertElement($token);
- break;
-
- /* A start tag token whose tag name is "plaintext" */
- case 'plaintext':
- /* If the stack of open elements has a p element in scope,
- then act as if an end tag with the tag name p had been
- seen. */
- if ($this->elementInScope('p')) {
- $this->emitToken(
- array(
- 'name' => 'p',
- 'type' => HTML5::ENDTAG
- )
- );
- }
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- return HTML5::PLAINTEXT;
- break;
-
- /* A start tag whose tag name is one of: "h1", "h2", "h3", "h4",
- "h5", "h6" */
- case 'h1':
- case 'h2':
- case 'h3':
- case 'h4':
- case 'h5':
- case 'h6':
- /* If the stack of open elements has a p element in scope,
- then act as if an end tag with the tag name p had been seen. */
- if ($this->elementInScope('p')) {
- $this->emitToken(
- array(
- 'name' => 'p',
- 'type' => HTML5::ENDTAG
- )
- );
- }
-
- /* If the stack of open elements has in scope an element whose
- tag name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
- this is a parse error; pop elements from the stack until an
- element with one of those tag names has been popped from the
- stack. */
- while ($this->elementInScope(array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
- array_pop($this->stack);
- }
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
- break;
-
- /* A start tag whose tag name is "a" */
- case 'a':
- /* If the list of active formatting elements contains
- an element whose tag name is "a" between the end of the
- list and the last marker on the list (or the start of
- the list if there is no marker on the list), then this
- is a parse error; act as if an end tag with the tag name
- "a" had been seen, then remove that element from the list
- of active formatting elements and the stack of open
- elements if the end tag didn't already remove it (it
- might not have if the element is not in table scope). */
- $leng = count($this->a_formatting);
-
- for ($n = $leng - 1; $n >= 0; $n--) {
- if ($this->a_formatting[$n] === self::MARKER) {
- break;
-
- } elseif ($this->a_formatting[$n]->nodeName === 'a') {
- $this->emitToken(
- array(
- 'name' => 'a',
- 'type' => HTML5::ENDTAG
- )
- );
- break;
- }
- }
-
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Insert an HTML element for the token. */
- $el = $this->insertElement($token);
-
- /* Add that element to the list of active formatting
- elements. */
- $this->a_formatting[] = $el;
- break;
-
- /* A start tag whose tag name is one of: "b", "big", "em", "font",
- "i", "nobr", "s", "small", "strike", "strong", "tt", "u" */
- case 'b':
- case 'big':
- case 'em':
- case 'font':
- case 'i':
- case 'nobr':
- case 's':
- case 'small':
- case 'strike':
- case 'strong':
- case 'tt':
- case 'u':
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Insert an HTML element for the token. */
- $el = $this->insertElement($token);
-
- /* Add that element to the list of active formatting
- elements. */
- $this->a_formatting[] = $el;
- break;
-
- /* A start tag token whose tag name is "button" */
- case 'button':
- /* If the stack of open elements has a button element in scope,
- then this is a parse error; act as if an end tag with the tag
- name "button" had been seen, then reprocess the token. (We don't
- do that. Unnecessary.) */
- if ($this->elementInScope('button')) {
- $this->inBody(
- array(
- 'name' => 'button',
- 'type' => HTML5::ENDTAG
- )
- );
- }
-
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* Insert a marker at the end of the list of active
- formatting elements. */
- $this->a_formatting[] = self::MARKER;
- break;
-
- /* A start tag token whose tag name is one of: "marquee", "object" */
- case 'marquee':
- case 'object':
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* Insert a marker at the end of the list of active
- formatting elements. */
- $this->a_formatting[] = self::MARKER;
- break;
-
- /* A start tag token whose tag name is "xmp" */
- case 'xmp':
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* Switch the content model flag to the CDATA state. */
- return HTML5::CDATA;
- break;
-
- /* A start tag whose tag name is "table" */
- case 'table':
- /* If the stack of open elements has a p element in scope,
- then act as if an end tag with the tag name p had been seen. */
- if ($this->elementInScope('p')) {
- $this->emitToken(
- array(
- 'name' => 'p',
- 'type' => HTML5::ENDTAG
- )
- );
- }
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* Change the insertion mode to "in table". */
- $this->mode = self::IN_TABLE;
- break;
-
- /* A start tag whose tag name is one of: "area", "basefont",
- "bgsound", "br", "embed", "img", "param", "spacer", "wbr" */
- case 'area':
- case 'basefont':
- case 'bgsound':
- case 'br':
- case 'embed':
- case 'img':
- case 'param':
- case 'spacer':
- case 'wbr':
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* Immediately pop the current node off the stack of open elements. */
- array_pop($this->stack);
- break;
-
- /* A start tag whose tag name is "hr" */
- case 'hr':
- /* If the stack of open elements has a p element in scope,
- then act as if an end tag with the tag name p had been seen. */
- if ($this->elementInScope('p')) {
- $this->emitToken(
- array(
- 'name' => 'p',
- 'type' => HTML5::ENDTAG
- )
- );
- }
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* Immediately pop the current node off the stack of open elements. */
- array_pop($this->stack);
- break;
-
- /* A start tag whose tag name is "image" */
- case 'image':
- /* Parse error. Change the token's tag name to "img" and
- reprocess it. (Don't ask.) */
- $token['name'] = 'img';
- return $this->inBody($token);
- break;
-
- /* A start tag whose tag name is "input" */
- case 'input':
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Insert an input element for the token. */
- $element = $this->insertElement($token, false);
-
- /* If the form element pointer is not null, then associate the
- input element with the form element pointed to by the form
- element pointer. */
- $this->form_pointer !== null
- ? $this->form_pointer->appendChild($element)
- : end($this->stack)->appendChild($element);
-
- /* Pop that input element off the stack of open elements. */
- array_pop($this->stack);
- break;
-
- /* A start tag whose tag name is "isindex" */
- case 'isindex':
- /* Parse error. */
- // w/e
-
- /* If the form element pointer is not null,
- then ignore the token. */
- if ($this->form_pointer === null) {
- /* Act as if a start tag token with the tag name "form" had
- been seen. */
- $this->inBody(
- array(
- 'name' => 'body',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- )
- );
-
- /* Act as if a start tag token with the tag name "hr" had
- been seen. */
- $this->inBody(
- array(
- 'name' => 'hr',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- )
- );
-
- /* Act as if a start tag token with the tag name "p" had
- been seen. */
- $this->inBody(
- array(
- 'name' => 'p',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- )
- );
-
- /* Act as if a start tag token with the tag name "label"
- had been seen. */
- $this->inBody(
- array(
- 'name' => 'label',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- )
- );
-
- /* Act as if a stream of character tokens had been seen. */
- $this->insertText(
- 'This is a searchable index. ' .
- 'Insert your search keywords here: '
- );
-
- /* Act as if a start tag token with the tag name "input"
- had been seen, with all the attributes from the "isindex"
- token, except with the "name" attribute set to the value
- "isindex" (ignoring any explicit "name" attribute). */
- $attr = $token['attr'];
- $attr[] = array('name' => 'name', 'value' => 'isindex');
-
- $this->inBody(
- array(
- 'name' => 'input',
- 'type' => HTML5::STARTTAG,
- 'attr' => $attr
- )
- );
-
- /* Act as if a stream of character tokens had been seen
- (see below for what they should say). */
- $this->insertText(
- 'This is a searchable index. ' .
- 'Insert your search keywords here: '
- );
-
- /* Act as if an end tag token with the tag name "label"
- had been seen. */
- $this->inBody(
- array(
- 'name' => 'label',
- 'type' => HTML5::ENDTAG
- )
- );
-
- /* Act as if an end tag token with the tag name "p" had
- been seen. */
- $this->inBody(
- array(
- 'name' => 'p',
- 'type' => HTML5::ENDTAG
- )
- );
-
- /* Act as if a start tag token with the tag name "hr" had
- been seen. */
- $this->inBody(
- array(
- 'name' => 'hr',
- 'type' => HTML5::ENDTAG
- )
- );
-
- /* Act as if an end tag token with the tag name "form" had
- been seen. */
- $this->inBody(
- array(
- 'name' => 'form',
- 'type' => HTML5::ENDTAG
- )
- );
- }
- break;
-
- /* A start tag whose tag name is "textarea" */
- case 'textarea':
- $this->insertElement($token);
-
- /* Switch the tokeniser's content model flag to the
- RCDATA state. */
- return HTML5::RCDATA;
- break;
-
- /* A start tag whose tag name is one of: "iframe", "noembed",
- "noframes" */
- case 'iframe':
- case 'noembed':
- case 'noframes':
- $this->insertElement($token);
-
- /* Switch the tokeniser's content model flag to the CDATA state. */
- return HTML5::CDATA;
- break;
-
- /* A start tag whose tag name is "select" */
- case 'select':
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* Change the insertion mode to "in select". */
- $this->mode = self::IN_SELECT;
- break;
-
- /* A start or end tag whose tag name is one of: "caption", "col",
- "colgroup", "frame", "frameset", "head", "option", "optgroup",
- "tbody", "td", "tfoot", "th", "thead", "tr". */
- case 'caption':
- case 'col':
- case 'colgroup':
- case 'frame':
- case 'frameset':
- case 'head':
- case 'option':
- case 'optgroup':
- case 'tbody':
- case 'td':
- case 'tfoot':
- case 'th':
- case 'thead':
- case 'tr':
- // Parse error. Ignore the token.
- break;
-
- /* A start or end tag whose tag name is one of: "event-source",
- "section", "nav", "article", "aside", "header", "footer",
- "datagrid", "command" */
- case 'event-source':
- case 'section':
- case 'nav':
- case 'article':
- case 'aside':
- case 'header':
- case 'footer':
- case 'datagrid':
- case 'command':
- // Work in progress!
- break;
-
- /* A start tag token not covered by the previous entries */
- default:
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- $this->insertElement($token, true, true);
- break;
- }
- break;
-
- case HTML5::ENDTAG:
- switch ($token['name']) {
- /* An end tag with the tag name "body" */
- case 'body':
- /* If the second element in the stack of open elements is
- not a body element, this is a parse error. Ignore the token.
- (innerHTML case) */
- if (count($this->stack) < 2 || $this->stack[1]->nodeName !== 'body') {
- // Ignore.
-
- /* If the current node is not the body element, then this
- is a parse error. */
- } elseif (end($this->stack)->nodeName !== 'body') {
- // Parse error.
- }
-
- /* Change the insertion mode to "after body". */
- $this->mode = self::AFTER_BODY;
- break;
-
- /* An end tag with the tag name "html" */
- case 'html':
- /* Act as if an end tag with tag name "body" had been seen,
- then, if that token wasn't ignored, reprocess the current
- token. */
- $this->inBody(
- array(
- 'name' => 'body',
- 'type' => HTML5::ENDTAG
- )
- );
-
- return $this->afterBody($token);
- break;
-
- /* An end tag whose tag name is one of: "address", "blockquote",
- "center", "dir", "div", "dl", "fieldset", "listing", "menu",
- "ol", "pre", "ul" */
- case 'address':
- case 'blockquote':
- case 'center':
- case 'dir':
- case 'div':
- case 'dl':
- case 'fieldset':
- case 'listing':
- case 'menu':
- case 'ol':
- case 'pre':
- case 'ul':
- /* If the stack of open elements has an element in scope
- with the same tag name as that of the token, then generate
- implied end tags. */
- if ($this->elementInScope($token['name'])) {
- $this->generateImpliedEndTags();
-
- /* Now, if the current node is not an element with
- the same tag name as that of the token, then this
- is a parse error. */
- // w/e
-
- /* If the stack of open elements has an element in
- scope with the same tag name as that of the token,
- then pop elements from this stack until an element
- with that tag name has been popped from the stack. */
- for ($n = count($this->stack) - 1; $n >= 0; $n--) {
- if ($this->stack[$n]->nodeName === $token['name']) {
- $n = -1;
- }
-
- array_pop($this->stack);
- }
- }
- break;
-
- /* An end tag whose tag name is "form" */
- case 'form':
- /* If the stack of open elements has an element in scope
- with the same tag name as that of the token, then generate
- implied end tags. */
- if ($this->elementInScope($token['name'])) {
- $this->generateImpliedEndTags();
-
- }
-
- if (end($this->stack)->nodeName !== $token['name']) {
- /* Now, if the current node is not an element with the
- same tag name as that of the token, then this is a parse
- error. */
- // w/e
-
- } else {
- /* Otherwise, if the current node is an element with
- the same tag name as that of the token pop that element
- from the stack. */
- array_pop($this->stack);
- }
-
- /* In any case, set the form element pointer to null. */
- $this->form_pointer = null;
- break;
-
- /* An end tag whose tag name is "p" */
- case 'p':
- /* If the stack of open elements has a p element in scope,
- then generate implied end tags, except for p elements. */
- if ($this->elementInScope('p')) {
- $this->generateImpliedEndTags(array('p'));
-
- /* If the current node is not a p element, then this is
- a parse error. */
- // k
-
- /* If the stack of open elements has a p element in
- scope, then pop elements from this stack until the stack
- no longer has a p element in scope. */
- for ($n = count($this->stack) - 1; $n >= 0; $n--) {
- if ($this->elementInScope('p')) {
- array_pop($this->stack);
-
- } else {
- break;
- }
- }
- }
- break;
-
- /* An end tag whose tag name is "dd", "dt", or "li" */
- case 'dd':
- case 'dt':
- case 'li':
- /* If the stack of open elements has an element in scope
- whose tag name matches the tag name of the token, then
- generate implied end tags, except for elements with the
- same tag name as the token. */
- if ($this->elementInScope($token['name'])) {
- $this->generateImpliedEndTags(array($token['name']));
-
- /* If the current node is not an element with the same
- tag name as the token, then this is a parse error. */
- // w/e
-
- /* If the stack of open elements has an element in scope
- whose tag name matches the tag name of the token, then
- pop elements from this stack until an element with that
- tag name has been popped from the stack. */
- for ($n = count($this->stack) - 1; $n >= 0; $n--) {
- if ($this->stack[$n]->nodeName === $token['name']) {
- $n = -1;
- }
-
- array_pop($this->stack);
- }
- }
- break;
-
- /* An end tag whose tag name is one of: "h1", "h2", "h3", "h4",
- "h5", "h6" */
- case 'h1':
- case 'h2':
- case 'h3':
- case 'h4':
- case 'h5':
- case 'h6':
- $elements = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6');
-
- /* If the stack of open elements has in scope an element whose
- tag name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
- generate implied end tags. */
- if ($this->elementInScope($elements)) {
- $this->generateImpliedEndTags();
-
- /* Now, if the current node is not an element with the same
- tag name as that of the token, then this is a parse error. */
- // w/e
-
- /* If the stack of open elements has in scope an element
- whose tag name is one of "h1", "h2", "h3", "h4", "h5", or
- "h6", then pop elements from the stack until an element
- with one of those tag names has been popped from the stack. */
- while ($this->elementInScope($elements)) {
- array_pop($this->stack);
- }
- }
- break;
-
- /* An end tag whose tag name is one of: "a", "b", "big", "em",
- "font", "i", "nobr", "s", "small", "strike", "strong", "tt", "u" */
- case 'a':
- case 'b':
- case 'big':
- case 'em':
- case 'font':
- case 'i':
- case 'nobr':
- case 's':
- case 'small':
- case 'strike':
- case 'strong':
- case 'tt':
- case 'u':
- /* 1. Let the formatting element be the last element in
- the list of active formatting elements that:
- * is between the end of the list and the last scope
- marker in the list, if any, or the start of the list
- otherwise, and
- * has the same tag name as the token.
- */
- while (true) {
- for ($a = count($this->a_formatting) - 1; $a >= 0; $a--) {
- if ($this->a_formatting[$a] === self::MARKER) {
- break;
-
- } elseif ($this->a_formatting[$a]->tagName === $token['name']) {
- $formatting_element = $this->a_formatting[$a];
- $in_stack = in_array($formatting_element, $this->stack, true);
- $fe_af_pos = $a;
- break;
- }
- }
-
- /* If there is no such node, or, if that node is
- also in the stack of open elements but the element
- is not in scope, then this is a parse error. Abort
- these steps. The token is ignored. */
- if (!isset($formatting_element) || ($in_stack &&
- !$this->elementInScope($token['name']))
- ) {
- break;
-
- /* Otherwise, if there is such a node, but that node
- is not in the stack of open elements, then this is a
- parse error; remove the element from the list, and
- abort these steps. */
- } elseif (isset($formatting_element) && !$in_stack) {
- unset($this->a_formatting[$fe_af_pos]);
- $this->a_formatting = array_merge($this->a_formatting);
- break;
- }
-
- /* 2. Let the furthest block be the topmost node in the
- stack of open elements that is lower in the stack
- than the formatting element, and is not an element in
- the phrasing or formatting categories. There might
- not be one. */
- $fe_s_pos = array_search($formatting_element, $this->stack, true);
- $length = count($this->stack);
-
- for ($s = $fe_s_pos + 1; $s < $length; $s++) {
- $category = $this->getElementCategory($this->stack[$s]->nodeName);
-
- if ($category !== self::PHRASING && $category !== self::FORMATTING) {
- $furthest_block = $this->stack[$s];
- }
- }
-
- /* 3. If there is no furthest block, then the UA must
- skip the subsequent steps and instead just pop all
- the nodes from the bottom of the stack of open
- elements, from the current node up to the formatting
- element, and remove the formatting element from the
- list of active formatting elements. */
- if (!isset($furthest_block)) {
- for ($n = $length - 1; $n >= $fe_s_pos; $n--) {
- array_pop($this->stack);
- }
-
- unset($this->a_formatting[$fe_af_pos]);
- $this->a_formatting = array_merge($this->a_formatting);
- break;
- }
-
- /* 4. Let the common ancestor be the element
- immediately above the formatting element in the stack
- of open elements. */
- $common_ancestor = $this->stack[$fe_s_pos - 1];
-
- /* 5. If the furthest block has a parent node, then
- remove the furthest block from its parent node. */
- if ($furthest_block->parentNode !== null) {
- $furthest_block->parentNode->removeChild($furthest_block);
- }
-
- /* 6. Let a bookmark note the position of the
- formatting element in the list of active formatting
- elements relative to the elements on either side
- of it in the list. */
- $bookmark = $fe_af_pos;
-
- /* 7. Let node and last node be the furthest block.
- Follow these steps: */
- $node = $furthest_block;
- $last_node = $furthest_block;
-
- while (true) {
- for ($n = array_search($node, $this->stack, true) - 1; $n >= 0; $n--) {
- /* 7.1 Let node be the element immediately
- prior to node in the stack of open elements. */
- $node = $this->stack[$n];
-
- /* 7.2 If node is not in the list of active
- formatting elements, then remove node from
- the stack of open elements and then go back
- to step 1. */
- if (!in_array($node, $this->a_formatting, true)) {
- unset($this->stack[$n]);
- $this->stack = array_merge($this->stack);
-
- } else {
- break;
- }
- }
-
- /* 7.3 Otherwise, if node is the formatting
- element, then go to the next step in the overall
- algorithm. */
- if ($node === $formatting_element) {
- break;
-
- /* 7.4 Otherwise, if last node is the furthest
- block, then move the aforementioned bookmark to
- be immediately after the node in the list of
- active formatting elements. */
- } elseif ($last_node === $furthest_block) {
- $bookmark = array_search($node, $this->a_formatting, true) + 1;
- }
-
- /* 7.5 If node has any children, perform a
- shallow clone of node, replace the entry for
- node in the list of active formatting elements
- with an entry for the clone, replace the entry
- for node in the stack of open elements with an
- entry for the clone, and let node be the clone. */
- if ($node->hasChildNodes()) {
- $clone = $node->cloneNode();
- $s_pos = array_search($node, $this->stack, true);
- $a_pos = array_search($node, $this->a_formatting, true);
-
- $this->stack[$s_pos] = $clone;
- $this->a_formatting[$a_pos] = $clone;
- $node = $clone;
- }
-
- /* 7.6 Insert last node into node, first removing
- it from its previous parent node if any. */
- if ($last_node->parentNode !== null) {
- $last_node->parentNode->removeChild($last_node);
- }
-
- $node->appendChild($last_node);
-
- /* 7.7 Let last node be node. */
- $last_node = $node;
- }
-
- /* 8. Insert whatever last node ended up being in
- the previous step into the common ancestor node,
- first removing it from its previous parent node if
- any. */
- if ($last_node->parentNode !== null) {
- $last_node->parentNode->removeChild($last_node);
- }
-
- $common_ancestor->appendChild($last_node);
-
- /* 9. Perform a shallow clone of the formatting
- element. */
- $clone = $formatting_element->cloneNode();
-
- /* 10. Take all of the child nodes of the furthest
- block and append them to the clone created in the
- last step. */
- while ($furthest_block->hasChildNodes()) {
- $child = $furthest_block->firstChild;
- $furthest_block->removeChild($child);
- $clone->appendChild($child);
- }
-
- /* 11. Append that clone to the furthest block. */
- $furthest_block->appendChild($clone);
-
- /* 12. Remove the formatting element from the list
- of active formatting elements, and insert the clone
- into the list of active formatting elements at the
- position of the aforementioned bookmark. */
- $fe_af_pos = array_search($formatting_element, $this->a_formatting, true);
- unset($this->a_formatting[$fe_af_pos]);
- $this->a_formatting = array_merge($this->a_formatting);
-
- $af_part1 = array_slice($this->a_formatting, 0, $bookmark - 1);
- $af_part2 = array_slice($this->a_formatting, $bookmark, count($this->a_formatting));
- $this->a_formatting = array_merge($af_part1, array($clone), $af_part2);
-
- /* 13. Remove the formatting element from the stack
- of open elements, and insert the clone into the stack
- of open elements immediately after (i.e. in a more
- deeply nested position than) the position of the
- furthest block in that stack. */
- $fe_s_pos = array_search($formatting_element, $this->stack, true);
- $fb_s_pos = array_search($furthest_block, $this->stack, true);
- unset($this->stack[$fe_s_pos]);
-
- $s_part1 = array_slice($this->stack, 0, $fb_s_pos);
- $s_part2 = array_slice($this->stack, $fb_s_pos + 1, count($this->stack));
- $this->stack = array_merge($s_part1, array($clone), $s_part2);
-
- /* 14. Jump back to step 1 in this series of steps. */
- unset($formatting_element, $fe_af_pos, $fe_s_pos, $furthest_block);
- }
- break;
-
- /* An end tag token whose tag name is one of: "button",
- "marquee", "object" */
- case 'button':
- case 'marquee':
- case 'object':
- /* If the stack of open elements has an element in scope whose
- tag name matches the tag name of the token, then generate implied
- tags. */
- if ($this->elementInScope($token['name'])) {
- $this->generateImpliedEndTags();
-
- /* Now, if the current node is not an element with the same
- tag name as the token, then this is a parse error. */
- // k
-
- /* Now, if the stack of open elements has an element in scope
- whose tag name matches the tag name of the token, then pop
- elements from the stack until that element has been popped from
- the stack, and clear the list of active formatting elements up
- to the last marker. */
- for ($n = count($this->stack) - 1; $n >= 0; $n--) {
- if ($this->stack[$n]->nodeName === $token['name']) {
- $n = -1;
- }
-
- array_pop($this->stack);
- }
-
- $marker = end(array_keys($this->a_formatting, self::MARKER, true));
-
- for ($n = count($this->a_formatting) - 1; $n > $marker; $n--) {
- array_pop($this->a_formatting);
- }
- }
- break;
-
- /* Or an end tag whose tag name is one of: "area", "basefont",
- "bgsound", "br", "embed", "hr", "iframe", "image", "img",
- "input", "isindex", "noembed", "noframes", "param", "select",
- "spacer", "table", "textarea", "wbr" */
- case 'area':
- case 'basefont':
- case 'bgsound':
- case 'br':
- case 'embed':
- case 'hr':
- case 'iframe':
- case 'image':
- case 'img':
- case 'input':
- case 'isindex':
- case 'noembed':
- case 'noframes':
- case 'param':
- case 'select':
- case 'spacer':
- case 'table':
- case 'textarea':
- case 'wbr':
- // Parse error. Ignore the token.
- break;
-
- /* An end tag token not covered by the previous entries */
- default:
- for ($n = count($this->stack) - 1; $n >= 0; $n--) {
- /* Initialise node to be the current node (the bottommost
- node of the stack). */
- $node = end($this->stack);
-
- /* If node has the same tag name as the end tag token,
- then: */
- if ($token['name'] === $node->nodeName) {
- /* Generate implied end tags. */
- $this->generateImpliedEndTags();
-
- /* If the tag name of the end tag token does not
- match the tag name of the current node, this is a
- parse error. */
- // k
-
- /* Pop all the nodes from the current node up to
- node, including node, then stop this algorithm. */
- for ($x = count($this->stack) - $n; $x >= $n; $x--) {
- array_pop($this->stack);
- }
-
- } else {
- $category = $this->getElementCategory($node);
-
- if ($category !== self::SPECIAL && $category !== self::SCOPING) {
- /* Otherwise, if node is in neither the formatting
- category nor the phrasing category, then this is a
- parse error. Stop this algorithm. The end tag token
- is ignored. */
- return false;
- }
- }
- }
- break;
- }
- break;
- }
- }
-
- private function inTable($token)
- {
- $clear = array('html', 'table');
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE */
- if ($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
- ) {
- /* Append the character to the current node. */
- $text = $this->dom->createTextNode($token['data']);
- end($this->stack)->appendChild($text);
-
- /* A comment token */
- } elseif ($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the current node with the data
- attribute set to the data given in the comment token. */
- $comment = $this->dom->createComment($token['data']);
- end($this->stack)->appendChild($comment);
-
- /* A start tag whose tag name is "caption" */
- } elseif ($token['type'] === HTML5::STARTTAG &&
- $token['name'] === 'caption'
- ) {
- /* Clear the stack back to a table context. */
- $this->clearStackToTableContext($clear);
-
- /* Insert a marker at the end of the list of active
- formatting elements. */
- $this->a_formatting[] = self::MARKER;
-
- /* Insert an HTML element for the token, then switch the
- insertion mode to "in caption". */
- $this->insertElement($token);
- $this->mode = self::IN_CAPTION;
-
- /* A start tag whose tag name is "colgroup" */
- } elseif ($token['type'] === HTML5::STARTTAG &&
- $token['name'] === 'colgroup'
- ) {
- /* Clear the stack back to a table context. */
- $this->clearStackToTableContext($clear);
-
- /* Insert an HTML element for the token, then switch the
- insertion mode to "in column group". */
- $this->insertElement($token);
- $this->mode = self::IN_CGROUP;
-
- /* A start tag whose tag name is "col" */
- } elseif ($token['type'] === HTML5::STARTTAG &&
- $token['name'] === 'col'
- ) {
- $this->inTable(
- array(
- 'name' => 'colgroup',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- )
- );
-
- $this->inColumnGroup($token);
-
- /* A start tag whose tag name is one of: "tbody", "tfoot", "thead" */
- } elseif ($token['type'] === HTML5::STARTTAG && in_array(
- $token['name'],
- array('tbody', 'tfoot', 'thead')
- )
- ) {
- /* Clear the stack back to a table context. */
- $this->clearStackToTableContext($clear);
-
- /* Insert an HTML element for the token, then switch the insertion
- mode to "in table body". */
- $this->insertElement($token);
- $this->mode = self::IN_TBODY;
-
- /* A start tag whose tag name is one of: "td", "th", "tr" */
- } elseif ($token['type'] === HTML5::STARTTAG &&
- in_array($token['name'], array('td', 'th', 'tr'))
- ) {
- /* Act as if a start tag token with the tag name "tbody" had been
- seen, then reprocess the current token. */
- $this->inTable(
- array(
- 'name' => 'tbody',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- )
- );
-
- return $this->inTableBody($token);
-
- /* A start tag whose tag name is "table" */
- } elseif ($token['type'] === HTML5::STARTTAG &&
- $token['name'] === 'table'
- ) {
- /* Parse error. Act as if an end tag token with the tag name "table"
- had been seen, then, if that token wasn't ignored, reprocess the
- current token. */
- $this->inTable(
- array(
- 'name' => 'table',
- 'type' => HTML5::ENDTAG
- )
- );
-
- return $this->mainPhase($token);
-
- /* An end tag whose tag name is "table" */
- } elseif ($token['type'] === HTML5::ENDTAG &&
- $token['name'] === 'table'
- ) {
- /* If the stack of open elements does not have an element in table
- scope with the same tag name as the token, this is a parse error.
- Ignore the token. (innerHTML case) */
- if (!$this->elementInScope($token['name'], true)) {
- return false;
-
- /* Otherwise: */
- } else {
- /* Generate implied end tags. */
- $this->generateImpliedEndTags();
-
- /* Now, if the current node is not a table element, then this
- is a parse error. */
- // w/e
-
- /* Pop elements from this stack until a table element has been
- popped from the stack. */
- while (true) {
- $current = end($this->stack)->nodeName;
- array_pop($this->stack);
-
- if ($current === 'table') {
- break;
- }
- }
-
- /* Reset the insertion mode appropriately. */
- $this->resetInsertionMode();
- }
-
- /* An end tag whose tag name is one of: "body", "caption", "col",
- "colgroup", "html", "tbody", "td", "tfoot", "th", "thead", "tr" */
- } elseif ($token['type'] === HTML5::ENDTAG && in_array(
- $token['name'],
- array(
- 'body',
- 'caption',
- 'col',
- 'colgroup',
- 'html',
- 'tbody',
- 'td',
- 'tfoot',
- 'th',
- 'thead',
- 'tr'
- )
- )
- ) {
- // Parse error. Ignore the token.
-
- /* Anything else */
- } else {
- /* Parse error. Process the token as if the insertion mode was "in
- body", with the following exception: */
-
- /* If the current node is a table, tbody, tfoot, thead, or tr
- element, then, whenever a node would be inserted into the current
- node, it must instead be inserted into the foster parent element. */
- if (in_array(
- end($this->stack)->nodeName,
- array('table', 'tbody', 'tfoot', 'thead', 'tr')
- )
- ) {
- /* The foster parent element is the parent element of the last
- table element in the stack of open elements, if there is a
- table element and it has such a parent element. If there is no
- table element in the stack of open elements (innerHTML case),
- then the foster parent element is the first element in the
- stack of open elements (the html element). Otherwise, if there
- is a table element in the stack of open elements, but the last
- table element in the stack of open elements has no parent, or
- its parent node is not an element, then the foster parent
- element is the element before the last table element in the
- stack of open elements. */
- for ($n = count($this->stack) - 1; $n >= 0; $n--) {
- if ($this->stack[$n]->nodeName === 'table') {
- $table = $this->stack[$n];
- break;
- }
- }
-
- if (isset($table) && $table->parentNode !== null) {
- $this->foster_parent = $table->parentNode;
-
- } elseif (!isset($table)) {
- $this->foster_parent = $this->stack[0];
-
- } elseif (isset($table) && ($table->parentNode === null ||
- $table->parentNode->nodeType !== XML_ELEMENT_NODE)
- ) {
- $this->foster_parent = $this->stack[$n - 1];
- }
- }
-
- $this->inBody($token);
- }
- }
-
- private function inCaption($token)
- {
- /* An end tag whose tag name is "caption" */
- if ($token['type'] === HTML5::ENDTAG && $token['name'] === 'caption') {
- /* If the stack of open elements does not have an element in table
- scope with the same tag name as the token, this is a parse error.
- Ignore the token. (innerHTML case) */
- if (!$this->elementInScope($token['name'], true)) {
- // Ignore
-
- /* Otherwise: */
- } else {
- /* Generate implied end tags. */
- $this->generateImpliedEndTags();
-
- /* Now, if the current node is not a caption element, then this
- is a parse error. */
- // w/e
-
- /* Pop elements from this stack until a caption element has
- been popped from the stack. */
- while (true) {
- $node = end($this->stack)->nodeName;
- array_pop($this->stack);
-
- if ($node === 'caption') {
- break;
- }
- }
-
- /* Clear the list of active formatting elements up to the last
- marker. */
- $this->clearTheActiveFormattingElementsUpToTheLastMarker();
-
- /* Switch the insertion mode to "in table". */
- $this->mode = self::IN_TABLE;
- }
-
- /* A start tag whose tag name is one of: "caption", "col", "colgroup",
- "tbody", "td", "tfoot", "th", "thead", "tr", or an end tag whose tag
- name is "table" */
- } elseif (($token['type'] === HTML5::STARTTAG && in_array(
- $token['name'],
- array(
- 'caption',
- 'col',
- 'colgroup',
- 'tbody',
- 'td',
- 'tfoot',
- 'th',
- 'thead',
- 'tr'
- )
- )) || ($token['type'] === HTML5::ENDTAG &&
- $token['name'] === 'table')
- ) {
- /* Parse error. Act as if an end tag with the tag name "caption"
- had been seen, then, if that token wasn't ignored, reprocess the
- current token. */
- $this->inCaption(
- array(
- 'name' => 'caption',
- 'type' => HTML5::ENDTAG
- )
- );
-
- return $this->inTable($token);
-
- /* An end tag whose tag name is one of: "body", "col", "colgroup",
- "html", "tbody", "td", "tfoot", "th", "thead", "tr" */
- } elseif ($token['type'] === HTML5::ENDTAG && in_array(
- $token['name'],
- array(
- 'body',
- 'col',
- 'colgroup',
- 'html',
- 'tbody',
- 'tfoot',
- 'th',
- 'thead',
- 'tr'
- )
- )
- ) {
- // Parse error. Ignore the token.
-
- /* Anything else */
- } else {
- /* Process the token as if the insertion mode was "in body". */
- $this->inBody($token);
- }
- }
-
- private function inColumnGroup($token)
- {
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE */
- if ($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
- ) {
- /* Append the character to the current node. */
- $text = $this->dom->createTextNode($token['data']);
- end($this->stack)->appendChild($text);
-
- /* A comment token */
- } elseif ($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the current node with the data
- attribute set to the data given in the comment token. */
- $comment = $this->dom->createComment($token['data']);
- end($this->stack)->appendChild($comment);
-
- /* A start tag whose tag name is "col" */
- } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'col') {
- /* Insert a col element for the token. Immediately pop the current
- node off the stack of open elements. */
- $this->insertElement($token);
- array_pop($this->stack);
-
- /* An end tag whose tag name is "colgroup" */
- } elseif ($token['type'] === HTML5::ENDTAG &&
- $token['name'] === 'colgroup'
- ) {
- /* If the current node is the root html element, then this is a
- parse error, ignore the token. (innerHTML case) */
- if (end($this->stack)->nodeName === 'html') {
- // Ignore
-
- /* Otherwise, pop the current node (which will be a colgroup
- element) from the stack of open elements. Switch the insertion
- mode to "in table". */
- } else {
- array_pop($this->stack);
- $this->mode = self::IN_TABLE;
- }
-
- /* An end tag whose tag name is "col" */
- } elseif ($token['type'] === HTML5::ENDTAG && $token['name'] === 'col') {
- /* Parse error. Ignore the token. */
-
- /* Anything else */
- } else {
- /* Act as if an end tag with the tag name "colgroup" had been seen,
- and then, if that token wasn't ignored, reprocess the current token. */
- $this->inColumnGroup(
- array(
- 'name' => 'colgroup',
- 'type' => HTML5::ENDTAG
- )
- );
-
- return $this->inTable($token);
- }
- }
-
- private function inTableBody($token)
- {
- $clear = array('tbody', 'tfoot', 'thead', 'html');
-
- /* A start tag whose tag name is "tr" */
- if ($token['type'] === HTML5::STARTTAG && $token['name'] === 'tr') {
- /* Clear the stack back to a table body context. */
- $this->clearStackToTableContext($clear);
-
- /* Insert a tr element for the token, then switch the insertion
- mode to "in row". */
- $this->insertElement($token);
- $this->mode = self::IN_ROW;
-
- /* A start tag whose tag name is one of: "th", "td" */
- } elseif ($token['type'] === HTML5::STARTTAG &&
- ($token['name'] === 'th' || $token['name'] === 'td')
- ) {
- /* Parse error. Act as if a start tag with the tag name "tr" had
- been seen, then reprocess the current token. */
- $this->inTableBody(
- array(
- 'name' => 'tr',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- )
- );
-
- return $this->inRow($token);
-
- /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
- } elseif ($token['type'] === HTML5::ENDTAG &&
- in_array($token['name'], array('tbody', 'tfoot', 'thead'))
- ) {
- /* If the stack of open elements does not have an element in table
- scope with the same tag name as the token, this is a parse error.
- Ignore the token. */
- if (!$this->elementInScope($token['name'], true)) {
- // Ignore
-
- /* Otherwise: */
- } else {
- /* Clear the stack back to a table body context. */
- $this->clearStackToTableContext($clear);
-
- /* Pop the current node from the stack of open elements. Switch
- the insertion mode to "in table". */
- array_pop($this->stack);
- $this->mode = self::IN_TABLE;
- }
-
- /* A start tag whose tag name is one of: "caption", "col", "colgroup",
- "tbody", "tfoot", "thead", or an end tag whose tag name is "table" */
- } elseif (($token['type'] === HTML5::STARTTAG && in_array(
- $token['name'],
- array('caption', 'col', 'colgroup', 'tbody', 'tfoor', 'thead')
- )) ||
- ($token['type'] === HTML5::STARTTAG && $token['name'] === 'table')
- ) {
- /* If the stack of open elements does not have a tbody, thead, or
- tfoot element in table scope, this is a parse error. Ignore the
- token. (innerHTML case) */
- if (!$this->elementInScope(array('tbody', 'thead', 'tfoot'), true)) {
- // Ignore.
-
- /* Otherwise: */
- } else {
- /* Clear the stack back to a table body context. */
- $this->clearStackToTableContext($clear);
-
- /* Act as if an end tag with the same tag name as the current
- node ("tbody", "tfoot", or "thead") had been seen, then
- reprocess the current token. */
- $this->inTableBody(
- array(
- 'name' => end($this->stack)->nodeName,
- 'type' => HTML5::ENDTAG
- )
- );
-
- return $this->mainPhase($token);
- }
-
- /* An end tag whose tag name is one of: "body", "caption", "col",
- "colgroup", "html", "td", "th", "tr" */
- } elseif ($token['type'] === HTML5::ENDTAG && in_array(
- $token['name'],
- array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr')
- )
- ) {
- /* Parse error. Ignore the token. */
-
- /* Anything else */
- } else {
- /* Process the token as if the insertion mode was "in table". */
- $this->inTable($token);
- }
- }
-
- private function inRow($token)
- {
- $clear = array('tr', 'html');
-
- /* A start tag whose tag name is one of: "th", "td" */
- if ($token['type'] === HTML5::STARTTAG &&
- ($token['name'] === 'th' || $token['name'] === 'td')
- ) {
- /* Clear the stack back to a table row context. */
- $this->clearStackToTableContext($clear);
-
- /* Insert an HTML element for the token, then switch the insertion
- mode to "in cell". */
- $this->insertElement($token);
- $this->mode = self::IN_CELL;
-
- /* Insert a marker at the end of the list of active formatting
- elements. */
- $this->a_formatting[] = self::MARKER;
-
- /* An end tag whose tag name is "tr" */
- } elseif ($token['type'] === HTML5::ENDTAG && $token['name'] === 'tr') {
- /* If the stack of open elements does not have an element in table
- scope with the same tag name as the token, this is a parse error.
- Ignore the token. (innerHTML case) */
- if (!$this->elementInScope($token['name'], true)) {
- // Ignore.
-
- /* Otherwise: */
- } else {
- /* Clear the stack back to a table row context. */
- $this->clearStackToTableContext($clear);
-
- /* Pop the current node (which will be a tr element) from the
- stack of open elements. Switch the insertion mode to "in table
- body". */
- array_pop($this->stack);
- $this->mode = self::IN_TBODY;
- }
-
- /* A start tag whose tag name is one of: "caption", "col", "colgroup",
- "tbody", "tfoot", "thead", "tr" or an end tag whose tag name is "table" */
- } elseif ($token['type'] === HTML5::STARTTAG && in_array(
- $token['name'],
- array('caption', 'col', 'colgroup', 'tbody', 'tfoot', 'thead', 'tr')
- )
- ) {
- /* Act as if an end tag with the tag name "tr" had been seen, then,
- if that token wasn't ignored, reprocess the current token. */
- $this->inRow(
- array(
- 'name' => 'tr',
- 'type' => HTML5::ENDTAG
- )
- );
-
- return $this->inCell($token);
-
- /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
- } elseif ($token['type'] === HTML5::ENDTAG &&
- in_array($token['name'], array('tbody', 'tfoot', 'thead'))
- ) {
- /* If the stack of open elements does not have an element in table
- scope with the same tag name as the token, this is a parse error.
- Ignore the token. */
- if (!$this->elementInScope($token['name'], true)) {
- // Ignore.
-
- /* Otherwise: */
- } else {
- /* Otherwise, act as if an end tag with the tag name "tr" had
- been seen, then reprocess the current token. */
- $this->inRow(
- array(
- 'name' => 'tr',
- 'type' => HTML5::ENDTAG
- )
- );
-
- return $this->inCell($token);
- }
-
- /* An end tag whose tag name is one of: "body", "caption", "col",
- "colgroup", "html", "td", "th" */
- } elseif ($token['type'] === HTML5::ENDTAG && in_array(
- $token['name'],
- array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr')
- )
- ) {
- /* Parse error. Ignore the token. */
-
- /* Anything else */
- } else {
- /* Process the token as if the insertion mode was "in table". */
- $this->inTable($token);
- }
- }
-
- private function inCell($token)
- {
- /* An end tag whose tag name is one of: "td", "th" */
- if ($token['type'] === HTML5::ENDTAG &&
- ($token['name'] === 'td' || $token['name'] === 'th')
- ) {
- /* If the stack of open elements does not have an element in table
- scope with the same tag name as that of the token, then this is a
- parse error and the token must be ignored. */
- if (!$this->elementInScope($token['name'], true)) {
- // Ignore.
-
- /* Otherwise: */
- } else {
- /* Generate implied end tags, except for elements with the same
- tag name as the token. */
- $this->generateImpliedEndTags(array($token['name']));
-
- /* Now, if the current node is not an element with the same tag
- name as the token, then this is a parse error. */
- // k
-
- /* Pop elements from this stack until an element with the same
- tag name as the token has been popped from the stack. */
- while (true) {
- $node = end($this->stack)->nodeName;
- array_pop($this->stack);
-
- if ($node === $token['name']) {
- break;
- }
- }
-
- /* Clear the list of active formatting elements up to the last
- marker. */
- $this->clearTheActiveFormattingElementsUpToTheLastMarker();
-
- /* Switch the insertion mode to "in row". (The current node
- will be a tr element at this point.) */
- $this->mode = self::IN_ROW;
- }
-
- /* A start tag whose tag name is one of: "caption", "col", "colgroup",
- "tbody", "td", "tfoot", "th", "thead", "tr" */
- } elseif ($token['type'] === HTML5::STARTTAG && in_array(
- $token['name'],
- array(
- 'caption',
- 'col',
- 'colgroup',
- 'tbody',
- 'td',
- 'tfoot',
- 'th',
- 'thead',
- 'tr'
- )
- )
- ) {
- /* If the stack of open elements does not have a td or th element
- in table scope, then this is a parse error; ignore the token.
- (innerHTML case) */
- if (!$this->elementInScope(array('td', 'th'), true)) {
- // Ignore.
-
- /* Otherwise, close the cell (see below) and reprocess the current
- token. */
- } else {
- $this->closeCell();
- return $this->inRow($token);
- }
-
- /* A start tag whose tag name is one of: "caption", "col", "colgroup",
- "tbody", "td", "tfoot", "th", "thead", "tr" */
- } elseif ($token['type'] === HTML5::STARTTAG && in_array(
- $token['name'],
- array(
- 'caption',
- 'col',
- 'colgroup',
- 'tbody',
- 'td',
- 'tfoot',
- 'th',
- 'thead',
- 'tr'
- )
- )
- ) {
- /* If the stack of open elements does not have a td or th element
- in table scope, then this is a parse error; ignore the token.
- (innerHTML case) */
- if (!$this->elementInScope(array('td', 'th'), true)) {
- // Ignore.
-
- /* Otherwise, close the cell (see below) and reprocess the current
- token. */
- } else {
- $this->closeCell();
- return $this->inRow($token);
- }
-
- /* An end tag whose tag name is one of: "body", "caption", "col",
- "colgroup", "html" */
- } elseif ($token['type'] === HTML5::ENDTAG && in_array(
- $token['name'],
- array('body', 'caption', 'col', 'colgroup', 'html')
- )
- ) {
- /* Parse error. Ignore the token. */
-
- /* An end tag whose tag name is one of: "table", "tbody", "tfoot",
- "thead", "tr" */
- } elseif ($token['type'] === HTML5::ENDTAG && in_array(
- $token['name'],
- array('table', 'tbody', 'tfoot', 'thead', 'tr')
- )
- ) {
- /* If the stack of open elements does not have an element in table
- scope with the same tag name as that of the token (which can only
- happen for "tbody", "tfoot" and "thead", or, in the innerHTML case),
- then this is a parse error and the token must be ignored. */
- if (!$this->elementInScope($token['name'], true)) {
- // Ignore.
-
- /* Otherwise, close the cell (see below) and reprocess the current
- token. */
- } else {
- $this->closeCell();
- return $this->inRow($token);
- }
-
- /* Anything else */
- } else {
- /* Process the token as if the insertion mode was "in body". */
- $this->inBody($token);
- }
- }
-
- private function inSelect($token)
- {
- /* Handle the token as follows: */
-
- /* A character token */
- if ($token['type'] === HTML5::CHARACTR) {
- /* Append the token's character to the current node. */
- $this->insertText($token['data']);
-
- /* A comment token */
- } elseif ($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the current node with the data
- attribute set to the data given in the comment token. */
- $this->insertComment($token['data']);
-
- /* A start tag token whose tag name is "option" */
- } elseif ($token['type'] === HTML5::STARTTAG &&
- $token['name'] === 'option'
- ) {
- /* If the current node is an option element, act as if an end tag
- with the tag name "option" had been seen. */
- if (end($this->stack)->nodeName === 'option') {
- $this->inSelect(
- array(
- 'name' => 'option',
- 'type' => HTML5::ENDTAG
- )
- );
- }
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* A start tag token whose tag name is "optgroup" */
- } elseif ($token['type'] === HTML5::STARTTAG &&
- $token['name'] === 'optgroup'
- ) {
- /* If the current node is an option element, act as if an end tag
- with the tag name "option" had been seen. */
- if (end($this->stack)->nodeName === 'option') {
- $this->inSelect(
- array(
- 'name' => 'option',
- 'type' => HTML5::ENDTAG
- )
- );
- }
-
- /* If the current node is an optgroup element, act as if an end tag
- with the tag name "optgroup" had been seen. */
- if (end($this->stack)->nodeName === 'optgroup') {
- $this->inSelect(
- array(
- 'name' => 'optgroup',
- 'type' => HTML5::ENDTAG
- )
- );
- }
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* An end tag token whose tag name is "optgroup" */
- } elseif ($token['type'] === HTML5::ENDTAG &&
- $token['name'] === 'optgroup'
- ) {
- /* First, if the current node is an option element, and the node
- immediately before it in the stack of open elements is an optgroup
- element, then act as if an end tag with the tag name "option" had
- been seen. */
- $elements_in_stack = count($this->stack);
-
- if ($this->stack[$elements_in_stack - 1]->nodeName === 'option' &&
- $this->stack[$elements_in_stack - 2]->nodeName === 'optgroup'
- ) {
- $this->inSelect(
- array(
- 'name' => 'option',
- 'type' => HTML5::ENDTAG
- )
- );
- }
-
- /* If the current node is an optgroup element, then pop that node
- from the stack of open elements. Otherwise, this is a parse error,
- ignore the token. */
- if ($this->stack[$elements_in_stack - 1] === 'optgroup') {
- array_pop($this->stack);
- }
-
- /* An end tag token whose tag name is "option" */
- } elseif ($token['type'] === HTML5::ENDTAG &&
- $token['name'] === 'option'
- ) {
- /* If the current node is an option element, then pop that node
- from the stack of open elements. Otherwise, this is a parse error,
- ignore the token. */
- if (end($this->stack)->nodeName === 'option') {
- array_pop($this->stack);
- }
-
- /* An end tag whose tag name is "select" */
- } elseif ($token['type'] === HTML5::ENDTAG &&
- $token['name'] === 'select'
- ) {
- /* If the stack of open elements does not have an element in table
- scope with the same tag name as the token, this is a parse error.
- Ignore the token. (innerHTML case) */
- if (!$this->elementInScope($token['name'], true)) {
- // w/e
-
- /* Otherwise: */
- } else {
- /* Pop elements from the stack of open elements until a select
- element has been popped from the stack. */
- while (true) {
- $current = end($this->stack)->nodeName;
- array_pop($this->stack);
-
- if ($current === 'select') {
- break;
- }
- }
-
- /* Reset the insertion mode appropriately. */
- $this->resetInsertionMode();
- }
-
- /* A start tag whose tag name is "select" */
- } elseif ($token['name'] === 'select' &&
- $token['type'] === HTML5::STARTTAG
- ) {
- /* Parse error. Act as if the token had been an end tag with the
- tag name "select" instead. */
- $this->inSelect(
- array(
- 'name' => 'select',
- 'type' => HTML5::ENDTAG
- )
- );
-
- /* An end tag whose tag name is one of: "caption", "table", "tbody",
- "tfoot", "thead", "tr", "td", "th" */
- } elseif (in_array(
- $token['name'],
- array(
- 'caption',
- 'table',
- 'tbody',
- 'tfoot',
- 'thead',
- 'tr',
- 'td',
- 'th'
- )
- ) && $token['type'] === HTML5::ENDTAG
- ) {
- /* Parse error. */
- // w/e
-
- /* If the stack of open elements has an element in table scope with
- the same tag name as that of the token, then act as if an end tag
- with the tag name "select" had been seen, and reprocess the token.
- Otherwise, ignore the token. */
- if ($this->elementInScope($token['name'], true)) {
- $this->inSelect(
- array(
- 'name' => 'select',
- 'type' => HTML5::ENDTAG
- )
- );
-
- $this->mainPhase($token);
- }
-
- /* Anything else */
- } else {
- /* Parse error. Ignore the token. */
- }
- }
-
- private function afterBody($token)
- {
- /* Handle the token as follows: */
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE */
- if ($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
- ) {
- /* Process the token as it would be processed if the insertion mode
- was "in body". */
- $this->inBody($token);
-
- /* A comment token */
- } elseif ($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the first element in the stack of open
- elements (the html element), with the data attribute set to the
- data given in the comment token. */
- $comment = $this->dom->createComment($token['data']);
- $this->stack[0]->appendChild($comment);
-
- /* An end tag with the tag name "html" */
- } elseif ($token['type'] === HTML5::ENDTAG && $token['name'] === 'html') {
- /* If the parser was originally created in order to handle the
- setting of an element's innerHTML attribute, this is a parse error;
- ignore the token. (The element will be an html element in this
- case.) (innerHTML case) */
-
- /* Otherwise, switch to the trailing end phase. */
- $this->phase = self::END_PHASE;
-
- /* Anything else */
- } else {
- /* Parse error. Set the insertion mode to "in body" and reprocess
- the token. */
- $this->mode = self::IN_BODY;
- return $this->inBody($token);
- }
- }
-
- private function inFrameset($token)
- {
- /* Handle the token as follows: */
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- U+000D CARRIAGE RETURN (CR), or U+0020 SPACE */
- if ($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
- ) {
- /* Append the character to the current node. */
- $this->insertText($token['data']);
-
- /* A comment token */
- } elseif ($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the current node with the data
- attribute set to the data given in the comment token. */
- $this->insertComment($token['data']);
-
- /* A start tag with the tag name "frameset" */
- } elseif ($token['name'] === 'frameset' &&
- $token['type'] === HTML5::STARTTAG
- ) {
- $this->insertElement($token);
-
- /* An end tag with the tag name "frameset" */
- } elseif ($token['name'] === 'frameset' &&
- $token['type'] === HTML5::ENDTAG
- ) {
- /* If the current node is the root html element, then this is a
- parse error; ignore the token. (innerHTML case) */
- if (end($this->stack)->nodeName === 'html') {
- // Ignore
-
- } else {
- /* Otherwise, pop the current node from the stack of open
- elements. */
- array_pop($this->stack);
-
- /* If the parser was not originally created in order to handle
- the setting of an element's innerHTML attribute (innerHTML case),
- and the current node is no longer a frameset element, then change
- the insertion mode to "after frameset". */
- $this->mode = self::AFTR_FRAME;
- }
-
- /* A start tag with the tag name "frame" */
- } elseif ($token['name'] === 'frame' &&
- $token['type'] === HTML5::STARTTAG
- ) {
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* Immediately pop the current node off the stack of open elements. */
- array_pop($this->stack);
-
- /* A start tag with the tag name "noframes" */
- } elseif ($token['name'] === 'noframes' &&
- $token['type'] === HTML5::STARTTAG
- ) {
- /* Process the token as if the insertion mode had been "in body". */
- $this->inBody($token);
-
- /* Anything else */
- } else {
- /* Parse error. Ignore the token. */
- }
- }
-
- private function afterFrameset($token)
- {
- /* Handle the token as follows: */
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- U+000D CARRIAGE RETURN (CR), or U+0020 SPACE */
- if ($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
- ) {
- /* Append the character to the current node. */
- $this->insertText($token['data']);
-
- /* A comment token */
- } elseif ($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the current node with the data
- attribute set to the data given in the comment token. */
- $this->insertComment($token['data']);
-
- /* An end tag with the tag name "html" */
- } elseif ($token['name'] === 'html' &&
- $token['type'] === HTML5::ENDTAG
- ) {
- /* Switch to the trailing end phase. */
- $this->phase = self::END_PHASE;
-
- /* A start tag with the tag name "noframes" */
- } elseif ($token['name'] === 'noframes' &&
- $token['type'] === HTML5::STARTTAG
- ) {
- /* Process the token as if the insertion mode had been "in body". */
- $this->inBody($token);
-
- /* Anything else */
- } else {
- /* Parse error. Ignore the token. */
- }
- }
-
- private function trailingEndPhase($token)
- {
- /* After the main phase, as each token is emitted from the tokenisation
- stage, it must be processed as described in this section. */
-
- /* A DOCTYPE token */
- if ($token['type'] === HTML5::DOCTYPE) {
- // Parse error. Ignore the token.
-
- /* A comment token */
- } elseif ($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the Document object with the data
- attribute set to the data given in the comment token. */
- $comment = $this->dom->createComment($token['data']);
- $this->dom->appendChild($comment);
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE */
- } elseif ($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
- ) {
- /* Process the token as it would be processed in the main phase. */
- $this->mainPhase($token);
-
- /* A character token that is not one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE. Or a start tag token. Or an end tag token. */
- } elseif (($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) ||
- $token['type'] === HTML5::STARTTAG || $token['type'] === HTML5::ENDTAG
- ) {
- /* Parse error. Switch back to the main phase and reprocess the
- token. */
- $this->phase = self::MAIN_PHASE;
- return $this->mainPhase($token);
-
- /* An end-of-file token */
- } elseif ($token['type'] === HTML5::EOF) {
- /* OMG DONE!! */
- }
- }
-
- private function insertElement($token, $append = true, $check = false)
- {
- // Proprietary workaround for libxml2's limitations with tag names
- if ($check) {
- // Slightly modified HTML5 tag-name modification,
- // removing anything that's not an ASCII letter, digit, or hyphen
- $token['name'] = preg_replace('/[^a-z0-9-]/i', '', $token['name']);
- // Remove leading hyphens and numbers
- $token['name'] = ltrim($token['name'], '-0..9');
- // In theory, this should ever be needed, but just in case
- if ($token['name'] === '') {
- $token['name'] = 'span';
- } // arbitrary generic choice
- }
-
- $el = $this->dom->createElement($token['name']);
-
- foreach ($token['attr'] as $attr) {
- if (!$el->hasAttribute($attr['name'])) {
- $el->setAttribute($attr['name'], $attr['value']);
- }
- }
-
- $this->appendToRealParent($el);
- $this->stack[] = $el;
-
- return $el;
- }
-
- private function insertText($data)
- {
- $text = $this->dom->createTextNode($data);
- $this->appendToRealParent($text);
- }
-
- private function insertComment($data)
- {
- $comment = $this->dom->createComment($data);
- $this->appendToRealParent($comment);
- }
-
- private function appendToRealParent($node)
- {
- if ($this->foster_parent === null) {
- end($this->stack)->appendChild($node);
-
- } elseif ($this->foster_parent !== null) {
- /* If the foster parent element is the parent element of the
- last table element in the stack of open elements, then the new
- node must be inserted immediately before the last table element
- in the stack of open elements in the foster parent element;
- otherwise, the new node must be appended to the foster parent
- element. */
- for ($n = count($this->stack) - 1; $n >= 0; $n--) {
- if ($this->stack[$n]->nodeName === 'table' &&
- $this->stack[$n]->parentNode !== null
- ) {
- $table = $this->stack[$n];
- break;
- }
- }
-
- if (isset($table) && $this->foster_parent->isSameNode($table->parentNode)) {
- $this->foster_parent->insertBefore($node, $table);
- } else {
- $this->foster_parent->appendChild($node);
- }
-
- $this->foster_parent = null;
- }
- }
-
- private function elementInScope($el, $table = false)
- {
- if (is_array($el)) {
- foreach ($el as $element) {
- if ($this->elementInScope($element, $table)) {
- return true;
- }
- }
-
- return false;
- }
-
- $leng = count($this->stack);
-
- for ($n = 0; $n < $leng; $n++) {
- /* 1. Initialise node to be the current node (the bottommost node of
- the stack). */
- $node = $this->stack[$leng - 1 - $n];
-
- if ($node->tagName === $el) {
- /* 2. If node is the target node, terminate in a match state. */
- return true;
-
- } elseif ($node->tagName === 'table') {
- /* 3. Otherwise, if node is a table element, terminate in a failure
- state. */
- return false;
-
- } elseif ($table === true && in_array(
- $node->tagName,
- array(
- 'caption',
- 'td',
- 'th',
- 'button',
- 'marquee',
- 'object'
- )
- )
- ) {
- /* 4. Otherwise, if the algorithm is the "has an element in scope"
- variant (rather than the "has an element in table scope" variant),
- and node is one of the following, terminate in a failure state. */
- return false;
-
- } elseif ($node === $node->ownerDocument->documentElement) {
- /* 5. Otherwise, if node is an html element (root element), terminate
- in a failure state. (This can only happen if the node is the topmost
- node of the stack of open elements, and prevents the next step from
- being invoked if there are no more elements in the stack.) */
- return false;
- }
-
- /* Otherwise, set node to the previous entry in the stack of open
- elements and return to step 2. (This will never fail, since the loop
- will always terminate in the previous step if the top of the stack
- is reached.) */
- }
- }
-
- private function reconstructActiveFormattingElements()
- {
- /* 1. If there are no entries in the list of active formatting elements,
- then there is nothing to reconstruct; stop this algorithm. */
- $formatting_elements = count($this->a_formatting);
-
- if ($formatting_elements === 0) {
- return false;
- }
-
- /* 3. Let entry be the last (most recently added) element in the list
- of active formatting elements. */
- $entry = end($this->a_formatting);
-
- /* 2. If the last (most recently added) entry in the list of active
- formatting elements is a marker, or if it is an element that is in the
- stack of open elements, then there is nothing to reconstruct; stop this
- algorithm. */
- if ($entry === self::MARKER || in_array($entry, $this->stack, true)) {
- return false;
- }
-
- for ($a = $formatting_elements - 1; $a >= 0; true) {
- /* 4. If there are no entries before entry in the list of active
- formatting elements, then jump to step 8. */
- if ($a === 0) {
- $step_seven = false;
- break;
- }
-
- /* 5. Let entry be the entry one earlier than entry in the list of
- active formatting elements. */
- $a--;
- $entry = $this->a_formatting[$a];
-
- /* 6. If entry is neither a marker nor an element that is also in
- thetack of open elements, go to step 4. */
- if ($entry === self::MARKER || in_array($entry, $this->stack, true)) {
- break;
- }
- }
-
- while (true) {
- /* 7. Let entry be the element one later than entry in the list of
- active formatting elements. */
- if (isset($step_seven) && $step_seven === true) {
- $a++;
- $entry = $this->a_formatting[$a];
- }
-
- /* 8. Perform a shallow clone of the element entry to obtain clone. */
- $clone = $entry->cloneNode();
-
- /* 9. Append clone to the current node and push it onto the stack
- of open elements so that it is the new current node. */
- end($this->stack)->appendChild($clone);
- $this->stack[] = $clone;
-
- /* 10. Replace the entry for entry in the list with an entry for
- clone. */
- $this->a_formatting[$a] = $clone;
-
- /* 11. If the entry for clone in the list of active formatting
- elements is not the last entry in the list, return to step 7. */
- if (end($this->a_formatting) !== $clone) {
- $step_seven = true;
- } else {
- break;
- }
- }
- }
-
- private function clearTheActiveFormattingElementsUpToTheLastMarker()
- {
- /* When the steps below require the UA to clear the list of active
- formatting elements up to the last marker, the UA must perform the
- following steps: */
-
- while (true) {
- /* 1. Let entry be the last (most recently added) entry in the list
- of active formatting elements. */
- $entry = end($this->a_formatting);
-
- /* 2. Remove entry from the list of active formatting elements. */
- array_pop($this->a_formatting);
-
- /* 3. If entry was a marker, then stop the algorithm at this point.
- The list has been cleared up to the last marker. */
- if ($entry === self::MARKER) {
- break;
- }
- }
- }
-
- private function generateImpliedEndTags($exclude = array())
- {
- /* When the steps below require the UA to generate implied end tags,
- then, if the current node is a dd element, a dt element, an li element,
- a p element, a td element, a th element, or a tr element, the UA must
- act as if an end tag with the respective tag name had been seen and
- then generate implied end tags again. */
- $node = end($this->stack);
- $elements = array_diff(array('dd', 'dt', 'li', 'p', 'td', 'th', 'tr'), $exclude);
-
- while (in_array(end($this->stack)->nodeName, $elements)) {
- array_pop($this->stack);
- }
- }
-
- private function getElementCategory($node)
- {
- $name = $node->tagName;
- if (in_array($name, $this->special)) {
- return self::SPECIAL;
- } elseif (in_array($name, $this->scoping)) {
- return self::SCOPING;
- } elseif (in_array($name, $this->formatting)) {
- return self::FORMATTING;
- } else {
- return self::PHRASING;
- }
- }
-
- private function clearStackToTableContext($elements)
- {
- /* When the steps above require the UA to clear the stack back to a
- table context, it means that the UA must, while the current node is not
- a table element or an html element, pop elements from the stack of open
- elements. If this causes any elements to be popped from the stack, then
- this is a parse error. */
- while (true) {
- $node = end($this->stack)->nodeName;
-
- if (in_array($node, $elements)) {
- break;
- } else {
- array_pop($this->stack);
- }
- }
- }
-
- private function resetInsertionMode()
- {
- /* 1. Let last be false. */
- $last = false;
- $leng = count($this->stack);
-
- for ($n = $leng - 1; $n >= 0; $n--) {
- /* 2. Let node be the last node in the stack of open elements. */
- $node = $this->stack[$n];
-
- /* 3. If node is the first node in the stack of open elements, then
- set last to true. If the element whose innerHTML attribute is being
- set is neither a td element nor a th element, then set node to the
- element whose innerHTML attribute is being set. (innerHTML case) */
- if ($this->stack[0]->isSameNode($node)) {
- $last = true;
- }
-
- /* 4. If node is a select element, then switch the insertion mode to
- "in select" and abort these steps. (innerHTML case) */
- if ($node->nodeName === 'select') {
- $this->mode = self::IN_SELECT;
- break;
-
- /* 5. If node is a td or th element, then switch the insertion mode
- to "in cell" and abort these steps. */
- } elseif ($node->nodeName === 'td' || $node->nodeName === 'th') {
- $this->mode = self::IN_CELL;
- break;
-
- /* 6. If node is a tr element, then switch the insertion mode to
- "in row" and abort these steps. */
- } elseif ($node->nodeName === 'tr') {
- $this->mode = self::IN_ROW;
- break;
-
- /* 7. If node is a tbody, thead, or tfoot element, then switch the
- insertion mode to "in table body" and abort these steps. */
- } elseif (in_array($node->nodeName, array('tbody', 'thead', 'tfoot'))) {
- $this->mode = self::IN_TBODY;
- break;
-
- /* 8. If node is a caption element, then switch the insertion mode
- to "in caption" and abort these steps. */
- } elseif ($node->nodeName === 'caption') {
- $this->mode = self::IN_CAPTION;
- break;
-
- /* 9. If node is a colgroup element, then switch the insertion mode
- to "in column group" and abort these steps. (innerHTML case) */
- } elseif ($node->nodeName === 'colgroup') {
- $this->mode = self::IN_CGROUP;
- break;
-
- /* 10. If node is a table element, then switch the insertion mode
- to "in table" and abort these steps. */
- } elseif ($node->nodeName === 'table') {
- $this->mode = self::IN_TABLE;
- break;
-
- /* 11. If node is a head element, then switch the insertion mode
- to "in body" ("in body"! not "in head"!) and abort these steps.
- (innerHTML case) */
- } elseif ($node->nodeName === 'head') {
- $this->mode = self::IN_BODY;
- break;
-
- /* 12. If node is a body element, then switch the insertion mode to
- "in body" and abort these steps. */
- } elseif ($node->nodeName === 'body') {
- $this->mode = self::IN_BODY;
- break;
-
- /* 13. If node is a frameset element, then switch the insertion
- mode to "in frameset" and abort these steps. (innerHTML case) */
- } elseif ($node->nodeName === 'frameset') {
- $this->mode = self::IN_FRAME;
- break;
-
- /* 14. If node is an html element, then: if the head element
- pointer is null, switch the insertion mode to "before head",
- otherwise, switch the insertion mode to "after head". In either
- case, abort these steps. (innerHTML case) */
- } elseif ($node->nodeName === 'html') {
- $this->mode = ($this->head_pointer === null)
- ? self::BEFOR_HEAD
- : self::AFTER_HEAD;
-
- break;
-
- /* 15. If last is true, then set the insertion mode to "in body"
- and abort these steps. (innerHTML case) */
- } elseif ($last) {
- $this->mode = self::IN_BODY;
- break;
- }
- }
- }
-
- private function closeCell()
- {
- /* If the stack of open elements has a td or th element in table scope,
- then act as if an end tag token with that tag name had been seen. */
- foreach (array('td', 'th') as $cell) {
- if ($this->elementInScope($cell, true)) {
- $this->inCell(
- array(
- 'name' => $cell,
- 'type' => HTML5::ENDTAG
- )
- );
-
- break;
- }
- }
- }
-
- public function save()
- {
- return $this->dom;
- }
-}
+<?php
+
+/**
+ * Experimental HTML5-based parser using Jeroen van der Meer's PH5P library.
+ * Occupies space in the HTML5 pseudo-namespace, which may cause conflicts.
+ *
+ * @note
+ * Recent changes to PHP's DOM extension have resulted in some fatal
+ * error conditions with the original version of PH5P. Pending changes,
+ * this lexer will punt to DirectLex if DOM throws an exception.
+ */
+
+class HTMLPurifier_Lexer_PH5P extends HTMLPurifier_Lexer_DOMLex
+{
+ /**
+ * @param string $html
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return HTMLPurifier_Token[]
+ */
+ public function tokenizeHTML($html, $config, $context)
+ {
+ $new_html = $this->normalize($html, $config, $context);
+ $new_html = $this->wrapHTML($new_html, $config, $context);
+ try {
+ $parser = new HTML5($new_html);
+ $doc = $parser->save();
+ } catch (DOMException $e) {
+ // Uh oh, it failed. Punt to DirectLex.
+ $lexer = new HTMLPurifier_Lexer_DirectLex();
+ $context->register('PH5PError', $e); // save the error, so we can detect it
+ return $lexer->tokenizeHTML($html, $config, $context); // use original HTML
+ }
+ $tokens = array();
+ $this->tokenizeDOM(
+ $doc->getElementsByTagName('html')->item(0)-> // <html>
+ getElementsByTagName('body')->item(0) // <body>
+ ,
+ $tokens
+ );
+ return $tokens;
+ }
+}
+
+/*
+
+Copyright 2007 Jeroen van der Meer <http://jero.net/>
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+class HTML5
+{
+ private $data;
+ private $char;
+ private $EOF;
+ private $state;
+ private $tree;
+ private $token;
+ private $content_model;
+ private $escape = false;
+ private $entities = array(
+ 'AElig;',
+ 'AElig',
+ 'AMP;',
+ 'AMP',
+ 'Aacute;',
+ 'Aacute',
+ 'Acirc;',
+ 'Acirc',
+ 'Agrave;',
+ 'Agrave',
+ 'Alpha;',
+ 'Aring;',
+ 'Aring',
+ 'Atilde;',
+ 'Atilde',
+ 'Auml;',
+ 'Auml',
+ 'Beta;',
+ 'COPY;',
+ 'COPY',
+ 'Ccedil;',
+ 'Ccedil',
+ 'Chi;',
+ 'Dagger;',
+ 'Delta;',
+ 'ETH;',
+ 'ETH',
+ 'Eacute;',
+ 'Eacute',
+ 'Ecirc;',
+ 'Ecirc',
+ 'Egrave;',
+ 'Egrave',
+ 'Epsilon;',
+ 'Eta;',
+ 'Euml;',
+ 'Euml',
+ 'GT;',
+ 'GT',
+ 'Gamma;',
+ 'Iacute;',
+ 'Iacute',
+ 'Icirc;',
+ 'Icirc',
+ 'Igrave;',
+ 'Igrave',
+ 'Iota;',
+ 'Iuml;',
+ 'Iuml',
+ 'Kappa;',
+ 'LT;',
+ 'LT',
+ 'Lambda;',
+ 'Mu;',
+ 'Ntilde;',
+ 'Ntilde',
+ 'Nu;',
+ 'OElig;',
+ 'Oacute;',
+ 'Oacute',
+ 'Ocirc;',
+ 'Ocirc',
+ 'Ograve;',
+ 'Ograve',
+ 'Omega;',
+ 'Omicron;',
+ 'Oslash;',
+ 'Oslash',
+ 'Otilde;',
+ 'Otilde',
+ 'Ouml;',
+ 'Ouml',
+ 'Phi;',
+ 'Pi;',
+ 'Prime;',
+ 'Psi;',
+ 'QUOT;',
+ 'QUOT',
+ 'REG;',
+ 'REG',
+ 'Rho;',
+ 'Scaron;',
+ 'Sigma;',
+ 'THORN;',
+ 'THORN',
+ 'TRADE;',
+ 'Tau;',
+ 'Theta;',
+ 'Uacute;',
+ 'Uacute',
+ 'Ucirc;',
+ 'Ucirc',
+ 'Ugrave;',
+ 'Ugrave',
+ 'Upsilon;',
+ 'Uuml;',
+ 'Uuml',
+ 'Xi;',
+ 'Yacute;',
+ 'Yacute',
+ 'Yuml;',
+ 'Zeta;',
+ 'aacute;',
+ 'aacute',
+ 'acirc;',
+ 'acirc',
+ 'acute;',
+ 'acute',
+ 'aelig;',
+ 'aelig',
+ 'agrave;',
+ 'agrave',
+ 'alefsym;',
+ 'alpha;',
+ 'amp;',
+ 'amp',
+ 'and;',
+ 'ang;',
+ 'apos;',
+ 'aring;',
+ 'aring',
+ 'asymp;',
+ 'atilde;',
+ 'atilde',
+ 'auml;',
+ 'auml',
+ 'bdquo;',
+ 'beta;',
+ 'brvbar;',
+ 'brvbar',
+ 'bull;',
+ 'cap;',
+ 'ccedil;',
+ 'ccedil',
+ 'cedil;',
+ 'cedil',
+ 'cent;',
+ 'cent',
+ 'chi;',
+ 'circ;',
+ 'clubs;',
+ 'cong;',
+ 'copy;',
+ 'copy',
+ 'crarr;',
+ 'cup;',
+ 'curren;',
+ 'curren',
+ 'dArr;',
+ 'dagger;',
+ 'darr;',
+ 'deg;',
+ 'deg',
+ 'delta;',
+ 'diams;',
+ 'divide;',
+ 'divide',
+ 'eacute;',
+ 'eacute',
+ 'ecirc;',
+ 'ecirc',
+ 'egrave;',
+ 'egrave',
+ 'empty;',
+ 'emsp;',
+ 'ensp;',
+ 'epsilon;',
+ 'equiv;',
+ 'eta;',
+ 'eth;',
+ 'eth',
+ 'euml;',
+ 'euml',
+ 'euro;',
+ 'exist;',
+ 'fnof;',
+ 'forall;',
+ 'frac12;',
+ 'frac12',
+ 'frac14;',
+ 'frac14',
+ 'frac34;',
+ 'frac34',
+ 'frasl;',
+ 'gamma;',
+ 'ge;',
+ 'gt;',
+ 'gt',
+ 'hArr;',
+ 'harr;',
+ 'hearts;',
+ 'hellip;',
+ 'iacute;',
+ 'iacute',
+ 'icirc;',
+ 'icirc',
+ 'iexcl;',
+ 'iexcl',
+ 'igrave;',
+ 'igrave',
+ 'image;',
+ 'infin;',
+ 'int;',
+ 'iota;',
+ 'iquest;',
+ 'iquest',
+ 'isin;',
+ 'iuml;',
+ 'iuml',
+ 'kappa;',
+ 'lArr;',
+ 'lambda;',
+ 'lang;',
+ 'laquo;',
+ 'laquo',
+ 'larr;',
+ 'lceil;',
+ 'ldquo;',
+ 'le;',
+ 'lfloor;',
+ 'lowast;',
+ 'loz;',
+ 'lrm;',
+ 'lsaquo;',
+ 'lsquo;',
+ 'lt;',
+ 'lt',
+ 'macr;',
+ 'macr',
+ 'mdash;',
+ 'micro;',
+ 'micro',
+ 'middot;',
+ 'middot',
+ 'minus;',
+ 'mu;',
+ 'nabla;',
+ 'nbsp;',
+ 'nbsp',
+ 'ndash;',
+ 'ne;',
+ 'ni;',
+ 'not;',
+ 'not',
+ 'notin;',
+ 'nsub;',
+ 'ntilde;',
+ 'ntilde',
+ 'nu;',
+ 'oacute;',
+ 'oacute',
+ 'ocirc;',
+ 'ocirc',
+ 'oelig;',
+ 'ograve;',
+ 'ograve',
+ 'oline;',
+ 'omega;',
+ 'omicron;',
+ 'oplus;',
+ 'or;',
+ 'ordf;',
+ 'ordf',
+ 'ordm;',
+ 'ordm',
+ 'oslash;',
+ 'oslash',
+ 'otilde;',
+ 'otilde',
+ 'otimes;',
+ 'ouml;',
+ 'ouml',
+ 'para;',
+ 'para',
+ 'part;',
+ 'permil;',
+ 'perp;',
+ 'phi;',
+ 'pi;',
+ 'piv;',
+ 'plusmn;',
+ 'plusmn',
+ 'pound;',
+ 'pound',
+ 'prime;',
+ 'prod;',
+ 'prop;',
+ 'psi;',
+ 'quot;',
+ 'quot',
+ 'rArr;',
+ 'radic;',
+ 'rang;',
+ 'raquo;',
+ 'raquo',
+ 'rarr;',
+ 'rceil;',
+ 'rdquo;',
+ 'real;',
+ 'reg;',
+ 'reg',
+ 'rfloor;',
+ 'rho;',
+ 'rlm;',
+ 'rsaquo;',
+ 'rsquo;',
+ 'sbquo;',
+ 'scaron;',
+ 'sdot;',
+ 'sect;',
+ 'sect',
+ 'shy;',
+ 'shy',
+ 'sigma;',
+ 'sigmaf;',
+ 'sim;',
+ 'spades;',
+ 'sub;',
+ 'sube;',
+ 'sum;',
+ 'sup1;',
+ 'sup1',
+ 'sup2;',
+ 'sup2',
+ 'sup3;',
+ 'sup3',
+ 'sup;',
+ 'supe;',
+ 'szlig;',
+ 'szlig',
+ 'tau;',
+ 'there4;',
+ 'theta;',
+ 'thetasym;',
+ 'thinsp;',
+ 'thorn;',
+ 'thorn',
+ 'tilde;',
+ 'times;',
+ 'times',
+ 'trade;',
+ 'uArr;',
+ 'uacute;',
+ 'uacute',
+ 'uarr;',
+ 'ucirc;',
+ 'ucirc',
+ 'ugrave;',
+ 'ugrave',
+ 'uml;',
+ 'uml',
+ 'upsih;',
+ 'upsilon;',
+ 'uuml;',
+ 'uuml',
+ 'weierp;',
+ 'xi;',
+ 'yacute;',
+ 'yacute',
+ 'yen;',
+ 'yen',
+ 'yuml;',
+ 'yuml',
+ 'zeta;',
+ 'zwj;',
+ 'zwnj;'
+ );
+
+ const PCDATA = 0;
+ const RCDATA = 1;
+ const CDATA = 2;
+ const PLAINTEXT = 3;
+
+ const DOCTYPE = 0;
+ const STARTTAG = 1;
+ const ENDTAG = 2;
+ const COMMENT = 3;
+ const CHARACTR = 4;
+ const EOF = 5;
+
+ public function __construct($data)
+ {
+ $this->data = $data;
+ $this->char = -1;
+ $this->EOF = strlen($data);
+ $this->tree = new HTML5TreeConstructer;
+ $this->content_model = self::PCDATA;
+
+ $this->state = 'data';
+
+ while ($this->state !== null) {
+ $this->{$this->state . 'State'}();
+ }
+ }
+
+ public function save()
+ {
+ return $this->tree->save();
+ }
+
+ private function char()
+ {
+ return ($this->char < $this->EOF)
+ ? $this->data[$this->char]
+ : false;
+ }
+
+ private function character($s, $l = 0)
+ {
+ if ($s + $l < $this->EOF) {
+ if ($l === 0) {
+ return $this->data[$s];
+ } else {
+ return substr($this->data, $s, $l);
+ }
+ }
+ }
+
+ private function characters($char_class, $start)
+ {
+ return preg_replace('#^([' . $char_class . ']+).*#s', '\\1', substr($this->data, $start));
+ }
+
+ private function dataState()
+ {
+ // Consume the next input character
+ $this->char++;
+ $char = $this->char();
+
+ if ($char === '&' && ($this->content_model === self::PCDATA || $this->content_model === self::RCDATA)) {
+ /* U+0026 AMPERSAND (&)
+ When the content model flag is set to one of the PCDATA or RCDATA
+ states: switch to the entity data state. Otherwise: treat it as per
+ the "anything else" entry below. */
+ $this->state = 'entityData';
+
+ } elseif ($char === '-') {
+ /* If the content model flag is set to either the RCDATA state or
+ the CDATA state, and the escape flag is false, and there are at
+ least three characters before this one in the input stream, and the
+ last four characters in the input stream, including this one, are
+ U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS,
+ and U+002D HYPHEN-MINUS ("<!--"), then set the escape flag to true. */
+ if (($this->content_model === self::RCDATA || $this->content_model ===
+ self::CDATA) && $this->escape === false &&
+ $this->char >= 3 && $this->character($this->char - 4, 4) === '<!--'
+ ) {
+ $this->escape = true;
+ }
+
+ /* In any case, emit the input character as a character token. Stay
+ in the data state. */
+ $this->emitToken(
+ array(
+ 'type' => self::CHARACTR,
+ 'data' => $char
+ )
+ );
+
+ /* U+003C LESS-THAN SIGN (<) */
+ } elseif ($char === '<' && ($this->content_model === self::PCDATA ||
+ (($this->content_model === self::RCDATA ||
+ $this->content_model === self::CDATA) && $this->escape === false))
+ ) {
+ /* When the content model flag is set to the PCDATA state: switch
+ to the tag open state.
+
+ When the content model flag is set to either the RCDATA state or
+ the CDATA state and the escape flag is false: switch to the tag
+ open state.
+
+ Otherwise: treat it as per the "anything else" entry below. */
+ $this->state = 'tagOpen';
+
+ /* U+003E GREATER-THAN SIGN (>) */
+ } elseif ($char === '>') {
+ /* If the content model flag is set to either the RCDATA state or
+ the CDATA state, and the escape flag is true, and the last three
+ characters in the input stream including this one are U+002D
+ HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN ("-->"),
+ set the escape flag to false. */
+ if (($this->content_model === self::RCDATA ||
+ $this->content_model === self::CDATA) && $this->escape === true &&
+ $this->character($this->char, 3) === '-->'
+ ) {
+ $this->escape = false;
+ }
+
+ /* In any case, emit the input character as a character token.
+ Stay in the data state. */
+ $this->emitToken(
+ array(
+ 'type' => self::CHARACTR,
+ 'data' => $char
+ )
+ );
+
+ } elseif ($this->char === $this->EOF) {
+ /* EOF
+ Emit an end-of-file token. */
+ $this->EOF();
+
+ } elseif ($this->content_model === self::PLAINTEXT) {
+ /* When the content model flag is set to the PLAINTEXT state
+ THIS DIFFERS GREATLY FROM THE SPEC: Get the remaining characters of
+ the text and emit it as a character token. */
+ $this->emitToken(
+ array(
+ 'type' => self::CHARACTR,
+ 'data' => substr($this->data, $this->char)
+ )
+ );
+
+ $this->EOF();
+
+ } else {
+ /* Anything else
+ THIS DIFFERS GREATLY FROM THE SPEC: Get as many character that
+ otherwise would also be treated as a character token and emit it
+ as a single character token. Stay in the data state. */
+ $len = strcspn($this->data, '<&', $this->char);
+ $char = substr($this->data, $this->char, $len);
+ $this->char += $len - 1;
+
+ $this->emitToken(
+ array(
+ 'type' => self::CHARACTR,
+ 'data' => $char
+ )
+ );
+
+ $this->state = 'data';
+ }
+ }
+
+ private function entityDataState()
+ {
+ // Attempt to consume an entity.
+ $entity = $this->entity();
+
+ // If nothing is returned, emit a U+0026 AMPERSAND character token.
+ // Otherwise, emit the character token that was returned.
+ $char = (!$entity) ? '&' : $entity;
+ $this->emitToken(
+ array(
+ 'type' => self::CHARACTR,
+ 'data' => $char
+ )
+ );
+
+ // Finally, switch to the data state.
+ $this->state = 'data';
+ }
+
+ private function tagOpenState()
+ {
+ switch ($this->content_model) {
+ case self::RCDATA:
+ case self::CDATA:
+ /* If the next input character is a U+002F SOLIDUS (/) character,
+ consume it and switch to the close tag open state. If the next
+ input character is not a U+002F SOLIDUS (/) character, emit a
+ U+003C LESS-THAN SIGN character token and switch to the data
+ state to process the next input character. */
+ if ($this->character($this->char + 1) === '/') {
+ $this->char++;
+ $this->state = 'closeTagOpen';
+
+ } else {
+ $this->emitToken(
+ array(
+ 'type' => self::CHARACTR,
+ 'data' => '<'
+ )
+ );
+
+ $this->state = 'data';
+ }
+ break;
+
+ case self::PCDATA:
+ // If the content model flag is set to the PCDATA state
+ // Consume the next input character:
+ $this->char++;
+ $char = $this->char();
+
+ if ($char === '!') {
+ /* U+0021 EXCLAMATION MARK (!)
+ Switch to the markup declaration open state. */
+ $this->state = 'markupDeclarationOpen';
+
+ } elseif ($char === '/') {
+ /* U+002F SOLIDUS (/)
+ Switch to the close tag open state. */
+ $this->state = 'closeTagOpen';
+
+ } elseif (preg_match('/^[A-Za-z]$/', $char)) {
+ /* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
+ Create a new start tag token, set its tag name to the lowercase
+ version of the input character (add 0x0020 to the character's code
+ point), then switch to the tag name state. (Don't emit the token
+ yet; further details will be filled in before it is emitted.) */
+ $this->token = array(
+ 'name' => strtolower($char),
+ 'type' => self::STARTTAG,
+ 'attr' => array()
+ );
+
+ $this->state = 'tagName';
+
+ } elseif ($char === '>') {
+ /* U+003E GREATER-THAN SIGN (>)
+ Parse error. Emit a U+003C LESS-THAN SIGN character token and a
+ U+003E GREATER-THAN SIGN character token. Switch to the data state. */
+ $this->emitToken(
+ array(
+ 'type' => self::CHARACTR,
+ 'data' => '<>'
+ )
+ );
+
+ $this->state = 'data';
+
+ } elseif ($char === '?') {
+ /* U+003F QUESTION MARK (?)
+ Parse error. Switch to the bogus comment state. */
+ $this->state = 'bogusComment';
+
+ } else {
+ /* Anything else
+ Parse error. Emit a U+003C LESS-THAN SIGN character token and
+ reconsume the current input character in the data state. */
+ $this->emitToken(
+ array(
+ 'type' => self::CHARACTR,
+ 'data' => '<'
+ )
+ );
+
+ $this->char--;
+ $this->state = 'data';
+ }
+ break;
+ }
+ }
+
+ private function closeTagOpenState()
+ {
+ $next_node = strtolower($this->characters('A-Za-z', $this->char + 1));
+ $the_same = count($this->tree->stack) > 0 && $next_node === end($this->tree->stack)->nodeName;
+
+ if (($this->content_model === self::RCDATA || $this->content_model === self::CDATA) &&
+ (!$the_same || ($the_same && (!preg_match(
+ '/[\t\n\x0b\x0c >\/]/',
+ $this->character($this->char + 1 + strlen($next_node))
+ ) || $this->EOF === $this->char)))
+ ) {
+ /* If the content model flag is set to the RCDATA or CDATA states then
+ examine the next few characters. If they do not match the tag name of
+ the last start tag token emitted (case insensitively), or if they do but
+ they are not immediately followed by one of the following characters:
+ * U+0009 CHARACTER TABULATION
+ * U+000A LINE FEED (LF)
+ * U+000B LINE TABULATION
+ * U+000C FORM FEED (FF)
+ * U+0020 SPACE
+ * U+003E GREATER-THAN SIGN (>)
+ * U+002F SOLIDUS (/)
+ * EOF
+ ...then there is a parse error. Emit a U+003C LESS-THAN SIGN character
+ token, a U+002F SOLIDUS character token, and switch to the data state
+ to process the next input character. */
+ $this->emitToken(
+ array(
+ 'type' => self::CHARACTR,
+ 'data' => '</'
+ )
+ );
+
+ $this->state = 'data';
+
+ } else {
+ /* Otherwise, if the content model flag is set to the PCDATA state,
+ or if the next few characters do match that tag name, consume the
+ next input character: */
+ $this->char++;
+ $char = $this->char();
+
+ if (preg_match('/^[A-Za-z]$/', $char)) {
+ /* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
+ Create a new end tag token, set its tag name to the lowercase version
+ of the input character (add 0x0020 to the character's code point), then
+ switch to the tag name state. (Don't emit the token yet; further details
+ will be filled in before it is emitted.) */
+ $this->token = array(
+ 'name' => strtolower($char),
+ 'type' => self::ENDTAG
+ );
+
+ $this->state = 'tagName';
+
+ } elseif ($char === '>') {
+ /* U+003E GREATER-THAN SIGN (>)
+ Parse error. Switch to the data state. */
+ $this->state = 'data';
+
+ } elseif ($this->char === $this->EOF) {
+ /* EOF
+ Parse error. Emit a U+003C LESS-THAN SIGN character token and a U+002F
+ SOLIDUS character token. Reconsume the EOF character in the data state. */
+ $this->emitToken(
+ array(
+ 'type' => self::CHARACTR,
+ 'data' => '</'
+ )
+ );
+
+ $this->char--;
+ $this->state = 'data';
+
+ } else {
+ /* Parse error. Switch to the bogus comment state. */
+ $this->state = 'bogusComment';
+ }
+ }
+ }
+
+ private function tagNameState()
+ {
+ // Consume the next input character:
+ $this->char++;
+ $char = $this->character($this->char);
+
+ if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+ /* U+0009 CHARACTER TABULATION
+ U+000A LINE FEED (LF)
+ U+000B LINE TABULATION
+ U+000C FORM FEED (FF)
+ U+0020 SPACE
+ Switch to the before attribute name state. */
+ $this->state = 'beforeAttributeName';
+
+ } elseif ($char === '>') {
+ /* U+003E GREATER-THAN SIGN (>)
+ Emit the current tag token. Switch to the data state. */
+ $this->emitToken($this->token);
+ $this->state = 'data';
+
+ } elseif ($this->char === $this->EOF) {
+ /* EOF
+ Parse error. Emit the current tag token. Reconsume the EOF
+ character in the data state. */
+ $this->emitToken($this->token);
+
+ $this->char--;
+ $this->state = 'data';
+
+ } elseif ($char === '/') {
+ /* U+002F SOLIDUS (/)
+ Parse error unless this is a permitted slash. Switch to the before
+ attribute name state. */
+ $this->state = 'beforeAttributeName';
+
+ } else {
+ /* Anything else
+ Append the current input character to the current tag token's tag name.
+ Stay in the tag name state. */
+ $this->token['name'] .= strtolower($char);
+ $this->state = 'tagName';
+ }
+ }
+
+ private function beforeAttributeNameState()
+ {
+ // Consume the next input character:
+ $this->char++;
+ $char = $this->character($this->char);
+
+ if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+ /* U+0009 CHARACTER TABULATION
+ U+000A LINE FEED (LF)
+ U+000B LINE TABULATION
+ U+000C FORM FEED (FF)
+ U+0020 SPACE
+ Stay in the before attribute name state. */
+ $this->state = 'beforeAttributeName';
+
+ } elseif ($char === '>') {
+ /* U+003E GREATER-THAN SIGN (>)
+ Emit the current tag token. Switch to the data state. */
+ $this->emitToken($this->token);
+ $this->state = 'data';
+
+ } elseif ($char === '/') {
+ /* U+002F SOLIDUS (/)
+ Parse error unless this is a permitted slash. Stay in the before
+ attribute name state. */
+ $this->state = 'beforeAttributeName';
+
+ } elseif ($this->char === $this->EOF) {
+ /* EOF
+ Parse error. Emit the current tag token. Reconsume the EOF
+ character in the data state. */
+ $this->emitToken($this->token);
+
+ $this->char--;
+ $this->state = 'data';
+
+ } else {
+ /* Anything else
+ Start a new attribute in the current tag token. Set that attribute's
+ name to the current input character, and its value to the empty string.
+ Switch to the attribute name state. */
+ $this->token['attr'][] = array(
+ 'name' => strtolower($char),
+ 'value' => null
+ );
+
+ $this->state = 'attributeName';
+ }
+ }
+
+ private function attributeNameState()
+ {
+ // Consume the next input character:
+ $this->char++;
+ $char = $this->character($this->char);
+
+ if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+ /* U+0009 CHARACTER TABULATION
+ U+000A LINE FEED (LF)
+ U+000B LINE TABULATION
+ U+000C FORM FEED (FF)
+ U+0020 SPACE
+ Stay in the before attribute name state. */
+ $this->state = 'afterAttributeName';
+
+ } elseif ($char === '=') {
+ /* U+003D EQUALS SIGN (=)
+ Switch to the before attribute value state. */
+ $this->state = 'beforeAttributeValue';
+
+ } elseif ($char === '>') {
+ /* U+003E GREATER-THAN SIGN (>)
+ Emit the current tag token. Switch to the data state. */
+ $this->emitToken($this->token);
+ $this->state = 'data';
+
+ } elseif ($char === '/' && $this->character($this->char + 1) !== '>') {
+ /* U+002F SOLIDUS (/)
+ Parse error unless this is a permitted slash. Switch to the before
+ attribute name state. */
+ $this->state = 'beforeAttributeName';
+
+ } elseif ($this->char === $this->EOF) {
+ /* EOF
+ Parse error. Emit the current tag token. Reconsume the EOF
+ character in the data state. */
+ $this->emitToken($this->token);
+
+ $this->char--;
+ $this->state = 'data';
+
+ } else {
+ /* Anything else
+ Append the current input character to the current attribute's name.
+ Stay in the attribute name state. */
+ $last = count($this->token['attr']) - 1;
+ $this->token['attr'][$last]['name'] .= strtolower($char);
+
+ $this->state = 'attributeName';
+ }
+ }
+
+ private function afterAttributeNameState()
+ {
+ // Consume the next input character:
+ $this->char++;
+ $char = $this->character($this->char);
+
+ if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+ /* U+0009 CHARACTER TABULATION
+ U+000A LINE FEED (LF)
+ U+000B LINE TABULATION
+ U+000C FORM FEED (FF)
+ U+0020 SPACE
+ Stay in the after attribute name state. */
+ $this->state = 'afterAttributeName';
+
+ } elseif ($char === '=') {
+ /* U+003D EQUALS SIGN (=)
+ Switch to the before attribute value state. */
+ $this->state = 'beforeAttributeValue';
+
+ } elseif ($char === '>') {
+ /* U+003E GREATER-THAN SIGN (>)
+ Emit the current tag token. Switch to the data state. */
+ $this->emitToken($this->token);
+ $this->state = 'data';
+
+ } elseif ($char === '/' && $this->character($this->char + 1) !== '>') {
+ /* U+002F SOLIDUS (/)
+ Parse error unless this is a permitted slash. Switch to the
+ before attribute name state. */
+ $this->state = 'beforeAttributeName';
+
+ } elseif ($this->char === $this->EOF) {
+ /* EOF
+ Parse error. Emit the current tag token. Reconsume the EOF
+ character in the data state. */
+ $this->emitToken($this->token);
+
+ $this->char--;
+ $this->state = 'data';
+
+ } else {
+ /* Anything else
+ Start a new attribute in the current tag token. Set that attribute's
+ name to the current input character, and its value to the empty string.
+ Switch to the attribute name state. */
+ $this->token['attr'][] = array(
+ 'name' => strtolower($char),
+ 'value' => null
+ );
+
+ $this->state = 'attributeName';
+ }
+ }
+
+ private function beforeAttributeValueState()
+ {
+ // Consume the next input character:
+ $this->char++;
+ $char = $this->character($this->char);
+
+ if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+ /* U+0009 CHARACTER TABULATION
+ U+000A LINE FEED (LF)
+ U+000B LINE TABULATION
+ U+000C FORM FEED (FF)
+ U+0020 SPACE
+ Stay in the before attribute value state. */
+ $this->state = 'beforeAttributeValue';
+
+ } elseif ($char === '"') {
+ /* U+0022 QUOTATION MARK (")
+ Switch to the attribute value (double-quoted) state. */
+ $this->state = 'attributeValueDoubleQuoted';
+
+ } elseif ($char === '&') {
+ /* U+0026 AMPERSAND (&)
+ Switch to the attribute value (unquoted) state and reconsume
+ this input character. */
+ $this->char--;
+ $this->state = 'attributeValueUnquoted';
+
+ } elseif ($char === '\'') {
+ /* U+0027 APOSTROPHE (')
+ Switch to the attribute value (single-quoted) state. */
+ $this->state = 'attributeValueSingleQuoted';
+
+ } elseif ($char === '>') {
+ /* U+003E GREATER-THAN SIGN (>)
+ Emit the current tag token. Switch to the data state. */
+ $this->emitToken($this->token);
+ $this->state = 'data';
+
+ } else {
+ /* Anything else
+ Append the current input character to the current attribute's value.
+ Switch to the attribute value (unquoted) state. */
+ $last = count($this->token['attr']) - 1;
+ $this->token['attr'][$last]['value'] .= $char;
+
+ $this->state = 'attributeValueUnquoted';
+ }
+ }
+
+ private function attributeValueDoubleQuotedState()
+ {
+ // Consume the next input character:
+ $this->char++;
+ $char = $this->character($this->char);
+
+ if ($char === '"') {
+ /* U+0022 QUOTATION MARK (")
+ Switch to the before attribute name state. */
+ $this->state = 'beforeAttributeName';
+
+ } elseif ($char === '&') {
+ /* U+0026 AMPERSAND (&)
+ Switch to the entity in attribute value state. */
+ $this->entityInAttributeValueState('double');
+
+ } elseif ($this->char === $this->EOF) {
+ /* EOF
+ Parse error. Emit the current tag token. Reconsume the character
+ in the data state. */
+ $this->emitToken($this->token);
+
+ $this->char--;
+ $this->state = 'data';
+
+ } else {
+ /* Anything else
+ Append the current input character to the current attribute's value.
+ Stay in the attribute value (double-quoted) state. */
+ $last = count($this->token['attr']) - 1;
+ $this->token['attr'][$last]['value'] .= $char;
+
+ $this->state = 'attributeValueDoubleQuoted';
+ }
+ }
+
+ private function attributeValueSingleQuotedState()
+ {
+ // Consume the next input character:
+ $this->char++;
+ $char = $this->character($this->char);
+
+ if ($char === '\'') {
+ /* U+0022 QUOTATION MARK (')
+ Switch to the before attribute name state. */
+ $this->state = 'beforeAttributeName';
+
+ } elseif ($char === '&') {
+ /* U+0026 AMPERSAND (&)
+ Switch to the entity in attribute value state. */
+ $this->entityInAttributeValueState('single');
+
+ } elseif ($this->char === $this->EOF) {
+ /* EOF
+ Parse error. Emit the current tag token. Reconsume the character
+ in the data state. */
+ $this->emitToken($this->token);
+
+ $this->char--;
+ $this->state = 'data';
+
+ } else {
+ /* Anything else
+ Append the current input character to the current attribute's value.
+ Stay in the attribute value (single-quoted) state. */
+ $last = count($this->token['attr']) - 1;
+ $this->token['attr'][$last]['value'] .= $char;
+
+ $this->state = 'attributeValueSingleQuoted';
+ }
+ }
+
+ private function attributeValueUnquotedState()
+ {
+ // Consume the next input character:
+ $this->char++;
+ $char = $this->character($this->char);
+
+ if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+ /* U+0009 CHARACTER TABULATION
+ U+000A LINE FEED (LF)
+ U+000B LINE TABULATION
+ U+000C FORM FEED (FF)
+ U+0020 SPACE
+ Switch to the before attribute name state. */
+ $this->state = 'beforeAttributeName';
+
+ } elseif ($char === '&') {
+ /* U+0026 AMPERSAND (&)
+ Switch to the entity in attribute value state. */
+ $this->entityInAttributeValueState();
+
+ } elseif ($char === '>') {
+ /* U+003E GREATER-THAN SIGN (>)
+ Emit the current tag token. Switch to the data state. */
+ $this->emitToken($this->token);
+ $this->state = 'data';
+
+ } else {
+ /* Anything else
+ Append the current input character to the current attribute's value.
+ Stay in the attribute value (unquoted) state. */
+ $last = count($this->token['attr']) - 1;
+ $this->token['attr'][$last]['value'] .= $char;
+
+ $this->state = 'attributeValueUnquoted';
+ }
+ }
+
+ private function entityInAttributeValueState()
+ {
+ // Attempt to consume an entity.
+ $entity = $this->entity();
+
+ // If nothing is returned, append a U+0026 AMPERSAND character to the
+ // current attribute's value. Otherwise, emit the character token that
+ // was returned.
+ $char = (!$entity)
+ ? '&'
+ : $entity;
+
+ $last = count($this->token['attr']) - 1;
+ $this->token['attr'][$last]['value'] .= $char;
+ }
+
+ private function bogusCommentState()
+ {
+ /* Consume every character up to the first U+003E GREATER-THAN SIGN
+ character (>) or the end of the file (EOF), whichever comes first. Emit
+ a comment token whose data is the concatenation of all the characters
+ starting from and including the character that caused the state machine
+ to switch into the bogus comment state, up to and including the last
+ consumed character before the U+003E character, if any, or up to the
+ end of the file otherwise. (If the comment was started by the end of
+ the file (EOF), the token is empty.) */
+ $data = $this->characters('^>', $this->char);
+ $this->emitToken(
+ array(
+ 'data' => $data,
+ 'type' => self::COMMENT
+ )
+ );
+
+ $this->char += strlen($data);
+
+ /* Switch to the data state. */
+ $this->state = 'data';
+
+ /* If the end of the file was reached, reconsume the EOF character. */
+ if ($this->char === $this->EOF) {
+ $this->char = $this->EOF - 1;
+ }
+ }
+
+ private function markupDeclarationOpenState()
+ {
+ /* If the next two characters are both U+002D HYPHEN-MINUS (-)
+ characters, consume those two characters, create a comment token whose
+ data is the empty string, and switch to the comment state. */
+ if ($this->character($this->char + 1, 2) === '--') {
+ $this->char += 2;
+ $this->state = 'comment';
+ $this->token = array(
+ 'data' => null,
+ 'type' => self::COMMENT
+ );
+
+ /* Otherwise if the next seven chacacters are a case-insensitive match
+ for the word "DOCTYPE", then consume those characters and switch to the
+ DOCTYPE state. */
+ } elseif (strtolower($this->character($this->char + 1, 7)) === 'doctype') {
+ $this->char += 7;
+ $this->state = 'doctype';
+
+ /* Otherwise, is is a parse error. Switch to the bogus comment state.
+ The next character that is consumed, if any, is the first character
+ that will be in the comment. */
+ } else {
+ $this->char++;
+ $this->state = 'bogusComment';
+ }
+ }
+
+ private function commentState()
+ {
+ /* Consume the next input character: */
+ $this->char++;
+ $char = $this->char();
+
+ /* U+002D HYPHEN-MINUS (-) */
+ if ($char === '-') {
+ /* Switch to the comment dash state */
+ $this->state = 'commentDash';
+
+ /* EOF */
+ } elseif ($this->char === $this->EOF) {
+ /* Parse error. Emit the comment token. Reconsume the EOF character
+ in the data state. */
+ $this->emitToken($this->token);
+ $this->char--;
+ $this->state = 'data';
+
+ /* Anything else */
+ } else {
+ /* Append the input character to the comment token's data. Stay in
+ the comment state. */
+ $this->token['data'] .= $char;
+ }
+ }
+
+ private function commentDashState()
+ {
+ /* Consume the next input character: */
+ $this->char++;
+ $char = $this->char();
+
+ /* U+002D HYPHEN-MINUS (-) */
+ if ($char === '-') {
+ /* Switch to the comment end state */
+ $this->state = 'commentEnd';
+
+ /* EOF */
+ } elseif ($this->char === $this->EOF) {
+ /* Parse error. Emit the comment token. Reconsume the EOF character
+ in the data state. */
+ $this->emitToken($this->token);
+ $this->char--;
+ $this->state = 'data';
+
+ /* Anything else */
+ } else {
+ /* Append a U+002D HYPHEN-MINUS (-) character and the input
+ character to the comment token's data. Switch to the comment state. */
+ $this->token['data'] .= '-' . $char;
+ $this->state = 'comment';
+ }
+ }
+
+ private function commentEndState()
+ {
+ /* Consume the next input character: */
+ $this->char++;
+ $char = $this->char();
+
+ if ($char === '>') {
+ $this->emitToken($this->token);
+ $this->state = 'data';
+
+ } elseif ($char === '-') {
+ $this->token['data'] .= '-';
+
+ } elseif ($this->char === $this->EOF) {
+ $this->emitToken($this->token);
+ $this->char--;
+ $this->state = 'data';
+
+ } else {
+ $this->token['data'] .= '--' . $char;
+ $this->state = 'comment';
+ }
+ }
+
+ private function doctypeState()
+ {
+ /* Consume the next input character: */
+ $this->char++;
+ $char = $this->char();
+
+ if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+ $this->state = 'beforeDoctypeName';
+
+ } else {
+ $this->char--;
+ $this->state = 'beforeDoctypeName';
+ }
+ }
+
+ private function beforeDoctypeNameState()
+ {
+ /* Consume the next input character: */
+ $this->char++;
+ $char = $this->char();
+
+ if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+ // Stay in the before DOCTYPE name state.
+
+ } elseif (preg_match('/^[a-z]$/', $char)) {
+ $this->token = array(
+ 'name' => strtoupper($char),
+ 'type' => self::DOCTYPE,
+ 'error' => true
+ );
+
+ $this->state = 'doctypeName';
+
+ } elseif ($char === '>') {
+ $this->emitToken(
+ array(
+ 'name' => null,
+ 'type' => self::DOCTYPE,
+ 'error' => true
+ )
+ );
+
+ $this->state = 'data';
+
+ } elseif ($this->char === $this->EOF) {
+ $this->emitToken(
+ array(
+ 'name' => null,
+ 'type' => self::DOCTYPE,
+ 'error' => true
+ )
+ );
+
+ $this->char--;
+ $this->state = 'data';
+
+ } else {
+ $this->token = array(
+ 'name' => $char,
+ 'type' => self::DOCTYPE,
+ 'error' => true
+ );
+
+ $this->state = 'doctypeName';
+ }
+ }
+
+ private function doctypeNameState()
+ {
+ /* Consume the next input character: */
+ $this->char++;
+ $char = $this->char();
+
+ if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+ $this->state = 'AfterDoctypeName';
+
+ } elseif ($char === '>') {
+ $this->emitToken($this->token);
+ $this->state = 'data';
+
+ } elseif (preg_match('/^[a-z]$/', $char)) {
+ $this->token['name'] .= strtoupper($char);
+
+ } elseif ($this->char === $this->EOF) {
+ $this->emitToken($this->token);
+ $this->char--;
+ $this->state = 'data';
+
+ } else {
+ $this->token['name'] .= $char;
+ }
+
+ $this->token['error'] = ($this->token['name'] === 'HTML')
+ ? false
+ : true;
+ }
+
+ private function afterDoctypeNameState()
+ {
+ /* Consume the next input character: */
+ $this->char++;
+ $char = $this->char();
+
+ if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+ // Stay in the DOCTYPE name state.
+
+ } elseif ($char === '>') {
+ $this->emitToken($this->token);
+ $this->state = 'data';
+
+ } elseif ($this->char === $this->EOF) {
+ $this->emitToken($this->token);
+ $this->char--;
+ $this->state = 'data';
+
+ } else {
+ $this->token['error'] = true;
+ $this->state = 'bogusDoctype';
+ }
+ }
+
+ private function bogusDoctypeState()
+ {
+ /* Consume the next input character: */
+ $this->char++;
+ $char = $this->char();
+
+ if ($char === '>') {
+ $this->emitToken($this->token);
+ $this->state = 'data';
+
+ } elseif ($this->char === $this->EOF) {
+ $this->emitToken($this->token);
+ $this->char--;
+ $this->state = 'data';
+
+ } else {
+ // Stay in the bogus DOCTYPE state.
+ }
+ }
+
+ private function entity()
+ {
+ $start = $this->char;
+
+ // This section defines how to consume an entity. This definition is
+ // used when parsing entities in text and in attributes.
+
+ // The behaviour depends on the identity of the next character (the
+ // one immediately after the U+0026 AMPERSAND character):
+
+ switch ($this->character($this->char + 1)) {
+ // U+0023 NUMBER SIGN (#)
+ case '#':
+
+ // The behaviour further depends on the character after the
+ // U+0023 NUMBER SIGN:
+ switch ($this->character($this->char + 1)) {
+ // U+0078 LATIN SMALL LETTER X
+ // U+0058 LATIN CAPITAL LETTER X
+ case 'x':
+ case 'X':
+ // Follow the steps below, but using the range of
+ // characters U+0030 DIGIT ZERO through to U+0039 DIGIT
+ // NINE, U+0061 LATIN SMALL LETTER A through to U+0066
+ // LATIN SMALL LETTER F, and U+0041 LATIN CAPITAL LETTER
+ // A, through to U+0046 LATIN CAPITAL LETTER F (in other
+ // words, 0-9, A-F, a-f).
+ $char = 1;
+ $char_class = '0-9A-Fa-f';
+ break;
+
+ // Anything else
+ default:
+ // Follow the steps below, but using the range of
+ // characters U+0030 DIGIT ZERO through to U+0039 DIGIT
+ // NINE (i.e. just 0-9).
+ $char = 0;
+ $char_class = '0-9';
+ break;
+ }
+
+ // Consume as many characters as match the range of characters
+ // given above.
+ $this->char++;
+ $e_name = $this->characters($char_class, $this->char + $char + 1);
+ $entity = $this->character($start, $this->char);
+ $cond = strlen($e_name) > 0;
+
+ // The rest of the parsing happens bellow.
+ break;
+
+ // Anything else
+ default:
+ // Consume the maximum number of characters possible, with the
+ // consumed characters case-sensitively matching one of the
+ // identifiers in the first column of the entities table.
+ $e_name = $this->characters('0-9A-Za-z;', $this->char + 1);
+ $len = strlen($e_name);
+
+ for ($c = 1; $c <= $len; $c++) {
+ $id = substr($e_name, 0, $c);
+ $this->char++;
+
+ if (in_array($id, $this->entities)) {
+ if ($e_name[$c - 1] !== ';') {
+ if ($c < $len && $e_name[$c] == ';') {
+ $this->char++; // consume extra semicolon
+ }
+ }
+ $entity = $id;
+ break;
+ }
+ }
+
+ $cond = isset($entity);
+ // The rest of the parsing happens bellow.
+ break;
+ }
+
+ if (!$cond) {
+ // If no match can be made, then this is a parse error. No
+ // characters are consumed, and nothing is returned.
+ $this->char = $start;
+ return false;
+ }
+
+ // Return a character token for the character corresponding to the
+ // entity name (as given by the second column of the entities table).
+ return html_entity_decode('&' . $entity . ';', ENT_QUOTES, 'UTF-8');
+ }
+
+ private function emitToken($token)
+ {
+ $emit = $this->tree->emitToken($token);
+
+ if (is_int($emit)) {
+ $this->content_model = $emit;
+
+ } elseif ($token['type'] === self::ENDTAG) {
+ $this->content_model = self::PCDATA;
+ }
+ }
+
+ private function EOF()
+ {
+ $this->state = null;
+ $this->tree->emitToken(
+ array(
+ 'type' => self::EOF
+ )
+ );
+ }
+}
+
+class HTML5TreeConstructer
+{
+ public $stack = array();
+
+ private $phase;
+ private $mode;
+ private $dom;
+ private $foster_parent = null;
+ private $a_formatting = array();
+
+ private $head_pointer = null;
+ private $form_pointer = null;
+
+ private $scoping = array('button', 'caption', 'html', 'marquee', 'object', 'table', 'td', 'th');
+ private $formatting = array(
+ 'a',
+ 'b',
+ 'big',
+ 'em',
+ 'font',
+ 'i',
+ 'nobr',
+ 's',
+ 'small',
+ 'strike',
+ 'strong',
+ 'tt',
+ 'u'
+ );
+ private $special = array(
+ 'address',
+ 'area',
+ 'base',
+ 'basefont',
+ 'bgsound',
+ 'blockquote',
+ 'body',
+ 'br',
+ 'center',
+ 'col',
+ 'colgroup',
+ 'dd',
+ 'dir',
+ 'div',
+ 'dl',
+ 'dt',
+ 'embed',
+ 'fieldset',
+ 'form',
+ 'frame',
+ 'frameset',
+ 'h1',
+ 'h2',
+ 'h3',
+ 'h4',
+ 'h5',
+ 'h6',
+ 'head',
+ 'hr',
+ 'iframe',
+ 'image',
+ 'img',
+ 'input',
+ 'isindex',
+ 'li',
+ 'link',
+ 'listing',
+ 'menu',
+ 'meta',
+ 'noembed',
+ 'noframes',
+ 'noscript',
+ 'ol',
+ 'optgroup',
+ 'option',
+ 'p',
+ 'param',
+ 'plaintext',
+ 'pre',
+ 'script',
+ 'select',
+ 'spacer',
+ 'style',
+ 'tbody',
+ 'textarea',
+ 'tfoot',
+ 'thead',
+ 'title',
+ 'tr',
+ 'ul',
+ 'wbr'
+ );
+
+ // The different phases.
+ const INIT_PHASE = 0;
+ const ROOT_PHASE = 1;
+ const MAIN_PHASE = 2;
+ const END_PHASE = 3;
+
+ // The different insertion modes for the main phase.
+ const BEFOR_HEAD = 0;
+ const IN_HEAD = 1;
+ const AFTER_HEAD = 2;
+ const IN_BODY = 3;
+ const IN_TABLE = 4;
+ const IN_CAPTION = 5;
+ const IN_CGROUP = 6;
+ const IN_TBODY = 7;
+ const IN_ROW = 8;
+ const IN_CELL = 9;
+ const IN_SELECT = 10;
+ const AFTER_BODY = 11;
+ const IN_FRAME = 12;
+ const AFTR_FRAME = 13;
+
+ // The different types of elements.
+ const SPECIAL = 0;
+ const SCOPING = 1;
+ const FORMATTING = 2;
+ const PHRASING = 3;
+
+ const MARKER = 0;
+
+ public function __construct()
+ {
+ $this->phase = self::INIT_PHASE;
+ $this->mode = self::BEFOR_HEAD;
+ $this->dom = new DOMDocument;
+
+ $this->dom->encoding = 'UTF-8';
+ $this->dom->preserveWhiteSpace = true;
+ $this->dom->substituteEntities = true;
+ $this->dom->strictErrorChecking = false;
+ }
+
+ // Process tag tokens
+ public function emitToken($token)
+ {
+ switch ($this->phase) {
+ case self::INIT_PHASE:
+ return $this->initPhase($token);
+ break;
+ case self::ROOT_PHASE:
+ return $this->rootElementPhase($token);
+ break;
+ case self::MAIN_PHASE:
+ return $this->mainPhase($token);
+ break;
+ case self::END_PHASE :
+ return $this->trailingEndPhase($token);
+ break;
+ }
+ }
+
+ private function initPhase($token)
+ {
+ /* Initially, the tree construction stage must handle each token
+ emitted from the tokenisation stage as follows: */
+
+ /* A DOCTYPE token that is marked as being in error
+ A comment token
+ A start tag token
+ An end tag token
+ A character token that is not one of one of U+0009 CHARACTER TABULATION,
+ U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+ or U+0020 SPACE
+ An end-of-file token */
+ if ((isset($token['error']) && $token['error']) ||
+ $token['type'] === HTML5::COMMENT ||
+ $token['type'] === HTML5::STARTTAG ||
+ $token['type'] === HTML5::ENDTAG ||
+ $token['type'] === HTML5::EOF ||
+ ($token['type'] === HTML5::CHARACTR && isset($token['data']) &&
+ !preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data']))
+ ) {
+ /* This specification does not define how to handle this case. In
+ particular, user agents may ignore the entirety of this specification
+ altogether for such documents, and instead invoke special parse modes
+ with a greater emphasis on backwards compatibility. */
+
+ $this->phase = self::ROOT_PHASE;
+ return $this->rootElementPhase($token);
+
+ /* A DOCTYPE token marked as being correct */
+ } elseif (isset($token['error']) && !$token['error']) {
+ /* Append a DocumentType node to the Document node, with the name
+ attribute set to the name given in the DOCTYPE token (which will be
+ "HTML"), and the other attributes specific to DocumentType objects
+ set to null, empty lists, or the empty string as appropriate. */
+ $doctype = new DOMDocumentType(null, null, 'HTML');
+
+ /* Then, switch to the root element phase of the tree construction
+ stage. */
+ $this->phase = self::ROOT_PHASE;
+
+ /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+ U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+ or U+0020 SPACE */
+ } elseif (isset($token['data']) && preg_match(
+ '/^[\t\n\x0b\x0c ]+$/',
+ $token['data']
+ )
+ ) {
+ /* Append that character to the Document node. */
+ $text = $this->dom->createTextNode($token['data']);
+ $this->dom->appendChild($text);
+ }
+ }
+
+ private function rootElementPhase($token)
+ {
+ /* After the initial phase, as each token is emitted from the tokenisation
+ stage, it must be processed as described in this section. */
+
+ /* A DOCTYPE token */
+ if ($token['type'] === HTML5::DOCTYPE) {
+ // Parse error. Ignore the token.
+
+ /* A comment token */
+ } elseif ($token['type'] === HTML5::COMMENT) {
+ /* Append a Comment node to the Document object with the data
+ attribute set to the data given in the comment token. */
+ $comment = $this->dom->createComment($token['data']);
+ $this->dom->appendChild($comment);
+
+ /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+ U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+ or U+0020 SPACE */
+ } elseif ($token['type'] === HTML5::CHARACTR &&
+ preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+ ) {
+ /* Append that character to the Document node. */
+ $text = $this->dom->createTextNode($token['data']);
+ $this->dom->appendChild($text);
+
+ /* A character token that is not one of U+0009 CHARACTER TABULATION,
+ U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED
+ (FF), or U+0020 SPACE
+ A start tag token
+ An end tag token
+ An end-of-file token */
+ } elseif (($token['type'] === HTML5::CHARACTR &&
+ !preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) ||
+ $token['type'] === HTML5::STARTTAG ||
+ $token['type'] === HTML5::ENDTAG ||
+ $token['type'] === HTML5::EOF
+ ) {
+ /* Create an HTMLElement node with the tag name html, in the HTML
+ namespace. Append it to the Document object. Switch to the main
+ phase and reprocess the current token. */
+ $html = $this->dom->createElement('html');
+ $this->dom->appendChild($html);
+ $this->stack[] = $html;
+
+ $this->phase = self::MAIN_PHASE;
+ return $this->mainPhase($token);
+ }
+ }
+
+ private function mainPhase($token)
+ {
+ /* Tokens in the main phase must be handled as follows: */
+
+ /* A DOCTYPE token */
+ if ($token['type'] === HTML5::DOCTYPE) {
+ // Parse error. Ignore the token.
+
+ /* A start tag token with the tag name "html" */
+ } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'html') {
+ /* If this start tag token was not the first start tag token, then
+ it is a parse error. */
+
+ /* For each attribute on the token, check to see if the attribute
+ is already present on the top element of the stack of open elements.
+ If it is not, add the attribute and its corresponding value to that
+ element. */
+ foreach ($token['attr'] as $attr) {
+ if (!$this->stack[0]->hasAttribute($attr['name'])) {
+ $this->stack[0]->setAttribute($attr['name'], $attr['value']);
+ }
+ }
+
+ /* An end-of-file token */
+ } elseif ($token['type'] === HTML5::EOF) {
+ /* Generate implied end tags. */
+ $this->generateImpliedEndTags();
+
+ /* Anything else. */
+ } else {
+ /* Depends on the insertion mode: */
+ switch ($this->mode) {
+ case self::BEFOR_HEAD:
+ return $this->beforeHead($token);
+ break;
+ case self::IN_HEAD:
+ return $this->inHead($token);
+ break;
+ case self::AFTER_HEAD:
+ return $this->afterHead($token);
+ break;
+ case self::IN_BODY:
+ return $this->inBody($token);
+ break;
+ case self::IN_TABLE:
+ return $this->inTable($token);
+ break;
+ case self::IN_CAPTION:
+ return $this->inCaption($token);
+ break;
+ case self::IN_CGROUP:
+ return $this->inColumnGroup($token);
+ break;
+ case self::IN_TBODY:
+ return $this->inTableBody($token);
+ break;
+ case self::IN_ROW:
+ return $this->inRow($token);
+ break;
+ case self::IN_CELL:
+ return $this->inCell($token);
+ break;
+ case self::IN_SELECT:
+ return $this->inSelect($token);
+ break;
+ case self::AFTER_BODY:
+ return $this->afterBody($token);
+ break;
+ case self::IN_FRAME:
+ return $this->inFrameset($token);
+ break;
+ case self::AFTR_FRAME:
+ return $this->afterFrameset($token);
+ break;
+ case self::END_PHASE:
+ return $this->trailingEndPhase($token);
+ break;
+ }
+ }
+ }
+
+ private function beforeHead($token)
+ {
+ /* Handle the token as follows: */
+
+ /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+ U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+ or U+0020 SPACE */
+ if ($token['type'] === HTML5::CHARACTR &&
+ preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+ ) {
+ /* Append the character to the current node. */
+ $this->insertText($token['data']);
+
+ /* A comment token */
+ } elseif ($token['type'] === HTML5::COMMENT) {
+ /* Append a Comment node to the current node with the data attribute
+ set to the data given in the comment token. */
+ $this->insertComment($token['data']);
+
+ /* A start tag token with the tag name "head" */
+ } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'head') {
+ /* Create an element for the token, append the new element to the
+ current node and push it onto the stack of open elements. */
+ $element = $this->insertElement($token);
+
+ /* Set the head element pointer to this new element node. */
+ $this->head_pointer = $element;
+
+ /* Change the insertion mode to "in head". */
+ $this->mode = self::IN_HEAD;
+
+ /* A start tag token whose tag name is one of: "base", "link", "meta",
+ "script", "style", "title". Or an end tag with the tag name "html".
+ Or a character token that is not one of U+0009 CHARACTER TABULATION,
+ U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+ or U+0020 SPACE. Or any other start tag token */
+ } elseif ($token['type'] === HTML5::STARTTAG ||
+ ($token['type'] === HTML5::ENDTAG && $token['name'] === 'html') ||
+ ($token['type'] === HTML5::CHARACTR && !preg_match(
+ '/^[\t\n\x0b\x0c ]$/',
+ $token['data']
+ ))
+ ) {
+ /* Act as if a start tag token with the tag name "head" and no
+ attributes had been seen, then reprocess the current token. */
+ $this->beforeHead(
+ array(
+ 'name' => 'head',
+ 'type' => HTML5::STARTTAG,
+ 'attr' => array()
+ )
+ );
+
+ return $this->inHead($token);
+
+ /* Any other end tag */
+ } elseif ($token['type'] === HTML5::ENDTAG) {
+ /* Parse error. Ignore the token. */
+ }
+ }
+
+ private function inHead($token)
+ {
+ /* Handle the token as follows: */
+
+ /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+ U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+ or U+0020 SPACE.
+
+ THIS DIFFERS FROM THE SPEC: If the current node is either a title, style
+ or script element, append the character to the current node regardless
+ of its content. */
+ if (($token['type'] === HTML5::CHARACTR &&
+ preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) || (
+ $token['type'] === HTML5::CHARACTR && in_array(
+ end($this->stack)->nodeName,
+ array('title', 'style', 'script')
+ ))
+ ) {
+ /* Append the character to the current node. */
+ $this->insertText($token['data']);
+
+ /* A comment token */
+ } elseif ($token['type'] === HTML5::COMMENT) {
+ /* Append a Comment node to the current node with the data attribute
+ set to the data given in the comment token. */
+ $this->insertComment($token['data']);
+
+ } elseif ($token['type'] === HTML5::ENDTAG &&
+ in_array($token['name'], array('title', 'style', 'script'))
+ ) {
+ array_pop($this->stack);
+ return HTML5::PCDATA;
+
+ /* A start tag with the tag name "title" */
+ } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'title') {
+ /* Create an element for the token and append the new element to the
+ node pointed to by the head element pointer, or, if that is null
+ (innerHTML case), to the current node. */
+ if ($this->head_pointer !== null) {
+ $element = $this->insertElement($token, false);
+ $this->head_pointer->appendChild($element);
+
+ } else {
+ $element = $this->insertElement($token);
+ }
+
+ /* Switch the tokeniser's content model flag to the RCDATA state. */
+ return HTML5::RCDATA;
+
+ /* A start tag with the tag name "style" */
+ } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'style') {
+ /* Create an element for the token and append the new element to the
+ node pointed to by the head element pointer, or, if that is null
+ (innerHTML case), to the current node. */
+ if ($this->head_pointer !== null) {
+ $element = $this->insertElement($token, false);
+ $this->head_pointer->appendChild($element);
+
+ } else {
+ $this->insertElement($token);
+ }
+
+ /* Switch the tokeniser's content model flag to the CDATA state. */
+ return HTML5::CDATA;
+
+ /* A start tag with the tag name "script" */
+ } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'script') {
+ /* Create an element for the token. */
+ $element = $this->insertElement($token, false);
+ $this->head_pointer->appendChild($element);
+
+ /* Switch the tokeniser's content model flag to the CDATA state. */
+ return HTML5::CDATA;
+
+ /* A start tag with the tag name "base", "link", or "meta" */
+ } elseif ($token['type'] === HTML5::STARTTAG && in_array(
+ $token['name'],
+ array('base', 'link', 'meta')
+ )
+ ) {
+ /* Create an element for the token and append the new element to the
+ node pointed to by the head element pointer, or, if that is null
+ (innerHTML case), to the current node. */
+ if ($this->head_pointer !== null) {
+ $element = $this->insertElement($token, false);
+ $this->head_pointer->appendChild($element);
+ array_pop($this->stack);
+
+ } else {
+ $this->insertElement($token);
+ }
+
+ /* An end tag with the tag name "head" */
+ } elseif ($token['type'] === HTML5::ENDTAG && $token['name'] === 'head') {
+ /* If the current node is a head element, pop the current node off
+ the stack of open elements. */
+ if ($this->head_pointer->isSameNode(end($this->stack))) {
+ array_pop($this->stack);
+
+ /* Otherwise, this is a parse error. */
+ } else {
+ // k
+ }
+
+ /* Change the insertion mode to "after head". */
+ $this->mode = self::AFTER_HEAD;
+
+ /* A start tag with the tag name "head" or an end tag except "html". */
+ } elseif (($token['type'] === HTML5::STARTTAG && $token['name'] === 'head') ||
+ ($token['type'] === HTML5::ENDTAG && $token['name'] !== 'html')
+ ) {
+ // Parse error. Ignore the token.
+
+ /* Anything else */
+ } else {
+ /* If the current node is a head element, act as if an end tag
+ token with the tag name "head" had been seen. */
+ if ($this->head_pointer->isSameNode(end($this->stack))) {
+ $this->inHead(
+ array(
+ 'name' => 'head',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+
+ /* Otherwise, change the insertion mode to "after head". */
+ } else {
+ $this->mode = self::AFTER_HEAD;
+ }
+
+ /* Then, reprocess the current token. */
+ return $this->afterHead($token);
+ }
+ }
+
+ private function afterHead($token)
+ {
+ /* Handle the token as follows: */
+
+ /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+ U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+ or U+0020 SPACE */
+ if ($token['type'] === HTML5::CHARACTR &&
+ preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+ ) {
+ /* Append the character to the current node. */
+ $this->insertText($token['data']);
+
+ /* A comment token */
+ } elseif ($token['type'] === HTML5::COMMENT) {
+ /* Append a Comment node to the current node with the data attribute
+ set to the data given in the comment token. */
+ $this->insertComment($token['data']);
+
+ /* A start tag token with the tag name "body" */
+ } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'body') {
+ /* Insert a body element for the token. */
+ $this->insertElement($token);
+
+ /* Change the insertion mode to "in body". */
+ $this->mode = self::IN_BODY;
+
+ /* A start tag token with the tag name "frameset" */
+ } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'frameset') {
+ /* Insert a frameset element for the token. */
+ $this->insertElement($token);
+
+ /* Change the insertion mode to "in frameset". */
+ $this->mode = self::IN_FRAME;
+
+ /* A start tag token whose tag name is one of: "base", "link", "meta",
+ "script", "style", "title" */
+ } elseif ($token['type'] === HTML5::STARTTAG && in_array(
+ $token['name'],
+ array('base', 'link', 'meta', 'script', 'style', 'title')
+ )
+ ) {
+ /* Parse error. Switch the insertion mode back to "in head" and
+ reprocess the token. */
+ $this->mode = self::IN_HEAD;
+ return $this->inHead($token);
+
+ /* Anything else */
+ } else {
+ /* Act as if a start tag token with the tag name "body" and no
+ attributes had been seen, and then reprocess the current token. */
+ $this->afterHead(
+ array(
+ 'name' => 'body',
+ 'type' => HTML5::STARTTAG,
+ 'attr' => array()
+ )
+ );
+
+ return $this->inBody($token);
+ }
+ }
+
+ private function inBody($token)
+ {
+ /* Handle the token as follows: */
+
+ switch ($token['type']) {
+ /* A character token */
+ case HTML5::CHARACTR:
+ /* Reconstruct the active formatting elements, if any. */
+ $this->reconstructActiveFormattingElements();
+
+ /* Append the token's character to the current node. */
+ $this->insertText($token['data']);
+ break;
+
+ /* A comment token */
+ case HTML5::COMMENT:
+ /* Append a Comment node to the current node with the data
+ attribute set to the data given in the comment token. */
+ $this->insertComment($token['data']);
+ break;
+
+ case HTML5::STARTTAG:
+ switch ($token['name']) {
+ /* A start tag token whose tag name is one of: "script",
+ "style" */
+ case 'script':
+ case 'style':
+ /* Process the token as if the insertion mode had been "in
+ head". */
+ return $this->inHead($token);
+ break;
+
+ /* A start tag token whose tag name is one of: "base", "link",
+ "meta", "title" */
+ case 'base':
+ case 'link':
+ case 'meta':
+ case 'title':
+ /* Parse error. Process the token as if the insertion mode
+ had been "in head". */
+ return $this->inHead($token);
+ break;
+
+ /* A start tag token with the tag name "body" */
+ case 'body':
+ /* Parse error. If the second element on the stack of open
+ elements is not a body element, or, if the stack of open
+ elements has only one node on it, then ignore the token.
+ (innerHTML case) */
+ if (count($this->stack) === 1 || $this->stack[1]->nodeName !== 'body') {
+ // Ignore
+
+ /* Otherwise, for each attribute on the token, check to see
+ if the attribute is already present on the body element (the
+ second element) on the stack of open elements. If it is not,
+ add the attribute and its corresponding value to that
+ element. */
+ } else {
+ foreach ($token['attr'] as $attr) {
+ if (!$this->stack[1]->hasAttribute($attr['name'])) {
+ $this->stack[1]->setAttribute($attr['name'], $attr['value']);
+ }
+ }
+ }
+ break;
+
+ /* A start tag whose tag name is one of: "address",
+ "blockquote", "center", "dir", "div", "dl", "fieldset",
+ "listing", "menu", "ol", "p", "ul" */
+ case 'address':
+ case 'blockquote':
+ case 'center':
+ case 'dir':
+ case 'div':
+ case 'dl':
+ case 'fieldset':
+ case 'listing':
+ case 'menu':
+ case 'ol':
+ case 'p':
+ case 'ul':
+ /* If the stack of open elements has a p element in scope,
+ then act as if an end tag with the tag name p had been
+ seen. */
+ if ($this->elementInScope('p')) {
+ $this->emitToken(
+ array(
+ 'name' => 'p',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+ }
+
+ /* Insert an HTML element for the token. */
+ $this->insertElement($token);
+ break;
+
+ /* A start tag whose tag name is "form" */
+ case 'form':
+ /* If the form element pointer is not null, ignore the
+ token with a parse error. */
+ if ($this->form_pointer !== null) {
+ // Ignore.
+
+ /* Otherwise: */
+ } else {
+ /* If the stack of open elements has a p element in
+ scope, then act as if an end tag with the tag name p
+ had been seen. */
+ if ($this->elementInScope('p')) {
+ $this->emitToken(
+ array(
+ 'name' => 'p',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+ }
+
+ /* Insert an HTML element for the token, and set the
+ form element pointer to point to the element created. */
+ $element = $this->insertElement($token);
+ $this->form_pointer = $element;
+ }
+ break;
+
+ /* A start tag whose tag name is "li", "dd" or "dt" */
+ case 'li':
+ case 'dd':
+ case 'dt':
+ /* If the stack of open elements has a p element in scope,
+ then act as if an end tag with the tag name p had been
+ seen. */
+ if ($this->elementInScope('p')) {
+ $this->emitToken(
+ array(
+ 'name' => 'p',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+ }
+
+ $stack_length = count($this->stack) - 1;
+
+ for ($n = $stack_length; 0 <= $n; $n--) {
+ /* 1. Initialise node to be the current node (the
+ bottommost node of the stack). */
+ $stop = false;
+ $node = $this->stack[$n];
+ $cat = $this->getElementCategory($node->tagName);
+
+ /* 2. If node is an li, dd or dt element, then pop all
+ the nodes from the current node up to node, including
+ node, then stop this algorithm. */
+ if ($token['name'] === $node->tagName || ($token['name'] !== 'li'
+ && ($node->tagName === 'dd' || $node->tagName === 'dt'))
+ ) {
+ for ($x = $stack_length; $x >= $n; $x--) {
+ array_pop($this->stack);
+ }
+
+ break;
+ }
+
+ /* 3. If node is not in the formatting category, and is
+ not in the phrasing category, and is not an address or
+ div element, then stop this algorithm. */
+ if ($cat !== self::FORMATTING && $cat !== self::PHRASING &&
+ $node->tagName !== 'address' && $node->tagName !== 'div'
+ ) {
+ break;
+ }
+ }
+
+ /* Finally, insert an HTML element with the same tag
+ name as the token's. */
+ $this->insertElement($token);
+ break;
+
+ /* A start tag token whose tag name is "plaintext" */
+ case 'plaintext':
+ /* If the stack of open elements has a p element in scope,
+ then act as if an end tag with the tag name p had been
+ seen. */
+ if ($this->elementInScope('p')) {
+ $this->emitToken(
+ array(
+ 'name' => 'p',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+ }
+
+ /* Insert an HTML element for the token. */
+ $this->insertElement($token);
+
+ return HTML5::PLAINTEXT;
+ break;
+
+ /* A start tag whose tag name is one of: "h1", "h2", "h3", "h4",
+ "h5", "h6" */
+ case 'h1':
+ case 'h2':
+ case 'h3':
+ case 'h4':
+ case 'h5':
+ case 'h6':
+ /* If the stack of open elements has a p element in scope,
+ then act as if an end tag with the tag name p had been seen. */
+ if ($this->elementInScope('p')) {
+ $this->emitToken(
+ array(
+ 'name' => 'p',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+ }
+
+ /* If the stack of open elements has in scope an element whose
+ tag name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
+ this is a parse error; pop elements from the stack until an
+ element with one of those tag names has been popped from the
+ stack. */
+ while ($this->elementInScope(array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
+ array_pop($this->stack);
+ }
+
+ /* Insert an HTML element for the token. */
+ $this->insertElement($token);
+ break;
+
+ /* A start tag whose tag name is "a" */
+ case 'a':
+ /* If the list of active formatting elements contains
+ an element whose tag name is "a" between the end of the
+ list and the last marker on the list (or the start of
+ the list if there is no marker on the list), then this
+ is a parse error; act as if an end tag with the tag name
+ "a" had been seen, then remove that element from the list
+ of active formatting elements and the stack of open
+ elements if the end tag didn't already remove it (it
+ might not have if the element is not in table scope). */
+ $leng = count($this->a_formatting);
+
+ for ($n = $leng - 1; $n >= 0; $n--) {
+ if ($this->a_formatting[$n] === self::MARKER) {
+ break;
+
+ } elseif ($this->a_formatting[$n]->nodeName === 'a') {
+ $this->emitToken(
+ array(
+ 'name' => 'a',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+ break;
+ }
+ }
+
+ /* Reconstruct the active formatting elements, if any. */
+ $this->reconstructActiveFormattingElements();
+
+ /* Insert an HTML element for the token. */
+ $el = $this->insertElement($token);
+
+ /* Add that element to the list of active formatting
+ elements. */
+ $this->a_formatting[] = $el;
+ break;
+
+ /* A start tag whose tag name is one of: "b", "big", "em", "font",
+ "i", "nobr", "s", "small", "strike", "strong", "tt", "u" */
+ case 'b':
+ case 'big':
+ case 'em':
+ case 'font':
+ case 'i':
+ case 'nobr':
+ case 's':
+ case 'small':
+ case 'strike':
+ case 'strong':
+ case 'tt':
+ case 'u':
+ /* Reconstruct the active formatting elements, if any. */
+ $this->reconstructActiveFormattingElements();
+
+ /* Insert an HTML element for the token. */
+ $el = $this->insertElement($token);
+
+ /* Add that element to the list of active formatting
+ elements. */
+ $this->a_formatting[] = $el;
+ break;
+
+ /* A start tag token whose tag name is "button" */
+ case 'button':
+ /* If the stack of open elements has a button element in scope,
+ then this is a parse error; act as if an end tag with the tag
+ name "button" had been seen, then reprocess the token. (We don't
+ do that. Unnecessary.) */
+ if ($this->elementInScope('button')) {
+ $this->inBody(
+ array(
+ 'name' => 'button',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+ }
+
+ /* Reconstruct the active formatting elements, if any. */
+ $this->reconstructActiveFormattingElements();
+
+ /* Insert an HTML element for the token. */
+ $this->insertElement($token);
+
+ /* Insert a marker at the end of the list of active
+ formatting elements. */
+ $this->a_formatting[] = self::MARKER;
+ break;
+
+ /* A start tag token whose tag name is one of: "marquee", "object" */
+ case 'marquee':
+ case 'object':
+ /* Reconstruct the active formatting elements, if any. */
+ $this->reconstructActiveFormattingElements();
+
+ /* Insert an HTML element for the token. */
+ $this->insertElement($token);
+
+ /* Insert a marker at the end of the list of active
+ formatting elements. */
+ $this->a_formatting[] = self::MARKER;
+ break;
+
+ /* A start tag token whose tag name is "xmp" */
+ case 'xmp':
+ /* Reconstruct the active formatting elements, if any. */
+ $this->reconstructActiveFormattingElements();
+
+ /* Insert an HTML element for the token. */
+ $this->insertElement($token);
+
+ /* Switch the content model flag to the CDATA state. */
+ return HTML5::CDATA;
+ break;
+
+ /* A start tag whose tag name is "table" */
+ case 'table':
+ /* If the stack of open elements has a p element in scope,
+ then act as if an end tag with the tag name p had been seen. */
+ if ($this->elementInScope('p')) {
+ $this->emitToken(
+ array(
+ 'name' => 'p',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+ }
+
+ /* Insert an HTML element for the token. */
+ $this->insertElement($token);
+
+ /* Change the insertion mode to "in table". */
+ $this->mode = self::IN_TABLE;
+ break;
+
+ /* A start tag whose tag name is one of: "area", "basefont",
+ "bgsound", "br", "embed", "img", "param", "spacer", "wbr" */
+ case 'area':
+ case 'basefont':
+ case 'bgsound':
+ case 'br':
+ case 'embed':
+ case 'img':
+ case 'param':
+ case 'spacer':
+ case 'wbr':
+ /* Reconstruct the active formatting elements, if any. */
+ $this->reconstructActiveFormattingElements();
+
+ /* Insert an HTML element for the token. */
+ $this->insertElement($token);
+
+ /* Immediately pop the current node off the stack of open elements. */
+ array_pop($this->stack);
+ break;
+
+ /* A start tag whose tag name is "hr" */
+ case 'hr':
+ /* If the stack of open elements has a p element in scope,
+ then act as if an end tag with the tag name p had been seen. */
+ if ($this->elementInScope('p')) {
+ $this->emitToken(
+ array(
+ 'name' => 'p',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+ }
+
+ /* Insert an HTML element for the token. */
+ $this->insertElement($token);
+
+ /* Immediately pop the current node off the stack of open elements. */
+ array_pop($this->stack);
+ break;
+
+ /* A start tag whose tag name is "image" */
+ case 'image':
+ /* Parse error. Change the token's tag name to "img" and
+ reprocess it. (Don't ask.) */
+ $token['name'] = 'img';
+ return $this->inBody($token);
+ break;
+
+ /* A start tag whose tag name is "input" */
+ case 'input':
+ /* Reconstruct the active formatting elements, if any. */
+ $this->reconstructActiveFormattingElements();
+
+ /* Insert an input element for the token. */
+ $element = $this->insertElement($token, false);
+
+ /* If the form element pointer is not null, then associate the
+ input element with the form element pointed to by the form
+ element pointer. */
+ $this->form_pointer !== null
+ ? $this->form_pointer->appendChild($element)
+ : end($this->stack)->appendChild($element);
+
+ /* Pop that input element off the stack of open elements. */
+ array_pop($this->stack);
+ break;
+
+ /* A start tag whose tag name is "isindex" */
+ case 'isindex':
+ /* Parse error. */
+ // w/e
+
+ /* If the form element pointer is not null,
+ then ignore the token. */
+ if ($this->form_pointer === null) {
+ /* Act as if a start tag token with the tag name "form" had
+ been seen. */
+ $this->inBody(
+ array(
+ 'name' => 'body',
+ 'type' => HTML5::STARTTAG,
+ 'attr' => array()
+ )
+ );
+
+ /* Act as if a start tag token with the tag name "hr" had
+ been seen. */
+ $this->inBody(
+ array(
+ 'name' => 'hr',
+ 'type' => HTML5::STARTTAG,
+ 'attr' => array()
+ )
+ );
+
+ /* Act as if a start tag token with the tag name "p" had
+ been seen. */
+ $this->inBody(
+ array(
+ 'name' => 'p',
+ 'type' => HTML5::STARTTAG,
+ 'attr' => array()
+ )
+ );
+
+ /* Act as if a start tag token with the tag name "label"
+ had been seen. */
+ $this->inBody(
+ array(
+ 'name' => 'label',
+ 'type' => HTML5::STARTTAG,
+ 'attr' => array()
+ )
+ );
+
+ /* Act as if a stream of character tokens had been seen. */
+ $this->insertText(
+ 'This is a searchable index. ' .
+ 'Insert your search keywords here: '
+ );
+
+ /* Act as if a start tag token with the tag name "input"
+ had been seen, with all the attributes from the "isindex"
+ token, except with the "name" attribute set to the value
+ "isindex" (ignoring any explicit "name" attribute). */
+ $attr = $token['attr'];
+ $attr[] = array('name' => 'name', 'value' => 'isindex');
+
+ $this->inBody(
+ array(
+ 'name' => 'input',
+ 'type' => HTML5::STARTTAG,
+ 'attr' => $attr
+ )
+ );
+
+ /* Act as if a stream of character tokens had been seen
+ (see below for what they should say). */
+ $this->insertText(
+ 'This is a searchable index. ' .
+ 'Insert your search keywords here: '
+ );
+
+ /* Act as if an end tag token with the tag name "label"
+ had been seen. */
+ $this->inBody(
+ array(
+ 'name' => 'label',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+
+ /* Act as if an end tag token with the tag name "p" had
+ been seen. */
+ $this->inBody(
+ array(
+ 'name' => 'p',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+
+ /* Act as if a start tag token with the tag name "hr" had
+ been seen. */
+ $this->inBody(
+ array(
+ 'name' => 'hr',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+
+ /* Act as if an end tag token with the tag name "form" had
+ been seen. */
+ $this->inBody(
+ array(
+ 'name' => 'form',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+ }
+ break;
+
+ /* A start tag whose tag name is "textarea" */
+ case 'textarea':
+ $this->insertElement($token);
+
+ /* Switch the tokeniser's content model flag to the
+ RCDATA state. */
+ return HTML5::RCDATA;
+ break;
+
+ /* A start tag whose tag name is one of: "iframe", "noembed",
+ "noframes" */
+ case 'iframe':
+ case 'noembed':
+ case 'noframes':
+ $this->insertElement($token);
+
+ /* Switch the tokeniser's content model flag to the CDATA state. */
+ return HTML5::CDATA;
+ break;
+
+ /* A start tag whose tag name is "select" */
+ case 'select':
+ /* Reconstruct the active formatting elements, if any. */
+ $this->reconstructActiveFormattingElements();
+
+ /* Insert an HTML element for the token. */
+ $this->insertElement($token);
+
+ /* Change the insertion mode to "in select". */
+ $this->mode = self::IN_SELECT;
+ break;
+
+ /* A start or end tag whose tag name is one of: "caption", "col",
+ "colgroup", "frame", "frameset", "head", "option", "optgroup",
+ "tbody", "td", "tfoot", "th", "thead", "tr". */
+ case 'caption':
+ case 'col':
+ case 'colgroup':
+ case 'frame':
+ case 'frameset':
+ case 'head':
+ case 'option':
+ case 'optgroup':
+ case 'tbody':
+ case 'td':
+ case 'tfoot':
+ case 'th':
+ case 'thead':
+ case 'tr':
+ // Parse error. Ignore the token.
+ break;
+
+ /* A start or end tag whose tag name is one of: "event-source",
+ "section", "nav", "article", "aside", "header", "footer",
+ "datagrid", "command" */
+ case 'event-source':
+ case 'section':
+ case 'nav':
+ case 'article':
+ case 'aside':
+ case 'header':
+ case 'footer':
+ case 'datagrid':
+ case 'command':
+ // Work in progress!
+ break;
+
+ /* A start tag token not covered by the previous entries */
+ default:
+ /* Reconstruct the active formatting elements, if any. */
+ $this->reconstructActiveFormattingElements();
+
+ $this->insertElement($token, true, true);
+ break;
+ }
+ break;
+
+ case HTML5::ENDTAG:
+ switch ($token['name']) {
+ /* An end tag with the tag name "body" */
+ case 'body':
+ /* If the second element in the stack of open elements is
+ not a body element, this is a parse error. Ignore the token.
+ (innerHTML case) */
+ if (count($this->stack) < 2 || $this->stack[1]->nodeName !== 'body') {
+ // Ignore.
+
+ /* If the current node is not the body element, then this
+ is a parse error. */
+ } elseif (end($this->stack)->nodeName !== 'body') {
+ // Parse error.
+ }
+
+ /* Change the insertion mode to "after body". */
+ $this->mode = self::AFTER_BODY;
+ break;
+
+ /* An end tag with the tag name "html" */
+ case 'html':
+ /* Act as if an end tag with tag name "body" had been seen,
+ then, if that token wasn't ignored, reprocess the current
+ token. */
+ $this->inBody(
+ array(
+ 'name' => 'body',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+
+ return $this->afterBody($token);
+ break;
+
+ /* An end tag whose tag name is one of: "address", "blockquote",
+ "center", "dir", "div", "dl", "fieldset", "listing", "menu",
+ "ol", "pre", "ul" */
+ case 'address':
+ case 'blockquote':
+ case 'center':
+ case 'dir':
+ case 'div':
+ case 'dl':
+ case 'fieldset':
+ case 'listing':
+ case 'menu':
+ case 'ol':
+ case 'pre':
+ case 'ul':
+ /* If the stack of open elements has an element in scope
+ with the same tag name as that of the token, then generate
+ implied end tags. */
+ if ($this->elementInScope($token['name'])) {
+ $this->generateImpliedEndTags();
+
+ /* Now, if the current node is not an element with
+ the same tag name as that of the token, then this
+ is a parse error. */
+ // w/e
+
+ /* If the stack of open elements has an element in
+ scope with the same tag name as that of the token,
+ then pop elements from this stack until an element
+ with that tag name has been popped from the stack. */
+ for ($n = count($this->stack) - 1; $n >= 0; $n--) {
+ if ($this->stack[$n]->nodeName === $token['name']) {
+ $n = -1;
+ }
+
+ array_pop($this->stack);
+ }
+ }
+ break;
+
+ /* An end tag whose tag name is "form" */
+ case 'form':
+ /* If the stack of open elements has an element in scope
+ with the same tag name as that of the token, then generate
+ implied end tags. */
+ if ($this->elementInScope($token['name'])) {
+ $this->generateImpliedEndTags();
+
+ }
+
+ if (end($this->stack)->nodeName !== $token['name']) {
+ /* Now, if the current node is not an element with the
+ same tag name as that of the token, then this is a parse
+ error. */
+ // w/e
+
+ } else {
+ /* Otherwise, if the current node is an element with
+ the same tag name as that of the token pop that element
+ from the stack. */
+ array_pop($this->stack);
+ }
+
+ /* In any case, set the form element pointer to null. */
+ $this->form_pointer = null;
+ break;
+
+ /* An end tag whose tag name is "p" */
+ case 'p':
+ /* If the stack of open elements has a p element in scope,
+ then generate implied end tags, except for p elements. */
+ if ($this->elementInScope('p')) {
+ $this->generateImpliedEndTags(array('p'));
+
+ /* If the current node is not a p element, then this is
+ a parse error. */
+ // k
+
+ /* If the stack of open elements has a p element in
+ scope, then pop elements from this stack until the stack
+ no longer has a p element in scope. */
+ for ($n = count($this->stack) - 1; $n >= 0; $n--) {
+ if ($this->elementInScope('p')) {
+ array_pop($this->stack);
+
+ } else {
+ break;
+ }
+ }
+ }
+ break;
+
+ /* An end tag whose tag name is "dd", "dt", or "li" */
+ case 'dd':
+ case 'dt':
+ case 'li':
+ /* If the stack of open elements has an element in scope
+ whose tag name matches the tag name of the token, then
+ generate implied end tags, except for elements with the
+ same tag name as the token. */
+ if ($this->elementInScope($token['name'])) {
+ $this->generateImpliedEndTags(array($token['name']));
+
+ /* If the current node is not an element with the same
+ tag name as the token, then this is a parse error. */
+ // w/e
+
+ /* If the stack of open elements has an element in scope
+ whose tag name matches the tag name of the token, then
+ pop elements from this stack until an element with that
+ tag name has been popped from the stack. */
+ for ($n = count($this->stack) - 1; $n >= 0; $n--) {
+ if ($this->stack[$n]->nodeName === $token['name']) {
+ $n = -1;
+ }
+
+ array_pop($this->stack);
+ }
+ }
+ break;
+
+ /* An end tag whose tag name is one of: "h1", "h2", "h3", "h4",
+ "h5", "h6" */
+ case 'h1':
+ case 'h2':
+ case 'h3':
+ case 'h4':
+ case 'h5':
+ case 'h6':
+ $elements = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6');
+
+ /* If the stack of open elements has in scope an element whose
+ tag name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
+ generate implied end tags. */
+ if ($this->elementInScope($elements)) {
+ $this->generateImpliedEndTags();
+
+ /* Now, if the current node is not an element with the same
+ tag name as that of the token, then this is a parse error. */
+ // w/e
+
+ /* If the stack of open elements has in scope an element
+ whose tag name is one of "h1", "h2", "h3", "h4", "h5", or
+ "h6", then pop elements from the stack until an element
+ with one of those tag names has been popped from the stack. */
+ while ($this->elementInScope($elements)) {
+ array_pop($this->stack);
+ }
+ }
+ break;
+
+ /* An end tag whose tag name is one of: "a", "b", "big", "em",
+ "font", "i", "nobr", "s", "small", "strike", "strong", "tt", "u" */
+ case 'a':
+ case 'b':
+ case 'big':
+ case 'em':
+ case 'font':
+ case 'i':
+ case 'nobr':
+ case 's':
+ case 'small':
+ case 'strike':
+ case 'strong':
+ case 'tt':
+ case 'u':
+ /* 1. Let the formatting element be the last element in
+ the list of active formatting elements that:
+ * is between the end of the list and the last scope
+ marker in the list, if any, or the start of the list
+ otherwise, and
+ * has the same tag name as the token.
+ */
+ while (true) {
+ for ($a = count($this->a_formatting) - 1; $a >= 0; $a--) {
+ if ($this->a_formatting[$a] === self::MARKER) {
+ break;
+
+ } elseif ($this->a_formatting[$a]->tagName === $token['name']) {
+ $formatting_element = $this->a_formatting[$a];
+ $in_stack = in_array($formatting_element, $this->stack, true);
+ $fe_af_pos = $a;
+ break;
+ }
+ }
+
+ /* If there is no such node, or, if that node is
+ also in the stack of open elements but the element
+ is not in scope, then this is a parse error. Abort
+ these steps. The token is ignored. */
+ if (!isset($formatting_element) || ($in_stack &&
+ !$this->elementInScope($token['name']))
+ ) {
+ break;
+
+ /* Otherwise, if there is such a node, but that node
+ is not in the stack of open elements, then this is a
+ parse error; remove the element from the list, and
+ abort these steps. */
+ } elseif (isset($formatting_element) && !$in_stack) {
+ unset($this->a_formatting[$fe_af_pos]);
+ $this->a_formatting = array_merge($this->a_formatting);
+ break;
+ }
+
+ /* 2. Let the furthest block be the topmost node in the
+ stack of open elements that is lower in the stack
+ than the formatting element, and is not an element in
+ the phrasing or formatting categories. There might
+ not be one. */
+ $fe_s_pos = array_search($formatting_element, $this->stack, true);
+ $length = count($this->stack);
+
+ for ($s = $fe_s_pos + 1; $s < $length; $s++) {
+ $category = $this->getElementCategory($this->stack[$s]->nodeName);
+
+ if ($category !== self::PHRASING && $category !== self::FORMATTING) {
+ $furthest_block = $this->stack[$s];
+ }
+ }
+
+ /* 3. If there is no furthest block, then the UA must
+ skip the subsequent steps and instead just pop all
+ the nodes from the bottom of the stack of open
+ elements, from the current node up to the formatting
+ element, and remove the formatting element from the
+ list of active formatting elements. */
+ if (!isset($furthest_block)) {
+ for ($n = $length - 1; $n >= $fe_s_pos; $n--) {
+ array_pop($this->stack);
+ }
+
+ unset($this->a_formatting[$fe_af_pos]);
+ $this->a_formatting = array_merge($this->a_formatting);
+ break;
+ }
+
+ /* 4. Let the common ancestor be the element
+ immediately above the formatting element in the stack
+ of open elements. */
+ $common_ancestor = $this->stack[$fe_s_pos - 1];
+
+ /* 5. If the furthest block has a parent node, then
+ remove the furthest block from its parent node. */
+ if ($furthest_block->parentNode !== null) {
+ $furthest_block->parentNode->removeChild($furthest_block);
+ }
+
+ /* 6. Let a bookmark note the position of the
+ formatting element in the list of active formatting
+ elements relative to the elements on either side
+ of it in the list. */
+ $bookmark = $fe_af_pos;
+
+ /* 7. Let node and last node be the furthest block.
+ Follow these steps: */
+ $node = $furthest_block;
+ $last_node = $furthest_block;
+
+ while (true) {
+ for ($n = array_search($node, $this->stack, true) - 1; $n >= 0; $n--) {
+ /* 7.1 Let node be the element immediately
+ prior to node in the stack of open elements. */
+ $node = $this->stack[$n];
+
+ /* 7.2 If node is not in the list of active
+ formatting elements, then remove node from
+ the stack of open elements and then go back
+ to step 1. */
+ if (!in_array($node, $this->a_formatting, true)) {
+ unset($this->stack[$n]);
+ $this->stack = array_merge($this->stack);
+
+ } else {
+ break;
+ }
+ }
+
+ /* 7.3 Otherwise, if node is the formatting
+ element, then go to the next step in the overall
+ algorithm. */
+ if ($node === $formatting_element) {
+ break;
+
+ /* 7.4 Otherwise, if last node is the furthest
+ block, then move the aforementioned bookmark to
+ be immediately after the node in the list of
+ active formatting elements. */
+ } elseif ($last_node === $furthest_block) {
+ $bookmark = array_search($node, $this->a_formatting, true) + 1;
+ }
+
+ /* 7.5 If node has any children, perform a
+ shallow clone of node, replace the entry for
+ node in the list of active formatting elements
+ with an entry for the clone, replace the entry
+ for node in the stack of open elements with an
+ entry for the clone, and let node be the clone. */
+ if ($node->hasChildNodes()) {
+ $clone = $node->cloneNode();
+ $s_pos = array_search($node, $this->stack, true);
+ $a_pos = array_search($node, $this->a_formatting, true);
+
+ $this->stack[$s_pos] = $clone;
+ $this->a_formatting[$a_pos] = $clone;
+ $node = $clone;
+ }
+
+ /* 7.6 Insert last node into node, first removing
+ it from its previous parent node if any. */
+ if ($last_node->parentNode !== null) {
+ $last_node->parentNode->removeChild($last_node);
+ }
+
+ $node->appendChild($last_node);
+
+ /* 7.7 Let last node be node. */
+ $last_node = $node;
+ }
+
+ /* 8. Insert whatever last node ended up being in
+ the previous step into the common ancestor node,
+ first removing it from its previous parent node if
+ any. */
+ if ($last_node->parentNode !== null) {
+ $last_node->parentNode->removeChild($last_node);
+ }
+
+ $common_ancestor->appendChild($last_node);
+
+ /* 9. Perform a shallow clone of the formatting
+ element. */
+ $clone = $formatting_element->cloneNode();
+
+ /* 10. Take all of the child nodes of the furthest
+ block and append them to the clone created in the
+ last step. */
+ while ($furthest_block->hasChildNodes()) {
+ $child = $furthest_block->firstChild;
+ $furthest_block->removeChild($child);
+ $clone->appendChild($child);
+ }
+
+ /* 11. Append that clone to the furthest block. */
+ $furthest_block->appendChild($clone);
+
+ /* 12. Remove the formatting element from the list
+ of active formatting elements, and insert the clone
+ into the list of active formatting elements at the
+ position of the aforementioned bookmark. */
+ $fe_af_pos = array_search($formatting_element, $this->a_formatting, true);
+ unset($this->a_formatting[$fe_af_pos]);
+ $this->a_formatting = array_merge($this->a_formatting);
+
+ $af_part1 = array_slice($this->a_formatting, 0, $bookmark - 1);
+ $af_part2 = array_slice($this->a_formatting, $bookmark, count($this->a_formatting));
+ $this->a_formatting = array_merge($af_part1, array($clone), $af_part2);
+
+ /* 13. Remove the formatting element from the stack
+ of open elements, and insert the clone into the stack
+ of open elements immediately after (i.e. in a more
+ deeply nested position than) the position of the
+ furthest block in that stack. */
+ $fe_s_pos = array_search($formatting_element, $this->stack, true);
+ $fb_s_pos = array_search($furthest_block, $this->stack, true);
+ unset($this->stack[$fe_s_pos]);
+
+ $s_part1 = array_slice($this->stack, 0, $fb_s_pos);
+ $s_part2 = array_slice($this->stack, $fb_s_pos + 1, count($this->stack));
+ $this->stack = array_merge($s_part1, array($clone), $s_part2);
+
+ /* 14. Jump back to step 1 in this series of steps. */
+ unset($formatting_element, $fe_af_pos, $fe_s_pos, $furthest_block);
+ }
+ break;
+
+ /* An end tag token whose tag name is one of: "button",
+ "marquee", "object" */
+ case 'button':
+ case 'marquee':
+ case 'object':
+ /* If the stack of open elements has an element in scope whose
+ tag name matches the tag name of the token, then generate implied
+ tags. */
+ if ($this->elementInScope($token['name'])) {
+ $this->generateImpliedEndTags();
+
+ /* Now, if the current node is not an element with the same
+ tag name as the token, then this is a parse error. */
+ // k
+
+ /* Now, if the stack of open elements has an element in scope
+ whose tag name matches the tag name of the token, then pop
+ elements from the stack until that element has been popped from
+ the stack, and clear the list of active formatting elements up
+ to the last marker. */
+ for ($n = count($this->stack) - 1; $n >= 0; $n--) {
+ if ($this->stack[$n]->nodeName === $token['name']) {
+ $n = -1;
+ }
+
+ array_pop($this->stack);
+ }
+
+ $marker = end(array_keys($this->a_formatting, self::MARKER, true));
+
+ for ($n = count($this->a_formatting) - 1; $n > $marker; $n--) {
+ array_pop($this->a_formatting);
+ }
+ }
+ break;
+
+ /* Or an end tag whose tag name is one of: "area", "basefont",
+ "bgsound", "br", "embed", "hr", "iframe", "image", "img",
+ "input", "isindex", "noembed", "noframes", "param", "select",
+ "spacer", "table", "textarea", "wbr" */
+ case 'area':
+ case 'basefont':
+ case 'bgsound':
+ case 'br':
+ case 'embed':
+ case 'hr':
+ case 'iframe':
+ case 'image':
+ case 'img':
+ case 'input':
+ case 'isindex':
+ case 'noembed':
+ case 'noframes':
+ case 'param':
+ case 'select':
+ case 'spacer':
+ case 'table':
+ case 'textarea':
+ case 'wbr':
+ // Parse error. Ignore the token.
+ break;
+
+ /* An end tag token not covered by the previous entries */
+ default:
+ for ($n = count($this->stack) - 1; $n >= 0; $n--) {
+ /* Initialise node to be the current node (the bottommost
+ node of the stack). */
+ $node = end($this->stack);
+
+ /* If node has the same tag name as the end tag token,
+ then: */
+ if ($token['name'] === $node->nodeName) {
+ /* Generate implied end tags. */
+ $this->generateImpliedEndTags();
+
+ /* If the tag name of the end tag token does not
+ match the tag name of the current node, this is a
+ parse error. */
+ // k
+
+ /* Pop all the nodes from the current node up to
+ node, including node, then stop this algorithm. */
+ for ($x = count($this->stack) - $n; $x >= $n; $x--) {
+ array_pop($this->stack);
+ }
+
+ } else {
+ $category = $this->getElementCategory($node);
+
+ if ($category !== self::SPECIAL && $category !== self::SCOPING) {
+ /* Otherwise, if node is in neither the formatting
+ category nor the phrasing category, then this is a
+ parse error. Stop this algorithm. The end tag token
+ is ignored. */
+ return false;
+ }
+ }
+ }
+ break;
+ }
+ break;
+ }
+ }
+
+ private function inTable($token)
+ {
+ $clear = array('html', 'table');
+
+ /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+ U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+ or U+0020 SPACE */
+ if ($token['type'] === HTML5::CHARACTR &&
+ preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+ ) {
+ /* Append the character to the current node. */
+ $text = $this->dom->createTextNode($token['data']);
+ end($this->stack)->appendChild($text);
+
+ /* A comment token */
+ } elseif ($token['type'] === HTML5::COMMENT) {
+ /* Append a Comment node to the current node with the data
+ attribute set to the data given in the comment token. */
+ $comment = $this->dom->createComment($token['data']);
+ end($this->stack)->appendChild($comment);
+
+ /* A start tag whose tag name is "caption" */
+ } elseif ($token['type'] === HTML5::STARTTAG &&
+ $token['name'] === 'caption'
+ ) {
+ /* Clear the stack back to a table context. */
+ $this->clearStackToTableContext($clear);
+
+ /* Insert a marker at the end of the list of active
+ formatting elements. */
+ $this->a_formatting[] = self::MARKER;
+
+ /* Insert an HTML element for the token, then switch the
+ insertion mode to "in caption". */
+ $this->insertElement($token);
+ $this->mode = self::IN_CAPTION;
+
+ /* A start tag whose tag name is "colgroup" */
+ } elseif ($token['type'] === HTML5::STARTTAG &&
+ $token['name'] === 'colgroup'
+ ) {
+ /* Clear the stack back to a table context. */
+ $this->clearStackToTableContext($clear);
+
+ /* Insert an HTML element for the token, then switch the
+ insertion mode to "in column group". */
+ $this->insertElement($token);
+ $this->mode = self::IN_CGROUP;
+
+ /* A start tag whose tag name is "col" */
+ } elseif ($token['type'] === HTML5::STARTTAG &&
+ $token['name'] === 'col'
+ ) {
+ $this->inTable(
+ array(
+ 'name' => 'colgroup',
+ 'type' => HTML5::STARTTAG,
+ 'attr' => array()
+ )
+ );
+
+ $this->inColumnGroup($token);
+
+ /* A start tag whose tag name is one of: "tbody", "tfoot", "thead" */
+ } elseif ($token['type'] === HTML5::STARTTAG && in_array(
+ $token['name'],
+ array('tbody', 'tfoot', 'thead')
+ )
+ ) {
+ /* Clear the stack back to a table context. */
+ $this->clearStackToTableContext($clear);
+
+ /* Insert an HTML element for the token, then switch the insertion
+ mode to "in table body". */
+ $this->insertElement($token);
+ $this->mode = self::IN_TBODY;
+
+ /* A start tag whose tag name is one of: "td", "th", "tr" */
+ } elseif ($token['type'] === HTML5::STARTTAG &&
+ in_array($token['name'], array('td', 'th', 'tr'))
+ ) {
+ /* Act as if a start tag token with the tag name "tbody" had been
+ seen, then reprocess the current token. */
+ $this->inTable(
+ array(
+ 'name' => 'tbody',
+ 'type' => HTML5::STARTTAG,
+ 'attr' => array()
+ )
+ );
+
+ return $this->inTableBody($token);
+
+ /* A start tag whose tag name is "table" */
+ } elseif ($token['type'] === HTML5::STARTTAG &&
+ $token['name'] === 'table'
+ ) {
+ /* Parse error. Act as if an end tag token with the tag name "table"
+ had been seen, then, if that token wasn't ignored, reprocess the
+ current token. */
+ $this->inTable(
+ array(
+ 'name' => 'table',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+
+ return $this->mainPhase($token);
+
+ /* An end tag whose tag name is "table" */
+ } elseif ($token['type'] === HTML5::ENDTAG &&
+ $token['name'] === 'table'
+ ) {
+ /* If the stack of open elements does not have an element in table
+ scope with the same tag name as the token, this is a parse error.
+ Ignore the token. (innerHTML case) */
+ if (!$this->elementInScope($token['name'], true)) {
+ return false;
+
+ /* Otherwise: */
+ } else {
+ /* Generate implied end tags. */
+ $this->generateImpliedEndTags();
+
+ /* Now, if the current node is not a table element, then this
+ is a parse error. */
+ // w/e
+
+ /* Pop elements from this stack until a table element has been
+ popped from the stack. */
+ while (true) {
+ $current = end($this->stack)->nodeName;
+ array_pop($this->stack);
+
+ if ($current === 'table') {
+ break;
+ }
+ }
+
+ /* Reset the insertion mode appropriately. */
+ $this->resetInsertionMode();
+ }
+
+ /* An end tag whose tag name is one of: "body", "caption", "col",
+ "colgroup", "html", "tbody", "td", "tfoot", "th", "thead", "tr" */
+ } elseif ($token['type'] === HTML5::ENDTAG && in_array(
+ $token['name'],
+ array(
+ 'body',
+ 'caption',
+ 'col',
+ 'colgroup',
+ 'html',
+ 'tbody',
+ 'td',
+ 'tfoot',
+ 'th',
+ 'thead',
+ 'tr'
+ )
+ )
+ ) {
+ // Parse error. Ignore the token.
+
+ /* Anything else */
+ } else {
+ /* Parse error. Process the token as if the insertion mode was "in
+ body", with the following exception: */
+
+ /* If the current node is a table, tbody, tfoot, thead, or tr
+ element, then, whenever a node would be inserted into the current
+ node, it must instead be inserted into the foster parent element. */
+ if (in_array(
+ end($this->stack)->nodeName,
+ array('table', 'tbody', 'tfoot', 'thead', 'tr')
+ )
+ ) {
+ /* The foster parent element is the parent element of the last
+ table element in the stack of open elements, if there is a
+ table element and it has such a parent element. If there is no
+ table element in the stack of open elements (innerHTML case),
+ then the foster parent element is the first element in the
+ stack of open elements (the html element). Otherwise, if there
+ is a table element in the stack of open elements, but the last
+ table element in the stack of open elements has no parent, or
+ its parent node is not an element, then the foster parent
+ element is the element before the last table element in the
+ stack of open elements. */
+ for ($n = count($this->stack) - 1; $n >= 0; $n--) {
+ if ($this->stack[$n]->nodeName === 'table') {
+ $table = $this->stack[$n];
+ break;
+ }
+ }
+
+ if (isset($table) && $table->parentNode !== null) {
+ $this->foster_parent = $table->parentNode;
+
+ } elseif (!isset($table)) {
+ $this->foster_parent = $this->stack[0];
+
+ } elseif (isset($table) && ($table->parentNode === null ||
+ $table->parentNode->nodeType !== XML_ELEMENT_NODE)
+ ) {
+ $this->foster_parent = $this->stack[$n - 1];
+ }
+ }
+
+ $this->inBody($token);
+ }
+ }
+
+ private function inCaption($token)
+ {
+ /* An end tag whose tag name is "caption" */
+ if ($token['type'] === HTML5::ENDTAG && $token['name'] === 'caption') {
+ /* If the stack of open elements does not have an element in table
+ scope with the same tag name as the token, this is a parse error.
+ Ignore the token. (innerHTML case) */
+ if (!$this->elementInScope($token['name'], true)) {
+ // Ignore
+
+ /* Otherwise: */
+ } else {
+ /* Generate implied end tags. */
+ $this->generateImpliedEndTags();
+
+ /* Now, if the current node is not a caption element, then this
+ is a parse error. */
+ // w/e
+
+ /* Pop elements from this stack until a caption element has
+ been popped from the stack. */
+ while (true) {
+ $node = end($this->stack)->nodeName;
+ array_pop($this->stack);
+
+ if ($node === 'caption') {
+ break;
+ }
+ }
+
+ /* Clear the list of active formatting elements up to the last
+ marker. */
+ $this->clearTheActiveFormattingElementsUpToTheLastMarker();
+
+ /* Switch the insertion mode to "in table". */
+ $this->mode = self::IN_TABLE;
+ }
+
+ /* A start tag whose tag name is one of: "caption", "col", "colgroup",
+ "tbody", "td", "tfoot", "th", "thead", "tr", or an end tag whose tag
+ name is "table" */
+ } elseif (($token['type'] === HTML5::STARTTAG && in_array(
+ $token['name'],
+ array(
+ 'caption',
+ 'col',
+ 'colgroup',
+ 'tbody',
+ 'td',
+ 'tfoot',
+ 'th',
+ 'thead',
+ 'tr'
+ )
+ )) || ($token['type'] === HTML5::ENDTAG &&
+ $token['name'] === 'table')
+ ) {
+ /* Parse error. Act as if an end tag with the tag name "caption"
+ had been seen, then, if that token wasn't ignored, reprocess the
+ current token. */
+ $this->inCaption(
+ array(
+ 'name' => 'caption',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+
+ return $this->inTable($token);
+
+ /* An end tag whose tag name is one of: "body", "col", "colgroup",
+ "html", "tbody", "td", "tfoot", "th", "thead", "tr" */
+ } elseif ($token['type'] === HTML5::ENDTAG && in_array(
+ $token['name'],
+ array(
+ 'body',
+ 'col',
+ 'colgroup',
+ 'html',
+ 'tbody',
+ 'tfoot',
+ 'th',
+ 'thead',
+ 'tr'
+ )
+ )
+ ) {
+ // Parse error. Ignore the token.
+
+ /* Anything else */
+ } else {
+ /* Process the token as if the insertion mode was "in body". */
+ $this->inBody($token);
+ }
+ }
+
+ private function inColumnGroup($token)
+ {
+ /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+ U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+ or U+0020 SPACE */
+ if ($token['type'] === HTML5::CHARACTR &&
+ preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+ ) {
+ /* Append the character to the current node. */
+ $text = $this->dom->createTextNode($token['data']);
+ end($this->stack)->appendChild($text);
+
+ /* A comment token */
+ } elseif ($token['type'] === HTML5::COMMENT) {
+ /* Append a Comment node to the current node with the data
+ attribute set to the data given in the comment token. */
+ $comment = $this->dom->createComment($token['data']);
+ end($this->stack)->appendChild($comment);
+
+ /* A start tag whose tag name is "col" */
+ } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'col') {
+ /* Insert a col element for the token. Immediately pop the current
+ node off the stack of open elements. */
+ $this->insertElement($token);
+ array_pop($this->stack);
+
+ /* An end tag whose tag name is "colgroup" */
+ } elseif ($token['type'] === HTML5::ENDTAG &&
+ $token['name'] === 'colgroup'
+ ) {
+ /* If the current node is the root html element, then this is a
+ parse error, ignore the token. (innerHTML case) */
+ if (end($this->stack)->nodeName === 'html') {
+ // Ignore
+
+ /* Otherwise, pop the current node (which will be a colgroup
+ element) from the stack of open elements. Switch the insertion
+ mode to "in table". */
+ } else {
+ array_pop($this->stack);
+ $this->mode = self::IN_TABLE;
+ }
+
+ /* An end tag whose tag name is "col" */
+ } elseif ($token['type'] === HTML5::ENDTAG && $token['name'] === 'col') {
+ /* Parse error. Ignore the token. */
+
+ /* Anything else */
+ } else {
+ /* Act as if an end tag with the tag name "colgroup" had been seen,
+ and then, if that token wasn't ignored, reprocess the current token. */
+ $this->inColumnGroup(
+ array(
+ 'name' => 'colgroup',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+
+ return $this->inTable($token);
+ }
+ }
+
+ private function inTableBody($token)
+ {
+ $clear = array('tbody', 'tfoot', 'thead', 'html');
+
+ /* A start tag whose tag name is "tr" */
+ if ($token['type'] === HTML5::STARTTAG && $token['name'] === 'tr') {
+ /* Clear the stack back to a table body context. */
+ $this->clearStackToTableContext($clear);
+
+ /* Insert a tr element for the token, then switch the insertion
+ mode to "in row". */
+ $this->insertElement($token);
+ $this->mode = self::IN_ROW;
+
+ /* A start tag whose tag name is one of: "th", "td" */
+ } elseif ($token['type'] === HTML5::STARTTAG &&
+ ($token['name'] === 'th' || $token['name'] === 'td')
+ ) {
+ /* Parse error. Act as if a start tag with the tag name "tr" had
+ been seen, then reprocess the current token. */
+ $this->inTableBody(
+ array(
+ 'name' => 'tr',
+ 'type' => HTML5::STARTTAG,
+ 'attr' => array()
+ )
+ );
+
+ return $this->inRow($token);
+
+ /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
+ } elseif ($token['type'] === HTML5::ENDTAG &&
+ in_array($token['name'], array('tbody', 'tfoot', 'thead'))
+ ) {
+ /* If the stack of open elements does not have an element in table
+ scope with the same tag name as the token, this is a parse error.
+ Ignore the token. */
+ if (!$this->elementInScope($token['name'], true)) {
+ // Ignore
+
+ /* Otherwise: */
+ } else {
+ /* Clear the stack back to a table body context. */
+ $this->clearStackToTableContext($clear);
+
+ /* Pop the current node from the stack of open elements. Switch
+ the insertion mode to "in table". */
+ array_pop($this->stack);
+ $this->mode = self::IN_TABLE;
+ }
+
+ /* A start tag whose tag name is one of: "caption", "col", "colgroup",
+ "tbody", "tfoot", "thead", or an end tag whose tag name is "table" */
+ } elseif (($token['type'] === HTML5::STARTTAG && in_array(
+ $token['name'],
+ array('caption', 'col', 'colgroup', 'tbody', 'tfoor', 'thead')
+ )) ||
+ ($token['type'] === HTML5::STARTTAG && $token['name'] === 'table')
+ ) {
+ /* If the stack of open elements does not have a tbody, thead, or
+ tfoot element in table scope, this is a parse error. Ignore the
+ token. (innerHTML case) */
+ if (!$this->elementInScope(array('tbody', 'thead', 'tfoot'), true)) {
+ // Ignore.
+
+ /* Otherwise: */
+ } else {
+ /* Clear the stack back to a table body context. */
+ $this->clearStackToTableContext($clear);
+
+ /* Act as if an end tag with the same tag name as the current
+ node ("tbody", "tfoot", or "thead") had been seen, then
+ reprocess the current token. */
+ $this->inTableBody(
+ array(
+ 'name' => end($this->stack)->nodeName,
+ 'type' => HTML5::ENDTAG
+ )
+ );
+
+ return $this->mainPhase($token);
+ }
+
+ /* An end tag whose tag name is one of: "body", "caption", "col",
+ "colgroup", "html", "td", "th", "tr" */
+ } elseif ($token['type'] === HTML5::ENDTAG && in_array(
+ $token['name'],
+ array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr')
+ )
+ ) {
+ /* Parse error. Ignore the token. */
+
+ /* Anything else */
+ } else {
+ /* Process the token as if the insertion mode was "in table". */
+ $this->inTable($token);
+ }
+ }
+
+ private function inRow($token)
+ {
+ $clear = array('tr', 'html');
+
+ /* A start tag whose tag name is one of: "th", "td" */
+ if ($token['type'] === HTML5::STARTTAG &&
+ ($token['name'] === 'th' || $token['name'] === 'td')
+ ) {
+ /* Clear the stack back to a table row context. */
+ $this->clearStackToTableContext($clear);
+
+ /* Insert an HTML element for the token, then switch the insertion
+ mode to "in cell". */
+ $this->insertElement($token);
+ $this->mode = self::IN_CELL;
+
+ /* Insert a marker at the end of the list of active formatting
+ elements. */
+ $this->a_formatting[] = self::MARKER;
+
+ /* An end tag whose tag name is "tr" */
+ } elseif ($token['type'] === HTML5::ENDTAG && $token['name'] === 'tr') {
+ /* If the stack of open elements does not have an element in table
+ scope with the same tag name as the token, this is a parse error.
+ Ignore the token. (innerHTML case) */
+ if (!$this->elementInScope($token['name'], true)) {
+ // Ignore.
+
+ /* Otherwise: */
+ } else {
+ /* Clear the stack back to a table row context. */
+ $this->clearStackToTableContext($clear);
+
+ /* Pop the current node (which will be a tr element) from the
+ stack of open elements. Switch the insertion mode to "in table
+ body". */
+ array_pop($this->stack);
+ $this->mode = self::IN_TBODY;
+ }
+
+ /* A start tag whose tag name is one of: "caption", "col", "colgroup",
+ "tbody", "tfoot", "thead", "tr" or an end tag whose tag name is "table" */
+ } elseif ($token['type'] === HTML5::STARTTAG && in_array(
+ $token['name'],
+ array('caption', 'col', 'colgroup', 'tbody', 'tfoot', 'thead', 'tr')
+ )
+ ) {
+ /* Act as if an end tag with the tag name "tr" had been seen, then,
+ if that token wasn't ignored, reprocess the current token. */
+ $this->inRow(
+ array(
+ 'name' => 'tr',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+
+ return $this->inCell($token);
+
+ /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
+ } elseif ($token['type'] === HTML5::ENDTAG &&
+ in_array($token['name'], array('tbody', 'tfoot', 'thead'))
+ ) {
+ /* If the stack of open elements does not have an element in table
+ scope with the same tag name as the token, this is a parse error.
+ Ignore the token. */
+ if (!$this->elementInScope($token['name'], true)) {
+ // Ignore.
+
+ /* Otherwise: */
+ } else {
+ /* Otherwise, act as if an end tag with the tag name "tr" had
+ been seen, then reprocess the current token. */
+ $this->inRow(
+ array(
+ 'name' => 'tr',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+
+ return $this->inCell($token);
+ }
+
+ /* An end tag whose tag name is one of: "body", "caption", "col",
+ "colgroup", "html", "td", "th" */
+ } elseif ($token['type'] === HTML5::ENDTAG && in_array(
+ $token['name'],
+ array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr')
+ )
+ ) {
+ /* Parse error. Ignore the token. */
+
+ /* Anything else */
+ } else {
+ /* Process the token as if the insertion mode was "in table". */
+ $this->inTable($token);
+ }
+ }
+
+ private function inCell($token)
+ {
+ /* An end tag whose tag name is one of: "td", "th" */
+ if ($token['type'] === HTML5::ENDTAG &&
+ ($token['name'] === 'td' || $token['name'] === 'th')
+ ) {
+ /* If the stack of open elements does not have an element in table
+ scope with the same tag name as that of the token, then this is a
+ parse error and the token must be ignored. */
+ if (!$this->elementInScope($token['name'], true)) {
+ // Ignore.
+
+ /* Otherwise: */
+ } else {
+ /* Generate implied end tags, except for elements with the same
+ tag name as the token. */
+ $this->generateImpliedEndTags(array($token['name']));
+
+ /* Now, if the current node is not an element with the same tag
+ name as the token, then this is a parse error. */
+ // k
+
+ /* Pop elements from this stack until an element with the same
+ tag name as the token has been popped from the stack. */
+ while (true) {
+ $node = end($this->stack)->nodeName;
+ array_pop($this->stack);
+
+ if ($node === $token['name']) {
+ break;
+ }
+ }
+
+ /* Clear the list of active formatting elements up to the last
+ marker. */
+ $this->clearTheActiveFormattingElementsUpToTheLastMarker();
+
+ /* Switch the insertion mode to "in row". (The current node
+ will be a tr element at this point.) */
+ $this->mode = self::IN_ROW;
+ }
+
+ /* A start tag whose tag name is one of: "caption", "col", "colgroup",
+ "tbody", "td", "tfoot", "th", "thead", "tr" */
+ } elseif ($token['type'] === HTML5::STARTTAG && in_array(
+ $token['name'],
+ array(
+ 'caption',
+ 'col',
+ 'colgroup',
+ 'tbody',
+ 'td',
+ 'tfoot',
+ 'th',
+ 'thead',
+ 'tr'
+ )
+ )
+ ) {
+ /* If the stack of open elements does not have a td or th element
+ in table scope, then this is a parse error; ignore the token.
+ (innerHTML case) */
+ if (!$this->elementInScope(array('td', 'th'), true)) {
+ // Ignore.
+
+ /* Otherwise, close the cell (see below) and reprocess the current
+ token. */
+ } else {
+ $this->closeCell();
+ return $this->inRow($token);
+ }
+
+ /* A start tag whose tag name is one of: "caption", "col", "colgroup",
+ "tbody", "td", "tfoot", "th", "thead", "tr" */
+ } elseif ($token['type'] === HTML5::STARTTAG && in_array(
+ $token['name'],
+ array(
+ 'caption',
+ 'col',
+ 'colgroup',
+ 'tbody',
+ 'td',
+ 'tfoot',
+ 'th',
+ 'thead',
+ 'tr'
+ )
+ )
+ ) {
+ /* If the stack of open elements does not have a td or th element
+ in table scope, then this is a parse error; ignore the token.
+ (innerHTML case) */
+ if (!$this->elementInScope(array('td', 'th'), true)) {
+ // Ignore.
+
+ /* Otherwise, close the cell (see below) and reprocess the current
+ token. */
+ } else {
+ $this->closeCell();
+ return $this->inRow($token);
+ }
+
+ /* An end tag whose tag name is one of: "body", "caption", "col",
+ "colgroup", "html" */
+ } elseif ($token['type'] === HTML5::ENDTAG && in_array(
+ $token['name'],
+ array('body', 'caption', 'col', 'colgroup', 'html')
+ )
+ ) {
+ /* Parse error. Ignore the token. */
+
+ /* An end tag whose tag name is one of: "table", "tbody", "tfoot",
+ "thead", "tr" */
+ } elseif ($token['type'] === HTML5::ENDTAG && in_array(
+ $token['name'],
+ array('table', 'tbody', 'tfoot', 'thead', 'tr')
+ )
+ ) {
+ /* If the stack of open elements does not have an element in table
+ scope with the same tag name as that of the token (which can only
+ happen for "tbody", "tfoot" and "thead", or, in the innerHTML case),
+ then this is a parse error and the token must be ignored. */
+ if (!$this->elementInScope($token['name'], true)) {
+ // Ignore.
+
+ /* Otherwise, close the cell (see below) and reprocess the current
+ token. */
+ } else {
+ $this->closeCell();
+ return $this->inRow($token);
+ }
+
+ /* Anything else */
+ } else {
+ /* Process the token as if the insertion mode was "in body". */
+ $this->inBody($token);
+ }
+ }
+
+ private function inSelect($token)
+ {
+ /* Handle the token as follows: */
+
+ /* A character token */
+ if ($token['type'] === HTML5::CHARACTR) {
+ /* Append the token's character to the current node. */
+ $this->insertText($token['data']);
+
+ /* A comment token */
+ } elseif ($token['type'] === HTML5::COMMENT) {
+ /* Append a Comment node to the current node with the data
+ attribute set to the data given in the comment token. */
+ $this->insertComment($token['data']);
+
+ /* A start tag token whose tag name is "option" */
+ } elseif ($token['type'] === HTML5::STARTTAG &&
+ $token['name'] === 'option'
+ ) {
+ /* If the current node is an option element, act as if an end tag
+ with the tag name "option" had been seen. */
+ if (end($this->stack)->nodeName === 'option') {
+ $this->inSelect(
+ array(
+ 'name' => 'option',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+ }
+
+ /* Insert an HTML element for the token. */
+ $this->insertElement($token);
+
+ /* A start tag token whose tag name is "optgroup" */
+ } elseif ($token['type'] === HTML5::STARTTAG &&
+ $token['name'] === 'optgroup'
+ ) {
+ /* If the current node is an option element, act as if an end tag
+ with the tag name "option" had been seen. */
+ if (end($this->stack)->nodeName === 'option') {
+ $this->inSelect(
+ array(
+ 'name' => 'option',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+ }
+
+ /* If the current node is an optgroup element, act as if an end tag
+ with the tag name "optgroup" had been seen. */
+ if (end($this->stack)->nodeName === 'optgroup') {
+ $this->inSelect(
+ array(
+ 'name' => 'optgroup',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+ }
+
+ /* Insert an HTML element for the token. */
+ $this->insertElement($token);
+
+ /* An end tag token whose tag name is "optgroup" */
+ } elseif ($token['type'] === HTML5::ENDTAG &&
+ $token['name'] === 'optgroup'
+ ) {
+ /* First, if the current node is an option element, and the node
+ immediately before it in the stack of open elements is an optgroup
+ element, then act as if an end tag with the tag name "option" had
+ been seen. */
+ $elements_in_stack = count($this->stack);
+
+ if ($this->stack[$elements_in_stack - 1]->nodeName === 'option' &&
+ $this->stack[$elements_in_stack - 2]->nodeName === 'optgroup'
+ ) {
+ $this->inSelect(
+ array(
+ 'name' => 'option',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+ }
+
+ /* If the current node is an optgroup element, then pop that node
+ from the stack of open elements. Otherwise, this is a parse error,
+ ignore the token. */
+ if ($this->stack[$elements_in_stack - 1] === 'optgroup') {
+ array_pop($this->stack);
+ }
+
+ /* An end tag token whose tag name is "option" */
+ } elseif ($token['type'] === HTML5::ENDTAG &&
+ $token['name'] === 'option'
+ ) {
+ /* If the current node is an option element, then pop that node
+ from the stack of open elements. Otherwise, this is a parse error,
+ ignore the token. */
+ if (end($this->stack)->nodeName === 'option') {
+ array_pop($this->stack);
+ }
+
+ /* An end tag whose tag name is "select" */
+ } elseif ($token['type'] === HTML5::ENDTAG &&
+ $token['name'] === 'select'
+ ) {
+ /* If the stack of open elements does not have an element in table
+ scope with the same tag name as the token, this is a parse error.
+ Ignore the token. (innerHTML case) */
+ if (!$this->elementInScope($token['name'], true)) {
+ // w/e
+
+ /* Otherwise: */
+ } else {
+ /* Pop elements from the stack of open elements until a select
+ element has been popped from the stack. */
+ while (true) {
+ $current = end($this->stack)->nodeName;
+ array_pop($this->stack);
+
+ if ($current === 'select') {
+ break;
+ }
+ }
+
+ /* Reset the insertion mode appropriately. */
+ $this->resetInsertionMode();
+ }
+
+ /* A start tag whose tag name is "select" */
+ } elseif ($token['name'] === 'select' &&
+ $token['type'] === HTML5::STARTTAG
+ ) {
+ /* Parse error. Act as if the token had been an end tag with the
+ tag name "select" instead. */
+ $this->inSelect(
+ array(
+ 'name' => 'select',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+
+ /* An end tag whose tag name is one of: "caption", "table", "tbody",
+ "tfoot", "thead", "tr", "td", "th" */
+ } elseif (in_array(
+ $token['name'],
+ array(
+ 'caption',
+ 'table',
+ 'tbody',
+ 'tfoot',
+ 'thead',
+ 'tr',
+ 'td',
+ 'th'
+ )
+ ) && $token['type'] === HTML5::ENDTAG
+ ) {
+ /* Parse error. */
+ // w/e
+
+ /* If the stack of open elements has an element in table scope with
+ the same tag name as that of the token, then act as if an end tag
+ with the tag name "select" had been seen, and reprocess the token.
+ Otherwise, ignore the token. */
+ if ($this->elementInScope($token['name'], true)) {
+ $this->inSelect(
+ array(
+ 'name' => 'select',
+ 'type' => HTML5::ENDTAG
+ )
+ );
+
+ $this->mainPhase($token);
+ }
+
+ /* Anything else */
+ } else {
+ /* Parse error. Ignore the token. */
+ }
+ }
+
+ private function afterBody($token)
+ {
+ /* Handle the token as follows: */
+
+ /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+ U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+ or U+0020 SPACE */
+ if ($token['type'] === HTML5::CHARACTR &&
+ preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+ ) {
+ /* Process the token as it would be processed if the insertion mode
+ was "in body". */
+ $this->inBody($token);
+
+ /* A comment token */
+ } elseif ($token['type'] === HTML5::COMMENT) {
+ /* Append a Comment node to the first element in the stack of open
+ elements (the html element), with the data attribute set to the
+ data given in the comment token. */
+ $comment = $this->dom->createComment($token['data']);
+ $this->stack[0]->appendChild($comment);
+
+ /* An end tag with the tag name "html" */
+ } elseif ($token['type'] === HTML5::ENDTAG && $token['name'] === 'html') {
+ /* If the parser was originally created in order to handle the
+ setting of an element's innerHTML attribute, this is a parse error;
+ ignore the token. (The element will be an html element in this
+ case.) (innerHTML case) */
+
+ /* Otherwise, switch to the trailing end phase. */
+ $this->phase = self::END_PHASE;
+
+ /* Anything else */
+ } else {
+ /* Parse error. Set the insertion mode to "in body" and reprocess
+ the token. */
+ $this->mode = self::IN_BODY;
+ return $this->inBody($token);
+ }
+ }
+
+ private function inFrameset($token)
+ {
+ /* Handle the token as follows: */
+
+ /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+ U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+ U+000D CARRIAGE RETURN (CR), or U+0020 SPACE */
+ if ($token['type'] === HTML5::CHARACTR &&
+ preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+ ) {
+ /* Append the character to the current node. */
+ $this->insertText($token['data']);
+
+ /* A comment token */
+ } elseif ($token['type'] === HTML5::COMMENT) {
+ /* Append a Comment node to the current node with the data
+ attribute set to the data given in the comment token. */
+ $this->insertComment($token['data']);
+
+ /* A start tag with the tag name "frameset" */
+ } elseif ($token['name'] === 'frameset' &&
+ $token['type'] === HTML5::STARTTAG
+ ) {
+ $this->insertElement($token);
+
+ /* An end tag with the tag name "frameset" */
+ } elseif ($token['name'] === 'frameset' &&
+ $token['type'] === HTML5::ENDTAG
+ ) {
+ /* If the current node is the root html element, then this is a
+ parse error; ignore the token. (innerHTML case) */
+ if (end($this->stack)->nodeName === 'html') {
+ // Ignore
+
+ } else {
+ /* Otherwise, pop the current node from the stack of open
+ elements. */
+ array_pop($this->stack);
+
+ /* If the parser was not originally created in order to handle
+ the setting of an element's innerHTML attribute (innerHTML case),
+ and the current node is no longer a frameset element, then change
+ the insertion mode to "after frameset". */
+ $this->mode = self::AFTR_FRAME;
+ }
+
+ /* A start tag with the tag name "frame" */
+ } elseif ($token['name'] === 'frame' &&
+ $token['type'] === HTML5::STARTTAG
+ ) {
+ /* Insert an HTML element for the token. */
+ $this->insertElement($token);
+
+ /* Immediately pop the current node off the stack of open elements. */
+ array_pop($this->stack);
+
+ /* A start tag with the tag name "noframes" */
+ } elseif ($token['name'] === 'noframes' &&
+ $token['type'] === HTML5::STARTTAG
+ ) {
+ /* Process the token as if the insertion mode had been "in body". */
+ $this->inBody($token);
+
+ /* Anything else */
+ } else {
+ /* Parse error. Ignore the token. */
+ }
+ }
+
+ private function afterFrameset($token)
+ {
+ /* Handle the token as follows: */
+
+ /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+ U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+ U+000D CARRIAGE RETURN (CR), or U+0020 SPACE */
+ if ($token['type'] === HTML5::CHARACTR &&
+ preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+ ) {
+ /* Append the character to the current node. */
+ $this->insertText($token['data']);
+
+ /* A comment token */
+ } elseif ($token['type'] === HTML5::COMMENT) {
+ /* Append a Comment node to the current node with the data
+ attribute set to the data given in the comment token. */
+ $this->insertComment($token['data']);
+
+ /* An end tag with the tag name "html" */
+ } elseif ($token['name'] === 'html' &&
+ $token['type'] === HTML5::ENDTAG
+ ) {
+ /* Switch to the trailing end phase. */
+ $this->phase = self::END_PHASE;
+
+ /* A start tag with the tag name "noframes" */
+ } elseif ($token['name'] === 'noframes' &&
+ $token['type'] === HTML5::STARTTAG
+ ) {
+ /* Process the token as if the insertion mode had been "in body". */
+ $this->inBody($token);
+
+ /* Anything else */
+ } else {
+ /* Parse error. Ignore the token. */
+ }
+ }
+
+ private function trailingEndPhase($token)
+ {
+ /* After the main phase, as each token is emitted from the tokenisation
+ stage, it must be processed as described in this section. */
+
+ /* A DOCTYPE token */
+ if ($token['type'] === HTML5::DOCTYPE) {
+ // Parse error. Ignore the token.
+
+ /* A comment token */
+ } elseif ($token['type'] === HTML5::COMMENT) {
+ /* Append a Comment node to the Document object with the data
+ attribute set to the data given in the comment token. */
+ $comment = $this->dom->createComment($token['data']);
+ $this->dom->appendChild($comment);
+
+ /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+ U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+ or U+0020 SPACE */
+ } elseif ($token['type'] === HTML5::CHARACTR &&
+ preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+ ) {
+ /* Process the token as it would be processed in the main phase. */
+ $this->mainPhase($token);
+
+ /* A character token that is not one of U+0009 CHARACTER TABULATION,
+ U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+ or U+0020 SPACE. Or a start tag token. Or an end tag token. */
+ } elseif (($token['type'] === HTML5::CHARACTR &&
+ preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) ||
+ $token['type'] === HTML5::STARTTAG || $token['type'] === HTML5::ENDTAG
+ ) {
+ /* Parse error. Switch back to the main phase and reprocess the
+ token. */
+ $this->phase = self::MAIN_PHASE;
+ return $this->mainPhase($token);
+
+ /* An end-of-file token */
+ } elseif ($token['type'] === HTML5::EOF) {
+ /* OMG DONE!! */
+ }
+ }
+
+ private function insertElement($token, $append = true, $check = false)
+ {
+ // Proprietary workaround for libxml2's limitations with tag names
+ if ($check) {
+ // Slightly modified HTML5 tag-name modification,
+ // removing anything that's not an ASCII letter, digit, or hyphen
+ $token['name'] = preg_replace('/[^a-z0-9-]/i', '', $token['name']);
+ // Remove leading hyphens and numbers
+ $token['name'] = ltrim($token['name'], '-0..9');
+ // In theory, this should ever be needed, but just in case
+ if ($token['name'] === '') {
+ $token['name'] = 'span';
+ } // arbitrary generic choice
+ }
+
+ $el = $this->dom->createElement($token['name']);
+
+ foreach ($token['attr'] as $attr) {
+ if (!$el->hasAttribute($attr['name'])) {
+ $el->setAttribute($attr['name'], $attr['value']);
+ }
+ }
+
+ $this->appendToRealParent($el);
+ $this->stack[] = $el;
+
+ return $el;
+ }
+
+ private function insertText($data)
+ {
+ $text = $this->dom->createTextNode($data);
+ $this->appendToRealParent($text);
+ }
+
+ private function insertComment($data)
+ {
+ $comment = $this->dom->createComment($data);
+ $this->appendToRealParent($comment);
+ }
+
+ private function appendToRealParent($node)
+ {
+ if ($this->foster_parent === null) {
+ end($this->stack)->appendChild($node);
+
+ } elseif ($this->foster_parent !== null) {
+ /* If the foster parent element is the parent element of the
+ last table element in the stack of open elements, then the new
+ node must be inserted immediately before the last table element
+ in the stack of open elements in the foster parent element;
+ otherwise, the new node must be appended to the foster parent
+ element. */
+ for ($n = count($this->stack) - 1; $n >= 0; $n--) {
+ if ($this->stack[$n]->nodeName === 'table' &&
+ $this->stack[$n]->parentNode !== null
+ ) {
+ $table = $this->stack[$n];
+ break;
+ }
+ }
+
+ if (isset($table) && $this->foster_parent->isSameNode($table->parentNode)) {
+ $this->foster_parent->insertBefore($node, $table);
+ } else {
+ $this->foster_parent->appendChild($node);
+ }
+
+ $this->foster_parent = null;
+ }
+ }
+
+ private function elementInScope($el, $table = false)
+ {
+ if (is_array($el)) {
+ foreach ($el as $element) {
+ if ($this->elementInScope($element, $table)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ $leng = count($this->stack);
+
+ for ($n = 0; $n < $leng; $n++) {
+ /* 1. Initialise node to be the current node (the bottommost node of
+ the stack). */
+ $node = $this->stack[$leng - 1 - $n];
+
+ if ($node->tagName === $el) {
+ /* 2. If node is the target node, terminate in a match state. */
+ return true;
+
+ } elseif ($node->tagName === 'table') {
+ /* 3. Otherwise, if node is a table element, terminate in a failure
+ state. */
+ return false;
+
+ } elseif ($table === true && in_array(
+ $node->tagName,
+ array(
+ 'caption',
+ 'td',
+ 'th',
+ 'button',
+ 'marquee',
+ 'object'
+ )
+ )
+ ) {
+ /* 4. Otherwise, if the algorithm is the "has an element in scope"
+ variant (rather than the "has an element in table scope" variant),
+ and node is one of the following, terminate in a failure state. */
+ return false;
+
+ } elseif ($node === $node->ownerDocument->documentElement) {
+ /* 5. Otherwise, if node is an html element (root element), terminate
+ in a failure state. (This can only happen if the node is the topmost
+ node of the stack of open elements, and prevents the next step from
+ being invoked if there are no more elements in the stack.) */
+ return false;
+ }
+
+ /* Otherwise, set node to the previous entry in the stack of open
+ elements and return to step 2. (This will never fail, since the loop
+ will always terminate in the previous step if the top of the stack
+ is reached.) */
+ }
+ }
+
+ private function reconstructActiveFormattingElements()
+ {
+ /* 1. If there are no entries in the list of active formatting elements,
+ then there is nothing to reconstruct; stop this algorithm. */
+ $formatting_elements = count($this->a_formatting);
+
+ if ($formatting_elements === 0) {
+ return false;
+ }
+
+ /* 3. Let entry be the last (most recently added) element in the list
+ of active formatting elements. */
+ $entry = end($this->a_formatting);
+
+ /* 2. If the last (most recently added) entry in the list of active
+ formatting elements is a marker, or if it is an element that is in the
+ stack of open elements, then there is nothing to reconstruct; stop this
+ algorithm. */
+ if ($entry === self::MARKER || in_array($entry, $this->stack, true)) {
+ return false;
+ }
+
+ for ($a = $formatting_elements - 1; $a >= 0; true) {
+ /* 4. If there are no entries before entry in the list of active
+ formatting elements, then jump to step 8. */
+ if ($a === 0) {
+ $step_seven = false;
+ break;
+ }
+
+ /* 5. Let entry be the entry one earlier than entry in the list of
+ active formatting elements. */
+ $a--;
+ $entry = $this->a_formatting[$a];
+
+ /* 6. If entry is neither a marker nor an element that is also in
+ thetack of open elements, go to step 4. */
+ if ($entry === self::MARKER || in_array($entry, $this->stack, true)) {
+ break;
+ }
+ }
+
+ while (true) {
+ /* 7. Let entry be the element one later than entry in the list of
+ active formatting elements. */
+ if (isset($step_seven) && $step_seven === true) {
+ $a++;
+ $entry = $this->a_formatting[$a];
+ }
+
+ /* 8. Perform a shallow clone of the element entry to obtain clone. */
+ $clone = $entry->cloneNode();
+
+ /* 9. Append clone to the current node and push it onto the stack
+ of open elements so that it is the new current node. */
+ end($this->stack)->appendChild($clone);
+ $this->stack[] = $clone;
+
+ /* 10. Replace the entry for entry in the list with an entry for
+ clone. */
+ $this->a_formatting[$a] = $clone;
+
+ /* 11. If the entry for clone in the list of active formatting
+ elements is not the last entry in the list, return to step 7. */
+ if (end($this->a_formatting) !== $clone) {
+ $step_seven = true;
+ } else {
+ break;
+ }
+ }
+ }
+
+ private function clearTheActiveFormattingElementsUpToTheLastMarker()
+ {
+ /* When the steps below require the UA to clear the list of active
+ formatting elements up to the last marker, the UA must perform the
+ following steps: */
+
+ while (true) {
+ /* 1. Let entry be the last (most recently added) entry in the list
+ of active formatting elements. */
+ $entry = end($this->a_formatting);
+
+ /* 2. Remove entry from the list of active formatting elements. */
+ array_pop($this->a_formatting);
+
+ /* 3. If entry was a marker, then stop the algorithm at this point.
+ The list has been cleared up to the last marker. */
+ if ($entry === self::MARKER) {
+ break;
+ }
+ }
+ }
+
+ private function generateImpliedEndTags($exclude = array())
+ {
+ /* When the steps below require the UA to generate implied end tags,
+ then, if the current node is a dd element, a dt element, an li element,
+ a p element, a td element, a th element, or a tr element, the UA must
+ act as if an end tag with the respective tag name had been seen and
+ then generate implied end tags again. */
+ $node = end($this->stack);
+ $elements = array_diff(array('dd', 'dt', 'li', 'p', 'td', 'th', 'tr'), $exclude);
+
+ while (in_array(end($this->stack)->nodeName, $elements)) {
+ array_pop($this->stack);
+ }
+ }
+
+ private function getElementCategory($node)
+ {
+ $name = $node->tagName;
+ if (in_array($name, $this->special)) {
+ return self::SPECIAL;
+ } elseif (in_array($name, $this->scoping)) {
+ return self::SCOPING;
+ } elseif (in_array($name, $this->formatting)) {
+ return self::FORMATTING;
+ } else {
+ return self::PHRASING;
+ }
+ }
+
+ private function clearStackToTableContext($elements)
+ {
+ /* When the steps above require the UA to clear the stack back to a
+ table context, it means that the UA must, while the current node is not
+ a table element or an html element, pop elements from the stack of open
+ elements. If this causes any elements to be popped from the stack, then
+ this is a parse error. */
+ while (true) {
+ $node = end($this->stack)->nodeName;
+
+ if (in_array($node, $elements)) {
+ break;
+ } else {
+ array_pop($this->stack);
+ }
+ }
+ }
+
+ private function resetInsertionMode()
+ {
+ /* 1. Let last be false. */
+ $last = false;
+ $leng = count($this->stack);
+
+ for ($n = $leng - 1; $n >= 0; $n--) {
+ /* 2. Let node be the last node in the stack of open elements. */
+ $node = $this->stack[$n];
+
+ /* 3. If node is the first node in the stack of open elements, then
+ set last to true. If the element whose innerHTML attribute is being
+ set is neither a td element nor a th element, then set node to the
+ element whose innerHTML attribute is being set. (innerHTML case) */
+ if ($this->stack[0]->isSameNode($node)) {
+ $last = true;
+ }
+
+ /* 4. If node is a select element, then switch the insertion mode to
+ "in select" and abort these steps. (innerHTML case) */
+ if ($node->nodeName === 'select') {
+ $this->mode = self::IN_SELECT;
+ break;
+
+ /* 5. If node is a td or th element, then switch the insertion mode
+ to "in cell" and abort these steps. */
+ } elseif ($node->nodeName === 'td' || $node->nodeName === 'th') {
+ $this->mode = self::IN_CELL;
+ break;
+
+ /* 6. If node is a tr element, then switch the insertion mode to
+ "in row" and abort these steps. */
+ } elseif ($node->nodeName === 'tr') {
+ $this->mode = self::IN_ROW;
+ break;
+
+ /* 7. If node is a tbody, thead, or tfoot element, then switch the
+ insertion mode to "in table body" and abort these steps. */
+ } elseif (in_array($node->nodeName, array('tbody', 'thead', 'tfoot'))) {
+ $this->mode = self::IN_TBODY;
+ break;
+
+ /* 8. If node is a caption element, then switch the insertion mode
+ to "in caption" and abort these steps. */
+ } elseif ($node->nodeName === 'caption') {
+ $this->mode = self::IN_CAPTION;
+ break;
+
+ /* 9. If node is a colgroup element, then switch the insertion mode
+ to "in column group" and abort these steps. (innerHTML case) */
+ } elseif ($node->nodeName === 'colgroup') {
+ $this->mode = self::IN_CGROUP;
+ break;
+
+ /* 10. If node is a table element, then switch the insertion mode
+ to "in table" and abort these steps. */
+ } elseif ($node->nodeName === 'table') {
+ $this->mode = self::IN_TABLE;
+ break;
+
+ /* 11. If node is a head element, then switch the insertion mode
+ to "in body" ("in body"! not "in head"!) and abort these steps.
+ (innerHTML case) */
+ } elseif ($node->nodeName === 'head') {
+ $this->mode = self::IN_BODY;
+ break;
+
+ /* 12. If node is a body element, then switch the insertion mode to
+ "in body" and abort these steps. */
+ } elseif ($node->nodeName === 'body') {
+ $this->mode = self::IN_BODY;
+ break;
+
+ /* 13. If node is a frameset element, then switch the insertion
+ mode to "in frameset" and abort these steps. (innerHTML case) */
+ } elseif ($node->nodeName === 'frameset') {
+ $this->mode = self::IN_FRAME;
+ break;
+
+ /* 14. If node is an html element, then: if the head element
+ pointer is null, switch the insertion mode to "before head",
+ otherwise, switch the insertion mode to "after head". In either
+ case, abort these steps. (innerHTML case) */
+ } elseif ($node->nodeName === 'html') {
+ $this->mode = ($this->head_pointer === null)
+ ? self::BEFOR_HEAD
+ : self::AFTER_HEAD;
+
+ break;
+
+ /* 15. If last is true, then set the insertion mode to "in body"
+ and abort these steps. (innerHTML case) */
+ } elseif ($last) {
+ $this->mode = self::IN_BODY;
+ break;
+ }
+ }
+ }
+
+ private function closeCell()
+ {
+ /* If the stack of open elements has a td or th element in table scope,
+ then act as if an end tag token with that tag name had been seen. */
+ foreach (array('td', 'th') as $cell) {
+ if ($this->elementInScope($cell, true)) {
+ $this->inCell(
+ array(
+ 'name' => $cell,
+ 'type' => HTML5::ENDTAG
+ )
+ );
+
+ break;
+ }
+ }
+ }
+
+ public function save()
+ {
+ return $this->dom;
+ }
+}
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Node.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Node.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Node.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Node.php
index d7dcf62..3995fec 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Node.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Node.php
@@ -1,49 +1,49 @@
-<?php
-
-/**
- * Abstract base node class that all others inherit from.
- *
- * Why do we not use the DOM extension? (1) It is not always available,
- * (2) it has funny constraints on the data it can represent,
- * whereas we want a maximally flexible representation, and (3) its
- * interface is a bit cumbersome.
- */
-abstract class HTMLPurifier_Node
-{
- /**
- * Line number of the start token in the source document
- * @type int
- */
- public $line;
-
- /**
- * Column number of the start token in the source document. Null if unknown.
- * @type int
- */
- public $col;
-
- /**
- * Lookup array of processing that this token is exempt from.
- * Currently, valid values are "ValidateAttributes".
- * @type array
- */
- public $armor = array();
-
- /**
- * When true, this node should be ignored as non-existent.
- *
- * Who is responsible for ignoring dead nodes? FixNesting is
- * responsible for removing them before passing on to child
- * validators.
- */
- public $dead = false;
-
- /**
- * Returns a pair of start and end tokens, where the end token
- * is null if it is not necessary. Does not include children.
- * @type array
- */
- abstract public function toTokenPair();
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Abstract base node class that all others inherit from.
+ *
+ * Why do we not use the DOM extension? (1) It is not always available,
+ * (2) it has funny constraints on the data it can represent,
+ * whereas we want a maximally flexible representation, and (3) its
+ * interface is a bit cumbersome.
+ */
+abstract class HTMLPurifier_Node
+{
+ /**
+ * Line number of the start token in the source document
+ * @type int
+ */
+ public $line;
+
+ /**
+ * Column number of the start token in the source document. Null if unknown.
+ * @type int
+ */
+ public $col;
+
+ /**
+ * Lookup array of processing that this token is exempt from.
+ * Currently, valid values are "ValidateAttributes".
+ * @type array
+ */
+ public $armor = array();
+
+ /**
+ * When true, this node should be ignored as non-existent.
+ *
+ * Who is responsible for ignoring dead nodes? FixNesting is
+ * responsible for removing them before passing on to child
+ * validators.
+ */
+ public $dead = false;
+
+ /**
+ * Returns a pair of start and end tokens, where the end token
+ * is null if it is not necessary. Does not include children.
+ * @type array
+ */
+ abstract public function toTokenPair();
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Node/Comment.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Node/Comment.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Node/Comment.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Node/Comment.php
index 11f3245..38ba193 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Node/Comment.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Node/Comment.php
@@ -1,36 +1,36 @@
-<?php
-
-/**
- * Concrete comment node class.
- */
-class HTMLPurifier_Node_Comment extends HTMLPurifier_Node
-{
- /**
- * Character data within comment.
- * @type string
- */
- public $data;
-
- /**
- * @type bool
- */
- public $is_whitespace = true;
-
- /**
- * Transparent constructor.
- *
- * @param string $data String comment data.
- * @param int $line
- * @param int $col
- */
- public function __construct($data, $line = null, $col = null)
- {
- $this->data = $data;
- $this->line = $line;
- $this->col = $col;
- }
-
- public function toTokenPair() {
- return array(new HTMLPurifier_Token_Comment($this->data, $this->line, $this->col), null);
- }
-}
+<?php
+
+/**
+ * Concrete comment node class.
+ */
+class HTMLPurifier_Node_Comment extends HTMLPurifier_Node
+{
+ /**
+ * Character data within comment.
+ * @type string
+ */
+ public $data;
+
+ /**
+ * @type bool
+ */
+ public $is_whitespace = true;
+
+ /**
+ * Transparent constructor.
+ *
+ * @param string $data String comment data.
+ * @param int $line
+ * @param int $col
+ */
+ public function __construct($data, $line = null, $col = null)
+ {
+ $this->data = $data;
+ $this->line = $line;
+ $this->col = $col;
+ }
+
+ public function toTokenPair() {
+ return array(new HTMLPurifier_Token_Comment($this->data, $this->line, $this->col), null);
+ }
+}
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Node/Element.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Node/Element.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Node/Element.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Node/Element.php
index 7db4d02..6cbf56d 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Node/Element.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Node/Element.php
@@ -1,59 +1,59 @@
-<?php
-
-/**
- * Concrete element node class.
- */
-class HTMLPurifier_Node_Element extends HTMLPurifier_Node
-{
- /**
- * The lower-case name of the tag, like 'a', 'b' or 'blockquote'.
- *
- * @note Strictly speaking, XML tags are case sensitive, so we shouldn't
- * be lower-casing them, but these tokens cater to HTML tags, which are
- * insensitive.
- * @type string
- */
- public $name;
-
- /**
- * Associative array of the node's attributes.
- * @type array
- */
- public $attr = array();
-
- /**
- * List of child elements.
- * @type array
- */
- public $children = array();
-
- /**
- * Does this use the <a></a> form or the </a> form, i.e.
- * is it a pair of start/end tokens or an empty token.
- * @bool
- */
- public $empty = false;
-
- public $endCol = null, $endLine = null, $endArmor = array();
-
- public function __construct($name, $attr = array(), $line = null, $col = null, $armor = array()) {
- $this->name = $name;
- $this->attr = $attr;
- $this->line = $line;
- $this->col = $col;
- $this->armor = $armor;
- }
-
- public function toTokenPair() {
- // XXX inefficiency here, normalization is not necessary
- if ($this->empty) {
- return array(new HTMLPurifier_Token_Empty($this->name, $this->attr, $this->line, $this->col, $this->armor), null);
- } else {
- $start = new HTMLPurifier_Token_Start($this->name, $this->attr, $this->line, $this->col, $this->armor);
- $end = new HTMLPurifier_Token_End($this->name, array(), $this->endLine, $this->endCol, $this->endArmor);
- //$end->start = $start;
- return array($start, $end);
- }
- }
-}
-
+<?php
+
+/**
+ * Concrete element node class.
+ */
+class HTMLPurifier_Node_Element extends HTMLPurifier_Node
+{
+ /**
+ * The lower-case name of the tag, like 'a', 'b' or 'blockquote'.
+ *
+ * @note Strictly speaking, XML tags are case sensitive, so we shouldn't
+ * be lower-casing them, but these tokens cater to HTML tags, which are
+ * insensitive.
+ * @type string
+ */
+ public $name;
+
+ /**
+ * Associative array of the node's attributes.
+ * @type array
+ */
+ public $attr = array();
+
+ /**
+ * List of child elements.
+ * @type array
+ */
+ public $children = array();
+
+ /**
+ * Does this use the <a></a> form or the </a> form, i.e.
+ * is it a pair of start/end tokens or an empty token.
+ * @bool
+ */
+ public $empty = false;
+
+ public $endCol = null, $endLine = null, $endArmor = array();
+
+ public function __construct($name, $attr = array(), $line = null, $col = null, $armor = array()) {
+ $this->name = $name;
+ $this->attr = $attr;
+ $this->line = $line;
+ $this->col = $col;
+ $this->armor = $armor;
+ }
+
+ public function toTokenPair() {
+ // XXX inefficiency here, normalization is not necessary
+ if ($this->empty) {
+ return array(new HTMLPurifier_Token_Empty($this->name, $this->attr, $this->line, $this->col, $this->armor), null);
+ } else {
+ $start = new HTMLPurifier_Token_Start($this->name, $this->attr, $this->line, $this->col, $this->armor);
+ $end = new HTMLPurifier_Token_End($this->name, array(), $this->endLine, $this->endCol, $this->endArmor);
+ //$end->start = $start;
+ return array($start, $end);
+ }
+ }
+}
+
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Node/Text.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Node/Text.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Node/Text.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Node/Text.php
index f51d861..aec9166 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Node/Text.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Node/Text.php
@@ -1,54 +1,54 @@
-<?php
-
-/**
- * Concrete text token class.
- *
- * Text tokens comprise of regular parsed character data (PCDATA) and raw
- * character data (from the CDATA sections). Internally, their
- * data is parsed with all entities expanded. Surprisingly, the text token
- * does have a "tag name" called #PCDATA, which is how the DTD represents it
- * in permissible child nodes.
- */
-class HTMLPurifier_Node_Text extends HTMLPurifier_Node
-{
-
- /**
- * PCDATA tag name compatible with DTD, see
- * HTMLPurifier_ChildDef_Custom for details.
- * @type string
- */
- public $name = '#PCDATA';
-
- /**
- * @type string
- */
- public $data;
- /**< Parsed character data of text. */
-
- /**
- * @type bool
- */
- public $is_whitespace;
-
- /**< Bool indicating if node is whitespace. */
-
- /**
- * Constructor, accepts data and determines if it is whitespace.
- * @param string $data String parsed character data.
- * @param int $line
- * @param int $col
- */
- public function __construct($data, $is_whitespace, $line = null, $col = null)
- {
- $this->data = $data;
- $this->is_whitespace = $is_whitespace;
- $this->line = $line;
- $this->col = $col;
- }
-
- public function toTokenPair() {
- return array(new HTMLPurifier_Token_Text($this->data, $this->line, $this->col), null);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Concrete text token class.
+ *
+ * Text tokens comprise of regular parsed character data (PCDATA) and raw
+ * character data (from the CDATA sections). Internally, their
+ * data is parsed with all entities expanded. Surprisingly, the text token
+ * does have a "tag name" called #PCDATA, which is how the DTD represents it
+ * in permissible child nodes.
+ */
+class HTMLPurifier_Node_Text extends HTMLPurifier_Node
+{
+
+ /**
+ * PCDATA tag name compatible with DTD, see
+ * HTMLPurifier_ChildDef_Custom for details.
+ * @type string
+ */
+ public $name = '#PCDATA';
+
+ /**
+ * @type string
+ */
+ public $data;
+ /**< Parsed character data of text. */
+
+ /**
+ * @type bool
+ */
+ public $is_whitespace;
+
+ /**< Bool indicating if node is whitespace. */
+
+ /**
+ * Constructor, accepts data and determines if it is whitespace.
+ * @param string $data String parsed character data.
+ * @param int $line
+ * @param int $col
+ */
+ public function __construct($data, $is_whitespace, $line = null, $col = null)
+ {
+ $this->data = $data;
+ $this->is_whitespace = $is_whitespace;
+ $this->line = $line;
+ $this->col = $col;
+ }
+
+ public function toTokenPair() {
+ return array(new HTMLPurifier_Token_Text($this->data, $this->line, $this->col), null);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/PercentEncoder.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/PercentEncoder.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/PercentEncoder.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/PercentEncoder.php
index fb9fd1f..18c8bbb 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/PercentEncoder.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/PercentEncoder.php
@@ -1,111 +1,111 @@
-<?php
-
-/**
- * Class that handles operations involving percent-encoding in URIs.
- *
- * @warning
- * Be careful when reusing instances of PercentEncoder. The object
- * you use for normalize() SHOULD NOT be used for encode(), or
- * vice-versa.
- */
-class HTMLPurifier_PercentEncoder
-{
-
- /**
- * Reserved characters to preserve when using encode().
- * @type array
- */
- protected $preserve = array();
-
- /**
- * String of characters that should be preserved while using encode().
- * @param bool $preserve
- */
- public function __construct($preserve = false)
- {
- // unreserved letters, ought to const-ify
- for ($i = 48; $i <= 57; $i++) { // digits
- $this->preserve[$i] = true;
- }
- for ($i = 65; $i <= 90; $i++) { // upper-case
- $this->preserve[$i] = true;
- }
- for ($i = 97; $i <= 122; $i++) { // lower-case
- $this->preserve[$i] = true;
- }
- $this->preserve[45] = true; // Dash -
- $this->preserve[46] = true; // Period .
- $this->preserve[95] = true; // Underscore _
- $this->preserve[126]= true; // Tilde ~
-
- // extra letters not to escape
- if ($preserve !== false) {
- for ($i = 0, $c = strlen($preserve); $i < $c; $i++) {
- $this->preserve[ord($preserve[$i])] = true;
- }
- }
- }
-
- /**
- * Our replacement for urlencode, it encodes all non-reserved characters,
- * as well as any extra characters that were instructed to be preserved.
- * @note
- * Assumes that the string has already been normalized, making any
- * and all percent escape sequences valid. Percents will not be
- * re-escaped, regardless of their status in $preserve
- * @param string $string String to be encoded
- * @return string Encoded string.
- */
- public function encode($string)
- {
- $ret = '';
- for ($i = 0, $c = strlen($string); $i < $c; $i++) {
- if ($string[$i] !== '%' && !isset($this->preserve[$int = ord($string[$i])])) {
- $ret .= '%' . sprintf('%02X', $int);
- } else {
- $ret .= $string[$i];
- }
- }
- return $ret;
- }
-
- /**
- * Fix up percent-encoding by decoding unreserved characters and normalizing.
- * @warning This function is affected by $preserve, even though the
- * usual desired behavior is for this not to preserve those
- * characters. Be careful when reusing instances of PercentEncoder!
- * @param string $string String to normalize
- * @return string
- */
- public function normalize($string)
- {
- if ($string == '') {
- return '';
- }
- $parts = explode('%', $string);
- $ret = array_shift($parts);
- foreach ($parts as $part) {
- $length = strlen($part);
- if ($length < 2) {
- $ret .= '%25' . $part;
- continue;
- }
- $encoding = substr($part, 0, 2);
- $text = substr($part, 2);
- if (!ctype_xdigit($encoding)) {
- $ret .= '%25' . $part;
- continue;
- }
- $int = hexdec($encoding);
- if (isset($this->preserve[$int])) {
- $ret .= chr($int) . $text;
- continue;
- }
- $encoding = strtoupper($encoding);
- $ret .= '%' . $encoding . $text;
- }
- return $ret;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Class that handles operations involving percent-encoding in URIs.
+ *
+ * @warning
+ * Be careful when reusing instances of PercentEncoder. The object
+ * you use for normalize() SHOULD NOT be used for encode(), or
+ * vice-versa.
+ */
+class HTMLPurifier_PercentEncoder
+{
+
+ /**
+ * Reserved characters to preserve when using encode().
+ * @type array
+ */
+ protected $preserve = array();
+
+ /**
+ * String of characters that should be preserved while using encode().
+ * @param bool $preserve
+ */
+ public function __construct($preserve = false)
+ {
+ // unreserved letters, ought to const-ify
+ for ($i = 48; $i <= 57; $i++) { // digits
+ $this->preserve[$i] = true;
+ }
+ for ($i = 65; $i <= 90; $i++) { // upper-case
+ $this->preserve[$i] = true;
+ }
+ for ($i = 97; $i <= 122; $i++) { // lower-case
+ $this->preserve[$i] = true;
+ }
+ $this->preserve[45] = true; // Dash -
+ $this->preserve[46] = true; // Period .
+ $this->preserve[95] = true; // Underscore _
+ $this->preserve[126]= true; // Tilde ~
+
+ // extra letters not to escape
+ if ($preserve !== false) {
+ for ($i = 0, $c = strlen($preserve); $i < $c; $i++) {
+ $this->preserve[ord($preserve[$i])] = true;
+ }
+ }
+ }
+
+ /**
+ * Our replacement for urlencode, it encodes all non-reserved characters,
+ * as well as any extra characters that were instructed to be preserved.
+ * @note
+ * Assumes that the string has already been normalized, making any
+ * and all percent escape sequences valid. Percents will not be
+ * re-escaped, regardless of their status in $preserve
+ * @param string $string String to be encoded
+ * @return string Encoded string.
+ */
+ public function encode($string)
+ {
+ $ret = '';
+ for ($i = 0, $c = strlen($string); $i < $c; $i++) {
+ if ($string[$i] !== '%' && !isset($this->preserve[$int = ord($string[$i])])) {
+ $ret .= '%' . sprintf('%02X', $int);
+ } else {
+ $ret .= $string[$i];
+ }
+ }
+ return $ret;
+ }
+
+ /**
+ * Fix up percent-encoding by decoding unreserved characters and normalizing.
+ * @warning This function is affected by $preserve, even though the
+ * usual desired behavior is for this not to preserve those
+ * characters. Be careful when reusing instances of PercentEncoder!
+ * @param string $string String to normalize
+ * @return string
+ */
+ public function normalize($string)
+ {
+ if ($string == '') {
+ return '';
+ }
+ $parts = explode('%', $string);
+ $ret = array_shift($parts);
+ foreach ($parts as $part) {
+ $length = strlen($part);
+ if ($length < 2) {
+ $ret .= '%25' . $part;
+ continue;
+ }
+ $encoding = substr($part, 0, 2);
+ $text = substr($part, 2);
+ if (!ctype_xdigit($encoding)) {
+ $ret .= '%25' . $part;
+ continue;
+ }
+ $int = hexdec($encoding);
+ if (isset($this->preserve[$int])) {
+ $ret .= chr($int) . $text;
+ continue;
+ }
+ $encoding = strtoupper($encoding);
+ $ret .= '%' . $encoding . $text;
+ }
+ return $ret;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer.php
index 16acd41..549e4ce 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer.php
@@ -1,218 +1,218 @@
-<?php
-
-// OUT OF DATE, NEEDS UPDATING!
-// USE XMLWRITER!
-
-class HTMLPurifier_Printer
-{
-
- /**
- * For HTML generation convenience funcs.
- * @type HTMLPurifier_Generator
- */
- protected $generator;
-
- /**
- * For easy access.
- * @type HTMLPurifier_Config
- */
- protected $config;
-
- /**
- * Initialize $generator.
- */
- public function __construct()
- {
- }
-
- /**
- * Give generator necessary configuration if possible
- * @param HTMLPurifier_Config $config
- */
- public function prepareGenerator($config)
- {
- $all = $config->getAll();
- $context = new HTMLPurifier_Context();
- $this->generator = new HTMLPurifier_Generator($config, $context);
- }
-
- /**
- * Main function that renders object or aspect of that object
- * @note Parameters vary depending on printer
- */
- // function render() {}
-
- /**
- * Returns a start tag
- * @param string $tag Tag name
- * @param array $attr Attribute array
- * @return string
- */
- protected function start($tag, $attr = array())
- {
- return $this->generator->generateFromToken(
- new HTMLPurifier_Token_Start($tag, $attr ? $attr : array())
- );
- }
-
- /**
- * Returns an end tag
- * @param string $tag Tag name
- * @return string
- */
- protected function end($tag)
- {
- return $this->generator->generateFromToken(
- new HTMLPurifier_Token_End($tag)
- );
- }
-
- /**
- * Prints a complete element with content inside
- * @param string $tag Tag name
- * @param string $contents Element contents
- * @param array $attr Tag attributes
- * @param bool $escape whether or not to escape contents
- * @return string
- */
- protected function element($tag, $contents, $attr = array(), $escape = true)
- {
- return $this->start($tag, $attr) .
- ($escape ? $this->escape($contents) : $contents) .
- $this->end($tag);
- }
-
- /**
- * @param string $tag
- * @param array $attr
- * @return string
- */
- protected function elementEmpty($tag, $attr = array())
- {
- return $this->generator->generateFromToken(
- new HTMLPurifier_Token_Empty($tag, $attr)
- );
- }
-
- /**
- * @param string $text
- * @return string
- */
- protected function text($text)
- {
- return $this->generator->generateFromToken(
- new HTMLPurifier_Token_Text($text)
- );
- }
-
- /**
- * Prints a simple key/value row in a table.
- * @param string $name Key
- * @param mixed $value Value
- * @return string
- */
- protected function row($name, $value)
- {
- if (is_bool($value)) {
- $value = $value ? 'On' : 'Off';
- }
- return
- $this->start('tr') . "\n" .
- $this->element('th', $name) . "\n" .
- $this->element('td', $value) . "\n" .
- $this->end('tr');
- }
-
- /**
- * Escapes a string for HTML output.
- * @param string $string String to escape
- * @return string
- */
- protected function escape($string)
- {
- $string = HTMLPurifier_Encoder::cleanUTF8($string);
- $string = htmlspecialchars($string, ENT_COMPAT, 'UTF-8');
- return $string;
- }
-
- /**
- * Takes a list of strings and turns them into a single list
- * @param string[] $array List of strings
- * @param bool $polite Bool whether or not to add an end before the last
- * @return string
- */
- protected function listify($array, $polite = false)
- {
- if (empty($array)) {
- return 'None';
- }
- $ret = '';
- $i = count($array);
- foreach ($array as $value) {
- $i--;
- $ret .= $value;
- if ($i > 0 && !($polite && $i == 1)) {
- $ret .= ', ';
- }
- if ($polite && $i == 1) {
- $ret .= 'and ';
- }
- }
- return $ret;
- }
-
- /**
- * Retrieves the class of an object without prefixes, as well as metadata
- * @param object $obj Object to determine class of
- * @param string $sec_prefix Further prefix to remove
- * @return string
- */
- protected function getClass($obj, $sec_prefix = '')
- {
- static $five = null;
- if ($five === null) {
- $five = version_compare(PHP_VERSION, '5', '>=');
- }
- $prefix = 'HTMLPurifier_' . $sec_prefix;
- if (!$five) {
- $prefix = strtolower($prefix);
- }
- $class = str_replace($prefix, '', get_class($obj));
- $lclass = strtolower($class);
- $class .= '(';
- switch ($lclass) {
- case 'enum':
- $values = array();
- foreach ($obj->valid_values as $value => $bool) {
- $values[] = $value;
- }
- $class .= implode(', ', $values);
- break;
- case 'css_composite':
- $values = array();
- foreach ($obj->defs as $def) {
- $values[] = $this->getClass($def, $sec_prefix);
- }
- $class .= implode(', ', $values);
- break;
- case 'css_multiple':
- $class .= $this->getClass($obj->single, $sec_prefix) . ', ';
- $class .= $obj->max;
- break;
- case 'css_denyelementdecorator':
- $class .= $this->getClass($obj->def, $sec_prefix) . ', ';
- $class .= $obj->element;
- break;
- case 'css_importantdecorator':
- $class .= $this->getClass($obj->def, $sec_prefix);
- if ($obj->allow) {
- $class .= ', !important';
- }
- break;
- }
- $class .= ')';
- return $class;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+// OUT OF DATE, NEEDS UPDATING!
+// USE XMLWRITER!
+
+class HTMLPurifier_Printer
+{
+
+ /**
+ * For HTML generation convenience funcs.
+ * @type HTMLPurifier_Generator
+ */
+ protected $generator;
+
+ /**
+ * For easy access.
+ * @type HTMLPurifier_Config
+ */
+ protected $config;
+
+ /**
+ * Initialize $generator.
+ */
+ public function __construct()
+ {
+ }
+
+ /**
+ * Give generator necessary configuration if possible
+ * @param HTMLPurifier_Config $config
+ */
+ public function prepareGenerator($config)
+ {
+ $all = $config->getAll();
+ $context = new HTMLPurifier_Context();
+ $this->generator = new HTMLPurifier_Generator($config, $context);
+ }
+
+ /**
+ * Main function that renders object or aspect of that object
+ * @note Parameters vary depending on printer
+ */
+ // function render() {}
+
+ /**
+ * Returns a start tag
+ * @param string $tag Tag name
+ * @param array $attr Attribute array
+ * @return string
+ */
+ protected function start($tag, $attr = array())
+ {
+ return $this->generator->generateFromToken(
+ new HTMLPurifier_Token_Start($tag, $attr ? $attr : array())
+ );
+ }
+
+ /**
+ * Returns an end tag
+ * @param string $tag Tag name
+ * @return string
+ */
+ protected function end($tag)
+ {
+ return $this->generator->generateFromToken(
+ new HTMLPurifier_Token_End($tag)
+ );
+ }
+
+ /**
+ * Prints a complete element with content inside
+ * @param string $tag Tag name
+ * @param string $contents Element contents
+ * @param array $attr Tag attributes
+ * @param bool $escape whether or not to escape contents
+ * @return string
+ */
+ protected function element($tag, $contents, $attr = array(), $escape = true)
+ {
+ return $this->start($tag, $attr) .
+ ($escape ? $this->escape($contents) : $contents) .
+ $this->end($tag);
+ }
+
+ /**
+ * @param string $tag
+ * @param array $attr
+ * @return string
+ */
+ protected function elementEmpty($tag, $attr = array())
+ {
+ return $this->generator->generateFromToken(
+ new HTMLPurifier_Token_Empty($tag, $attr)
+ );
+ }
+
+ /**
+ * @param string $text
+ * @return string
+ */
+ protected function text($text)
+ {
+ return $this->generator->generateFromToken(
+ new HTMLPurifier_Token_Text($text)
+ );
+ }
+
+ /**
+ * Prints a simple key/value row in a table.
+ * @param string $name Key
+ * @param mixed $value Value
+ * @return string
+ */
+ protected function row($name, $value)
+ {
+ if (is_bool($value)) {
+ $value = $value ? 'On' : 'Off';
+ }
+ return
+ $this->start('tr') . "\n" .
+ $this->element('th', $name) . "\n" .
+ $this->element('td', $value) . "\n" .
+ $this->end('tr');
+ }
+
+ /**
+ * Escapes a string for HTML output.
+ * @param string $string String to escape
+ * @return string
+ */
+ protected function escape($string)
+ {
+ $string = HTMLPurifier_Encoder::cleanUTF8($string);
+ $string = htmlspecialchars($string, ENT_COMPAT, 'UTF-8');
+ return $string;
+ }
+
+ /**
+ * Takes a list of strings and turns them into a single list
+ * @param string[] $array List of strings
+ * @param bool $polite Bool whether or not to add an end before the last
+ * @return string
+ */
+ protected function listify($array, $polite = false)
+ {
+ if (empty($array)) {
+ return 'None';
+ }
+ $ret = '';
+ $i = count($array);
+ foreach ($array as $value) {
+ $i--;
+ $ret .= $value;
+ if ($i > 0 && !($polite && $i == 1)) {
+ $ret .= ', ';
+ }
+ if ($polite && $i == 1) {
+ $ret .= 'and ';
+ }
+ }
+ return $ret;
+ }
+
+ /**
+ * Retrieves the class of an object without prefixes, as well as metadata
+ * @param object $obj Object to determine class of
+ * @param string $sec_prefix Further prefix to remove
+ * @return string
+ */
+ protected function getClass($obj, $sec_prefix = '')
+ {
+ static $five = null;
+ if ($five === null) {
+ $five = version_compare(PHP_VERSION, '5', '>=');
+ }
+ $prefix = 'HTMLPurifier_' . $sec_prefix;
+ if (!$five) {
+ $prefix = strtolower($prefix);
+ }
+ $class = str_replace($prefix, '', get_class($obj));
+ $lclass = strtolower($class);
+ $class .= '(';
+ switch ($lclass) {
+ case 'enum':
+ $values = array();
+ foreach ($obj->valid_values as $value => $bool) {
+ $values[] = $value;
+ }
+ $class .= implode(', ', $values);
+ break;
+ case 'css_composite':
+ $values = array();
+ foreach ($obj->defs as $def) {
+ $values[] = $this->getClass($def, $sec_prefix);
+ }
+ $class .= implode(', ', $values);
+ break;
+ case 'css_multiple':
+ $class .= $this->getClass($obj->single, $sec_prefix) . ', ';
+ $class .= $obj->max;
+ break;
+ case 'css_denyelementdecorator':
+ $class .= $this->getClass($obj->def, $sec_prefix) . ', ';
+ $class .= $obj->element;
+ break;
+ case 'css_importantdecorator':
+ $class .= $this->getClass($obj->def, $sec_prefix);
+ if ($obj->allow) {
+ $class .= ', !important';
+ }
+ break;
+ }
+ $class .= ')';
+ return $class;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer/CSSDefinition.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer/CSSDefinition.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer/CSSDefinition.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer/CSSDefinition.php
index afc8c18..29505fe 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer/CSSDefinition.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer/CSSDefinition.php
@@ -1,44 +1,44 @@
-<?php
-
-class HTMLPurifier_Printer_CSSDefinition extends HTMLPurifier_Printer
-{
- /**
- * @type HTMLPurifier_CSSDefinition
- */
- protected $def;
-
- /**
- * @param HTMLPurifier_Config $config
- * @return string
- */
- public function render($config)
- {
- $this->def = $config->getCSSDefinition();
- $ret = '';
-
- $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
- $ret .= $this->start('table');
-
- $ret .= $this->element('caption', 'Properties ($info)');
-
- $ret .= $this->start('thead');
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Property', array('class' => 'heavy'));
- $ret .= $this->element('th', 'Definition', array('class' => 'heavy', 'style' => 'width:auto;'));
- $ret .= $this->end('tr');
- $ret .= $this->end('thead');
-
- ksort($this->def->info);
- foreach ($this->def->info as $property => $obj) {
- $name = $this->getClass($obj, 'AttrDef_');
- $ret .= $this->row($property, $name);
- }
-
- $ret .= $this->end('table');
- $ret .= $this->end('div');
-
- return $ret;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_Printer_CSSDefinition extends HTMLPurifier_Printer
+{
+ /**
+ * @type HTMLPurifier_CSSDefinition
+ */
+ protected $def;
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return string
+ */
+ public function render($config)
+ {
+ $this->def = $config->getCSSDefinition();
+ $ret = '';
+
+ $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
+ $ret .= $this->start('table');
+
+ $ret .= $this->element('caption', 'Properties ($info)');
+
+ $ret .= $this->start('thead');
+ $ret .= $this->start('tr');
+ $ret .= $this->element('th', 'Property', array('class' => 'heavy'));
+ $ret .= $this->element('th', 'Definition', array('class' => 'heavy', 'style' => 'width:auto;'));
+ $ret .= $this->end('tr');
+ $ret .= $this->end('thead');
+
+ ksort($this->def->info);
+ foreach ($this->def->info as $property => $obj) {
+ $name = $this->getClass($obj, 'AttrDef_');
+ $ret .= $this->row($property, $name);
+ }
+
+ $ret .= $this->end('table');
+ $ret .= $this->end('div');
+
+ return $ret;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer/ConfigForm.css b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer/ConfigForm.css
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer/ConfigForm.css
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer/ConfigForm.css
index 7af30fc..3ff1a88 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer/ConfigForm.css
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer/ConfigForm.css
@@ -1,10 +1,10 @@
-
-.hp-config {}
-
-.hp-config tbody th {text-align:right; padding-right:0.5em;}
-.hp-config thead, .hp-config .namespace {background:#3C578C; color:#FFF;}
-.hp-config .namespace th {text-align:center;}
-.hp-config .verbose {display:none;}
-.hp-config .controls {text-align:center;}
-
-/* vim: et sw=4 sts=4 */
+
+.hp-config {}
+
+.hp-config tbody th {text-align:right; padding-right:0.5em;}
+.hp-config thead, .hp-config .namespace {background:#3C578C; color:#FFF;}
+.hp-config .namespace th {text-align:center;}
+.hp-config .verbose {display:none;}
+.hp-config .controls {text-align:center;}
+
+/* vim: et sw=4 sts=4 */
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer/ConfigForm.js b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer/ConfigForm.js
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer/ConfigForm.js
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer/ConfigForm.js
index 83e0655..cba00c9 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer/ConfigForm.js
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer/ConfigForm.js
@@ -1,5 +1,5 @@
-function toggleWriteability(id_of_patient, checked) {
- document.getElementById(id_of_patient).disabled = checked;
-}
-
-// vim: et sw=4 sts=4
+function toggleWriteability(id_of_patient, checked) {
+ document.getElementById(id_of_patient).disabled = checked;
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer/ConfigForm.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer/ConfigForm.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer/ConfigForm.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer/ConfigForm.php
index 660960f..65a7779 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer/ConfigForm.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer/ConfigForm.php
@@ -1,447 +1,451 @@
-<?php
-
-/**
- * @todo Rewrite to use Interchange objects
- */
-class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
-{
-
- /**
- * Printers for specific fields.
- * @type HTMLPurifier_Printer[]
- */
- protected $fields = array();
-
- /**
- * Documentation URL, can have fragment tagged on end.
- * @type string
- */
- protected $docURL;
-
- /**
- * Name of form element to stuff config in.
- * @type string
- */
- protected $name;
-
- /**
- * Whether or not to compress directive names, clipping them off
- * after a certain amount of letters. False to disable or integer letters
- * before clipping.
- * @type bool
- */
- protected $compress = false;
-
- /**
- * @param string $name Form element name for directives to be stuffed into
- * @param string $doc_url String documentation URL, will have fragment tagged on
- * @param bool $compress Integer max length before compressing a directive name, set to false to turn off
- */
- public function __construct(
- $name,
- $doc_url = null,
- $compress = false
- ) {
- parent::__construct();
- $this->docURL = $doc_url;
- $this->name = $name;
- $this->compress = $compress;
- // initialize sub-printers
- $this->fields[0] = new HTMLPurifier_Printer_ConfigForm_default();
- $this->fields[HTMLPurifier_VarParser::BOOL] = new HTMLPurifier_Printer_ConfigForm_bool();
- }
-
- /**
- * Sets default column and row size for textareas in sub-printers
- * @param $cols Integer columns of textarea, null to use default
- * @param $rows Integer rows of textarea, null to use default
- */
- public function setTextareaDimensions($cols = null, $rows = null)
- {
- if ($cols) {
- $this->fields['default']->cols = $cols;
- }
- if ($rows) {
- $this->fields['default']->rows = $rows;
- }
- }
-
- /**
- * Retrieves styling, in case it is not accessible by webserver
- */
- public static function getCSS()
- {
- return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.css');
- }
-
- /**
- * Retrieves JavaScript, in case it is not accessible by webserver
- */
- public static function getJavaScript()
- {
- return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.js');
- }
-
- /**
- * Returns HTML output for a configuration form
- * @param HTMLPurifier_Config|array $config Configuration object of current form state, or an array
- * where [0] has an HTML namespace and [1] is being rendered.
- * @param array|bool $allowed Optional namespace(s) and directives to restrict form to.
- * @param bool $render_controls
- * @return string
- */
- public function render($config, $allowed = true, $render_controls = true)
- {
- if (is_array($config) && isset($config[0])) {
- $gen_config = $config[0];
- $config = $config[1];
- } else {
- $gen_config = $config;
- }
-
- $this->config = $config;
- $this->genConfig = $gen_config;
- $this->prepareGenerator($gen_config);
-
- $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $config->def);
- $all = array();
- foreach ($allowed as $key) {
- list($ns, $directive) = $key;
- $all[$ns][$directive] = $config->get($ns . '.' . $directive);
- }
-
- $ret = '';
- $ret .= $this->start('table', array('class' => 'hp-config'));
- $ret .= $this->start('thead');
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Directive', array('class' => 'hp-directive'));
- $ret .= $this->element('th', 'Value', array('class' => 'hp-value'));
- $ret .= $this->end('tr');
- $ret .= $this->end('thead');
- foreach ($all as $ns => $directives) {
- $ret .= $this->renderNamespace($ns, $directives);
- }
- if ($render_controls) {
- $ret .= $this->start('tbody');
- $ret .= $this->start('tr');
- $ret .= $this->start('td', array('colspan' => 2, 'class' => 'controls'));
- $ret .= $this->elementEmpty('input', array('type' => 'submit', 'value' => 'Submit'));
- $ret .= '[<a href="?">Reset</a>]';
- $ret .= $this->end('td');
- $ret .= $this->end('tr');
- $ret .= $this->end('tbody');
- }
- $ret .= $this->end('table');
- return $ret;
- }
-
- /**
- * Renders a single namespace
- * @param $ns String namespace name
- * @param array $directives array of directives to values
- * @return string
- */
- protected function renderNamespace($ns, $directives)
- {
- $ret = '';
- $ret .= $this->start('tbody', array('class' => 'namespace'));
- $ret .= $this->start('tr');
- $ret .= $this->element('th', $ns, array('colspan' => 2));
- $ret .= $this->end('tr');
- $ret .= $this->end('tbody');
- $ret .= $this->start('tbody');
- foreach ($directives as $directive => $value) {
- $ret .= $this->start('tr');
- $ret .= $this->start('th');
- if ($this->docURL) {
- $url = str_replace('%s', urlencode("$ns.$directive"), $this->docURL);
- $ret .= $this->start('a', array('href' => $url));
- }
- $attr = array('for' => "{$this->name}:$ns.$directive");
-
- // crop directive name if it's too long
- if (!$this->compress || (strlen($directive) < $this->compress)) {
- $directive_disp = $directive;
- } else {
- $directive_disp = substr($directive, 0, $this->compress - 2) . '...';
- $attr['title'] = $directive;
- }
-
- $ret .= $this->element(
- 'label',
- $directive_disp,
- // component printers must create an element with this id
- $attr
- );
- if ($this->docURL) {
- $ret .= $this->end('a');
- }
- $ret .= $this->end('th');
-
- $ret .= $this->start('td');
- $def = $this->config->def->info["$ns.$directive"];
- if (is_int($def)) {
- $allow_null = $def < 0;
- $type = abs($def);
- } else {
- $type = $def->type;
- $allow_null = isset($def->allow_null);
- }
- if (!isset($this->fields[$type])) {
- $type = 0;
- } // default
- $type_obj = $this->fields[$type];
- if ($allow_null) {
- $type_obj = new HTMLPurifier_Printer_ConfigForm_NullDecorator($type_obj);
- }
- $ret .= $type_obj->render($ns, $directive, $value, $this->name, array($this->genConfig, $this->config));
- $ret .= $this->end('td');
- $ret .= $this->end('tr');
- }
- $ret .= $this->end('tbody');
- return $ret;
- }
-
-}
-
-/**
- * Printer decorator for directives that accept null
- */
-class HTMLPurifier_Printer_ConfigForm_NullDecorator extends HTMLPurifier_Printer
-{
- /**
- * Printer being decorated
- * @type HTMLPurifier_Printer
- */
- protected $obj;
-
- /**
- * @param HTMLPurifier_Printer $obj Printer to decorate
- */
- public function __construct($obj)
- {
- parent::__construct();
- $this->obj = $obj;
- }
-
- /**
- * @param string $ns
- * @param string $directive
- * @param string $value
- * @param string $name
- * @param HTMLPurifier_Config|array $config
- * @return string
- */
- public function render($ns, $directive, $value, $name, $config)
- {
- if (is_array($config) && isset($config[0])) {
- $gen_config = $config[0];
- $config = $config[1];
- } else {
- $gen_config = $config;
- }
- $this->prepareGenerator($gen_config);
-
- $ret = '';
- $ret .= $this->start('label', array('for' => "$name:Null_$ns.$directive"));
- $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
- $ret .= $this->text(' Null/Disabled');
- $ret .= $this->end('label');
- $attr = array(
- 'type' => 'checkbox',
- 'value' => '1',
- 'class' => 'null-toggle',
- 'name' => "$name" . "[Null_$ns.$directive]",
- 'id' => "$name:Null_$ns.$directive",
- 'onclick' => "toggleWriteability('$name:$ns.$directive',checked)" // INLINE JAVASCRIPT!!!!
- );
- if ($this->obj instanceof HTMLPurifier_Printer_ConfigForm_bool) {
- // modify inline javascript slightly
- $attr['onclick'] =
- "toggleWriteability('$name:Yes_$ns.$directive',checked);" .
- "toggleWriteability('$name:No_$ns.$directive',checked)";
- }
- if ($value === null) {
- $attr['checked'] = 'checked';
- }
- $ret .= $this->elementEmpty('input', $attr);
- $ret .= $this->text(' or ');
- $ret .= $this->elementEmpty('br');
- $ret .= $this->obj->render($ns, $directive, $value, $name, array($gen_config, $config));
- return $ret;
- }
-}
-
-/**
- * Swiss-army knife configuration form field printer
- */
-class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer
-{
- /**
- * @type int
- */
- public $cols = 18;
-
- /**
- * @type int
- */
- public $rows = 5;
-
- /**
- * @param string $ns
- * @param string $directive
- * @param string $value
- * @param string $name
- * @param HTMLPurifier_Config|array $config
- * @return string
- */
- public function render($ns, $directive, $value, $name, $config)
- {
- if (is_array($config) && isset($config[0])) {
- $gen_config = $config[0];
- $config = $config[1];
- } else {
- $gen_config = $config;
- }
- $this->prepareGenerator($gen_config);
- // this should probably be split up a little
- $ret = '';
- $def = $config->def->info["$ns.$directive"];
- if (is_int($def)) {
- $type = abs($def);
- } else {
- $type = $def->type;
- }
- if (is_array($value)) {
- switch ($type) {
- case HTMLPurifier_VarParser::LOOKUP:
- $array = $value;
- $value = array();
- foreach ($array as $val => $b) {
- $value[] = $val;
- }
- //TODO does this need a break?
- case HTMLPurifier_VarParser::ALIST:
- $value = implode(PHP_EOL, $value);
- break;
- case HTMLPurifier_VarParser::HASH:
- $nvalue = '';
- foreach ($value as $i => $v) {
- $nvalue .= "$i:$v" . PHP_EOL;
- }
- $value = $nvalue;
- break;
- default:
- $value = '';
- }
- }
- if ($type === HTMLPurifier_VarParser::MIXED) {
- return 'Not supported';
- $value = serialize($value);
- }
- $attr = array(
- 'name' => "$name" . "[$ns.$directive]",
- 'id' => "$name:$ns.$directive"
- );
- if ($value === null) {
- $attr['disabled'] = 'disabled';
- }
- if (isset($def->allowed)) {
- $ret .= $this->start('select', $attr);
- foreach ($def->allowed as $val => $b) {
- $attr = array();
- if ($value == $val) {
- $attr['selected'] = 'selected';
- }
- $ret .= $this->element('option', $val, $attr);
- }
- $ret .= $this->end('select');
- } elseif ($type === HTMLPurifier_VarParser::TEXT ||
- $type === HTMLPurifier_VarParser::ITEXT ||
- $type === HTMLPurifier_VarParser::ALIST ||
- $type === HTMLPurifier_VarParser::HASH ||
- $type === HTMLPurifier_VarParser::LOOKUP) {
- $attr['cols'] = $this->cols;
- $attr['rows'] = $this->rows;
- $ret .= $this->start('textarea', $attr);
- $ret .= $this->text($value);
- $ret .= $this->end('textarea');
- } else {
- $attr['value'] = $value;
- $attr['type'] = 'text';
- $ret .= $this->elementEmpty('input', $attr);
- }
- return $ret;
- }
-}
-
-/**
- * Bool form field printer
- */
-class HTMLPurifier_Printer_ConfigForm_bool extends HTMLPurifier_Printer
-{
- /**
- * @param string $ns
- * @param string $directive
- * @param string $value
- * @param string $name
- * @param HTMLPurifier_Config|array $config
- * @return string
- */
- public function render($ns, $directive, $value, $name, $config)
- {
- if (is_array($config) && isset($config[0])) {
- $gen_config = $config[0];
- $config = $config[1];
- } else {
- $gen_config = $config;
- }
- $this->prepareGenerator($gen_config);
- $ret = '';
- $ret .= $this->start('div', array('id' => "$name:$ns.$directive"));
-
- $ret .= $this->start('label', array('for' => "$name:Yes_$ns.$directive"));
- $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
- $ret .= $this->text(' Yes');
- $ret .= $this->end('label');
-
- $attr = array(
- 'type' => 'radio',
- 'name' => "$name" . "[$ns.$directive]",
- 'id' => "$name:Yes_$ns.$directive",
- 'value' => '1'
- );
- if ($value === true) {
- $attr['checked'] = 'checked';
- }
- if ($value === null) {
- $attr['disabled'] = 'disabled';
- }
- $ret .= $this->elementEmpty('input', $attr);
-
- $ret .= $this->start('label', array('for' => "$name:No_$ns.$directive"));
- $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
- $ret .= $this->text(' No');
- $ret .= $this->end('label');
-
- $attr = array(
- 'type' => 'radio',
- 'name' => "$name" . "[$ns.$directive]",
- 'id' => "$name:No_$ns.$directive",
- 'value' => '0'
- );
- if ($value === false) {
- $attr['checked'] = 'checked';
- }
- if ($value === null) {
- $attr['disabled'] = 'disabled';
- }
- $ret .= $this->elementEmpty('input', $attr);
-
- $ret .= $this->end('div');
-
- return $ret;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * @todo Rewrite to use Interchange objects
+ */
+class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
+{
+
+ /**
+ * Printers for specific fields.
+ * @type HTMLPurifier_Printer[]
+ */
+ protected $fields = array();
+
+ /**
+ * Documentation URL, can have fragment tagged on end.
+ * @type string
+ */
+ protected $docURL;
+
+ /**
+ * Name of form element to stuff config in.
+ * @type string
+ */
+ protected $name;
+
+ /**
+ * Whether or not to compress directive names, clipping them off
+ * after a certain amount of letters. False to disable or integer letters
+ * before clipping.
+ * @type bool
+ */
+ protected $compress = false;
+
+ /**
+ * @param string $name Form element name for directives to be stuffed into
+ * @param string $doc_url String documentation URL, will have fragment tagged on
+ * @param bool $compress Integer max length before compressing a directive name, set to false to turn off
+ */
+ public function __construct(
+ $name,
+ $doc_url = null,
+ $compress = false
+ ) {
+ parent::__construct();
+ $this->docURL = $doc_url;
+ $this->name = $name;
+ $this->compress = $compress;
+ // initialize sub-printers
+ $this->fields[0] = new HTMLPurifier_Printer_ConfigForm_default();
+ $this->fields[HTMLPurifier_VarParser::BOOL] = new HTMLPurifier_Printer_ConfigForm_bool();
+ }
+
+ /**
+ * Sets default column and row size for textareas in sub-printers
+ * @param $cols Integer columns of textarea, null to use default
+ * @param $rows Integer rows of textarea, null to use default
+ */
+ public function setTextareaDimensions($cols = null, $rows = null)
+ {
+ if ($cols) {
+ $this->fields['default']->cols = $cols;
+ }
+ if ($rows) {
+ $this->fields['default']->rows = $rows;
+ }
+ }
+
+ /**
+ * Retrieves styling, in case it is not accessible by webserver
+ */
+ public static function getCSS()
+ {
+ return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.css');
+ }
+
+ /**
+ * Retrieves JavaScript, in case it is not accessible by webserver
+ */
+ public static function getJavaScript()
+ {
+ return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.js');
+ }
+
+ /**
+ * Returns HTML output for a configuration form
+ * @param HTMLPurifier_Config|array $config Configuration object of current form state, or an array
+ * where [0] has an HTML namespace and [1] is being rendered.
+ * @param array|bool $allowed Optional namespace(s) and directives to restrict form to.
+ * @param bool $render_controls
+ * @return string
+ */
+ public function render($config, $allowed = true, $render_controls = true)
+ {
+ if (is_array($config) && isset($config[0])) {
+ $gen_config = $config[0];
+ $config = $config[1];
+ } else {
+ $gen_config = $config;
+ }
+
+ $this->config = $config;
+ $this->genConfig = $gen_config;
+ $this->prepareGenerator($gen_config);
+
+ $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $config->def);
+ $all = array();
+ foreach ($allowed as $key) {
+ list($ns, $directive) = $key;
+ $all[$ns][$directive] = $config->get($ns . '.' . $directive);
+ }
+
+ $ret = '';
+ $ret .= $this->start('table', array('class' => 'hp-config'));
+ $ret .= $this->start('thead');
+ $ret .= $this->start('tr');
+ $ret .= $this->element('th', 'Directive', array('class' => 'hp-directive'));
+ $ret .= $this->element('th', 'Value', array('class' => 'hp-value'));
+ $ret .= $this->end('tr');
+ $ret .= $this->end('thead');
+ foreach ($all as $ns => $directives) {
+ $ret .= $this->renderNamespace($ns, $directives);
+ }
+ if ($render_controls) {
+ $ret .= $this->start('tbody');
+ $ret .= $this->start('tr');
+ $ret .= $this->start('td', array('colspan' => 2, 'class' => 'controls'));
+ $ret .= $this->elementEmpty('input', array('type' => 'submit', 'value' => 'Submit'));
+ $ret .= '[<a href="?">Reset</a>]';
+ $ret .= $this->end('td');
+ $ret .= $this->end('tr');
+ $ret .= $this->end('tbody');
+ }
+ $ret .= $this->end('table');
+ return $ret;
+ }
+
+ /**
+ * Renders a single namespace
+ * @param $ns String namespace name
+ * @param array $directives array of directives to values
+ * @return string
+ */
+ protected function renderNamespace($ns, $directives)
+ {
+ $ret = '';
+ $ret .= $this->start('tbody', array('class' => 'namespace'));
+ $ret .= $this->start('tr');
+ $ret .= $this->element('th', $ns, array('colspan' => 2));
+ $ret .= $this->end('tr');
+ $ret .= $this->end('tbody');
+ $ret .= $this->start('tbody');
+ foreach ($directives as $directive => $value) {
+ $ret .= $this->start('tr');
+ $ret .= $this->start('th');
+ if ($this->docURL) {
+ $url = str_replace('%s', urlencode("$ns.$directive"), $this->docURL);
+ $ret .= $this->start('a', array('href' => $url));
+ }
+ $attr = array('for' => "{$this->name}:$ns.$directive");
+
+ // crop directive name if it's too long
+ if (!$this->compress || (strlen($directive) < $this->compress)) {
+ $directive_disp = $directive;
+ } else {
+ $directive_disp = substr($directive, 0, $this->compress - 2) . '...';
+ $attr['title'] = $directive;
+ }
+
+ $ret .= $this->element(
+ 'label',
+ $directive_disp,
+ // component printers must create an element with this id
+ $attr
+ );
+ if ($this->docURL) {
+ $ret .= $this->end('a');
+ }
+ $ret .= $this->end('th');
+
+ $ret .= $this->start('td');
+ $def = $this->config->def->info["$ns.$directive"];
+ if (is_int($def)) {
+ $allow_null = $def < 0;
+ $type = abs($def);
+ } else {
+ $type = $def->type;
+ $allow_null = isset($def->allow_null);
+ }
+ if (!isset($this->fields[$type])) {
+ $type = 0;
+ } // default
+ $type_obj = $this->fields[$type];
+ if ($allow_null) {
+ $type_obj = new HTMLPurifier_Printer_ConfigForm_NullDecorator($type_obj);
+ }
+ $ret .= $type_obj->render($ns, $directive, $value, $this->name, array($this->genConfig, $this->config));
+ $ret .= $this->end('td');
+ $ret .= $this->end('tr');
+ }
+ $ret .= $this->end('tbody');
+ return $ret;
+ }
+
+}
+
+/**
+ * Printer decorator for directives that accept null
+ */
+class HTMLPurifier_Printer_ConfigForm_NullDecorator extends HTMLPurifier_Printer
+{
+ /**
+ * Printer being decorated
+ * @type HTMLPurifier_Printer
+ */
+ protected $obj;
+
+ /**
+ * @param HTMLPurifier_Printer $obj Printer to decorate
+ */
+ public function __construct($obj)
+ {
+ parent::__construct();
+ $this->obj = $obj;
+ }
+
+ /**
+ * @param string $ns
+ * @param string $directive
+ * @param string $value
+ * @param string $name
+ * @param HTMLPurifier_Config|array $config
+ * @return string
+ */
+ public function render($ns, $directive, $value, $name, $config)
+ {
+ if (is_array($config) && isset($config[0])) {
+ $gen_config = $config[0];
+ $config = $config[1];
+ } else {
+ $gen_config = $config;
+ }
+ $this->prepareGenerator($gen_config);
+
+ $ret = '';
+ $ret .= $this->start('label', array('for' => "$name:Null_$ns.$directive"));
+ $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
+ $ret .= $this->text(' Null/Disabled');
+ $ret .= $this->end('label');
+ $attr = array(
+ 'type' => 'checkbox',
+ 'value' => '1',
+ 'class' => 'null-toggle',
+ 'name' => "$name" . "[Null_$ns.$directive]",
+ 'id' => "$name:Null_$ns.$directive",
+ 'onclick' => "toggleWriteability('$name:$ns.$directive',checked)" // INLINE JAVASCRIPT!!!!
+ );
+ if ($this->obj instanceof HTMLPurifier_Printer_ConfigForm_bool) {
+ // modify inline javascript slightly
+ $attr['onclick'] =
+ "toggleWriteability('$name:Yes_$ns.$directive',checked);" .
+ "toggleWriteability('$name:No_$ns.$directive',checked)";
+ }
+ if ($value === null) {
+ $attr['checked'] = 'checked';
+ }
+ $ret .= $this->elementEmpty('input', $attr);
+ $ret .= $this->text(' or ');
+ $ret .= $this->elementEmpty('br');
+ $ret .= $this->obj->render($ns, $directive, $value, $name, array($gen_config, $config));
+ return $ret;
+ }
+}
+
+/**
+ * Swiss-army knife configuration form field printer
+ */
+class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer
+{
+ /**
+ * @type int
+ */
+ public $cols = 18;
+
+ /**
+ * @type int
+ */
+ public $rows = 5;
+
+ /**
+ * @param string $ns
+ * @param string $directive
+ * @param string $value
+ * @param string $name
+ * @param HTMLPurifier_Config|array $config
+ * @return string
+ */
+ public function render($ns, $directive, $value, $name, $config)
+ {
+ if (is_array($config) && isset($config[0])) {
+ $gen_config = $config[0];
+ $config = $config[1];
+ } else {
+ $gen_config = $config;
+ }
+ $this->prepareGenerator($gen_config);
+ // this should probably be split up a little
+ $ret = '';
+ $def = $config->def->info["$ns.$directive"];
+ if (is_int($def)) {
+ $type = abs($def);
+ } else {
+ $type = $def->type;
+ }
+ if (is_array($value)) {
+ switch ($type) {
+ case HTMLPurifier_VarParser::LOOKUP:
+ $array = $value;
+ $value = array();
+ foreach ($array as $val => $b) {
+ $value[] = $val;
+ }
+ //TODO does this need a break?
+ case HTMLPurifier_VarParser::ALIST:
+ $value = implode(PHP_EOL, $value);
+ break;
+ case HTMLPurifier_VarParser::HASH:
+ $nvalue = '';
+ foreach ($value as $i => $v) {
+ if (is_array($v)) {
+ // HACK
+ $v = implode(";", $v);
+ }
+ $nvalue .= "$i:$v" . PHP_EOL;
+ }
+ $value = $nvalue;
+ break;
+ default:
+ $value = '';
+ }
+ }
+ if ($type === HTMLPurifier_VarParser::MIXED) {
+ return 'Not supported';
+ $value = serialize($value);
+ }
+ $attr = array(
+ 'name' => "$name" . "[$ns.$directive]",
+ 'id' => "$name:$ns.$directive"
+ );
+ if ($value === null) {
+ $attr['disabled'] = 'disabled';
+ }
+ if (isset($def->allowed)) {
+ $ret .= $this->start('select', $attr);
+ foreach ($def->allowed as $val => $b) {
+ $attr = array();
+ if ($value == $val) {
+ $attr['selected'] = 'selected';
+ }
+ $ret .= $this->element('option', $val, $attr);
+ }
+ $ret .= $this->end('select');
+ } elseif ($type === HTMLPurifier_VarParser::TEXT ||
+ $type === HTMLPurifier_VarParser::ITEXT ||
+ $type === HTMLPurifier_VarParser::ALIST ||
+ $type === HTMLPurifier_VarParser::HASH ||
+ $type === HTMLPurifier_VarParser::LOOKUP) {
+ $attr['cols'] = $this->cols;
+ $attr['rows'] = $this->rows;
+ $ret .= $this->start('textarea', $attr);
+ $ret .= $this->text($value);
+ $ret .= $this->end('textarea');
+ } else {
+ $attr['value'] = $value;
+ $attr['type'] = 'text';
+ $ret .= $this->elementEmpty('input', $attr);
+ }
+ return $ret;
+ }
+}
+
+/**
+ * Bool form field printer
+ */
+class HTMLPurifier_Printer_ConfigForm_bool extends HTMLPurifier_Printer
+{
+ /**
+ * @param string $ns
+ * @param string $directive
+ * @param string $value
+ * @param string $name
+ * @param HTMLPurifier_Config|array $config
+ * @return string
+ */
+ public function render($ns, $directive, $value, $name, $config)
+ {
+ if (is_array($config) && isset($config[0])) {
+ $gen_config = $config[0];
+ $config = $config[1];
+ } else {
+ $gen_config = $config;
+ }
+ $this->prepareGenerator($gen_config);
+ $ret = '';
+ $ret .= $this->start('div', array('id' => "$name:$ns.$directive"));
+
+ $ret .= $this->start('label', array('for' => "$name:Yes_$ns.$directive"));
+ $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
+ $ret .= $this->text(' Yes');
+ $ret .= $this->end('label');
+
+ $attr = array(
+ 'type' => 'radio',
+ 'name' => "$name" . "[$ns.$directive]",
+ 'id' => "$name:Yes_$ns.$directive",
+ 'value' => '1'
+ );
+ if ($value === true) {
+ $attr['checked'] = 'checked';
+ }
+ if ($value === null) {
+ $attr['disabled'] = 'disabled';
+ }
+ $ret .= $this->elementEmpty('input', $attr);
+
+ $ret .= $this->start('label', array('for' => "$name:No_$ns.$directive"));
+ $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
+ $ret .= $this->text(' No');
+ $ret .= $this->end('label');
+
+ $attr = array(
+ 'type' => 'radio',
+ 'name' => "$name" . "[$ns.$directive]",
+ 'id' => "$name:No_$ns.$directive",
+ 'value' => '0'
+ );
+ if ($value === false) {
+ $attr['checked'] = 'checked';
+ }
+ if ($value === null) {
+ $attr['disabled'] = 'disabled';
+ }
+ $ret .= $this->elementEmpty('input', $attr);
+
+ $ret .= $this->end('div');
+
+ return $ret;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer/HTMLDefinition.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer/HTMLDefinition.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer/HTMLDefinition.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer/HTMLDefinition.php
index 679d19b..5f2f2f8 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Printer/HTMLDefinition.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Printer/HTMLDefinition.php
@@ -1,324 +1,324 @@
-<?php
-
-class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
-{
-
- /**
- * @type HTMLPurifier_HTMLDefinition, for easy access
- */
- protected $def;
-
- /**
- * @param HTMLPurifier_Config $config
- * @return string
- */
- public function render($config)
- {
- $ret = '';
- $this->config =& $config;
-
- $this->def = $config->getHTMLDefinition();
-
- $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
-
- $ret .= $this->renderDoctype();
- $ret .= $this->renderEnvironment();
- $ret .= $this->renderContentSets();
- $ret .= $this->renderInfo();
-
- $ret .= $this->end('div');
-
- return $ret;
- }
-
- /**
- * Renders the Doctype table
- * @return string
- */
- protected function renderDoctype()
- {
- $doctype = $this->def->doctype;
- $ret = '';
- $ret .= $this->start('table');
- $ret .= $this->element('caption', 'Doctype');
- $ret .= $this->row('Name', $doctype->name);
- $ret .= $this->row('XML', $doctype->xml ? 'Yes' : 'No');
- $ret .= $this->row('Default Modules', implode($doctype->modules, ', '));
- $ret .= $this->row('Default Tidy Modules', implode($doctype->tidyModules, ', '));
- $ret .= $this->end('table');
- return $ret;
- }
-
-
- /**
- * Renders environment table, which is miscellaneous info
- * @return string
- */
- protected function renderEnvironment()
- {
- $def = $this->def;
-
- $ret = '';
-
- $ret .= $this->start('table');
- $ret .= $this->element('caption', 'Environment');
-
- $ret .= $this->row('Parent of fragment', $def->info_parent);
- $ret .= $this->renderChildren($def->info_parent_def->child);
- $ret .= $this->row('Block wrap name', $def->info_block_wrapper);
-
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Global attributes');
- $ret .= $this->element('td', $this->listifyAttr($def->info_global_attr), null, 0);
- $ret .= $this->end('tr');
-
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Tag transforms');
- $list = array();
- foreach ($def->info_tag_transform as $old => $new) {
- $new = $this->getClass($new, 'TagTransform_');
- $list[] = "<$old> with $new";
- }
- $ret .= $this->element('td', $this->listify($list));
- $ret .= $this->end('tr');
-
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Pre-AttrTransform');
- $ret .= $this->element('td', $this->listifyObjectList($def->info_attr_transform_pre));
- $ret .= $this->end('tr');
-
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Post-AttrTransform');
- $ret .= $this->element('td', $this->listifyObjectList($def->info_attr_transform_post));
- $ret .= $this->end('tr');
-
- $ret .= $this->end('table');
- return $ret;
- }
-
- /**
- * Renders the Content Sets table
- * @return string
- */
- protected function renderContentSets()
- {
- $ret = '';
- $ret .= $this->start('table');
- $ret .= $this->element('caption', 'Content Sets');
- foreach ($this->def->info_content_sets as $name => $lookup) {
- $ret .= $this->heavyHeader($name);
- $ret .= $this->start('tr');
- $ret .= $this->element('td', $this->listifyTagLookup($lookup));
- $ret .= $this->end('tr');
- }
- $ret .= $this->end('table');
- return $ret;
- }
-
- /**
- * Renders the Elements ($info) table
- * @return string
- */
- protected function renderInfo()
- {
- $ret = '';
- $ret .= $this->start('table');
- $ret .= $this->element('caption', 'Elements ($info)');
- ksort($this->def->info);
- $ret .= $this->heavyHeader('Allowed tags', 2);
- $ret .= $this->start('tr');
- $ret .= $this->element('td', $this->listifyTagLookup($this->def->info), array('colspan' => 2));
- $ret .= $this->end('tr');
- foreach ($this->def->info as $name => $def) {
- $ret .= $this->start('tr');
- $ret .= $this->element('th', "<$name>", array('class' => 'heavy', 'colspan' => 2));
- $ret .= $this->end('tr');
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Inline content');
- $ret .= $this->element('td', $def->descendants_are_inline ? 'Yes' : 'No');
- $ret .= $this->end('tr');
- if (!empty($def->excludes)) {
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Excludes');
- $ret .= $this->element('td', $this->listifyTagLookup($def->excludes));
- $ret .= $this->end('tr');
- }
- if (!empty($def->attr_transform_pre)) {
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Pre-AttrTransform');
- $ret .= $this->element('td', $this->listifyObjectList($def->attr_transform_pre));
- $ret .= $this->end('tr');
- }
- if (!empty($def->attr_transform_post)) {
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Post-AttrTransform');
- $ret .= $this->element('td', $this->listifyObjectList($def->attr_transform_post));
- $ret .= $this->end('tr');
- }
- if (!empty($def->auto_close)) {
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Auto closed by');
- $ret .= $this->element('td', $this->listifyTagLookup($def->auto_close));
- $ret .= $this->end('tr');
- }
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Allowed attributes');
- $ret .= $this->element('td', $this->listifyAttr($def->attr), array(), 0);
- $ret .= $this->end('tr');
-
- if (!empty($def->required_attr)) {
- $ret .= $this->row('Required attributes', $this->listify($def->required_attr));
- }
-
- $ret .= $this->renderChildren($def->child);
- }
- $ret .= $this->end('table');
- return $ret;
- }
-
- /**
- * Renders a row describing the allowed children of an element
- * @param HTMLPurifier_ChildDef $def HTMLPurifier_ChildDef of pertinent element
- * @return string
- */
- protected function renderChildren($def)
- {
- $context = new HTMLPurifier_Context();
- $ret = '';
- $ret .= $this->start('tr');
- $elements = array();
- $attr = array();
- if (isset($def->elements)) {
- if ($def->type == 'strictblockquote') {
- $def->validateChildren(array(), $this->config, $context);
- }
- $elements = $def->elements;
- }
- if ($def->type == 'chameleon') {
- $attr['rowspan'] = 2;
- } elseif ($def->type == 'empty') {
- $elements = array();
- } elseif ($def->type == 'table') {
- $elements = array_flip(
- array(
- 'col',
- 'caption',
- 'colgroup',
- 'thead',
- 'tfoot',
- 'tbody',
- 'tr'
- )
- );
- }
- $ret .= $this->element('th', 'Allowed children', $attr);
-
- if ($def->type == 'chameleon') {
-
- $ret .= $this->element(
- 'td',
- '<em>Block</em>: ' .
- $this->escape($this->listifyTagLookup($def->block->elements)),
- null,
- 0
- );
- $ret .= $this->end('tr');
- $ret .= $this->start('tr');
- $ret .= $this->element(
- 'td',
- '<em>Inline</em>: ' .
- $this->escape($this->listifyTagLookup($def->inline->elements)),
- null,
- 0
- );
-
- } elseif ($def->type == 'custom') {
-
- $ret .= $this->element(
- 'td',
- '<em>' . ucfirst($def->type) . '</em>: ' .
- $def->dtd_regex
- );
-
- } else {
- $ret .= $this->element(
- 'td',
- '<em>' . ucfirst($def->type) . '</em>: ' .
- $this->escape($this->listifyTagLookup($elements)),
- null,
- 0
- );
- }
- $ret .= $this->end('tr');
- return $ret;
- }
-
- /**
- * Listifies a tag lookup table.
- * @param array $array Tag lookup array in form of array('tagname' => true)
- * @return string
- */
- protected function listifyTagLookup($array)
- {
- ksort($array);
- $list = array();
- foreach ($array as $name => $discard) {
- if ($name !== '#PCDATA' && !isset($this->def->info[$name])) {
- continue;
- }
- $list[] = $name;
- }
- return $this->listify($list);
- }
-
- /**
- * Listifies a list of objects by retrieving class names and internal state
- * @param array $array List of objects
- * @return string
- * @todo Also add information about internal state
- */
- protected function listifyObjectList($array)
- {
- ksort($array);
- $list = array();
- foreach ($array as $obj) {
- $list[] = $this->getClass($obj, 'AttrTransform_');
- }
- return $this->listify($list);
- }
-
- /**
- * Listifies a hash of attributes to AttrDef classes
- * @param array $array Array hash in form of array('attrname' => HTMLPurifier_AttrDef)
- * @return string
- */
- protected function listifyAttr($array)
- {
- ksort($array);
- $list = array();
- foreach ($array as $name => $obj) {
- if ($obj === false) {
- continue;
- }
- $list[] = "$name = <i>" . $this->getClass($obj, 'AttrDef_') . '</i>';
- }
- return $this->listify($list);
- }
-
- /**
- * Creates a heavy header row
- * @param string $text
- * @param int $num
- * @return string
- */
- protected function heavyHeader($text, $num = 1)
- {
- $ret = '';
- $ret .= $this->start('tr');
- $ret .= $this->element('th', $text, array('colspan' => $num, 'class' => 'heavy'));
- $ret .= $this->end('tr');
- return $ret;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
+{
+
+ /**
+ * @type HTMLPurifier_HTMLDefinition, for easy access
+ */
+ protected $def;
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return string
+ */
+ public function render($config)
+ {
+ $ret = '';
+ $this->config =& $config;
+
+ $this->def = $config->getHTMLDefinition();
+
+ $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
+
+ $ret .= $this->renderDoctype();
+ $ret .= $this->renderEnvironment();
+ $ret .= $this->renderContentSets();
+ $ret .= $this->renderInfo();
+
+ $ret .= $this->end('div');
+
+ return $ret;
+ }
+
+ /**
+ * Renders the Doctype table
+ * @return string
+ */
+ protected function renderDoctype()
+ {
+ $doctype = $this->def->doctype;
+ $ret = '';
+ $ret .= $this->start('table');
+ $ret .= $this->element('caption', 'Doctype');
+ $ret .= $this->row('Name', $doctype->name);
+ $ret .= $this->row('XML', $doctype->xml ? 'Yes' : 'No');
+ $ret .= $this->row('Default Modules', implode($doctype->modules, ', '));
+ $ret .= $this->row('Default Tidy Modules', implode($doctype->tidyModules, ', '));
+ $ret .= $this->end('table');
+ return $ret;
+ }
+
+
+ /**
+ * Renders environment table, which is miscellaneous info
+ * @return string
+ */
+ protected function renderEnvironment()
+ {
+ $def = $this->def;
+
+ $ret = '';
+
+ $ret .= $this->start('table');
+ $ret .= $this->element('caption', 'Environment');
+
+ $ret .= $this->row('Parent of fragment', $def->info_parent);
+ $ret .= $this->renderChildren($def->info_parent_def->child);
+ $ret .= $this->row('Block wrap name', $def->info_block_wrapper);
+
+ $ret .= $this->start('tr');
+ $ret .= $this->element('th', 'Global attributes');
+ $ret .= $this->element('td', $this->listifyAttr($def->info_global_attr), null, 0);
+ $ret .= $this->end('tr');
+
+ $ret .= $this->start('tr');
+ $ret .= $this->element('th', 'Tag transforms');
+ $list = array();
+ foreach ($def->info_tag_transform as $old => $new) {
+ $new = $this->getClass($new, 'TagTransform_');
+ $list[] = "<$old> with $new";
+ }
+ $ret .= $this->element('td', $this->listify($list));
+ $ret .= $this->end('tr');
+
+ $ret .= $this->start('tr');
+ $ret .= $this->element('th', 'Pre-AttrTransform');
+ $ret .= $this->element('td', $this->listifyObjectList($def->info_attr_transform_pre));
+ $ret .= $this->end('tr');
+
+ $ret .= $this->start('tr');
+ $ret .= $this->element('th', 'Post-AttrTransform');
+ $ret .= $this->element('td', $this->listifyObjectList($def->info_attr_transform_post));
+ $ret .= $this->end('tr');
+
+ $ret .= $this->end('table');
+ return $ret;
+ }
+
+ /**
+ * Renders the Content Sets table
+ * @return string
+ */
+ protected function renderContentSets()
+ {
+ $ret = '';
+ $ret .= $this->start('table');
+ $ret .= $this->element('caption', 'Content Sets');
+ foreach ($this->def->info_content_sets as $name => $lookup) {
+ $ret .= $this->heavyHeader($name);
+ $ret .= $this->start('tr');
+ $ret .= $this->element('td', $this->listifyTagLookup($lookup));
+ $ret .= $this->end('tr');
+ }
+ $ret .= $this->end('table');
+ return $ret;
+ }
+
+ /**
+ * Renders the Elements ($info) table
+ * @return string
+ */
+ protected function renderInfo()
+ {
+ $ret = '';
+ $ret .= $this->start('table');
+ $ret .= $this->element('caption', 'Elements ($info)');
+ ksort($this->def->info);
+ $ret .= $this->heavyHeader('Allowed tags', 2);
+ $ret .= $this->start('tr');
+ $ret .= $this->element('td', $this->listifyTagLookup($this->def->info), array('colspan' => 2));
+ $ret .= $this->end('tr');
+ foreach ($this->def->info as $name => $def) {
+ $ret .= $this->start('tr');
+ $ret .= $this->element('th', "<$name>", array('class' => 'heavy', 'colspan' => 2));
+ $ret .= $this->end('tr');
+ $ret .= $this->start('tr');
+ $ret .= $this->element('th', 'Inline content');
+ $ret .= $this->element('td', $def->descendants_are_inline ? 'Yes' : 'No');
+ $ret .= $this->end('tr');
+ if (!empty($def->excludes)) {
+ $ret .= $this->start('tr');
+ $ret .= $this->element('th', 'Excludes');
+ $ret .= $this->element('td', $this->listifyTagLookup($def->excludes));
+ $ret .= $this->end('tr');
+ }
+ if (!empty($def->attr_transform_pre)) {
+ $ret .= $this->start('tr');
+ $ret .= $this->element('th', 'Pre-AttrTransform');
+ $ret .= $this->element('td', $this->listifyObjectList($def->attr_transform_pre));
+ $ret .= $this->end('tr');
+ }
+ if (!empty($def->attr_transform_post)) {
+ $ret .= $this->start('tr');
+ $ret .= $this->element('th', 'Post-AttrTransform');
+ $ret .= $this->element('td', $this->listifyObjectList($def->attr_transform_post));
+ $ret .= $this->end('tr');
+ }
+ if (!empty($def->auto_close)) {
+ $ret .= $this->start('tr');
+ $ret .= $this->element('th', 'Auto closed by');
+ $ret .= $this->element('td', $this->listifyTagLookup($def->auto_close));
+ $ret .= $this->end('tr');
+ }
+ $ret .= $this->start('tr');
+ $ret .= $this->element('th', 'Allowed attributes');
+ $ret .= $this->element('td', $this->listifyAttr($def->attr), array(), 0);
+ $ret .= $this->end('tr');
+
+ if (!empty($def->required_attr)) {
+ $ret .= $this->row('Required attributes', $this->listify($def->required_attr));
+ }
+
+ $ret .= $this->renderChildren($def->child);
+ }
+ $ret .= $this->end('table');
+ return $ret;
+ }
+
+ /**
+ * Renders a row describing the allowed children of an element
+ * @param HTMLPurifier_ChildDef $def HTMLPurifier_ChildDef of pertinent element
+ * @return string
+ */
+ protected function renderChildren($def)
+ {
+ $context = new HTMLPurifier_Context();
+ $ret = '';
+ $ret .= $this->start('tr');
+ $elements = array();
+ $attr = array();
+ if (isset($def->elements)) {
+ if ($def->type == 'strictblockquote') {
+ $def->validateChildren(array(), $this->config, $context);
+ }
+ $elements = $def->elements;
+ }
+ if ($def->type == 'chameleon') {
+ $attr['rowspan'] = 2;
+ } elseif ($def->type == 'empty') {
+ $elements = array();
+ } elseif ($def->type == 'table') {
+ $elements = array_flip(
+ array(
+ 'col',
+ 'caption',
+ 'colgroup',
+ 'thead',
+ 'tfoot',
+ 'tbody',
+ 'tr'
+ )
+ );
+ }
+ $ret .= $this->element('th', 'Allowed children', $attr);
+
+ if ($def->type == 'chameleon') {
+
+ $ret .= $this->element(
+ 'td',
+ '<em>Block</em>: ' .
+ $this->escape($this->listifyTagLookup($def->block->elements)),
+ null,
+ 0
+ );
+ $ret .= $this->end('tr');
+ $ret .= $this->start('tr');
+ $ret .= $this->element(
+ 'td',
+ '<em>Inline</em>: ' .
+ $this->escape($this->listifyTagLookup($def->inline->elements)),
+ null,
+ 0
+ );
+
+ } elseif ($def->type == 'custom') {
+
+ $ret .= $this->element(
+ 'td',
+ '<em>' . ucfirst($def->type) . '</em>: ' .
+ $def->dtd_regex
+ );
+
+ } else {
+ $ret .= $this->element(
+ 'td',
+ '<em>' . ucfirst($def->type) . '</em>: ' .
+ $this->escape($this->listifyTagLookup($elements)),
+ null,
+ 0
+ );
+ }
+ $ret .= $this->end('tr');
+ return $ret;
+ }
+
+ /**
+ * Listifies a tag lookup table.
+ * @param array $array Tag lookup array in form of array('tagname' => true)
+ * @return string
+ */
+ protected function listifyTagLookup($array)
+ {
+ ksort($array);
+ $list = array();
+ foreach ($array as $name => $discard) {
+ if ($name !== '#PCDATA' && !isset($this->def->info[$name])) {
+ continue;
+ }
+ $list[] = $name;
+ }
+ return $this->listify($list);
+ }
+
+ /**
+ * Listifies a list of objects by retrieving class names and internal state
+ * @param array $array List of objects
+ * @return string
+ * @todo Also add information about internal state
+ */
+ protected function listifyObjectList($array)
+ {
+ ksort($array);
+ $list = array();
+ foreach ($array as $obj) {
+ $list[] = $this->getClass($obj, 'AttrTransform_');
+ }
+ return $this->listify($list);
+ }
+
+ /**
+ * Listifies a hash of attributes to AttrDef classes
+ * @param array $array Array hash in form of array('attrname' => HTMLPurifier_AttrDef)
+ * @return string
+ */
+ protected function listifyAttr($array)
+ {
+ ksort($array);
+ $list = array();
+ foreach ($array as $name => $obj) {
+ if ($obj === false) {
+ continue;
+ }
+ $list[] = "$name = <i>" . $this->getClass($obj, 'AttrDef_') . '</i>';
+ }
+ return $this->listify($list);
+ }
+
+ /**
+ * Creates a heavy header row
+ * @param string $text
+ * @param int $num
+ * @return string
+ */
+ protected function heavyHeader($text, $num = 1)
+ {
+ $ret = '';
+ $ret .= $this->start('tr');
+ $ret .= $this->element('th', $text, array('colspan' => $num, 'class' => 'heavy'));
+ $ret .= $this->end('tr');
+ return $ret;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/PropertyList.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/PropertyList.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/PropertyList.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/PropertyList.php
index d27fd53..189348f 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/PropertyList.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/PropertyList.php
@@ -1,122 +1,122 @@
-<?php
-
-/**
- * Generic property list implementation
- */
-class HTMLPurifier_PropertyList
-{
- /**
- * Internal data-structure for properties.
- * @type array
- */
- protected $data = array();
-
- /**
- * Parent plist.
- * @type HTMLPurifier_PropertyList
- */
- protected $parent;
-
- /**
- * Cache.
- * @type array
- */
- protected $cache;
-
- /**
- * @param HTMLPurifier_PropertyList $parent Parent plist
- */
- public function __construct($parent = null)
- {
- $this->parent = $parent;
- }
-
- /**
- * Recursively retrieves the value for a key
- * @param string $name
- * @throws HTMLPurifier_Exception
- */
- public function get($name)
- {
- if ($this->has($name)) {
- return $this->data[$name];
- }
- // possible performance bottleneck, convert to iterative if necessary
- if ($this->parent) {
- return $this->parent->get($name);
- }
- throw new HTMLPurifier_Exception("Key '$name' not found");
- }
-
- /**
- * Sets the value of a key, for this plist
- * @param string $name
- * @param mixed $value
- */
- public function set($name, $value)
- {
- $this->data[$name] = $value;
- }
-
- /**
- * Returns true if a given key exists
- * @param string $name
- * @return bool
- */
- public function has($name)
- {
- return array_key_exists($name, $this->data);
- }
-
- /**
- * Resets a value to the value of it's parent, usually the default. If
- * no value is specified, the entire plist is reset.
- * @param string $name
- */
- public function reset($name = null)
- {
- if ($name == null) {
- $this->data = array();
- } else {
- unset($this->data[$name]);
- }
- }
-
- /**
- * Squashes this property list and all of its property lists into a single
- * array, and returns the array. This value is cached by default.
- * @param bool $force If true, ignores the cache and regenerates the array.
- * @return array
- */
- public function squash($force = false)
- {
- if ($this->cache !== null && !$force) {
- return $this->cache;
- }
- if ($this->parent) {
- return $this->cache = array_merge($this->parent->squash($force), $this->data);
- } else {
- return $this->cache = $this->data;
- }
- }
-
- /**
- * Returns the parent plist.
- * @return HTMLPurifier_PropertyList
- */
- public function getParent()
- {
- return $this->parent;
- }
-
- /**
- * Sets the parent plist.
- * @param HTMLPurifier_PropertyList $plist Parent plist
- */
- public function setParent($plist)
- {
- $this->parent = $plist;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Generic property list implementation
+ */
+class HTMLPurifier_PropertyList
+{
+ /**
+ * Internal data-structure for properties.
+ * @type array
+ */
+ protected $data = array();
+
+ /**
+ * Parent plist.
+ * @type HTMLPurifier_PropertyList
+ */
+ protected $parent;
+
+ /**
+ * Cache.
+ * @type array
+ */
+ protected $cache;
+
+ /**
+ * @param HTMLPurifier_PropertyList $parent Parent plist
+ */
+ public function __construct($parent = null)
+ {
+ $this->parent = $parent;
+ }
+
+ /**
+ * Recursively retrieves the value for a key
+ * @param string $name
+ * @throws HTMLPurifier_Exception
+ */
+ public function get($name)
+ {
+ if ($this->has($name)) {
+ return $this->data[$name];
+ }
+ // possible performance bottleneck, convert to iterative if necessary
+ if ($this->parent) {
+ return $this->parent->get($name);
+ }
+ throw new HTMLPurifier_Exception("Key '$name' not found");
+ }
+
+ /**
+ * Sets the value of a key, for this plist
+ * @param string $name
+ * @param mixed $value
+ */
+ public function set($name, $value)
+ {
+ $this->data[$name] = $value;
+ }
+
+ /**
+ * Returns true if a given key exists
+ * @param string $name
+ * @return bool
+ */
+ public function has($name)
+ {
+ return array_key_exists($name, $this->data);
+ }
+
+ /**
+ * Resets a value to the value of it's parent, usually the default. If
+ * no value is specified, the entire plist is reset.
+ * @param string $name
+ */
+ public function reset($name = null)
+ {
+ if ($name == null) {
+ $this->data = array();
+ } else {
+ unset($this->data[$name]);
+ }
+ }
+
+ /**
+ * Squashes this property list and all of its property lists into a single
+ * array, and returns the array. This value is cached by default.
+ * @param bool $force If true, ignores the cache and regenerates the array.
+ * @return array
+ */
+ public function squash($force = false)
+ {
+ if ($this->cache !== null && !$force) {
+ return $this->cache;
+ }
+ if ($this->parent) {
+ return $this->cache = array_merge($this->parent->squash($force), $this->data);
+ } else {
+ return $this->cache = $this->data;
+ }
+ }
+
+ /**
+ * Returns the parent plist.
+ * @return HTMLPurifier_PropertyList
+ */
+ public function getParent()
+ {
+ return $this->parent;
+ }
+
+ /**
+ * Sets the parent plist.
+ * @param HTMLPurifier_PropertyList $plist Parent plist
+ */
+ public function setParent($plist)
+ {
+ $this->parent = $plist;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/PropertyListIterator.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/PropertyListIterator.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/PropertyListIterator.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/PropertyListIterator.php
index 1e707e2..15b330e 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/PropertyListIterator.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/PropertyListIterator.php
@@ -1,42 +1,42 @@
-<?php
-
-/**
- * Property list iterator. Do not instantiate this class directly.
- */
-class HTMLPurifier_PropertyListIterator extends FilterIterator
-{
-
- /**
- * @type int
- */
- protected $l;
- /**
- * @type string
- */
- protected $filter;
-
- /**
- * @param Iterator $iterator Array of data to iterate over
- * @param string $filter Optional prefix to only allow values of
- */
- public function __construct(Iterator $iterator, $filter = null)
- {
- parent::__construct($iterator);
- $this->l = strlen($filter);
- $this->filter = $filter;
- }
-
- /**
- * @return bool
- */
- public function accept()
- {
- $key = $this->getInnerIterator()->key();
- if (strncmp($key, $this->filter, $this->l) !== 0) {
- return false;
- }
- return true;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Property list iterator. Do not instantiate this class directly.
+ */
+class HTMLPurifier_PropertyListIterator extends FilterIterator
+{
+
+ /**
+ * @type int
+ */
+ protected $l;
+ /**
+ * @type string
+ */
+ protected $filter;
+
+ /**
+ * @param Iterator $iterator Array of data to iterate over
+ * @param string $filter Optional prefix to only allow values of
+ */
+ public function __construct(Iterator $iterator, $filter = null)
+ {
+ parent::__construct($iterator);
+ $this->l = strlen($filter);
+ $this->filter = $filter;
+ }
+
+ /**
+ * @return bool
+ */
+ public function accept()
+ {
+ $key = $this->getInnerIterator()->key();
+ if (strncmp($key, $this->filter, $this->l) !== 0) {
+ return false;
+ }
+ return true;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Queue.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Queue.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Queue.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Queue.php
index a75894d..f58db90 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Queue.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Queue.php
@@ -1,56 +1,56 @@
-<?php
-
-/**
- * A simple array-backed queue, based off of the classic Okasaki
- * persistent amortized queue. The basic idea is to maintain two
- * stacks: an input stack and an output stack. When the output
- * stack runs out, reverse the input stack and use it as the output
- * stack.
- *
- * We don't use the SPL implementation because it's only supported
- * on PHP 5.3 and later.
- *
- * Exercise: Prove that push/pop on this queue take amortized O(1) time.
- *
- * Exercise: Extend this queue to be a deque, while preserving amortized
- * O(1) time. Some care must be taken on rebalancing to avoid quadratic
- * behaviour caused by repeatedly shuffling data from the input stack
- * to the output stack and back.
- */
-class HTMLPurifier_Queue {
- private $input;
- private $output;
-
- public function __construct($input = array()) {
- $this->input = $input;
- $this->output = array();
- }
-
- /**
- * Shifts an element off the front of the queue.
- */
- public function shift() {
- if (empty($this->output)) {
- $this->output = array_reverse($this->input);
- $this->input = array();
- }
- if (empty($this->output)) {
- return NULL;
- }
- return array_pop($this->output);
- }
-
- /**
- * Pushes an element onto the front of the queue.
- */
- public function push($x) {
- array_push($this->input, $x);
- }
-
- /**
- * Checks if it's empty.
- */
- public function isEmpty() {
- return empty($this->input) && empty($this->output);
- }
-}
+<?php
+
+/**
+ * A simple array-backed queue, based off of the classic Okasaki
+ * persistent amortized queue. The basic idea is to maintain two
+ * stacks: an input stack and an output stack. When the output
+ * stack runs out, reverse the input stack and use it as the output
+ * stack.
+ *
+ * We don't use the SPL implementation because it's only supported
+ * on PHP 5.3 and later.
+ *
+ * Exercise: Prove that push/pop on this queue take amortized O(1) time.
+ *
+ * Exercise: Extend this queue to be a deque, while preserving amortized
+ * O(1) time. Some care must be taken on rebalancing to avoid quadratic
+ * behaviour caused by repeatedly shuffling data from the input stack
+ * to the output stack and back.
+ */
+class HTMLPurifier_Queue {
+ private $input;
+ private $output;
+
+ public function __construct($input = array()) {
+ $this->input = $input;
+ $this->output = array();
+ }
+
+ /**
+ * Shifts an element off the front of the queue.
+ */
+ public function shift() {
+ if (empty($this->output)) {
+ $this->output = array_reverse($this->input);
+ $this->input = array();
+ }
+ if (empty($this->output)) {
+ return NULL;
+ }
+ return array_pop($this->output);
+ }
+
+ /**
+ * Pushes an element onto the front of the queue.
+ */
+ public function push($x) {
+ array_push($this->input, $x);
+ }
+
+ /**
+ * Checks if it's empty.
+ */
+ public function isEmpty() {
+ return empty($this->input) && empty($this->output);
+ }
+}
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy.php
index 291eb83..e1ff3b7 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy.php
@@ -1,26 +1,26 @@
-<?php
-
-/**
- * Supertype for classes that define a strategy for modifying/purifying tokens.
- *
- * While HTMLPurifier's core purpose is fixing HTML into something proper,
- * strategies provide plug points for extra configuration or even extra
- * features, such as custom tags, custom parsing of text, etc.
- */
-
-
-abstract class HTMLPurifier_Strategy
-{
-
- /**
- * Executes the strategy on the tokens.
- *
- * @param HTMLPurifier_Token[] $tokens Array of HTMLPurifier_Token objects to be operated on.
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return HTMLPurifier_Token[] Processed array of token objects.
- */
- abstract public function execute($tokens, $config, $context);
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Supertype for classes that define a strategy for modifying/purifying tokens.
+ *
+ * While HTMLPurifier's core purpose is fixing HTML into something proper,
+ * strategies provide plug points for extra configuration or even extra
+ * features, such as custom tags, custom parsing of text, etc.
+ */
+
+
+abstract class HTMLPurifier_Strategy
+{
+
+ /**
+ * Executes the strategy on the tokens.
+ *
+ * @param HTMLPurifier_Token[] $tokens Array of HTMLPurifier_Token objects to be operated on.
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return HTMLPurifier_Token[] Processed array of token objects.
+ */
+ abstract public function execute($tokens, $config, $context);
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/Composite.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/Composite.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/Composite.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/Composite.php
index 9de812d..d7d35ce 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/Composite.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/Composite.php
@@ -1,30 +1,30 @@
-<?php
-
-/**
- * Composite strategy that runs multiple strategies on tokens.
- */
-abstract class HTMLPurifier_Strategy_Composite extends HTMLPurifier_Strategy
-{
-
- /**
- * List of strategies to run tokens through.
- * @type HTMLPurifier_Strategy[]
- */
- protected $strategies = array();
-
- /**
- * @param HTMLPurifier_Token[] $tokens
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return HTMLPurifier_Token[]
- */
- public function execute($tokens, $config, $context)
- {
- foreach ($this->strategies as $strategy) {
- $tokens = $strategy->execute($tokens, $config, $context);
- }
- return $tokens;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Composite strategy that runs multiple strategies on tokens.
+ */
+abstract class HTMLPurifier_Strategy_Composite extends HTMLPurifier_Strategy
+{
+
+ /**
+ * List of strategies to run tokens through.
+ * @type HTMLPurifier_Strategy[]
+ */
+ protected $strategies = array();
+
+ /**
+ * @param HTMLPurifier_Token[] $tokens
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return HTMLPurifier_Token[]
+ */
+ public function execute($tokens, $config, $context)
+ {
+ foreach ($this->strategies as $strategy) {
+ $tokens = $strategy->execute($tokens, $config, $context);
+ }
+ return $tokens;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/Core.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/Core.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/Core.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/Core.php
index 0775215..4414c17 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/Core.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/Core.php
@@ -1,17 +1,17 @@
-<?php
-
-/**
- * Core strategy composed of the big four strategies.
- */
-class HTMLPurifier_Strategy_Core extends HTMLPurifier_Strategy_Composite
-{
- public function __construct()
- {
- $this->strategies[] = new HTMLPurifier_Strategy_RemoveForeignElements();
- $this->strategies[] = new HTMLPurifier_Strategy_MakeWellFormed();
- $this->strategies[] = new HTMLPurifier_Strategy_FixNesting();
- $this->strategies[] = new HTMLPurifier_Strategy_ValidateAttributes();
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Core strategy composed of the big four strategies.
+ */
+class HTMLPurifier_Strategy_Core extends HTMLPurifier_Strategy_Composite
+{
+ public function __construct()
+ {
+ $this->strategies[] = new HTMLPurifier_Strategy_RemoveForeignElements();
+ $this->strategies[] = new HTMLPurifier_Strategy_MakeWellFormed();
+ $this->strategies[] = new HTMLPurifier_Strategy_FixNesting();
+ $this->strategies[] = new HTMLPurifier_Strategy_ValidateAttributes();
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/FixNesting.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/FixNesting.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/FixNesting.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/FixNesting.php
index 8b1eb20..6fa673d 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/FixNesting.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/FixNesting.php
@@ -1,181 +1,181 @@
-<?php
-
-/**
- * Takes a well formed list of tokens and fixes their nesting.
- *
- * HTML elements dictate which elements are allowed to be their children,
- * for example, you can't have a p tag in a span tag. Other elements have
- * much more rigorous definitions: tables, for instance, require a specific
- * order for their elements. There are also constraints not expressible by
- * document type definitions, such as the chameleon nature of ins/del
- * tags and global child exclusions.
- *
- * The first major objective of this strategy is to iterate through all
- * the nodes and determine whether or not their children conform to the
- * element's definition. If they do not, the child definition may
- * optionally supply an amended list of elements that is valid or
- * require that the entire node be deleted (and the previous node
- * rescanned).
- *
- * The second objective is to ensure that explicitly excluded elements of
- * an element do not appear in its children. Code that accomplishes this
- * task is pervasive through the strategy, though the two are distinct tasks
- * and could, theoretically, be seperated (although it's not recommended).
- *
- * @note Whether or not unrecognized children are silently dropped or
- * translated into text depends on the child definitions.
- *
- * @todo Enable nodes to be bubbled out of the structure. This is
- * easier with our new algorithm.
- */
-
-class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
-{
-
- /**
- * @param HTMLPurifier_Token[] $tokens
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array|HTMLPurifier_Token[]
- */
- public function execute($tokens, $config, $context)
- {
-
- //####################################################################//
- // Pre-processing
-
- // O(n) pass to convert to a tree, so that we can efficiently
- // refer to substrings
- $top_node = HTMLPurifier_Arborize::arborize($tokens, $config, $context);
-
- // get a copy of the HTML definition
- $definition = $config->getHTMLDefinition();
-
- $excludes_enabled = !$config->get('Core.DisableExcludes');
-
- // setup the context variable 'IsInline', for chameleon processing
- // is 'false' when we are not inline, 'true' when it must always
- // be inline, and an integer when it is inline for a certain
- // branch of the document tree
- $is_inline = $definition->info_parent_def->descendants_are_inline;
- $context->register('IsInline', $is_inline);
-
- // setup error collector
- $e =& $context->get('ErrorCollector', true);
-
- //####################################################################//
- // Loop initialization
-
- // stack that contains all elements that are excluded
- // it is organized by parent elements, similar to $stack,
- // but it is only populated when an element with exclusions is
- // processed, i.e. there won't be empty exclusions.
- $exclude_stack = array($definition->info_parent_def->excludes);
-
- // variable that contains the start token while we are processing
- // nodes. This enables error reporting to do its job
- $node = $top_node;
- // dummy token
- list($token, $d) = $node->toTokenPair();
- $context->register('CurrentNode', $node);
- $context->register('CurrentToken', $token);
-
- //####################################################################//
- // Loop
-
- // We need to implement a post-order traversal iteratively, to
- // avoid running into stack space limits. This is pretty tricky
- // to reason about, so we just manually stack-ify the recursive
- // variant:
- //
- // function f($node) {
- // foreach ($node->children as $child) {
- // f($child);
- // }
- // validate($node);
- // }
- //
- // Thus, we will represent a stack frame as array($node,
- // $is_inline, stack of children)
- // e.g. array_reverse($node->children) - already processed
- // children.
-
- $parent_def = $definition->info_parent_def;
- $stack = array(
- array($top_node,
- $parent_def->descendants_are_inline,
- $parent_def->excludes, // exclusions
- 0)
- );
-
- while (!empty($stack)) {
- list($node, $is_inline, $excludes, $ix) = array_pop($stack);
- // recursive call
- $go = false;
- $def = empty($stack) ? $definition->info_parent_def : $definition->info[$node->name];
- while (isset($node->children[$ix])) {
- $child = $node->children[$ix++];
- if ($child instanceof HTMLPurifier_Node_Element) {
- $go = true;
- $stack[] = array($node, $is_inline, $excludes, $ix);
- $stack[] = array($child,
- // ToDo: I don't think it matters if it's def or
- // child_def, but double check this...
- $is_inline || $def->descendants_are_inline,
- empty($def->excludes) ? $excludes
- : array_merge($excludes, $def->excludes),
- 0);
- break;
- }
- };
- if ($go) continue;
- list($token, $d) = $node->toTokenPair();
- // base case
- if ($excludes_enabled && isset($excludes[$node->name])) {
- $node->dead = true;
- if ($e) $e->send(E_ERROR, 'Strategy_FixNesting: Node excluded');
- } else {
- // XXX I suppose it would be slightly more efficient to
- // avoid the allocation here and have children
- // strategies handle it
- $children = array();
- foreach ($node->children as $child) {
- if (!$child->dead) $children[] = $child;
- }
- $result = $def->child->validateChildren($children, $config, $context);
- if ($result === true) {
- // nop
- $node->children = $children;
- } elseif ($result === false) {
- $node->dead = true;
- if ($e) $e->send(E_ERROR, 'Strategy_FixNesting: Node removed');
- } else {
- $node->children = $result;
- if ($e) {
- // XXX This will miss mutations of internal nodes. Perhaps defer to the child validators
- if (empty($result) && !empty($children)) {
- $e->send(E_ERROR, 'Strategy_FixNesting: Node contents removed');
- } else if ($result != $children) {
- $e->send(E_WARNING, 'Strategy_FixNesting: Node reorganized');
- }
- }
- }
- }
- }
-
- //####################################################################//
- // Post-processing
-
- // remove context variables
- $context->destroy('IsInline');
- $context->destroy('CurrentNode');
- $context->destroy('CurrentToken');
-
- //####################################################################//
- // Return
-
- return HTMLPurifier_Arborize::flatten($node, $config, $context);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Takes a well formed list of tokens and fixes their nesting.
+ *
+ * HTML elements dictate which elements are allowed to be their children,
+ * for example, you can't have a p tag in a span tag. Other elements have
+ * much more rigorous definitions: tables, for instance, require a specific
+ * order for their elements. There are also constraints not expressible by
+ * document type definitions, such as the chameleon nature of ins/del
+ * tags and global child exclusions.
+ *
+ * The first major objective of this strategy is to iterate through all
+ * the nodes and determine whether or not their children conform to the
+ * element's definition. If they do not, the child definition may
+ * optionally supply an amended list of elements that is valid or
+ * require that the entire node be deleted (and the previous node
+ * rescanned).
+ *
+ * The second objective is to ensure that explicitly excluded elements of
+ * an element do not appear in its children. Code that accomplishes this
+ * task is pervasive through the strategy, though the two are distinct tasks
+ * and could, theoretically, be seperated (although it's not recommended).
+ *
+ * @note Whether or not unrecognized children are silently dropped or
+ * translated into text depends on the child definitions.
+ *
+ * @todo Enable nodes to be bubbled out of the structure. This is
+ * easier with our new algorithm.
+ */
+
+class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
+{
+
+ /**
+ * @param HTMLPurifier_Token[] $tokens
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array|HTMLPurifier_Token[]
+ */
+ public function execute($tokens, $config, $context)
+ {
+
+ //####################################################################//
+ // Pre-processing
+
+ // O(n) pass to convert to a tree, so that we can efficiently
+ // refer to substrings
+ $top_node = HTMLPurifier_Arborize::arborize($tokens, $config, $context);
+
+ // get a copy of the HTML definition
+ $definition = $config->getHTMLDefinition();
+
+ $excludes_enabled = !$config->get('Core.DisableExcludes');
+
+ // setup the context variable 'IsInline', for chameleon processing
+ // is 'false' when we are not inline, 'true' when it must always
+ // be inline, and an integer when it is inline for a certain
+ // branch of the document tree
+ $is_inline = $definition->info_parent_def->descendants_are_inline;
+ $context->register('IsInline', $is_inline);
+
+ // setup error collector
+ $e =& $context->get('ErrorCollector', true);
+
+ //####################################################################//
+ // Loop initialization
+
+ // stack that contains all elements that are excluded
+ // it is organized by parent elements, similar to $stack,
+ // but it is only populated when an element with exclusions is
+ // processed, i.e. there won't be empty exclusions.
+ $exclude_stack = array($definition->info_parent_def->excludes);
+
+ // variable that contains the start token while we are processing
+ // nodes. This enables error reporting to do its job
+ $node = $top_node;
+ // dummy token
+ list($token, $d) = $node->toTokenPair();
+ $context->register('CurrentNode', $node);
+ $context->register('CurrentToken', $token);
+
+ //####################################################################//
+ // Loop
+
+ // We need to implement a post-order traversal iteratively, to
+ // avoid running into stack space limits. This is pretty tricky
+ // to reason about, so we just manually stack-ify the recursive
+ // variant:
+ //
+ // function f($node) {
+ // foreach ($node->children as $child) {
+ // f($child);
+ // }
+ // validate($node);
+ // }
+ //
+ // Thus, we will represent a stack frame as array($node,
+ // $is_inline, stack of children)
+ // e.g. array_reverse($node->children) - already processed
+ // children.
+
+ $parent_def = $definition->info_parent_def;
+ $stack = array(
+ array($top_node,
+ $parent_def->descendants_are_inline,
+ $parent_def->excludes, // exclusions
+ 0)
+ );
+
+ while (!empty($stack)) {
+ list($node, $is_inline, $excludes, $ix) = array_pop($stack);
+ // recursive call
+ $go = false;
+ $def = empty($stack) ? $definition->info_parent_def : $definition->info[$node->name];
+ while (isset($node->children[$ix])) {
+ $child = $node->children[$ix++];
+ if ($child instanceof HTMLPurifier_Node_Element) {
+ $go = true;
+ $stack[] = array($node, $is_inline, $excludes, $ix);
+ $stack[] = array($child,
+ // ToDo: I don't think it matters if it's def or
+ // child_def, but double check this...
+ $is_inline || $def->descendants_are_inline,
+ empty($def->excludes) ? $excludes
+ : array_merge($excludes, $def->excludes),
+ 0);
+ break;
+ }
+ };
+ if ($go) continue;
+ list($token, $d) = $node->toTokenPair();
+ // base case
+ if ($excludes_enabled && isset($excludes[$node->name])) {
+ $node->dead = true;
+ if ($e) $e->send(E_ERROR, 'Strategy_FixNesting: Node excluded');
+ } else {
+ // XXX I suppose it would be slightly more efficient to
+ // avoid the allocation here and have children
+ // strategies handle it
+ $children = array();
+ foreach ($node->children as $child) {
+ if (!$child->dead) $children[] = $child;
+ }
+ $result = $def->child->validateChildren($children, $config, $context);
+ if ($result === true) {
+ // nop
+ $node->children = $children;
+ } elseif ($result === false) {
+ $node->dead = true;
+ if ($e) $e->send(E_ERROR, 'Strategy_FixNesting: Node removed');
+ } else {
+ $node->children = $result;
+ if ($e) {
+ // XXX This will miss mutations of internal nodes. Perhaps defer to the child validators
+ if (empty($result) && !empty($children)) {
+ $e->send(E_ERROR, 'Strategy_FixNesting: Node contents removed');
+ } else if ($result != $children) {
+ $e->send(E_WARNING, 'Strategy_FixNesting: Node reorganized');
+ }
+ }
+ }
+ }
+ }
+
+ //####################################################################//
+ // Post-processing
+
+ // remove context variables
+ $context->destroy('IsInline');
+ $context->destroy('CurrentNode');
+ $context->destroy('CurrentToken');
+
+ //####################################################################//
+ // Return
+
+ return HTMLPurifier_Arborize::flatten($node, $config, $context);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/MakeWellFormed.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/MakeWellFormed.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/MakeWellFormed.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/MakeWellFormed.php
index 2c792fe..e389e00 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/MakeWellFormed.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/MakeWellFormed.php
@@ -1,600 +1,600 @@
-<?php
-
-/**
- * Takes tokens makes them well-formed (balance end tags, etc.)
- *
- * Specification of the armor attributes this strategy uses:
- *
- * - MakeWellFormed_TagClosedError: This armor field is used to
- * suppress tag closed errors for certain tokens [TagClosedSuppress],
- * in particular, if a tag was generated automatically by HTML
- * Purifier, we may rely on our infrastructure to close it for us
- * and shouldn't report an error to the user [TagClosedAuto].
- */
-class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
-{
-
- /**
- * Array stream of tokens being processed.
- * @type HTMLPurifier_Token[]
- */
- protected $tokens;
-
- /**
- * Current token.
- * @type HTMLPurifier_Token
- */
- protected $token;
-
- /**
- * Zipper managing the true state.
- * @type HTMLPurifier_Zipper
- */
- protected $zipper;
-
- /**
- * Current nesting of elements.
- * @type array
- */
- protected $stack;
-
- /**
- * Injectors active in this stream processing.
- * @type HTMLPurifier_Injector[]
- */
- protected $injectors;
-
- /**
- * Current instance of HTMLPurifier_Config.
- * @type HTMLPurifier_Config
- */
- protected $config;
-
- /**
- * Current instance of HTMLPurifier_Context.
- * @type HTMLPurifier_Context
- */
- protected $context;
-
- /**
- * @param HTMLPurifier_Token[] $tokens
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return HTMLPurifier_Token[]
- * @throws HTMLPurifier_Exception
- */
- public function execute($tokens, $config, $context)
- {
- $definition = $config->getHTMLDefinition();
-
- // local variables
- $generator = new HTMLPurifier_Generator($config, $context);
- $escape_invalid_tags = $config->get('Core.EscapeInvalidTags');
- // used for autoclose early abortion
- $global_parent_allowed_elements = $definition->info_parent_def->child->getAllowedElements($config);
- $e = $context->get('ErrorCollector', true);
- $i = false; // injector index
- list($zipper, $token) = HTMLPurifier_Zipper::fromArray($tokens);
- if ($token === NULL) {
- return array();
- }
- $reprocess = false; // whether or not to reprocess the same token
- $stack = array();
-
- // member variables
- $this->stack =& $stack;
- $this->tokens =& $tokens;
- $this->token =& $token;
- $this->zipper =& $zipper;
- $this->config = $config;
- $this->context = $context;
-
- // context variables
- $context->register('CurrentNesting', $stack);
- $context->register('InputZipper', $zipper);
- $context->register('CurrentToken', $token);
-
- // -- begin INJECTOR --
-
- $this->injectors = array();
-
- $injectors = $config->getBatch('AutoFormat');
- $def_injectors = $definition->info_injector;
- $custom_injectors = $injectors['Custom'];
- unset($injectors['Custom']); // special case
- foreach ($injectors as $injector => $b) {
- // XXX: Fix with a legitimate lookup table of enabled filters
- if (strpos($injector, '.') !== false) {
- continue;
- }
- $injector = "HTMLPurifier_Injector_$injector";
- if (!$b) {
- continue;
- }
- $this->injectors[] = new $injector;
- }
- foreach ($def_injectors as $injector) {
- // assumed to be objects
- $this->injectors[] = $injector;
- }
- foreach ($custom_injectors as $injector) {
- if (!$injector) {
- continue;
- }
- if (is_string($injector)) {
- $injector = "HTMLPurifier_Injector_$injector";
- $injector = new $injector;
- }
- $this->injectors[] = $injector;
- }
-
- // give the injectors references to the definition and context
- // variables for performance reasons
- foreach ($this->injectors as $ix => $injector) {
- $error = $injector->prepare($config, $context);
- if (!$error) {
- continue;
- }
- array_splice($this->injectors, $ix, 1); // rm the injector
- trigger_error("Cannot enable {$injector->name} injector because $error is not allowed", E_USER_WARNING);
- }
-
- // -- end INJECTOR --
-
- // a note on reprocessing:
- // In order to reduce code duplication, whenever some code needs
- // to make HTML changes in order to make things "correct", the
- // new HTML gets sent through the purifier, regardless of its
- // status. This means that if we add a start token, because it
- // was totally necessary, we don't have to update nesting; we just
- // punt ($reprocess = true; continue;) and it does that for us.
-
- // isset is in loop because $tokens size changes during loop exec
- for (;;
- // only increment if we don't need to reprocess
- $reprocess ? $reprocess = false : $token = $zipper->next($token)) {
-
- // check for a rewind
- if (is_int($i)) {
- // possibility: disable rewinding if the current token has a
- // rewind set on it already. This would offer protection from
- // infinite loop, but might hinder some advanced rewinding.
- $rewind_offset = $this->injectors[$i]->getRewindOffset();
- if (is_int($rewind_offset)) {
- for ($j = 0; $j < $rewind_offset; $j++) {
- if (empty($zipper->front)) break;
- $token = $zipper->prev($token);
- // indicate that other injectors should not process this token,
- // but we need to reprocess it
- unset($token->skip[$i]);
- $token->rewind = $i;
- if ($token instanceof HTMLPurifier_Token_Start) {
- array_pop($this->stack);
- } elseif ($token instanceof HTMLPurifier_Token_End) {
- $this->stack[] = $token->start;
- }
- }
- }
- $i = false;
- }
-
- // handle case of document end
- if ($token === NULL) {
- // kill processing if stack is empty
- if (empty($this->stack)) {
- break;
- }
-
- // peek
- $top_nesting = array_pop($this->stack);
- $this->stack[] = $top_nesting;
-
- // send error [TagClosedSuppress]
- if ($e && !isset($top_nesting->armor['MakeWellFormed_TagClosedError'])) {
- $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by document end', $top_nesting);
- }
-
- // append, don't splice, since this is the end
- $token = new HTMLPurifier_Token_End($top_nesting->name);
-
- // punt!
- $reprocess = true;
- continue;
- }
-
- //echo '<br>'; printZipper($zipper, $token);//printTokens($this->stack);
- //flush();
-
- // quick-check: if it's not a tag, no need to process
- if (empty($token->is_tag)) {
- if ($token instanceof HTMLPurifier_Token_Text) {
- foreach ($this->injectors as $i => $injector) {
- if (isset($token->skip[$i])) {
- continue;
- }
- if ($token->rewind !== null && $token->rewind !== $i) {
- continue;
- }
- // XXX fuckup
- $r = $token;
- $injector->handleText($r);
- $token = $this->processToken($r, $i);
- $reprocess = true;
- break;
- }
- }
- // another possibility is a comment
- continue;
- }
-
- if (isset($definition->info[$token->name])) {
- $type = $definition->info[$token->name]->child->type;
- } else {
- $type = false; // Type is unknown, treat accordingly
- }
-
- // quick tag checks: anything that's *not* an end tag
- $ok = false;
- if ($type === 'empty' && $token instanceof HTMLPurifier_Token_Start) {
- // claims to be a start tag but is empty
- $token = new HTMLPurifier_Token_Empty(
- $token->name,
- $token->attr,
- $token->line,
- $token->col,
- $token->armor
- );
- $ok = true;
- } elseif ($type && $type !== 'empty' && $token instanceof HTMLPurifier_Token_Empty) {
- // claims to be empty but really is a start tag
- // NB: this assignment is required
- $old_token = $token;
- $token = new HTMLPurifier_Token_End($token->name);
- $token = $this->insertBefore(
- new HTMLPurifier_Token_Start($old_token->name, $old_token->attr, $old_token->line, $old_token->col, $old_token->armor)
- );
- // punt (since we had to modify the input stream in a non-trivial way)
- $reprocess = true;
- continue;
- } elseif ($token instanceof HTMLPurifier_Token_Empty) {
- // real empty token
- $ok = true;
- } elseif ($token instanceof HTMLPurifier_Token_Start) {
- // start tag
-
- // ...unless they also have to close their parent
- if (!empty($this->stack)) {
-
- // Performance note: you might think that it's rather
- // inefficient, recalculating the autoclose information
- // for every tag that a token closes (since when we
- // do an autoclose, we push a new token into the
- // stream and then /process/ that, before
- // re-processing this token.) But this is
- // necessary, because an injector can make an
- // arbitrary transformations to the autoclosing
- // tokens we introduce, so things may have changed
- // in the meantime. Also, doing the inefficient thing is
- // "easy" to reason about (for certain perverse definitions
- // of "easy")
-
- $parent = array_pop($this->stack);
- $this->stack[] = $parent;
-
- $parent_def = null;
- $parent_elements = null;
- $autoclose = false;
- if (isset($definition->info[$parent->name])) {
- $parent_def = $definition->info[$parent->name];
- $parent_elements = $parent_def->child->getAllowedElements($config);
- $autoclose = !isset($parent_elements[$token->name]);
- }
-
- if ($autoclose && $definition->info[$token->name]->wrap) {
- // Check if an element can be wrapped by another
- // element to make it valid in a context (for
- // example, <ul><ul> needs a <li> in between)
- $wrapname = $definition->info[$token->name]->wrap;
- $wrapdef = $definition->info[$wrapname];
- $elements = $wrapdef->child->getAllowedElements($config);
- if (isset($elements[$token->name]) && isset($parent_elements[$wrapname])) {
- $newtoken = new HTMLPurifier_Token_Start($wrapname);
- $token = $this->insertBefore($newtoken);
- $reprocess = true;
- continue;
- }
- }
-
- $carryover = false;
- if ($autoclose && $parent_def->formatting) {
- $carryover = true;
- }
-
- if ($autoclose) {
- // check if this autoclose is doomed to fail
- // (this rechecks $parent, which his harmless)
- $autoclose_ok = isset($global_parent_allowed_elements[$token->name]);
- if (!$autoclose_ok) {
- foreach ($this->stack as $ancestor) {
- $elements = $definition->info[$ancestor->name]->child->getAllowedElements($config);
- if (isset($elements[$token->name])) {
- $autoclose_ok = true;
- break;
- }
- if ($definition->info[$token->name]->wrap) {
- $wrapname = $definition->info[$token->name]->wrap;
- $wrapdef = $definition->info[$wrapname];
- $wrap_elements = $wrapdef->child->getAllowedElements($config);
- if (isset($wrap_elements[$token->name]) && isset($elements[$wrapname])) {
- $autoclose_ok = true;
- break;
- }
- }
- }
- }
- if ($autoclose_ok) {
- // errors need to be updated
- $new_token = new HTMLPurifier_Token_End($parent->name);
- $new_token->start = $parent;
- // [TagClosedSuppress]
- if ($e && !isset($parent->armor['MakeWellFormed_TagClosedError'])) {
- if (!$carryover) {
- $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag auto closed', $parent);
- } else {
- $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag carryover', $parent);
- }
- }
- if ($carryover) {
- $element = clone $parent;
- // [TagClosedAuto]
- $element->armor['MakeWellFormed_TagClosedError'] = true;
- $element->carryover = true;
- $token = $this->processToken(array($new_token, $token, $element));
- } else {
- $token = $this->insertBefore($new_token);
- }
- } else {
- $token = $this->remove();
- }
- $reprocess = true;
- continue;
- }
-
- }
- $ok = true;
- }
-
- if ($ok) {
- foreach ($this->injectors as $i => $injector) {
- if (isset($token->skip[$i])) {
- continue;
- }
- if ($token->rewind !== null && $token->rewind !== $i) {
- continue;
- }
- $r = $token;
- $injector->handleElement($r);
- $token = $this->processToken($r, $i);
- $reprocess = true;
- break;
- }
- if (!$reprocess) {
- // ah, nothing interesting happened; do normal processing
- if ($token instanceof HTMLPurifier_Token_Start) {
- $this->stack[] = $token;
- } elseif ($token instanceof HTMLPurifier_Token_End) {
- throw new HTMLPurifier_Exception(
- 'Improper handling of end tag in start code; possible error in MakeWellFormed'
- );
- }
- }
- continue;
- }
-
- // sanity check: we should be dealing with a closing tag
- if (!$token instanceof HTMLPurifier_Token_End) {
- throw new HTMLPurifier_Exception('Unaccounted for tag token in input stream, bug in HTML Purifier');
- }
-
- // make sure that we have something open
- if (empty($this->stack)) {
- if ($escape_invalid_tags) {
- if ($e) {
- $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag to text');
- }
- $token = new HTMLPurifier_Token_Text($generator->generateFromToken($token));
- } else {
- if ($e) {
- $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag removed');
- }
- $token = $this->remove();
- }
- $reprocess = true;
- continue;
- }
-
- // first, check for the simplest case: everything closes neatly.
- // Eventually, everything passes through here; if there are problems
- // we modify the input stream accordingly and then punt, so that
- // the tokens get processed again.
- $current_parent = array_pop($this->stack);
- if ($current_parent->name == $token->name) {
- $token->start = $current_parent;
- foreach ($this->injectors as $i => $injector) {
- if (isset($token->skip[$i])) {
- continue;
- }
- if ($token->rewind !== null && $token->rewind !== $i) {
- continue;
- }
- $r = $token;
- $injector->handleEnd($r);
- $token = $this->processToken($r, $i);
- $this->stack[] = $current_parent;
- $reprocess = true;
- break;
- }
- continue;
- }
-
- // okay, so we're trying to close the wrong tag
-
- // undo the pop previous pop
- $this->stack[] = $current_parent;
-
- // scroll back the entire nest, trying to find our tag.
- // (feature could be to specify how far you'd like to go)
- $size = count($this->stack);
- // -2 because -1 is the last element, but we already checked that
- $skipped_tags = false;
- for ($j = $size - 2; $j >= 0; $j--) {
- if ($this->stack[$j]->name == $token->name) {
- $skipped_tags = array_slice($this->stack, $j);
- break;
- }
- }
-
- // we didn't find the tag, so remove
- if ($skipped_tags === false) {
- if ($escape_invalid_tags) {
- if ($e) {
- $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag to text');
- }
- $token = new HTMLPurifier_Token_Text($generator->generateFromToken($token));
- } else {
- if ($e) {
- $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag removed');
- }
- $token = $this->remove();
- }
- $reprocess = true;
- continue;
- }
-
- // do errors, in REVERSE $j order: a,b,c with </a></b></c>
- $c = count($skipped_tags);
- if ($e) {
- for ($j = $c - 1; $j > 0; $j--) {
- // notice we exclude $j == 0, i.e. the current ending tag, from
- // the errors... [TagClosedSuppress]
- if (!isset($skipped_tags[$j]->armor['MakeWellFormed_TagClosedError'])) {
- $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by element end', $skipped_tags[$j]);
- }
- }
- }
-
- // insert tags, in FORWARD $j order: c,b,a with </a></b></c>
- $replace = array($token);
- for ($j = 1; $j < $c; $j++) {
- // ...as well as from the insertions
- $new_token = new HTMLPurifier_Token_End($skipped_tags[$j]->name);
- $new_token->start = $skipped_tags[$j];
- array_unshift($replace, $new_token);
- if (isset($definition->info[$new_token->name]) && $definition->info[$new_token->name]->formatting) {
- // [TagClosedAuto]
- $element = clone $skipped_tags[$j];
- $element->carryover = true;
- $element->armor['MakeWellFormed_TagClosedError'] = true;
- $replace[] = $element;
- }
- }
- $token = $this->processToken($replace);
- $reprocess = true;
- continue;
- }
-
- $context->destroy('CurrentToken');
- $context->destroy('CurrentNesting');
- $context->destroy('InputZipper');
-
- unset($this->injectors, $this->stack, $this->tokens);
- return $zipper->toArray($token);
- }
-
- /**
- * Processes arbitrary token values for complicated substitution patterns.
- * In general:
- *
- * If $token is an array, it is a list of tokens to substitute for the
- * current token. These tokens then get individually processed. If there
- * is a leading integer in the list, that integer determines how many
- * tokens from the stream should be removed.
- *
- * If $token is a regular token, it is swapped with the current token.
- *
- * If $token is false, the current token is deleted.
- *
- * If $token is an integer, that number of tokens (with the first token
- * being the current one) will be deleted.
- *
- * @param HTMLPurifier_Token|array|int|bool $token Token substitution value
- * @param HTMLPurifier_Injector|int $injector Injector that performed the substitution; default is if
- * this is not an injector related operation.
- * @throws HTMLPurifier_Exception
- */
- protected function processToken($token, $injector = -1)
- {
- // normalize forms of token
- if (is_object($token)) {
- $token = array(1, $token);
- }
- if (is_int($token)) {
- $token = array($token);
- }
- if ($token === false) {
- $token = array(1);
- }
- if (!is_array($token)) {
- throw new HTMLPurifier_Exception('Invalid token type from injector');
- }
- if (!is_int($token[0])) {
- array_unshift($token, 1);
- }
- if ($token[0] === 0) {
- throw new HTMLPurifier_Exception('Deleting zero tokens is not valid');
- }
-
- // $token is now an array with the following form:
- // array(number nodes to delete, new node 1, new node 2, ...)
-
- $delete = array_shift($token);
- list($old, $r) = $this->zipper->splice($this->token, $delete, $token);
-
- if ($injector > -1) {
- // determine appropriate skips
- $oldskip = isset($old[0]) ? $old[0]->skip : array();
- foreach ($token as $object) {
- $object->skip = $oldskip;
- $object->skip[$injector] = true;
- }
- }
-
- return $r;
-
- }
-
- /**
- * Inserts a token before the current token. Cursor now points to
- * this token. You must reprocess after this.
- * @param HTMLPurifier_Token $token
- */
- private function insertBefore($token)
- {
- // NB not $this->zipper->insertBefore(), due to positioning
- // differences
- $splice = $this->zipper->splice($this->token, 0, array($token));
-
- return $splice[1];
- }
-
- /**
- * Removes current token. Cursor now points to new token occupying previously
- * occupied space. You must reprocess after this.
- */
- private function remove()
- {
- return $this->zipper->delete();
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Takes tokens makes them well-formed (balance end tags, etc.)
+ *
+ * Specification of the armor attributes this strategy uses:
+ *
+ * - MakeWellFormed_TagClosedError: This armor field is used to
+ * suppress tag closed errors for certain tokens [TagClosedSuppress],
+ * in particular, if a tag was generated automatically by HTML
+ * Purifier, we may rely on our infrastructure to close it for us
+ * and shouldn't report an error to the user [TagClosedAuto].
+ */
+class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
+{
+
+ /**
+ * Array stream of tokens being processed.
+ * @type HTMLPurifier_Token[]
+ */
+ protected $tokens;
+
+ /**
+ * Current token.
+ * @type HTMLPurifier_Token
+ */
+ protected $token;
+
+ /**
+ * Zipper managing the true state.
+ * @type HTMLPurifier_Zipper
+ */
+ protected $zipper;
+
+ /**
+ * Current nesting of elements.
+ * @type array
+ */
+ protected $stack;
+
+ /**
+ * Injectors active in this stream processing.
+ * @type HTMLPurifier_Injector[]
+ */
+ protected $injectors;
+
+ /**
+ * Current instance of HTMLPurifier_Config.
+ * @type HTMLPurifier_Config
+ */
+ protected $config;
+
+ /**
+ * Current instance of HTMLPurifier_Context.
+ * @type HTMLPurifier_Context
+ */
+ protected $context;
+
+ /**
+ * @param HTMLPurifier_Token[] $tokens
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return HTMLPurifier_Token[]
+ * @throws HTMLPurifier_Exception
+ */
+ public function execute($tokens, $config, $context)
+ {
+ $definition = $config->getHTMLDefinition();
+
+ // local variables
+ $generator = new HTMLPurifier_Generator($config, $context);
+ $escape_invalid_tags = $config->get('Core.EscapeInvalidTags');
+ // used for autoclose early abortion
+ $global_parent_allowed_elements = $definition->info_parent_def->child->getAllowedElements($config);
+ $e = $context->get('ErrorCollector', true);
+ $i = false; // injector index
+ list($zipper, $token) = HTMLPurifier_Zipper::fromArray($tokens);
+ if ($token === NULL) {
+ return array();
+ }
+ $reprocess = false; // whether or not to reprocess the same token
+ $stack = array();
+
+ // member variables
+ $this->stack =& $stack;
+ $this->tokens =& $tokens;
+ $this->token =& $token;
+ $this->zipper =& $zipper;
+ $this->config = $config;
+ $this->context = $context;
+
+ // context variables
+ $context->register('CurrentNesting', $stack);
+ $context->register('InputZipper', $zipper);
+ $context->register('CurrentToken', $token);
+
+ // -- begin INJECTOR --
+
+ $this->injectors = array();
+
+ $injectors = $config->getBatch('AutoFormat');
+ $def_injectors = $definition->info_injector;
+ $custom_injectors = $injectors['Custom'];
+ unset($injectors['Custom']); // special case
+ foreach ($injectors as $injector => $b) {
+ // XXX: Fix with a legitimate lookup table of enabled filters
+ if (strpos($injector, '.') !== false) {
+ continue;
+ }
+ $injector = "HTMLPurifier_Injector_$injector";
+ if (!$b) {
+ continue;
+ }
+ $this->injectors[] = new $injector;
+ }
+ foreach ($def_injectors as $injector) {
+ // assumed to be objects
+ $this->injectors[] = $injector;
+ }
+ foreach ($custom_injectors as $injector) {
+ if (!$injector) {
+ continue;
+ }
+ if (is_string($injector)) {
+ $injector = "HTMLPurifier_Injector_$injector";
+ $injector = new $injector;
+ }
+ $this->injectors[] = $injector;
+ }
+
+ // give the injectors references to the definition and context
+ // variables for performance reasons
+ foreach ($this->injectors as $ix => $injector) {
+ $error = $injector->prepare($config, $context);
+ if (!$error) {
+ continue;
+ }
+ array_splice($this->injectors, $ix, 1); // rm the injector
+ trigger_error("Cannot enable {$injector->name} injector because $error is not allowed", E_USER_WARNING);
+ }
+
+ // -- end INJECTOR --
+
+ // a note on reprocessing:
+ // In order to reduce code duplication, whenever some code needs
+ // to make HTML changes in order to make things "correct", the
+ // new HTML gets sent through the purifier, regardless of its
+ // status. This means that if we add a start token, because it
+ // was totally necessary, we don't have to update nesting; we just
+ // punt ($reprocess = true; continue;) and it does that for us.
+
+ // isset is in loop because $tokens size changes during loop exec
+ for (;;
+ // only increment if we don't need to reprocess
+ $reprocess ? $reprocess = false : $token = $zipper->next($token)) {
+
+ // check for a rewind
+ if (is_int($i)) {
+ // possibility: disable rewinding if the current token has a
+ // rewind set on it already. This would offer protection from
+ // infinite loop, but might hinder some advanced rewinding.
+ $rewind_offset = $this->injectors[$i]->getRewindOffset();
+ if (is_int($rewind_offset)) {
+ for ($j = 0; $j < $rewind_offset; $j++) {
+ if (empty($zipper->front)) break;
+ $token = $zipper->prev($token);
+ // indicate that other injectors should not process this token,
+ // but we need to reprocess it
+ unset($token->skip[$i]);
+ $token->rewind = $i;
+ if ($token instanceof HTMLPurifier_Token_Start) {
+ array_pop($this->stack);
+ } elseif ($token instanceof HTMLPurifier_Token_End) {
+ $this->stack[] = $token->start;
+ }
+ }
+ }
+ $i = false;
+ }
+
+ // handle case of document end
+ if ($token === NULL) {
+ // kill processing if stack is empty
+ if (empty($this->stack)) {
+ break;
+ }
+
+ // peek
+ $top_nesting = array_pop($this->stack);
+ $this->stack[] = $top_nesting;
+
+ // send error [TagClosedSuppress]
+ if ($e && !isset($top_nesting->armor['MakeWellFormed_TagClosedError'])) {
+ $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by document end', $top_nesting);
+ }
+
+ // append, don't splice, since this is the end
+ $token = new HTMLPurifier_Token_End($top_nesting->name);
+
+ // punt!
+ $reprocess = true;
+ continue;
+ }
+
+ //echo '<br>'; printZipper($zipper, $token);//printTokens($this->stack);
+ //flush();
+
+ // quick-check: if it's not a tag, no need to process
+ if (empty($token->is_tag)) {
+ if ($token instanceof HTMLPurifier_Token_Text) {
+ foreach ($this->injectors as $i => $injector) {
+ if (isset($token->skip[$i])) {
+ continue;
+ }
+ if ($token->rewind !== null && $token->rewind !== $i) {
+ continue;
+ }
+ // XXX fuckup
+ $r = $token;
+ $injector->handleText($r);
+ $token = $this->processToken($r, $i);
+ $reprocess = true;
+ break;
+ }
+ }
+ // another possibility is a comment
+ continue;
+ }
+
+ if (isset($definition->info[$token->name])) {
+ $type = $definition->info[$token->name]->child->type;
+ } else {
+ $type = false; // Type is unknown, treat accordingly
+ }
+
+ // quick tag checks: anything that's *not* an end tag
+ $ok = false;
+ if ($type === 'empty' && $token instanceof HTMLPurifier_Token_Start) {
+ // claims to be a start tag but is empty
+ $token = new HTMLPurifier_Token_Empty(
+ $token->name,
+ $token->attr,
+ $token->line,
+ $token->col,
+ $token->armor
+ );
+ $ok = true;
+ } elseif ($type && $type !== 'empty' && $token instanceof HTMLPurifier_Token_Empty) {
+ // claims to be empty but really is a start tag
+ // NB: this assignment is required
+ $old_token = $token;
+ $token = new HTMLPurifier_Token_End($token->name);
+ $token = $this->insertBefore(
+ new HTMLPurifier_Token_Start($old_token->name, $old_token->attr, $old_token->line, $old_token->col, $old_token->armor)
+ );
+ // punt (since we had to modify the input stream in a non-trivial way)
+ $reprocess = true;
+ continue;
+ } elseif ($token instanceof HTMLPurifier_Token_Empty) {
+ // real empty token
+ $ok = true;
+ } elseif ($token instanceof HTMLPurifier_Token_Start) {
+ // start tag
+
+ // ...unless they also have to close their parent
+ if (!empty($this->stack)) {
+
+ // Performance note: you might think that it's rather
+ // inefficient, recalculating the autoclose information
+ // for every tag that a token closes (since when we
+ // do an autoclose, we push a new token into the
+ // stream and then /process/ that, before
+ // re-processing this token.) But this is
+ // necessary, because an injector can make an
+ // arbitrary transformations to the autoclosing
+ // tokens we introduce, so things may have changed
+ // in the meantime. Also, doing the inefficient thing is
+ // "easy" to reason about (for certain perverse definitions
+ // of "easy")
+
+ $parent = array_pop($this->stack);
+ $this->stack[] = $parent;
+
+ $parent_def = null;
+ $parent_elements = null;
+ $autoclose = false;
+ if (isset($definition->info[$parent->name])) {
+ $parent_def = $definition->info[$parent->name];
+ $parent_elements = $parent_def->child->getAllowedElements($config);
+ $autoclose = !isset($parent_elements[$token->name]);
+ }
+
+ if ($autoclose && $definition->info[$token->name]->wrap) {
+ // Check if an element can be wrapped by another
+ // element to make it valid in a context (for
+ // example, <ul><ul> needs a <li> in between)
+ $wrapname = $definition->info[$token->name]->wrap;
+ $wrapdef = $definition->info[$wrapname];
+ $elements = $wrapdef->child->getAllowedElements($config);
+ if (isset($elements[$token->name]) && isset($parent_elements[$wrapname])) {
+ $newtoken = new HTMLPurifier_Token_Start($wrapname);
+ $token = $this->insertBefore($newtoken);
+ $reprocess = true;
+ continue;
+ }
+ }
+
+ $carryover = false;
+ if ($autoclose && $parent_def->formatting) {
+ $carryover = true;
+ }
+
+ if ($autoclose) {
+ // check if this autoclose is doomed to fail
+ // (this rechecks $parent, which his harmless)
+ $autoclose_ok = isset($global_parent_allowed_elements[$token->name]);
+ if (!$autoclose_ok) {
+ foreach ($this->stack as $ancestor) {
+ $elements = $definition->info[$ancestor->name]->child->getAllowedElements($config);
+ if (isset($elements[$token->name])) {
+ $autoclose_ok = true;
+ break;
+ }
+ if ($definition->info[$token->name]->wrap) {
+ $wrapname = $definition->info[$token->name]->wrap;
+ $wrapdef = $definition->info[$wrapname];
+ $wrap_elements = $wrapdef->child->getAllowedElements($config);
+ if (isset($wrap_elements[$token->name]) && isset($elements[$wrapname])) {
+ $autoclose_ok = true;
+ break;
+ }
+ }
+ }
+ }
+ if ($autoclose_ok) {
+ // errors need to be updated
+ $new_token = new HTMLPurifier_Token_End($parent->name);
+ $new_token->start = $parent;
+ // [TagClosedSuppress]
+ if ($e && !isset($parent->armor['MakeWellFormed_TagClosedError'])) {
+ if (!$carryover) {
+ $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag auto closed', $parent);
+ } else {
+ $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag carryover', $parent);
+ }
+ }
+ if ($carryover) {
+ $element = clone $parent;
+ // [TagClosedAuto]
+ $element->armor['MakeWellFormed_TagClosedError'] = true;
+ $element->carryover = true;
+ $token = $this->processToken(array($new_token, $token, $element));
+ } else {
+ $token = $this->insertBefore($new_token);
+ }
+ } else {
+ $token = $this->remove();
+ }
+ $reprocess = true;
+ continue;
+ }
+
+ }
+ $ok = true;
+ }
+
+ if ($ok) {
+ foreach ($this->injectors as $i => $injector) {
+ if (isset($token->skip[$i])) {
+ continue;
+ }
+ if ($token->rewind !== null && $token->rewind !== $i) {
+ continue;
+ }
+ $r = $token;
+ $injector->handleElement($r);
+ $token = $this->processToken($r, $i);
+ $reprocess = true;
+ break;
+ }
+ if (!$reprocess) {
+ // ah, nothing interesting happened; do normal processing
+ if ($token instanceof HTMLPurifier_Token_Start) {
+ $this->stack[] = $token;
+ } elseif ($token instanceof HTMLPurifier_Token_End) {
+ throw new HTMLPurifier_Exception(
+ 'Improper handling of end tag in start code; possible error in MakeWellFormed'
+ );
+ }
+ }
+ continue;
+ }
+
+ // sanity check: we should be dealing with a closing tag
+ if (!$token instanceof HTMLPurifier_Token_End) {
+ throw new HTMLPurifier_Exception('Unaccounted for tag token in input stream, bug in HTML Purifier');
+ }
+
+ // make sure that we have something open
+ if (empty($this->stack)) {
+ if ($escape_invalid_tags) {
+ if ($e) {
+ $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag to text');
+ }
+ $token = new HTMLPurifier_Token_Text($generator->generateFromToken($token));
+ } else {
+ if ($e) {
+ $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag removed');
+ }
+ $token = $this->remove();
+ }
+ $reprocess = true;
+ continue;
+ }
+
+ // first, check for the simplest case: everything closes neatly.
+ // Eventually, everything passes through here; if there are problems
+ // we modify the input stream accordingly and then punt, so that
+ // the tokens get processed again.
+ $current_parent = array_pop($this->stack);
+ if ($current_parent->name == $token->name) {
+ $token->start = $current_parent;
+ foreach ($this->injectors as $i => $injector) {
+ if (isset($token->skip[$i])) {
+ continue;
+ }
+ if ($token->rewind !== null && $token->rewind !== $i) {
+ continue;
+ }
+ $r = $token;
+ $injector->handleEnd($r);
+ $token = $this->processToken($r, $i);
+ $this->stack[] = $current_parent;
+ $reprocess = true;
+ break;
+ }
+ continue;
+ }
+
+ // okay, so we're trying to close the wrong tag
+
+ // undo the pop previous pop
+ $this->stack[] = $current_parent;
+
+ // scroll back the entire nest, trying to find our tag.
+ // (feature could be to specify how far you'd like to go)
+ $size = count($this->stack);
+ // -2 because -1 is the last element, but we already checked that
+ $skipped_tags = false;
+ for ($j = $size - 2; $j >= 0; $j--) {
+ if ($this->stack[$j]->name == $token->name) {
+ $skipped_tags = array_slice($this->stack, $j);
+ break;
+ }
+ }
+
+ // we didn't find the tag, so remove
+ if ($skipped_tags === false) {
+ if ($escape_invalid_tags) {
+ if ($e) {
+ $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag to text');
+ }
+ $token = new HTMLPurifier_Token_Text($generator->generateFromToken($token));
+ } else {
+ if ($e) {
+ $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag removed');
+ }
+ $token = $this->remove();
+ }
+ $reprocess = true;
+ continue;
+ }
+
+ // do errors, in REVERSE $j order: a,b,c with </a></b></c>
+ $c = count($skipped_tags);
+ if ($e) {
+ for ($j = $c - 1; $j > 0; $j--) {
+ // notice we exclude $j == 0, i.e. the current ending tag, from
+ // the errors... [TagClosedSuppress]
+ if (!isset($skipped_tags[$j]->armor['MakeWellFormed_TagClosedError'])) {
+ $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by element end', $skipped_tags[$j]);
+ }
+ }
+ }
+
+ // insert tags, in FORWARD $j order: c,b,a with </a></b></c>
+ $replace = array($token);
+ for ($j = 1; $j < $c; $j++) {
+ // ...as well as from the insertions
+ $new_token = new HTMLPurifier_Token_End($skipped_tags[$j]->name);
+ $new_token->start = $skipped_tags[$j];
+ array_unshift($replace, $new_token);
+ if (isset($definition->info[$new_token->name]) && $definition->info[$new_token->name]->formatting) {
+ // [TagClosedAuto]
+ $element = clone $skipped_tags[$j];
+ $element->carryover = true;
+ $element->armor['MakeWellFormed_TagClosedError'] = true;
+ $replace[] = $element;
+ }
+ }
+ $token = $this->processToken($replace);
+ $reprocess = true;
+ continue;
+ }
+
+ $context->destroy('CurrentToken');
+ $context->destroy('CurrentNesting');
+ $context->destroy('InputZipper');
+
+ unset($this->injectors, $this->stack, $this->tokens);
+ return $zipper->toArray($token);
+ }
+
+ /**
+ * Processes arbitrary token values for complicated substitution patterns.
+ * In general:
+ *
+ * If $token is an array, it is a list of tokens to substitute for the
+ * current token. These tokens then get individually processed. If there
+ * is a leading integer in the list, that integer determines how many
+ * tokens from the stream should be removed.
+ *
+ * If $token is a regular token, it is swapped with the current token.
+ *
+ * If $token is false, the current token is deleted.
+ *
+ * If $token is an integer, that number of tokens (with the first token
+ * being the current one) will be deleted.
+ *
+ * @param HTMLPurifier_Token|array|int|bool $token Token substitution value
+ * @param HTMLPurifier_Injector|int $injector Injector that performed the substitution; default is if
+ * this is not an injector related operation.
+ * @throws HTMLPurifier_Exception
+ */
+ protected function processToken($token, $injector = -1)
+ {
+ // normalize forms of token
+ if (is_object($token)) {
+ $token = array(1, $token);
+ }
+ if (is_int($token)) {
+ $token = array($token);
+ }
+ if ($token === false) {
+ $token = array(1);
+ }
+ if (!is_array($token)) {
+ throw new HTMLPurifier_Exception('Invalid token type from injector');
+ }
+ if (!is_int($token[0])) {
+ array_unshift($token, 1);
+ }
+ if ($token[0] === 0) {
+ throw new HTMLPurifier_Exception('Deleting zero tokens is not valid');
+ }
+
+ // $token is now an array with the following form:
+ // array(number nodes to delete, new node 1, new node 2, ...)
+
+ $delete = array_shift($token);
+ list($old, $r) = $this->zipper->splice($this->token, $delete, $token);
+
+ if ($injector > -1) {
+ // determine appropriate skips
+ $oldskip = isset($old[0]) ? $old[0]->skip : array();
+ foreach ($token as $object) {
+ $object->skip = $oldskip;
+ $object->skip[$injector] = true;
+ }
+ }
+
+ return $r;
+
+ }
+
+ /**
+ * Inserts a token before the current token. Cursor now points to
+ * this token. You must reprocess after this.
+ * @param HTMLPurifier_Token $token
+ */
+ private function insertBefore($token)
+ {
+ // NB not $this->zipper->insertBefore(), due to positioning
+ // differences
+ $splice = $this->zipper->splice($this->token, 0, array($token));
+
+ return $splice[1];
+ }
+
+ /**
+ * Removes current token. Cursor now points to new token occupying previously
+ * occupied space. You must reprocess after this.
+ */
+ private function remove()
+ {
+ return $this->zipper->delete();
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/RemoveForeignElements.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/RemoveForeignElements.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/RemoveForeignElements.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/RemoveForeignElements.php
index d1adf59..1a8149e 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/RemoveForeignElements.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/RemoveForeignElements.php
@@ -1,207 +1,207 @@
-<?php
-
-/**
- * Removes all unrecognized tags from the list of tokens.
- *
- * This strategy iterates through all the tokens and removes unrecognized
- * tokens. If a token is not recognized but a TagTransform is defined for
- * that element, the element will be transformed accordingly.
- */
-
-class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
-{
-
- /**
- * @param HTMLPurifier_Token[] $tokens
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return array|HTMLPurifier_Token[]
- */
- public function execute($tokens, $config, $context)
- {
- $definition = $config->getHTMLDefinition();
- $generator = new HTMLPurifier_Generator($config, $context);
- $result = array();
-
- $escape_invalid_tags = $config->get('Core.EscapeInvalidTags');
- $remove_invalid_img = $config->get('Core.RemoveInvalidImg');
-
- // currently only used to determine if comments should be kept
- $trusted = $config->get('HTML.Trusted');
- $comment_lookup = $config->get('HTML.AllowedComments');
- $comment_regexp = $config->get('HTML.AllowedCommentsRegexp');
- $check_comments = $comment_lookup !== array() || $comment_regexp !== null;
-
- $remove_script_contents = $config->get('Core.RemoveScriptContents');
- $hidden_elements = $config->get('Core.HiddenElements');
-
- // remove script contents compatibility
- if ($remove_script_contents === true) {
- $hidden_elements['script'] = true;
- } elseif ($remove_script_contents === false && isset($hidden_elements['script'])) {
- unset($hidden_elements['script']);
- }
-
- $attr_validator = new HTMLPurifier_AttrValidator();
-
- // removes tokens until it reaches a closing tag with its value
- $remove_until = false;
-
- // converts comments into text tokens when this is equal to a tag name
- $textify_comments = false;
-
- $token = false;
- $context->register('CurrentToken', $token);
-
- $e = false;
- if ($config->get('Core.CollectErrors')) {
- $e =& $context->get('ErrorCollector');
- }
-
- foreach ($tokens as $token) {
- if ($remove_until) {
- if (empty($token->is_tag) || $token->name !== $remove_until) {
- continue;
- }
- }
- if (!empty($token->is_tag)) {
- // DEFINITION CALL
-
- // before any processing, try to transform the element
- if (isset($definition->info_tag_transform[$token->name])) {
- $original_name = $token->name;
- // there is a transformation for this tag
- // DEFINITION CALL
- $token = $definition->
- info_tag_transform[$token->name]->transform($token, $config, $context);
- if ($e) {
- $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Tag transform', $original_name);
- }
- }
-
- if (isset($definition->info[$token->name])) {
- // mostly everything's good, but
- // we need to make sure required attributes are in order
- if (($token instanceof HTMLPurifier_Token_Start || $token instanceof HTMLPurifier_Token_Empty) &&
- $definition->info[$token->name]->required_attr &&
- ($token->name != 'img' || $remove_invalid_img) // ensure config option still works
- ) {
- $attr_validator->validateToken($token, $config, $context);
- $ok = true;
- foreach ($definition->info[$token->name]->required_attr as $name) {
- if (!isset($token->attr[$name])) {
- $ok = false;
- break;
- }
- }
- if (!$ok) {
- if ($e) {
- $e->send(
- E_ERROR,
- 'Strategy_RemoveForeignElements: Missing required attribute',
- $name
- );
- }
- continue;
- }
- $token->armor['ValidateAttributes'] = true;
- }
-
- if (isset($hidden_elements[$token->name]) && $token instanceof HTMLPurifier_Token_Start) {
- $textify_comments = $token->name;
- } elseif ($token->name === $textify_comments && $token instanceof HTMLPurifier_Token_End) {
- $textify_comments = false;
- }
-
- } elseif ($escape_invalid_tags) {
- // invalid tag, generate HTML representation and insert in
- if ($e) {
- $e->send(E_WARNING, 'Strategy_RemoveForeignElements: Foreign element to text');
- }
- $token = new HTMLPurifier_Token_Text(
- $generator->generateFromToken($token)
- );
- } else {
- // check if we need to destroy all of the tag's children
- // CAN BE GENERICIZED
- if (isset($hidden_elements[$token->name])) {
- if ($token instanceof HTMLPurifier_Token_Start) {
- $remove_until = $token->name;
- } elseif ($token instanceof HTMLPurifier_Token_Empty) {
- // do nothing: we're still looking
- } else {
- $remove_until = false;
- }
- if ($e) {
- $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign meta element removed');
- }
- } else {
- if ($e) {
- $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign element removed');
- }
- }
- continue;
- }
- } elseif ($token instanceof HTMLPurifier_Token_Comment) {
- // textify comments in script tags when they are allowed
- if ($textify_comments !== false) {
- $data = $token->data;
- $token = new HTMLPurifier_Token_Text($data);
- } elseif ($trusted || $check_comments) {
- // always cleanup comments
- $trailing_hyphen = false;
- if ($e) {
- // perform check whether or not there's a trailing hyphen
- if (substr($token->data, -1) == '-') {
- $trailing_hyphen = true;
- }
- }
- $token->data = rtrim($token->data, '-');
- $found_double_hyphen = false;
- while (strpos($token->data, '--') !== false) {
- $found_double_hyphen = true;
- $token->data = str_replace('--', '-', $token->data);
- }
- if ($trusted || !empty($comment_lookup[trim($token->data)]) ||
- ($comment_regexp !== null && preg_match($comment_regexp, trim($token->data)))) {
- // OK good
- if ($e) {
- if ($trailing_hyphen) {
- $e->send(
- E_NOTICE,
- 'Strategy_RemoveForeignElements: Trailing hyphen in comment removed'
- );
- }
- if ($found_double_hyphen) {
- $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Hyphens in comment collapsed');
- }
- }
- } else {
- if ($e) {
- $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
- }
- continue;
- }
- } else {
- // strip comments
- if ($e) {
- $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
- }
- continue;
- }
- } elseif ($token instanceof HTMLPurifier_Token_Text) {
- } else {
- continue;
- }
- $result[] = $token;
- }
- if ($remove_until && $e) {
- // we removed tokens until the end, throw error
- $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Token removed to end', $remove_until);
- }
- $context->destroy('CurrentToken');
- return $result;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Removes all unrecognized tags from the list of tokens.
+ *
+ * This strategy iterates through all the tokens and removes unrecognized
+ * tokens. If a token is not recognized but a TagTransform is defined for
+ * that element, the element will be transformed accordingly.
+ */
+
+class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
+{
+
+ /**
+ * @param HTMLPurifier_Token[] $tokens
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array|HTMLPurifier_Token[]
+ */
+ public function execute($tokens, $config, $context)
+ {
+ $definition = $config->getHTMLDefinition();
+ $generator = new HTMLPurifier_Generator($config, $context);
+ $result = array();
+
+ $escape_invalid_tags = $config->get('Core.EscapeInvalidTags');
+ $remove_invalid_img = $config->get('Core.RemoveInvalidImg');
+
+ // currently only used to determine if comments should be kept
+ $trusted = $config->get('HTML.Trusted');
+ $comment_lookup = $config->get('HTML.AllowedComments');
+ $comment_regexp = $config->get('HTML.AllowedCommentsRegexp');
+ $check_comments = $comment_lookup !== array() || $comment_regexp !== null;
+
+ $remove_script_contents = $config->get('Core.RemoveScriptContents');
+ $hidden_elements = $config->get('Core.HiddenElements');
+
+ // remove script contents compatibility
+ if ($remove_script_contents === true) {
+ $hidden_elements['script'] = true;
+ } elseif ($remove_script_contents === false && isset($hidden_elements['script'])) {
+ unset($hidden_elements['script']);
+ }
+
+ $attr_validator = new HTMLPurifier_AttrValidator();
+
+ // removes tokens until it reaches a closing tag with its value
+ $remove_until = false;
+
+ // converts comments into text tokens when this is equal to a tag name
+ $textify_comments = false;
+
+ $token = false;
+ $context->register('CurrentToken', $token);
+
+ $e = false;
+ if ($config->get('Core.CollectErrors')) {
+ $e =& $context->get('ErrorCollector');
+ }
+
+ foreach ($tokens as $token) {
+ if ($remove_until) {
+ if (empty($token->is_tag) || $token->name !== $remove_until) {
+ continue;
+ }
+ }
+ if (!empty($token->is_tag)) {
+ // DEFINITION CALL
+
+ // before any processing, try to transform the element
+ if (isset($definition->info_tag_transform[$token->name])) {
+ $original_name = $token->name;
+ // there is a transformation for this tag
+ // DEFINITION CALL
+ $token = $definition->
+ info_tag_transform[$token->name]->transform($token, $config, $context);
+ if ($e) {
+ $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Tag transform', $original_name);
+ }
+ }
+
+ if (isset($definition->info[$token->name])) {
+ // mostly everything's good, but
+ // we need to make sure required attributes are in order
+ if (($token instanceof HTMLPurifier_Token_Start || $token instanceof HTMLPurifier_Token_Empty) &&
+ $definition->info[$token->name]->required_attr &&
+ ($token->name != 'img' || $remove_invalid_img) // ensure config option still works
+ ) {
+ $attr_validator->validateToken($token, $config, $context);
+ $ok = true;
+ foreach ($definition->info[$token->name]->required_attr as $name) {
+ if (!isset($token->attr[$name])) {
+ $ok = false;
+ break;
+ }
+ }
+ if (!$ok) {
+ if ($e) {
+ $e->send(
+ E_ERROR,
+ 'Strategy_RemoveForeignElements: Missing required attribute',
+ $name
+ );
+ }
+ continue;
+ }
+ $token->armor['ValidateAttributes'] = true;
+ }
+
+ if (isset($hidden_elements[$token->name]) && $token instanceof HTMLPurifier_Token_Start) {
+ $textify_comments = $token->name;
+ } elseif ($token->name === $textify_comments && $token instanceof HTMLPurifier_Token_End) {
+ $textify_comments = false;
+ }
+
+ } elseif ($escape_invalid_tags) {
+ // invalid tag, generate HTML representation and insert in
+ if ($e) {
+ $e->send(E_WARNING, 'Strategy_RemoveForeignElements: Foreign element to text');
+ }
+ $token = new HTMLPurifier_Token_Text(
+ $generator->generateFromToken($token)
+ );
+ } else {
+ // check if we need to destroy all of the tag's children
+ // CAN BE GENERICIZED
+ if (isset($hidden_elements[$token->name])) {
+ if ($token instanceof HTMLPurifier_Token_Start) {
+ $remove_until = $token->name;
+ } elseif ($token instanceof HTMLPurifier_Token_Empty) {
+ // do nothing: we're still looking
+ } else {
+ $remove_until = false;
+ }
+ if ($e) {
+ $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign meta element removed');
+ }
+ } else {
+ if ($e) {
+ $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign element removed');
+ }
+ }
+ continue;
+ }
+ } elseif ($token instanceof HTMLPurifier_Token_Comment) {
+ // textify comments in script tags when they are allowed
+ if ($textify_comments !== false) {
+ $data = $token->data;
+ $token = new HTMLPurifier_Token_Text($data);
+ } elseif ($trusted || $check_comments) {
+ // always cleanup comments
+ $trailing_hyphen = false;
+ if ($e) {
+ // perform check whether or not there's a trailing hyphen
+ if (substr($token->data, -1) == '-') {
+ $trailing_hyphen = true;
+ }
+ }
+ $token->data = rtrim($token->data, '-');
+ $found_double_hyphen = false;
+ while (strpos($token->data, '--') !== false) {
+ $found_double_hyphen = true;
+ $token->data = str_replace('--', '-', $token->data);
+ }
+ if ($trusted || !empty($comment_lookup[trim($token->data)]) ||
+ ($comment_regexp !== null && preg_match($comment_regexp, trim($token->data)))) {
+ // OK good
+ if ($e) {
+ if ($trailing_hyphen) {
+ $e->send(
+ E_NOTICE,
+ 'Strategy_RemoveForeignElements: Trailing hyphen in comment removed'
+ );
+ }
+ if ($found_double_hyphen) {
+ $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Hyphens in comment collapsed');
+ }
+ }
+ } else {
+ if ($e) {
+ $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
+ }
+ continue;
+ }
+ } else {
+ // strip comments
+ if ($e) {
+ $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
+ }
+ continue;
+ }
+ } elseif ($token instanceof HTMLPurifier_Token_Text) {
+ } else {
+ continue;
+ }
+ $result[] = $token;
+ }
+ if ($remove_until && $e) {
+ // we removed tokens until the end, throw error
+ $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Token removed to end', $remove_until);
+ }
+ $context->destroy('CurrentToken');
+ return $result;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/ValidateAttributes.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/ValidateAttributes.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/ValidateAttributes.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/ValidateAttributes.php
index 428f975..fbb3d27 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Strategy/ValidateAttributes.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Strategy/ValidateAttributes.php
@@ -1,45 +1,45 @@
-<?php
-
-/**
- * Validate all attributes in the tokens.
- */
-
-class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy
-{
-
- /**
- * @param HTMLPurifier_Token[] $tokens
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return HTMLPurifier_Token[]
- */
- public function execute($tokens, $config, $context)
- {
- // setup validator
- $validator = new HTMLPurifier_AttrValidator();
-
- $token = false;
- $context->register('CurrentToken', $token);
-
- foreach ($tokens as $key => $token) {
-
- // only process tokens that have attributes,
- // namely start and empty tags
- if (!$token instanceof HTMLPurifier_Token_Start && !$token instanceof HTMLPurifier_Token_Empty) {
- continue;
- }
-
- // skip tokens that are armored
- if (!empty($token->armor['ValidateAttributes'])) {
- continue;
- }
-
- // note that we have no facilities here for removing tokens
- $validator->validateToken($token, $config, $context);
- }
- $context->destroy('CurrentToken');
- return $tokens;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validate all attributes in the tokens.
+ */
+
+class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy
+{
+
+ /**
+ * @param HTMLPurifier_Token[] $tokens
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return HTMLPurifier_Token[]
+ */
+ public function execute($tokens, $config, $context)
+ {
+ // setup validator
+ $validator = new HTMLPurifier_AttrValidator();
+
+ $token = false;
+ $context->register('CurrentToken', $token);
+
+ foreach ($tokens as $key => $token) {
+
+ // only process tokens that have attributes,
+ // namely start and empty tags
+ if (!$token instanceof HTMLPurifier_Token_Start && !$token instanceof HTMLPurifier_Token_Empty) {
+ continue;
+ }
+
+ // skip tokens that are armored
+ if (!empty($token->armor['ValidateAttributes'])) {
+ continue;
+ }
+
+ // note that we have no facilities here for removing tokens
+ $validator->validateToken($token, $config, $context);
+ }
+ $context->destroy('CurrentToken');
+ return $tokens;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/StringHash.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/StringHash.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/StringHash.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/StringHash.php
index 8d0740c..c073701 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/StringHash.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/StringHash.php
@@ -1,47 +1,47 @@
-<?php
-
-/**
- * This is in almost every respect equivalent to an array except
- * that it keeps track of which keys were accessed.
- *
- * @warning For the sake of backwards compatibility with early versions
- * of PHP 5, you must not use the $hash[$key] syntax; if you do
- * our version of offsetGet is never called.
- */
-class HTMLPurifier_StringHash extends ArrayObject
-{
- /**
- * @type array
- */
- protected $accessed = array();
-
- /**
- * Retrieves a value, and logs the access.
- * @param mixed $index
- * @return mixed
- */
- public function offsetGet($index)
- {
- $this->accessed[$index] = true;
- return parent::offsetGet($index);
- }
-
- /**
- * Returns a lookup array of all array indexes that have been accessed.
- * @return array in form array($index => true).
- */
- public function getAccessed()
- {
- return $this->accessed;
- }
-
- /**
- * Resets the access array.
- */
- public function resetAccessed()
- {
- $this->accessed = array();
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * This is in almost every respect equivalent to an array except
+ * that it keeps track of which keys were accessed.
+ *
+ * @warning For the sake of backwards compatibility with early versions
+ * of PHP 5, you must not use the $hash[$key] syntax; if you do
+ * our version of offsetGet is never called.
+ */
+class HTMLPurifier_StringHash extends ArrayObject
+{
+ /**
+ * @type array
+ */
+ protected $accessed = array();
+
+ /**
+ * Retrieves a value, and logs the access.
+ * @param mixed $index
+ * @return mixed
+ */
+ public function offsetGet($index)
+ {
+ $this->accessed[$index] = true;
+ return parent::offsetGet($index);
+ }
+
+ /**
+ * Returns a lookup array of all array indexes that have been accessed.
+ * @return array in form array($index => true).
+ */
+ public function getAccessed()
+ {
+ return $this->accessed;
+ }
+
+ /**
+ * Resets the access array.
+ */
+ public function resetAccessed()
+ {
+ $this->accessed = array();
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/StringHashParser.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/StringHashParser.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/StringHashParser.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/StringHashParser.php
index 05abd83..7c73f80 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/StringHashParser.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/StringHashParser.php
@@ -1,136 +1,136 @@
-<?php
-
-/**
- * Parses string hash files. File format is as such:
- *
- * DefaultKeyValue
- * KEY: Value
- * KEY2: Value2
- * --MULTILINE-KEY--
- * Multiline
- * value.
- *
- * Which would output something similar to:
- *
- * array(
- * 'ID' => 'DefaultKeyValue',
- * 'KEY' => 'Value',
- * 'KEY2' => 'Value2',
- * 'MULTILINE-KEY' => "Multiline\nvalue.\n",
- * )
- *
- * We use this as an easy to use file-format for configuration schema
- * files, but the class itself is usage agnostic.
- *
- * You can use ---- to forcibly terminate parsing of a single string-hash;
- * this marker is used in multi string-hashes to delimit boundaries.
- */
-class HTMLPurifier_StringHashParser
-{
-
- /**
- * @type string
- */
- public $default = 'ID';
-
- /**
- * Parses a file that contains a single string-hash.
- * @param string $file
- * @return array
- */
- public function parseFile($file)
- {
- if (!file_exists($file)) {
- return false;
- }
- $fh = fopen($file, 'r');
- if (!$fh) {
- return false;
- }
- $ret = $this->parseHandle($fh);
- fclose($fh);
- return $ret;
- }
-
- /**
- * Parses a file that contains multiple string-hashes delimited by '----'
- * @param string $file
- * @return array
- */
- public function parseMultiFile($file)
- {
- if (!file_exists($file)) {
- return false;
- }
- $ret = array();
- $fh = fopen($file, 'r');
- if (!$fh) {
- return false;
- }
- while (!feof($fh)) {
- $ret[] = $this->parseHandle($fh);
- }
- fclose($fh);
- return $ret;
- }
-
- /**
- * Internal parser that acepts a file handle.
- * @note While it's possible to simulate in-memory parsing by using
- * custom stream wrappers, if such a use-case arises we should
- * factor out the file handle into its own class.
- * @param resource $fh File handle with pointer at start of valid string-hash
- * block.
- * @return array
- */
- protected function parseHandle($fh)
- {
- $state = false;
- $single = false;
- $ret = array();
- do {
- $line = fgets($fh);
- if ($line === false) {
- break;
- }
- $line = rtrim($line, "\n\r");
- if (!$state && $line === '') {
- continue;
- }
- if ($line === '----') {
- break;
- }
- if (strncmp('--#', $line, 3) === 0) {
- // Comment
- continue;
- } elseif (strncmp('--', $line, 2) === 0) {
- // Multiline declaration
- $state = trim($line, '- ');
- if (!isset($ret[$state])) {
- $ret[$state] = '';
- }
- continue;
- } elseif (!$state) {
- $single = true;
- if (strpos($line, ':') !== false) {
- // Single-line declaration
- list($state, $line) = explode(':', $line, 2);
- $line = trim($line);
- } else {
- // Use default declaration
- $state = $this->default;
- }
- }
- if ($single) {
- $ret[$state] = $line;
- $single = false;
- $state = false;
- } else {
- $ret[$state] .= "$line\n";
- }
- } while (!feof($fh));
- return $ret;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Parses string hash files. File format is as such:
+ *
+ * DefaultKeyValue
+ * KEY: Value
+ * KEY2: Value2
+ * --MULTILINE-KEY--
+ * Multiline
+ * value.
+ *
+ * Which would output something similar to:
+ *
+ * array(
+ * 'ID' => 'DefaultKeyValue',
+ * 'KEY' => 'Value',
+ * 'KEY2' => 'Value2',
+ * 'MULTILINE-KEY' => "Multiline\nvalue.\n",
+ * )
+ *
+ * We use this as an easy to use file-format for configuration schema
+ * files, but the class itself is usage agnostic.
+ *
+ * You can use ---- to forcibly terminate parsing of a single string-hash;
+ * this marker is used in multi string-hashes to delimit boundaries.
+ */
+class HTMLPurifier_StringHashParser
+{
+
+ /**
+ * @type string
+ */
+ public $default = 'ID';
+
+ /**
+ * Parses a file that contains a single string-hash.
+ * @param string $file
+ * @return array
+ */
+ public function parseFile($file)
+ {
+ if (!file_exists($file)) {
+ return false;
+ }
+ $fh = fopen($file, 'r');
+ if (!$fh) {
+ return false;
+ }
+ $ret = $this->parseHandle($fh);
+ fclose($fh);
+ return $ret;
+ }
+
+ /**
+ * Parses a file that contains multiple string-hashes delimited by '----'
+ * @param string $file
+ * @return array
+ */
+ public function parseMultiFile($file)
+ {
+ if (!file_exists($file)) {
+ return false;
+ }
+ $ret = array();
+ $fh = fopen($file, 'r');
+ if (!$fh) {
+ return false;
+ }
+ while (!feof($fh)) {
+ $ret[] = $this->parseHandle($fh);
+ }
+ fclose($fh);
+ return $ret;
+ }
+
+ /**
+ * Internal parser that acepts a file handle.
+ * @note While it's possible to simulate in-memory parsing by using
+ * custom stream wrappers, if such a use-case arises we should
+ * factor out the file handle into its own class.
+ * @param resource $fh File handle with pointer at start of valid string-hash
+ * block.
+ * @return array
+ */
+ protected function parseHandle($fh)
+ {
+ $state = false;
+ $single = false;
+ $ret = array();
+ do {
+ $line = fgets($fh);
+ if ($line === false) {
+ break;
+ }
+ $line = rtrim($line, "\n\r");
+ if (!$state && $line === '') {
+ continue;
+ }
+ if ($line === '----') {
+ break;
+ }
+ if (strncmp('--#', $line, 3) === 0) {
+ // Comment
+ continue;
+ } elseif (strncmp('--', $line, 2) === 0) {
+ // Multiline declaration
+ $state = trim($line, '- ');
+ if (!isset($ret[$state])) {
+ $ret[$state] = '';
+ }
+ continue;
+ } elseif (!$state) {
+ $single = true;
+ if (strpos($line, ':') !== false) {
+ // Single-line declaration
+ list($state, $line) = explode(':', $line, 2);
+ $line = trim($line);
+ } else {
+ // Use default declaration
+ $state = $this->default;
+ }
+ }
+ if ($single) {
+ $ret[$state] = $line;
+ $single = false;
+ $state = false;
+ } else {
+ $ret[$state] .= "$line\n";
+ }
+ } while (!feof($fh));
+ return $ret;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/TagTransform.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/TagTransform.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/TagTransform.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/TagTransform.php
index 0f481bf..7b8d833 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/TagTransform.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/TagTransform.php
@@ -1,37 +1,37 @@
-<?php
-
-/**
- * Defines a mutation of an obsolete tag into a valid tag.
- */
-abstract class HTMLPurifier_TagTransform
-{
-
- /**
- * Tag name to transform the tag to.
- * @type string
- */
- public $transform_to;
-
- /**
- * Transforms the obsolete tag into the valid tag.
- * @param HTMLPurifier_Token_Tag $tag Tag to be transformed.
- * @param HTMLPurifier_Config $config Mandatory HTMLPurifier_Config object
- * @param HTMLPurifier_Context $context Mandatory HTMLPurifier_Context object
- */
- abstract public function transform($tag, $config, $context);
-
- /**
- * Prepends CSS properties to the style attribute, creating the
- * attribute if it doesn't exist.
- * @warning Copied over from AttrTransform, be sure to keep in sync
- * @param array $attr Attribute array to process (passed by reference)
- * @param string $css CSS to prepend
- */
- protected function prependCSS(&$attr, $css)
- {
- $attr['style'] = isset($attr['style']) ? $attr['style'] : '';
- $attr['style'] = $css . $attr['style'];
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Defines a mutation of an obsolete tag into a valid tag.
+ */
+abstract class HTMLPurifier_TagTransform
+{
+
+ /**
+ * Tag name to transform the tag to.
+ * @type string
+ */
+ public $transform_to;
+
+ /**
+ * Transforms the obsolete tag into the valid tag.
+ * @param HTMLPurifier_Token_Tag $tag Tag to be transformed.
+ * @param HTMLPurifier_Config $config Mandatory HTMLPurifier_Config object
+ * @param HTMLPurifier_Context $context Mandatory HTMLPurifier_Context object
+ */
+ abstract public function transform($tag, $config, $context);
+
+ /**
+ * Prepends CSS properties to the style attribute, creating the
+ * attribute if it doesn't exist.
+ * @warning Copied over from AttrTransform, be sure to keep in sync
+ * @param array $attr Attribute array to process (passed by reference)
+ * @param string $css CSS to prepend
+ */
+ protected function prependCSS(&$attr, $css)
+ {
+ $attr['style'] = isset($attr['style']) ? $attr['style'] : '';
+ $attr['style'] = $css . $attr['style'];
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/TagTransform/Font.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/TagTransform/Font.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/TagTransform/Font.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/TagTransform/Font.php
index 2a18651..7853d90 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/TagTransform/Font.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/TagTransform/Font.php
@@ -1,114 +1,114 @@
-<?php
-
-/**
- * Transforms FONT tags to the proper form (SPAN with CSS styling)
- *
- * This transformation takes the three proprietary attributes of FONT and
- * transforms them into their corresponding CSS attributes. These are color,
- * face, and size.
- *
- * @note Size is an interesting case because it doesn't map cleanly to CSS.
- * Thanks to
- * http://style.cleverchimp.com/font_size_intervals/altintervals.html
- * for reasonable mappings.
- * @warning This doesn't work completely correctly; specifically, this
- * TagTransform operates before well-formedness is enforced, so
- * the "active formatting elements" algorithm doesn't get applied.
- */
-class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform
-{
- /**
- * @type string
- */
- public $transform_to = 'span';
-
- /**
- * @type array
- */
- protected $_size_lookup = array(
- '0' => 'xx-small',
- '1' => 'xx-small',
- '2' => 'small',
- '3' => 'medium',
- '4' => 'large',
- '5' => 'x-large',
- '6' => 'xx-large',
- '7' => '300%',
- '-1' => 'smaller',
- '-2' => '60%',
- '+1' => 'larger',
- '+2' => '150%',
- '+3' => '200%',
- '+4' => '300%'
- );
-
- /**
- * @param HTMLPurifier_Token_Tag $tag
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return HTMLPurifier_Token_End|string
- */
- public function transform($tag, $config, $context)
- {
- if ($tag instanceof HTMLPurifier_Token_End) {
- $new_tag = clone $tag;
- $new_tag->name = $this->transform_to;
- return $new_tag;
- }
-
- $attr = $tag->attr;
- $prepend_style = '';
-
- // handle color transform
- if (isset($attr['color'])) {
- $prepend_style .= 'color:' . $attr['color'] . ';';
- unset($attr['color']);
- }
-
- // handle face transform
- if (isset($attr['face'])) {
- $prepend_style .= 'font-family:' . $attr['face'] . ';';
- unset($attr['face']);
- }
-
- // handle size transform
- if (isset($attr['size'])) {
- // normalize large numbers
- if ($attr['size'] !== '') {
- if ($attr['size']{0} == '+' || $attr['size']{0} == '-') {
- $size = (int)$attr['size'];
- if ($size < -2) {
- $attr['size'] = '-2';
- }
- if ($size > 4) {
- $attr['size'] = '+4';
- }
- } else {
- $size = (int)$attr['size'];
- if ($size > 7) {
- $attr['size'] = '7';
- }
- }
- }
- if (isset($this->_size_lookup[$attr['size']])) {
- $prepend_style .= 'font-size:' .
- $this->_size_lookup[$attr['size']] . ';';
- }
- unset($attr['size']);
- }
-
- if ($prepend_style) {
- $attr['style'] = isset($attr['style']) ?
- $prepend_style . $attr['style'] :
- $prepend_style;
- }
-
- $new_tag = clone $tag;
- $new_tag->name = $this->transform_to;
- $new_tag->attr = $attr;
-
- return $new_tag;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Transforms FONT tags to the proper form (SPAN with CSS styling)
+ *
+ * This transformation takes the three proprietary attributes of FONT and
+ * transforms them into their corresponding CSS attributes. These are color,
+ * face, and size.
+ *
+ * @note Size is an interesting case because it doesn't map cleanly to CSS.
+ * Thanks to
+ * http://style.cleverchimp.com/font_size_intervals/altintervals.html
+ * for reasonable mappings.
+ * @warning This doesn't work completely correctly; specifically, this
+ * TagTransform operates before well-formedness is enforced, so
+ * the "active formatting elements" algorithm doesn't get applied.
+ */
+class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform
+{
+ /**
+ * @type string
+ */
+ public $transform_to = 'span';
+
+ /**
+ * @type array
+ */
+ protected $_size_lookup = array(
+ '0' => 'xx-small',
+ '1' => 'xx-small',
+ '2' => 'small',
+ '3' => 'medium',
+ '4' => 'large',
+ '5' => 'x-large',
+ '6' => 'xx-large',
+ '7' => '300%',
+ '-1' => 'smaller',
+ '-2' => '60%',
+ '+1' => 'larger',
+ '+2' => '150%',
+ '+3' => '200%',
+ '+4' => '300%'
+ );
+
+ /**
+ * @param HTMLPurifier_Token_Tag $tag
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return HTMLPurifier_Token_End|string
+ */
+ public function transform($tag, $config, $context)
+ {
+ if ($tag instanceof HTMLPurifier_Token_End) {
+ $new_tag = clone $tag;
+ $new_tag->name = $this->transform_to;
+ return $new_tag;
+ }
+
+ $attr = $tag->attr;
+ $prepend_style = '';
+
+ // handle color transform
+ if (isset($attr['color'])) {
+ $prepend_style .= 'color:' . $attr['color'] . ';';
+ unset($attr['color']);
+ }
+
+ // handle face transform
+ if (isset($attr['face'])) {
+ $prepend_style .= 'font-family:' . $attr['face'] . ';';
+ unset($attr['face']);
+ }
+
+ // handle size transform
+ if (isset($attr['size'])) {
+ // normalize large numbers
+ if ($attr['size'] !== '') {
+ if ($attr['size']{0} == '+' || $attr['size']{0} == '-') {
+ $size = (int)$attr['size'];
+ if ($size < -2) {
+ $attr['size'] = '-2';
+ }
+ if ($size > 4) {
+ $attr['size'] = '+4';
+ }
+ } else {
+ $size = (int)$attr['size'];
+ if ($size > 7) {
+ $attr['size'] = '7';
+ }
+ }
+ }
+ if (isset($this->_size_lookup[$attr['size']])) {
+ $prepend_style .= 'font-size:' .
+ $this->_size_lookup[$attr['size']] . ';';
+ }
+ unset($attr['size']);
+ }
+
+ if ($prepend_style) {
+ $attr['style'] = isset($attr['style']) ?
+ $prepend_style . $attr['style'] :
+ $prepend_style;
+ }
+
+ $new_tag = clone $tag;
+ $new_tag->name = $this->transform_to;
+ $new_tag->attr = $attr;
+
+ return $new_tag;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/TagTransform/Simple.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/TagTransform/Simple.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/TagTransform/Simple.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/TagTransform/Simple.php
index d21b634..71bf10b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/TagTransform/Simple.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/TagTransform/Simple.php
@@ -1,44 +1,44 @@
-<?php
-
-/**
- * Simple transformation, just change tag name to something else,
- * and possibly add some styling. This will cover most of the deprecated
- * tag cases.
- */
-class HTMLPurifier_TagTransform_Simple extends HTMLPurifier_TagTransform
-{
- /**
- * @type string
- */
- protected $style;
-
- /**
- * @param string $transform_to Tag name to transform to.
- * @param string $style CSS style to add to the tag
- */
- public function __construct($transform_to, $style = null)
- {
- $this->transform_to = $transform_to;
- $this->style = $style;
- }
-
- /**
- * @param HTMLPurifier_Token_Tag $tag
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return string
- */
- public function transform($tag, $config, $context)
- {
- $new_tag = clone $tag;
- $new_tag->name = $this->transform_to;
- if (!is_null($this->style) &&
- ($new_tag instanceof HTMLPurifier_Token_Start || $new_tag instanceof HTMLPurifier_Token_Empty)
- ) {
- $this->prependCSS($new_tag->attr, $this->style);
- }
- return $new_tag;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Simple transformation, just change tag name to something else,
+ * and possibly add some styling. This will cover most of the deprecated
+ * tag cases.
+ */
+class HTMLPurifier_TagTransform_Simple extends HTMLPurifier_TagTransform
+{
+ /**
+ * @type string
+ */
+ protected $style;
+
+ /**
+ * @param string $transform_to Tag name to transform to.
+ * @param string $style CSS style to add to the tag
+ */
+ public function __construct($transform_to, $style = null)
+ {
+ $this->transform_to = $transform_to;
+ $this->style = $style;
+ }
+
+ /**
+ * @param HTMLPurifier_Token_Tag $tag
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return string
+ */
+ public function transform($tag, $config, $context)
+ {
+ $new_tag = clone $tag;
+ $new_tag->name = $this->transform_to;
+ if (!is_null($this->style) &&
+ ($new_tag instanceof HTMLPurifier_Token_Start || $new_tag instanceof HTMLPurifier_Token_Empty)
+ ) {
+ $this->prependCSS($new_tag->attr, $this->style);
+ }
+ return $new_tag;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token.php
index 9bc19c6..85b85e0 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token.php
@@ -1,100 +1,100 @@
-<?php
-
-/**
- * Abstract base token class that all others inherit from.
- */
-abstract class HTMLPurifier_Token
-{
- /**
- * Line number node was on in source document. Null if unknown.
- * @type int
- */
- public $line;
-
- /**
- * Column of line node was on in source document. Null if unknown.
- * @type int
- */
- public $col;
-
- /**
- * Lookup array of processing that this token is exempt from.
- * Currently, valid values are "ValidateAttributes" and
- * "MakeWellFormed_TagClosedError"
- * @type array
- */
- public $armor = array();
-
- /**
- * Used during MakeWellFormed.
- * @type
- */
- public $skip;
-
- /**
- * @type
- */
- public $rewind;
-
- /**
- * @type
- */
- public $carryover;
-
- /**
- * @param string $n
- * @return null|string
- */
- public function __get($n)
- {
- if ($n === 'type') {
- trigger_error('Deprecated type property called; use instanceof', E_USER_NOTICE);
- switch (get_class($this)) {
- case 'HTMLPurifier_Token_Start':
- return 'start';
- case 'HTMLPurifier_Token_Empty':
- return 'empty';
- case 'HTMLPurifier_Token_End':
- return 'end';
- case 'HTMLPurifier_Token_Text':
- return 'text';
- case 'HTMLPurifier_Token_Comment':
- return 'comment';
- default:
- return null;
- }
- }
- }
-
- /**
- * Sets the position of the token in the source document.
- * @param int $l
- * @param int $c
- */
- public function position($l = null, $c = null)
- {
- $this->line = $l;
- $this->col = $c;
- }
-
- /**
- * Convenience function for DirectLex settings line/col position.
- * @param int $l
- * @param int $c
- */
- public function rawPosition($l, $c)
- {
- if ($c === -1) {
- $l++;
- }
- $this->line = $l;
- $this->col = $c;
- }
-
- /**
- * Converts a token into its corresponding node.
- */
- abstract public function toNode();
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Abstract base token class that all others inherit from.
+ */
+abstract class HTMLPurifier_Token
+{
+ /**
+ * Line number node was on in source document. Null if unknown.
+ * @type int
+ */
+ public $line;
+
+ /**
+ * Column of line node was on in source document. Null if unknown.
+ * @type int
+ */
+ public $col;
+
+ /**
+ * Lookup array of processing that this token is exempt from.
+ * Currently, valid values are "ValidateAttributes" and
+ * "MakeWellFormed_TagClosedError"
+ * @type array
+ */
+ public $armor = array();
+
+ /**
+ * Used during MakeWellFormed.
+ * @type
+ */
+ public $skip;
+
+ /**
+ * @type
+ */
+ public $rewind;
+
+ /**
+ * @type
+ */
+ public $carryover;
+
+ /**
+ * @param string $n
+ * @return null|string
+ */
+ public function __get($n)
+ {
+ if ($n === 'type') {
+ trigger_error('Deprecated type property called; use instanceof', E_USER_NOTICE);
+ switch (get_class($this)) {
+ case 'HTMLPurifier_Token_Start':
+ return 'start';
+ case 'HTMLPurifier_Token_Empty':
+ return 'empty';
+ case 'HTMLPurifier_Token_End':
+ return 'end';
+ case 'HTMLPurifier_Token_Text':
+ return 'text';
+ case 'HTMLPurifier_Token_Comment':
+ return 'comment';
+ default:
+ return null;
+ }
+ }
+ }
+
+ /**
+ * Sets the position of the token in the source document.
+ * @param int $l
+ * @param int $c
+ */
+ public function position($l = null, $c = null)
+ {
+ $this->line = $l;
+ $this->col = $c;
+ }
+
+ /**
+ * Convenience function for DirectLex settings line/col position.
+ * @param int $l
+ * @param int $c
+ */
+ public function rawPosition($l, $c)
+ {
+ if ($c === -1) {
+ $l++;
+ }
+ $this->line = $l;
+ $this->col = $c;
+ }
+
+ /**
+ * Converts a token into its corresponding node.
+ */
+ abstract public function toNode();
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/Comment.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/Comment.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/Comment.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/Comment.php
index 3fd273b..23453c7 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/Comment.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/Comment.php
@@ -1,38 +1,38 @@
-<?php
-
-/**
- * Concrete comment token class. Generally will be ignored.
- */
-class HTMLPurifier_Token_Comment extends HTMLPurifier_Token
-{
- /**
- * Character data within comment.
- * @type string
- */
- public $data;
-
- /**
- * @type bool
- */
- public $is_whitespace = true;
-
- /**
- * Transparent constructor.
- *
- * @param string $data String comment data.
- * @param int $line
- * @param int $col
- */
- public function __construct($data, $line = null, $col = null)
- {
- $this->data = $data;
- $this->line = $line;
- $this->col = $col;
- }
-
- public function toNode() {
- return new HTMLPurifier_Node_Comment($this->data, $this->line, $this->col);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Concrete comment token class. Generally will be ignored.
+ */
+class HTMLPurifier_Token_Comment extends HTMLPurifier_Token
+{
+ /**
+ * Character data within comment.
+ * @type string
+ */
+ public $data;
+
+ /**
+ * @type bool
+ */
+ public $is_whitespace = true;
+
+ /**
+ * Transparent constructor.
+ *
+ * @param string $data String comment data.
+ * @param int $line
+ * @param int $col
+ */
+ public function __construct($data, $line = null, $col = null)
+ {
+ $this->data = $data;
+ $this->line = $line;
+ $this->col = $col;
+ }
+
+ public function toNode() {
+ return new HTMLPurifier_Node_Comment($this->data, $this->line, $this->col);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/Empty.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/Empty.php
similarity index 94%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/Empty.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/Empty.php
index bd35024..78a95f5 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/Empty.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/Empty.php
@@ -1,15 +1,15 @@
-<?php
-
-/**
- * Concrete empty token class.
- */
-class HTMLPurifier_Token_Empty extends HTMLPurifier_Token_Tag
-{
- public function toNode() {
- $n = parent::toNode();
- $n->empty = true;
- return $n;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Concrete empty token class.
+ */
+class HTMLPurifier_Token_Empty extends HTMLPurifier_Token_Tag
+{
+ public function toNode() {
+ $n = parent::toNode();
+ $n->empty = true;
+ return $n;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/End.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/End.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/End.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/End.php
index 99c34e7..59b38fd 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/End.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/End.php
@@ -1,24 +1,24 @@
-<?php
-
-/**
- * Concrete end token class.
- *
- * @warning This class accepts attributes even though end tags cannot. This
- * is for optimization reasons, as under normal circumstances, the Lexers
- * do not pass attributes.
- */
-class HTMLPurifier_Token_End extends HTMLPurifier_Token_Tag
-{
- /**
- * Token that started this node.
- * Added by MakeWellFormed. Please do not edit this!
- * @type HTMLPurifier_Token
- */
- public $start;
-
- public function toNode() {
- throw new Exception("HTMLPurifier_Token_End->toNode not supported!");
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Concrete end token class.
+ *
+ * @warning This class accepts attributes even though end tags cannot. This
+ * is for optimization reasons, as under normal circumstances, the Lexers
+ * do not pass attributes.
+ */
+class HTMLPurifier_Token_End extends HTMLPurifier_Token_Tag
+{
+ /**
+ * Token that started this node.
+ * Added by MakeWellFormed. Please do not edit this!
+ * @type HTMLPurifier_Token
+ */
+ public $start;
+
+ public function toNode() {
+ throw new Exception("HTMLPurifier_Token_End->toNode not supported!");
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/Start.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/Start.php
similarity index 93%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/Start.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/Start.php
index 574745b..019f317 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/Start.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/Start.php
@@ -1,10 +1,10 @@
-<?php
-
-/**
- * Concrete start token class.
- */
-class HTMLPurifier_Token_Start extends HTMLPurifier_Token_Tag
-{
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Concrete start token class.
+ */
+class HTMLPurifier_Token_Start extends HTMLPurifier_Token_Tag
+{
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/Tag.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/Tag.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/Tag.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/Tag.php
index 284e32e..d643fa6 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/Tag.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/Tag.php
@@ -1,68 +1,68 @@
-<?php
-
-/**
- * Abstract class of a tag token (start, end or empty), and its behavior.
- */
-abstract class HTMLPurifier_Token_Tag extends HTMLPurifier_Token
-{
- /**
- * Static bool marker that indicates the class is a tag.
- *
- * This allows us to check objects with <tt>!empty($obj->is_tag)</tt>
- * without having to use a function call <tt>is_a()</tt>.
- * @type bool
- */
- public $is_tag = true;
-
- /**
- * The lower-case name of the tag, like 'a', 'b' or 'blockquote'.
- *
- * @note Strictly speaking, XML tags are case sensitive, so we shouldn't
- * be lower-casing them, but these tokens cater to HTML tags, which are
- * insensitive.
- * @type string
- */
- public $name;
-
- /**
- * Associative array of the tag's attributes.
- * @type array
- */
- public $attr = array();
-
- /**
- * Non-overloaded constructor, which lower-cases passed tag name.
- *
- * @param string $name String name.
- * @param array $attr Associative array of attributes.
- * @param int $line
- * @param int $col
- * @param array $armor
- */
- public function __construct($name, $attr = array(), $line = null, $col = null, $armor = array())
- {
- $this->name = ctype_lower($name) ? $name : strtolower($name);
- foreach ($attr as $key => $value) {
- // normalization only necessary when key is not lowercase
- if (!ctype_lower($key)) {
- $new_key = strtolower($key);
- if (!isset($attr[$new_key])) {
- $attr[$new_key] = $attr[$key];
- }
- if ($new_key !== $key) {
- unset($attr[$key]);
- }
- }
- }
- $this->attr = $attr;
- $this->line = $line;
- $this->col = $col;
- $this->armor = $armor;
- }
-
- public function toNode() {
- return new HTMLPurifier_Node_Element($this->name, $this->attr, $this->line, $this->col, $this->armor);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Abstract class of a tag token (start, end or empty), and its behavior.
+ */
+abstract class HTMLPurifier_Token_Tag extends HTMLPurifier_Token
+{
+ /**
+ * Static bool marker that indicates the class is a tag.
+ *
+ * This allows us to check objects with <tt>!empty($obj->is_tag)</tt>
+ * without having to use a function call <tt>is_a()</tt>.
+ * @type bool
+ */
+ public $is_tag = true;
+
+ /**
+ * The lower-case name of the tag, like 'a', 'b' or 'blockquote'.
+ *
+ * @note Strictly speaking, XML tags are case sensitive, so we shouldn't
+ * be lower-casing them, but these tokens cater to HTML tags, which are
+ * insensitive.
+ * @type string
+ */
+ public $name;
+
+ /**
+ * Associative array of the tag's attributes.
+ * @type array
+ */
+ public $attr = array();
+
+ /**
+ * Non-overloaded constructor, which lower-cases passed tag name.
+ *
+ * @param string $name String name.
+ * @param array $attr Associative array of attributes.
+ * @param int $line
+ * @param int $col
+ * @param array $armor
+ */
+ public function __construct($name, $attr = array(), $line = null, $col = null, $armor = array())
+ {
+ $this->name = ctype_lower($name) ? $name : strtolower($name);
+ foreach ($attr as $key => $value) {
+ // normalization only necessary when key is not lowercase
+ if (!ctype_lower($key)) {
+ $new_key = strtolower($key);
+ if (!isset($attr[$new_key])) {
+ $attr[$new_key] = $attr[$key];
+ }
+ if ($new_key !== $key) {
+ unset($attr[$key]);
+ }
+ }
+ }
+ $this->attr = $attr;
+ $this->line = $line;
+ $this->col = $col;
+ $this->armor = $armor;
+ }
+
+ public function toNode() {
+ return new HTMLPurifier_Node_Element($this->name, $this->attr, $this->line, $this->col, $this->armor);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/Text.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/Text.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/Text.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/Text.php
index ff45125..f26a1c2 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Token/Text.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Token/Text.php
@@ -1,53 +1,53 @@
-<?php
-
-/**
- * Concrete text token class.
- *
- * Text tokens comprise of regular parsed character data (PCDATA) and raw
- * character data (from the CDATA sections). Internally, their
- * data is parsed with all entities expanded. Surprisingly, the text token
- * does have a "tag name" called #PCDATA, which is how the DTD represents it
- * in permissible child nodes.
- */
-class HTMLPurifier_Token_Text extends HTMLPurifier_Token
-{
-
- /**
- * @type string
- */
- public $name = '#PCDATA';
- /**< PCDATA tag name compatible with DTD. */
-
- /**
- * @type string
- */
- public $data;
- /**< Parsed character data of text. */
-
- /**
- * @type bool
- */
- public $is_whitespace;
-
- /**< Bool indicating if node is whitespace. */
-
- /**
- * Constructor, accepts data and determines if it is whitespace.
- * @param string $data String parsed character data.
- * @param int $line
- * @param int $col
- */
- public function __construct($data, $line = null, $col = null)
- {
- $this->data = $data;
- $this->is_whitespace = ctype_space($data);
- $this->line = $line;
- $this->col = $col;
- }
-
- public function toNode() {
- return new HTMLPurifier_Node_Text($this->data, $this->is_whitespace, $this->line, $this->col);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Concrete text token class.
+ *
+ * Text tokens comprise of regular parsed character data (PCDATA) and raw
+ * character data (from the CDATA sections). Internally, their
+ * data is parsed with all entities expanded. Surprisingly, the text token
+ * does have a "tag name" called #PCDATA, which is how the DTD represents it
+ * in permissible child nodes.
+ */
+class HTMLPurifier_Token_Text extends HTMLPurifier_Token
+{
+
+ /**
+ * @type string
+ */
+ public $name = '#PCDATA';
+ /**< PCDATA tag name compatible with DTD. */
+
+ /**
+ * @type string
+ */
+ public $data;
+ /**< Parsed character data of text. */
+
+ /**
+ * @type bool
+ */
+ public $is_whitespace;
+
+ /**< Bool indicating if node is whitespace. */
+
+ /**
+ * Constructor, accepts data and determines if it is whitespace.
+ * @param string $data String parsed character data.
+ * @param int $line
+ * @param int $col
+ */
+ public function __construct($data, $line = null, $col = null)
+ {
+ $this->data = $data;
+ $this->is_whitespace = ctype_space($data);
+ $this->line = $line;
+ $this->col = $col;
+ }
+
+ public function toNode() {
+ return new HTMLPurifier_Node_Text($this->data, $this->is_whitespace, $this->line, $this->col);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/TokenFactory.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/TokenFactory.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/TokenFactory.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/TokenFactory.php
index e016b80..dea2446 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/TokenFactory.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/TokenFactory.php
@@ -1,118 +1,118 @@
-<?php
-
-/**
- * Factory for token generation.
- *
- * @note Doing some benchmarking indicates that the new operator is much
- * slower than the clone operator (even discounting the cost of the
- * constructor). This class is for that optimization.
- * Other then that, there's not much point as we don't
- * maintain parallel HTMLPurifier_Token hierarchies (the main reason why
- * you'd want to use an abstract factory).
- * @todo Port DirectLex to use this
- */
-class HTMLPurifier_TokenFactory
-{
- // p stands for prototype
-
- /**
- * @type HTMLPurifier_Token_Start
- */
- private $p_start;
-
- /**
- * @type HTMLPurifier_Token_End
- */
- private $p_end;
-
- /**
- * @type HTMLPurifier_Token_Empty
- */
- private $p_empty;
-
- /**
- * @type HTMLPurifier_Token_Text
- */
- private $p_text;
-
- /**
- * @type HTMLPurifier_Token_Comment
- */
- private $p_comment;
-
- /**
- * Generates blank prototypes for cloning.
- */
- public function __construct()
- {
- $this->p_start = new HTMLPurifier_Token_Start('', array());
- $this->p_end = new HTMLPurifier_Token_End('');
- $this->p_empty = new HTMLPurifier_Token_Empty('', array());
- $this->p_text = new HTMLPurifier_Token_Text('');
- $this->p_comment = new HTMLPurifier_Token_Comment('');
- }
-
- /**
- * Creates a HTMLPurifier_Token_Start.
- * @param string $name Tag name
- * @param array $attr Associative array of attributes
- * @return HTMLPurifier_Token_Start Generated HTMLPurifier_Token_Start
- */
- public function createStart($name, $attr = array())
- {
- $p = clone $this->p_start;
- $p->__construct($name, $attr);
- return $p;
- }
-
- /**
- * Creates a HTMLPurifier_Token_End.
- * @param string $name Tag name
- * @return HTMLPurifier_Token_End Generated HTMLPurifier_Token_End
- */
- public function createEnd($name)
- {
- $p = clone $this->p_end;
- $p->__construct($name);
- return $p;
- }
-
- /**
- * Creates a HTMLPurifier_Token_Empty.
- * @param string $name Tag name
- * @param array $attr Associative array of attributes
- * @return HTMLPurifier_Token_Empty Generated HTMLPurifier_Token_Empty
- */
- public function createEmpty($name, $attr = array())
- {
- $p = clone $this->p_empty;
- $p->__construct($name, $attr);
- return $p;
- }
-
- /**
- * Creates a HTMLPurifier_Token_Text.
- * @param string $data Data of text token
- * @return HTMLPurifier_Token_Text Generated HTMLPurifier_Token_Text
- */
- public function createText($data)
- {
- $p = clone $this->p_text;
- $p->__construct($data);
- return $p;
- }
-
- /**
- * Creates a HTMLPurifier_Token_Comment.
- * @param string $data Data of comment token
- * @return HTMLPurifier_Token_Comment Generated HTMLPurifier_Token_Comment
- */
- public function createComment($data)
- {
- $p = clone $this->p_comment;
- $p->__construct($data);
- return $p;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Factory for token generation.
+ *
+ * @note Doing some benchmarking indicates that the new operator is much
+ * slower than the clone operator (even discounting the cost of the
+ * constructor). This class is for that optimization.
+ * Other then that, there's not much point as we don't
+ * maintain parallel HTMLPurifier_Token hierarchies (the main reason why
+ * you'd want to use an abstract factory).
+ * @todo Port DirectLex to use this
+ */
+class HTMLPurifier_TokenFactory
+{
+ // p stands for prototype
+
+ /**
+ * @type HTMLPurifier_Token_Start
+ */
+ private $p_start;
+
+ /**
+ * @type HTMLPurifier_Token_End
+ */
+ private $p_end;
+
+ /**
+ * @type HTMLPurifier_Token_Empty
+ */
+ private $p_empty;
+
+ /**
+ * @type HTMLPurifier_Token_Text
+ */
+ private $p_text;
+
+ /**
+ * @type HTMLPurifier_Token_Comment
+ */
+ private $p_comment;
+
+ /**
+ * Generates blank prototypes for cloning.
+ */
+ public function __construct()
+ {
+ $this->p_start = new HTMLPurifier_Token_Start('', array());
+ $this->p_end = new HTMLPurifier_Token_End('');
+ $this->p_empty = new HTMLPurifier_Token_Empty('', array());
+ $this->p_text = new HTMLPurifier_Token_Text('');
+ $this->p_comment = new HTMLPurifier_Token_Comment('');
+ }
+
+ /**
+ * Creates a HTMLPurifier_Token_Start.
+ * @param string $name Tag name
+ * @param array $attr Associative array of attributes
+ * @return HTMLPurifier_Token_Start Generated HTMLPurifier_Token_Start
+ */
+ public function createStart($name, $attr = array())
+ {
+ $p = clone $this->p_start;
+ $p->__construct($name, $attr);
+ return $p;
+ }
+
+ /**
+ * Creates a HTMLPurifier_Token_End.
+ * @param string $name Tag name
+ * @return HTMLPurifier_Token_End Generated HTMLPurifier_Token_End
+ */
+ public function createEnd($name)
+ {
+ $p = clone $this->p_end;
+ $p->__construct($name);
+ return $p;
+ }
+
+ /**
+ * Creates a HTMLPurifier_Token_Empty.
+ * @param string $name Tag name
+ * @param array $attr Associative array of attributes
+ * @return HTMLPurifier_Token_Empty Generated HTMLPurifier_Token_Empty
+ */
+ public function createEmpty($name, $attr = array())
+ {
+ $p = clone $this->p_empty;
+ $p->__construct($name, $attr);
+ return $p;
+ }
+
+ /**
+ * Creates a HTMLPurifier_Token_Text.
+ * @param string $data Data of text token
+ * @return HTMLPurifier_Token_Text Generated HTMLPurifier_Token_Text
+ */
+ public function createText($data)
+ {
+ $p = clone $this->p_text;
+ $p->__construct($data);
+ return $p;
+ }
+
+ /**
+ * Creates a HTMLPurifier_Token_Comment.
+ * @param string $data Data of comment token
+ * @return HTMLPurifier_Token_Comment Generated HTMLPurifier_Token_Comment
+ */
+ public function createComment($data)
+ {
+ $p = clone $this->p_comment;
+ $p->__construct($data);
+ return $p;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URI.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URI.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URI.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URI.php
index c4256b9..a5e7ae2 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URI.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URI.php
@@ -1,314 +1,314 @@
-<?php
-
-/**
- * HTML Purifier's internal representation of a URI.
- * @note
- * Internal data-structures are completely escaped. If the data needs
- * to be used in a non-URI context (which is very unlikely), be sure
- * to decode it first. The URI may not necessarily be well-formed until
- * validate() is called.
- */
-class HTMLPurifier_URI
-{
- /**
- * @type string
- */
- public $scheme;
-
- /**
- * @type string
- */
- public $userinfo;
-
- /**
- * @type string
- */
- public $host;
-
- /**
- * @type int
- */
- public $port;
-
- /**
- * @type string
- */
- public $path;
-
- /**
- * @type string
- */
- public $query;
-
- /**
- * @type string
- */
- public $fragment;
-
- /**
- * @param string $scheme
- * @param string $userinfo
- * @param string $host
- * @param int $port
- * @param string $path
- * @param string $query
- * @param string $fragment
- * @note Automatically normalizes scheme and port
- */
- public function __construct($scheme, $userinfo, $host, $port, $path, $query, $fragment)
- {
- $this->scheme = is_null($scheme) || ctype_lower($scheme) ? $scheme : strtolower($scheme);
- $this->userinfo = $userinfo;
- $this->host = $host;
- $this->port = is_null($port) ? $port : (int)$port;
- $this->path = $path;
- $this->query = $query;
- $this->fragment = $fragment;
- }
-
- /**
- * Retrieves a scheme object corresponding to the URI's scheme/default
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return HTMLPurifier_URIScheme Scheme object appropriate for validating this URI
- */
- public function getSchemeObj($config, $context)
- {
- $registry = HTMLPurifier_URISchemeRegistry::instance();
- if ($this->scheme !== null) {
- $scheme_obj = $registry->getScheme($this->scheme, $config, $context);
- if (!$scheme_obj) {
- return false;
- } // invalid scheme, clean it out
- } else {
- // no scheme: retrieve the default one
- $def = $config->getDefinition('URI');
- $scheme_obj = $def->getDefaultScheme($config, $context);
- if (!$scheme_obj) {
- // something funky happened to the default scheme object
- trigger_error(
- 'Default scheme object "' . $def->defaultScheme . '" was not readable',
- E_USER_WARNING
- );
- return false;
- }
- }
- return $scheme_obj;
- }
-
- /**
- * Generic validation method applicable for all schemes. May modify
- * this URI in order to get it into a compliant form.
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool True if validation/filtering succeeds, false if failure
- */
- public function validate($config, $context)
- {
- // ABNF definitions from RFC 3986
- $chars_sub_delims = '!$&\'()*+,;=';
- $chars_gen_delims = ':/?#[]@';
- $chars_pchar = $chars_sub_delims . ':@';
-
- // validate host
- if (!is_null($this->host)) {
- $host_def = new HTMLPurifier_AttrDef_URI_Host();
- $this->host = $host_def->validate($this->host, $config, $context);
- if ($this->host === false) {
- $this->host = null;
- }
- }
-
- // validate scheme
- // NOTE: It's not appropriate to check whether or not this
- // scheme is in our registry, since a URIFilter may convert a
- // URI that we don't allow into one we do. So instead, we just
- // check if the scheme can be dropped because there is no host
- // and it is our default scheme.
- if (!is_null($this->scheme) && is_null($this->host) || $this->host === '') {
- // support for relative paths is pretty abysmal when the
- // scheme is present, so axe it when possible
- $def = $config->getDefinition('URI');
- if ($def->defaultScheme === $this->scheme) {
- $this->scheme = null;
- }
- }
-
- // validate username
- if (!is_null($this->userinfo)) {
- $encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . ':');
- $this->userinfo = $encoder->encode($this->userinfo);
- }
-
- // validate port
- if (!is_null($this->port)) {
- if ($this->port < 1 || $this->port > 65535) {
- $this->port = null;
- }
- }
-
- // validate path
- $segments_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/');
- if (!is_null($this->host)) { // this catches $this->host === ''
- // path-abempty (hier and relative)
- // http://www.example.com/my/path
- // //www.example.com/my/path (looks odd, but works, and
- // recognized by most browsers)
- // (this set is valid or invalid on a scheme by scheme
- // basis, so we'll deal with it later)
- // file:///my/path
- // ///my/path
- $this->path = $segments_encoder->encode($this->path);
- } elseif ($this->path !== '') {
- if ($this->path[0] === '/') {
- // path-absolute (hier and relative)
- // http:/my/path
- // /my/path
- if (strlen($this->path) >= 2 && $this->path[1] === '/') {
- // This could happen if both the host gets stripped
- // out
- // http://my/path
- // //my/path
- $this->path = '';
- } else {
- $this->path = $segments_encoder->encode($this->path);
- }
- } elseif (!is_null($this->scheme)) {
- // path-rootless (hier)
- // http:my/path
- // Short circuit evaluation means we don't need to check nz
- $this->path = $segments_encoder->encode($this->path);
- } else {
- // path-noscheme (relative)
- // my/path
- // (once again, not checking nz)
- $segment_nc_encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . '@');
- $c = strpos($this->path, '/');
- if ($c !== false) {
- $this->path =
- $segment_nc_encoder->encode(substr($this->path, 0, $c)) .
- $segments_encoder->encode(substr($this->path, $c));
- } else {
- $this->path = $segment_nc_encoder->encode($this->path);
- }
- }
- } else {
- // path-empty (hier and relative)
- $this->path = ''; // just to be safe
- }
-
- // qf = query and fragment
- $qf_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/?');
-
- if (!is_null($this->query)) {
- $this->query = $qf_encoder->encode($this->query);
- }
-
- if (!is_null($this->fragment)) {
- $this->fragment = $qf_encoder->encode($this->fragment);
- }
- return true;
- }
-
- /**
- * Convert URI back to string
- * @return string URI appropriate for output
- */
- public function toString()
- {
- // reconstruct authority
- $authority = null;
- // there is a rendering difference between a null authority
- // (http:foo-bar) and an empty string authority
- // (http:///foo-bar).
- if (!is_null($this->host)) {
- $authority = '';
- if (!is_null($this->userinfo)) {
- $authority .= $this->userinfo . '@';
- }
- $authority .= $this->host;
- if (!is_null($this->port)) {
- $authority .= ':' . $this->port;
- }
- }
-
- // Reconstruct the result
- // One might wonder about parsing quirks from browsers after
- // this reconstruction. Unfortunately, parsing behavior depends
- // on what *scheme* was employed (file:///foo is handled *very*
- // differently than http:///foo), so unfortunately we have to
- // defer to the schemes to do the right thing.
- $result = '';
- if (!is_null($this->scheme)) {
- $result .= $this->scheme . ':';
- }
- if (!is_null($authority)) {
- $result .= '//' . $authority;
- }
- $result .= $this->path;
- if (!is_null($this->query)) {
- $result .= '?' . $this->query;
- }
- if (!is_null($this->fragment)) {
- $result .= '#' . $this->fragment;
- }
-
- return $result;
- }
-
- /**
- * Returns true if this URL might be considered a 'local' URL given
- * the current context. This is true when the host is null, or
- * when it matches the host supplied to the configuration.
- *
- * Note that this does not do any scheme checking, so it is mostly
- * only appropriate for metadata that doesn't care about protocol
- * security. isBenign is probably what you actually want.
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function isLocal($config, $context)
- {
- if ($this->host === null) {
- return true;
- }
- $uri_def = $config->getDefinition('URI');
- if ($uri_def->host === $this->host) {
- return true;
- }
- return false;
- }
-
- /**
- * Returns true if this URL should be considered a 'benign' URL,
- * that is:
- *
- * - It is a local URL (isLocal), and
- * - It has a equal or better level of security
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function isBenign($config, $context)
- {
- if (!$this->isLocal($config, $context)) {
- return false;
- }
-
- $scheme_obj = $this->getSchemeObj($config, $context);
- if (!$scheme_obj) {
- return false;
- } // conservative approach
-
- $current_scheme_obj = $config->getDefinition('URI')->getDefaultScheme($config, $context);
- if ($current_scheme_obj->secure) {
- if (!$scheme_obj->secure) {
- return false;
- }
- }
- return true;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * HTML Purifier's internal representation of a URI.
+ * @note
+ * Internal data-structures are completely escaped. If the data needs
+ * to be used in a non-URI context (which is very unlikely), be sure
+ * to decode it first. The URI may not necessarily be well-formed until
+ * validate() is called.
+ */
+class HTMLPurifier_URI
+{
+ /**
+ * @type string
+ */
+ public $scheme;
+
+ /**
+ * @type string
+ */
+ public $userinfo;
+
+ /**
+ * @type string
+ */
+ public $host;
+
+ /**
+ * @type int
+ */
+ public $port;
+
+ /**
+ * @type string
+ */
+ public $path;
+
+ /**
+ * @type string
+ */
+ public $query;
+
+ /**
+ * @type string
+ */
+ public $fragment;
+
+ /**
+ * @param string $scheme
+ * @param string $userinfo
+ * @param string $host
+ * @param int $port
+ * @param string $path
+ * @param string $query
+ * @param string $fragment
+ * @note Automatically normalizes scheme and port
+ */
+ public function __construct($scheme, $userinfo, $host, $port, $path, $query, $fragment)
+ {
+ $this->scheme = is_null($scheme) || ctype_lower($scheme) ? $scheme : strtolower($scheme);
+ $this->userinfo = $userinfo;
+ $this->host = $host;
+ $this->port = is_null($port) ? $port : (int)$port;
+ $this->path = $path;
+ $this->query = $query;
+ $this->fragment = $fragment;
+ }
+
+ /**
+ * Retrieves a scheme object corresponding to the URI's scheme/default
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return HTMLPurifier_URIScheme Scheme object appropriate for validating this URI
+ */
+ public function getSchemeObj($config, $context)
+ {
+ $registry = HTMLPurifier_URISchemeRegistry::instance();
+ if ($this->scheme !== null) {
+ $scheme_obj = $registry->getScheme($this->scheme, $config, $context);
+ if (!$scheme_obj) {
+ return false;
+ } // invalid scheme, clean it out
+ } else {
+ // no scheme: retrieve the default one
+ $def = $config->getDefinition('URI');
+ $scheme_obj = $def->getDefaultScheme($config, $context);
+ if (!$scheme_obj) {
+ // something funky happened to the default scheme object
+ trigger_error(
+ 'Default scheme object "' . $def->defaultScheme . '" was not readable',
+ E_USER_WARNING
+ );
+ return false;
+ }
+ }
+ return $scheme_obj;
+ }
+
+ /**
+ * Generic validation method applicable for all schemes. May modify
+ * this URI in order to get it into a compliant form.
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool True if validation/filtering succeeds, false if failure
+ */
+ public function validate($config, $context)
+ {
+ // ABNF definitions from RFC 3986
+ $chars_sub_delims = '!$&\'()*+,;=';
+ $chars_gen_delims = ':/?#[]@';
+ $chars_pchar = $chars_sub_delims . ':@';
+
+ // validate host
+ if (!is_null($this->host)) {
+ $host_def = new HTMLPurifier_AttrDef_URI_Host();
+ $this->host = $host_def->validate($this->host, $config, $context);
+ if ($this->host === false) {
+ $this->host = null;
+ }
+ }
+
+ // validate scheme
+ // NOTE: It's not appropriate to check whether or not this
+ // scheme is in our registry, since a URIFilter may convert a
+ // URI that we don't allow into one we do. So instead, we just
+ // check if the scheme can be dropped because there is no host
+ // and it is our default scheme.
+ if (!is_null($this->scheme) && is_null($this->host) || $this->host === '') {
+ // support for relative paths is pretty abysmal when the
+ // scheme is present, so axe it when possible
+ $def = $config->getDefinition('URI');
+ if ($def->defaultScheme === $this->scheme) {
+ $this->scheme = null;
+ }
+ }
+
+ // validate username
+ if (!is_null($this->userinfo)) {
+ $encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . ':');
+ $this->userinfo = $encoder->encode($this->userinfo);
+ }
+
+ // validate port
+ if (!is_null($this->port)) {
+ if ($this->port < 1 || $this->port > 65535) {
+ $this->port = null;
+ }
+ }
+
+ // validate path
+ $segments_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/');
+ if (!is_null($this->host)) { // this catches $this->host === ''
+ // path-abempty (hier and relative)
+ // http://www.example.com/my/path
+ // //www.example.com/my/path (looks odd, but works, and
+ // recognized by most browsers)
+ // (this set is valid or invalid on a scheme by scheme
+ // basis, so we'll deal with it later)
+ // file:///my/path
+ // ///my/path
+ $this->path = $segments_encoder->encode($this->path);
+ } elseif ($this->path !== '') {
+ if ($this->path[0] === '/') {
+ // path-absolute (hier and relative)
+ // http:/my/path
+ // /my/path
+ if (strlen($this->path) >= 2 && $this->path[1] === '/') {
+ // This could happen if both the host gets stripped
+ // out
+ // http://my/path
+ // //my/path
+ $this->path = '';
+ } else {
+ $this->path = $segments_encoder->encode($this->path);
+ }
+ } elseif (!is_null($this->scheme)) {
+ // path-rootless (hier)
+ // http:my/path
+ // Short circuit evaluation means we don't need to check nz
+ $this->path = $segments_encoder->encode($this->path);
+ } else {
+ // path-noscheme (relative)
+ // my/path
+ // (once again, not checking nz)
+ $segment_nc_encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . '@');
+ $c = strpos($this->path, '/');
+ if ($c !== false) {
+ $this->path =
+ $segment_nc_encoder->encode(substr($this->path, 0, $c)) .
+ $segments_encoder->encode(substr($this->path, $c));
+ } else {
+ $this->path = $segment_nc_encoder->encode($this->path);
+ }
+ }
+ } else {
+ // path-empty (hier and relative)
+ $this->path = ''; // just to be safe
+ }
+
+ // qf = query and fragment
+ $qf_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/?');
+
+ if (!is_null($this->query)) {
+ $this->query = $qf_encoder->encode($this->query);
+ }
+
+ if (!is_null($this->fragment)) {
+ $this->fragment = $qf_encoder->encode($this->fragment);
+ }
+ return true;
+ }
+
+ /**
+ * Convert URI back to string
+ * @return string URI appropriate for output
+ */
+ public function toString()
+ {
+ // reconstruct authority
+ $authority = null;
+ // there is a rendering difference between a null authority
+ // (http:foo-bar) and an empty string authority
+ // (http:///foo-bar).
+ if (!is_null($this->host)) {
+ $authority = '';
+ if (!is_null($this->userinfo)) {
+ $authority .= $this->userinfo . '@';
+ }
+ $authority .= $this->host;
+ if (!is_null($this->port)) {
+ $authority .= ':' . $this->port;
+ }
+ }
+
+ // Reconstruct the result
+ // One might wonder about parsing quirks from browsers after
+ // this reconstruction. Unfortunately, parsing behavior depends
+ // on what *scheme* was employed (file:///foo is handled *very*
+ // differently than http:///foo), so unfortunately we have to
+ // defer to the schemes to do the right thing.
+ $result = '';
+ if (!is_null($this->scheme)) {
+ $result .= $this->scheme . ':';
+ }
+ if (!is_null($authority)) {
+ $result .= '//' . $authority;
+ }
+ $result .= $this->path;
+ if (!is_null($this->query)) {
+ $result .= '?' . $this->query;
+ }
+ if (!is_null($this->fragment)) {
+ $result .= '#' . $this->fragment;
+ }
+
+ return $result;
+ }
+
+ /**
+ * Returns true if this URL might be considered a 'local' URL given
+ * the current context. This is true when the host is null, or
+ * when it matches the host supplied to the configuration.
+ *
+ * Note that this does not do any scheme checking, so it is mostly
+ * only appropriate for metadata that doesn't care about protocol
+ * security. isBenign is probably what you actually want.
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function isLocal($config, $context)
+ {
+ if ($this->host === null) {
+ return true;
+ }
+ $uri_def = $config->getDefinition('URI');
+ if ($uri_def->host === $this->host) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Returns true if this URL should be considered a 'benign' URL,
+ * that is:
+ *
+ * - It is a local URL (isLocal), and
+ * - It has a equal or better level of security
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function isBenign($config, $context)
+ {
+ if (!$this->isLocal($config, $context)) {
+ return false;
+ }
+
+ $scheme_obj = $this->getSchemeObj($config, $context);
+ if (!$scheme_obj) {
+ return false;
+ } // conservative approach
+
+ $current_scheme_obj = $config->getDefinition('URI')->getDefaultScheme($config, $context);
+ if ($current_scheme_obj->secure) {
+ if (!$scheme_obj->secure) {
+ return false;
+ }
+ }
+ return true;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIDefinition.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIDefinition.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIDefinition.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIDefinition.php
index dbc2a75..e0bd8bc 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIDefinition.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIDefinition.php
@@ -1,112 +1,112 @@
-<?php
-
-class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition
-{
-
- public $type = 'URI';
- protected $filters = array();
- protected $postFilters = array();
- protected $registeredFilters = array();
-
- /**
- * HTMLPurifier_URI object of the base specified at %URI.Base
- */
- public $base;
-
- /**
- * String host to consider "home" base, derived off of $base
- */
- public $host;
-
- /**
- * Name of default scheme based on %URI.DefaultScheme and %URI.Base
- */
- public $defaultScheme;
-
- public function __construct()
- {
- $this->registerFilter(new HTMLPurifier_URIFilter_DisableExternal());
- $this->registerFilter(new HTMLPurifier_URIFilter_DisableExternalResources());
- $this->registerFilter(new HTMLPurifier_URIFilter_DisableResources());
- $this->registerFilter(new HTMLPurifier_URIFilter_HostBlacklist());
- $this->registerFilter(new HTMLPurifier_URIFilter_SafeIframe());
- $this->registerFilter(new HTMLPurifier_URIFilter_MakeAbsolute());
- $this->registerFilter(new HTMLPurifier_URIFilter_Munge());
- }
-
- public function registerFilter($filter)
- {
- $this->registeredFilters[$filter->name] = $filter;
- }
-
- public function addFilter($filter, $config)
- {
- $r = $filter->prepare($config);
- if ($r === false) return; // null is ok, for backwards compat
- if ($filter->post) {
- $this->postFilters[$filter->name] = $filter;
- } else {
- $this->filters[$filter->name] = $filter;
- }
- }
-
- protected function doSetup($config)
- {
- $this->setupMemberVariables($config);
- $this->setupFilters($config);
- }
-
- protected function setupFilters($config)
- {
- foreach ($this->registeredFilters as $name => $filter) {
- if ($filter->always_load) {
- $this->addFilter($filter, $config);
- } else {
- $conf = $config->get('URI.' . $name);
- if ($conf !== false && $conf !== null) {
- $this->addFilter($filter, $config);
- }
- }
- }
- unset($this->registeredFilters);
- }
-
- protected function setupMemberVariables($config)
- {
- $this->host = $config->get('URI.Host');
- $base_uri = $config->get('URI.Base');
- if (!is_null($base_uri)) {
- $parser = new HTMLPurifier_URIParser();
- $this->base = $parser->parse($base_uri);
- $this->defaultScheme = $this->base->scheme;
- if (is_null($this->host)) $this->host = $this->base->host;
- }
- if (is_null($this->defaultScheme)) $this->defaultScheme = $config->get('URI.DefaultScheme');
- }
-
- public function getDefaultScheme($config, $context)
- {
- return HTMLPurifier_URISchemeRegistry::instance()->getScheme($this->defaultScheme, $config, $context);
- }
-
- public function filter(&$uri, $config, $context)
- {
- foreach ($this->filters as $name => $f) {
- $result = $f->filter($uri, $config, $context);
- if (!$result) return false;
- }
- return true;
- }
-
- public function postFilter(&$uri, $config, $context)
- {
- foreach ($this->postFilters as $name => $f) {
- $result = $f->filter($uri, $config, $context);
- if (!$result) return false;
- }
- return true;
- }
-
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition
+{
+
+ public $type = 'URI';
+ protected $filters = array();
+ protected $postFilters = array();
+ protected $registeredFilters = array();
+
+ /**
+ * HTMLPurifier_URI object of the base specified at %URI.Base
+ */
+ public $base;
+
+ /**
+ * String host to consider "home" base, derived off of $base
+ */
+ public $host;
+
+ /**
+ * Name of default scheme based on %URI.DefaultScheme and %URI.Base
+ */
+ public $defaultScheme;
+
+ public function __construct()
+ {
+ $this->registerFilter(new HTMLPurifier_URIFilter_DisableExternal());
+ $this->registerFilter(new HTMLPurifier_URIFilter_DisableExternalResources());
+ $this->registerFilter(new HTMLPurifier_URIFilter_DisableResources());
+ $this->registerFilter(new HTMLPurifier_URIFilter_HostBlacklist());
+ $this->registerFilter(new HTMLPurifier_URIFilter_SafeIframe());
+ $this->registerFilter(new HTMLPurifier_URIFilter_MakeAbsolute());
+ $this->registerFilter(new HTMLPurifier_URIFilter_Munge());
+ }
+
+ public function registerFilter($filter)
+ {
+ $this->registeredFilters[$filter->name] = $filter;
+ }
+
+ public function addFilter($filter, $config)
+ {
+ $r = $filter->prepare($config);
+ if ($r === false) return; // null is ok, for backwards compat
+ if ($filter->post) {
+ $this->postFilters[$filter->name] = $filter;
+ } else {
+ $this->filters[$filter->name] = $filter;
+ }
+ }
+
+ protected function doSetup($config)
+ {
+ $this->setupMemberVariables($config);
+ $this->setupFilters($config);
+ }
+
+ protected function setupFilters($config)
+ {
+ foreach ($this->registeredFilters as $name => $filter) {
+ if ($filter->always_load) {
+ $this->addFilter($filter, $config);
+ } else {
+ $conf = $config->get('URI.' . $name);
+ if ($conf !== false && $conf !== null) {
+ $this->addFilter($filter, $config);
+ }
+ }
+ }
+ unset($this->registeredFilters);
+ }
+
+ protected function setupMemberVariables($config)
+ {
+ $this->host = $config->get('URI.Host');
+ $base_uri = $config->get('URI.Base');
+ if (!is_null($base_uri)) {
+ $parser = new HTMLPurifier_URIParser();
+ $this->base = $parser->parse($base_uri);
+ $this->defaultScheme = $this->base->scheme;
+ if (is_null($this->host)) $this->host = $this->base->host;
+ }
+ if (is_null($this->defaultScheme)) $this->defaultScheme = $config->get('URI.DefaultScheme');
+ }
+
+ public function getDefaultScheme($config, $context)
+ {
+ return HTMLPurifier_URISchemeRegistry::instance()->getScheme($this->defaultScheme, $config, $context);
+ }
+
+ public function filter(&$uri, $config, $context)
+ {
+ foreach ($this->filters as $name => $f) {
+ $result = $f->filter($uri, $config, $context);
+ if (!$result) return false;
+ }
+ return true;
+ }
+
+ public function postFilter(&$uri, $config, $context)
+ {
+ foreach ($this->postFilters as $name => $f) {
+ $result = $f->filter($uri, $config, $context);
+ if (!$result) return false;
+ }
+ return true;
+ }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter.php
index 0333ea3..09724e9 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter.php
@@ -1,74 +1,74 @@
-<?php
-
-/**
- * Chainable filters for custom URI processing.
- *
- * These filters can perform custom actions on a URI filter object,
- * including transformation or blacklisting. A filter named Foo
- * must have a corresponding configuration directive %URI.Foo,
- * unless always_load is specified to be true.
- *
- * The following contexts may be available while URIFilters are being
- * processed:
- *
- * - EmbeddedURI: true if URI is an embedded resource that will
- * be loaded automatically on page load
- * - CurrentToken: a reference to the token that is currently
- * being processed
- * - CurrentAttr: the name of the attribute that is currently being
- * processed
- * - CurrentCSSProperty: the name of the CSS property that is
- * currently being processed (if applicable)
- *
- * @warning This filter is called before scheme object validation occurs.
- * Make sure, if you require a specific scheme object, you
- * you check that it exists. This allows filters to convert
- * proprietary URI schemes into regular ones.
- */
-abstract class HTMLPurifier_URIFilter
-{
-
- /**
- * Unique identifier of filter.
- * @type string
- */
- public $name;
-
- /**
- * True if this filter should be run after scheme validation.
- * @type bool
- */
- public $post = false;
-
- /**
- * True if this filter should always be loaded.
- * This permits a filter to be named Foo without the corresponding
- * %URI.Foo directive existing.
- * @type bool
- */
- public $always_load = false;
-
- /**
- * Performs initialization for the filter. If the filter returns
- * false, this means that it shouldn't be considered active.
- * @param HTMLPurifier_Config $config
- * @return bool
- */
- public function prepare($config)
- {
- return true;
- }
-
- /**
- * Filter a URI object
- * @param HTMLPurifier_URI $uri Reference to URI object variable
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool Whether or not to continue processing: false indicates
- * URL is no good, true indicates continue processing. Note that
- * all changes are committed directly on the URI object
- */
- abstract public function filter(&$uri, $config, $context);
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Chainable filters for custom URI processing.
+ *
+ * These filters can perform custom actions on a URI filter object,
+ * including transformation or blacklisting. A filter named Foo
+ * must have a corresponding configuration directive %URI.Foo,
+ * unless always_load is specified to be true.
+ *
+ * The following contexts may be available while URIFilters are being
+ * processed:
+ *
+ * - EmbeddedURI: true if URI is an embedded resource that will
+ * be loaded automatically on page load
+ * - CurrentToken: a reference to the token that is currently
+ * being processed
+ * - CurrentAttr: the name of the attribute that is currently being
+ * processed
+ * - CurrentCSSProperty: the name of the CSS property that is
+ * currently being processed (if applicable)
+ *
+ * @warning This filter is called before scheme object validation occurs.
+ * Make sure, if you require a specific scheme object, you
+ * you check that it exists. This allows filters to convert
+ * proprietary URI schemes into regular ones.
+ */
+abstract class HTMLPurifier_URIFilter
+{
+
+ /**
+ * Unique identifier of filter.
+ * @type string
+ */
+ public $name;
+
+ /**
+ * True if this filter should be run after scheme validation.
+ * @type bool
+ */
+ public $post = false;
+
+ /**
+ * True if this filter should always be loaded.
+ * This permits a filter to be named Foo without the corresponding
+ * %URI.Foo directive existing.
+ * @type bool
+ */
+ public $always_load = false;
+
+ /**
+ * Performs initialization for the filter. If the filter returns
+ * false, this means that it shouldn't be considered active.
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function prepare($config)
+ {
+ return true;
+ }
+
+ /**
+ * Filter a URI object
+ * @param HTMLPurifier_URI $uri Reference to URI object variable
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool Whether or not to continue processing: false indicates
+ * URL is no good, true indicates continue processing. Note that
+ * all changes are committed directly on the URI object
+ */
+ abstract public function filter(&$uri, $config, $context);
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/DisableExternal.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/DisableExternal.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/DisableExternal.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/DisableExternal.php
index 52e1297..ced1b13 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/DisableExternal.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/DisableExternal.php
@@ -1,54 +1,54 @@
-<?php
-
-class HTMLPurifier_URIFilter_DisableExternal extends HTMLPurifier_URIFilter
-{
- /**
- * @type string
- */
- public $name = 'DisableExternal';
-
- /**
- * @type array
- */
- protected $ourHostParts = false;
-
- /**
- * @param HTMLPurifier_Config $config
- * @return void
- */
- public function prepare($config)
- {
- $our_host = $config->getDefinition('URI')->host;
- if ($our_host !== null) {
- $this->ourHostParts = array_reverse(explode('.', $our_host));
- }
- }
-
- /**
- * @param HTMLPurifier_URI $uri Reference
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function filter(&$uri, $config, $context)
- {
- if (is_null($uri->host)) {
- return true;
- }
- if ($this->ourHostParts === false) {
- return false;
- }
- $host_parts = array_reverse(explode('.', $uri->host));
- foreach ($this->ourHostParts as $i => $x) {
- if (!isset($host_parts[$i])) {
- return false;
- }
- if ($host_parts[$i] != $this->ourHostParts[$i]) {
- return false;
- }
- }
- return true;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_URIFilter_DisableExternal extends HTMLPurifier_URIFilter
+{
+ /**
+ * @type string
+ */
+ public $name = 'DisableExternal';
+
+ /**
+ * @type array
+ */
+ protected $ourHostParts = false;
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return void
+ */
+ public function prepare($config)
+ {
+ $our_host = $config->getDefinition('URI')->host;
+ if ($our_host !== null) {
+ $this->ourHostParts = array_reverse(explode('.', $our_host));
+ }
+ }
+
+ /**
+ * @param HTMLPurifier_URI $uri Reference
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function filter(&$uri, $config, $context)
+ {
+ if (is_null($uri->host)) {
+ return true;
+ }
+ if ($this->ourHostParts === false) {
+ return false;
+ }
+ $host_parts = array_reverse(explode('.', $uri->host));
+ foreach ($this->ourHostParts as $i => $x) {
+ if (!isset($host_parts[$i])) {
+ return false;
+ }
+ if ($host_parts[$i] != $this->ourHostParts[$i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/DisableExternalResources.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/DisableExternalResources.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/DisableExternalResources.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/DisableExternalResources.php
index 22697d7..c656216 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/DisableExternalResources.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/DisableExternalResources.php
@@ -1,25 +1,25 @@
-<?php
-
-class HTMLPurifier_URIFilter_DisableExternalResources extends HTMLPurifier_URIFilter_DisableExternal
-{
- /**
- * @type string
- */
- public $name = 'DisableExternalResources';
-
- /**
- * @param HTMLPurifier_URI $uri
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function filter(&$uri, $config, $context)
- {
- if (!$context->get('EmbeddedURI', true)) {
- return true;
- }
- return parent::filter($uri, $config, $context);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_URIFilter_DisableExternalResources extends HTMLPurifier_URIFilter_DisableExternal
+{
+ /**
+ * @type string
+ */
+ public $name = 'DisableExternalResources';
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function filter(&$uri, $config, $context)
+ {
+ if (!$context->get('EmbeddedURI', true)) {
+ return true;
+ }
+ return parent::filter($uri, $config, $context);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/DisableResources.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/DisableResources.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/DisableResources.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/DisableResources.php
index bdae955..d5c412c 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/DisableResources.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/DisableResources.php
@@ -1,22 +1,22 @@
-<?php
-
-class HTMLPurifier_URIFilter_DisableResources extends HTMLPurifier_URIFilter
-{
- /**
- * @type string
- */
- public $name = 'DisableResources';
-
- /**
- * @param HTMLPurifier_URI $uri
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function filter(&$uri, $config, $context)
- {
- return !$context->get('EmbeddedURI', true);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_URIFilter_DisableResources extends HTMLPurifier_URIFilter
+{
+ /**
+ * @type string
+ */
+ public $name = 'DisableResources';
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function filter(&$uri, $config, $context)
+ {
+ return !$context->get('EmbeddedURI', true);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/HostBlacklist.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/HostBlacklist.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/HostBlacklist.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/HostBlacklist.php
index 54980b6..a6645c1 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/HostBlacklist.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/HostBlacklist.php
@@ -1,46 +1,46 @@
-<?php
-
-// It's not clear to me whether or not Punycode means that hostnames
-// do not have canonical forms anymore. As far as I can tell, it's
-// not a problem (punycoding should be identity when no Unicode
-// points are involved), but I'm not 100% sure
-class HTMLPurifier_URIFilter_HostBlacklist extends HTMLPurifier_URIFilter
-{
- /**
- * @type string
- */
- public $name = 'HostBlacklist';
-
- /**
- * @type array
- */
- protected $blacklist = array();
-
- /**
- * @param HTMLPurifier_Config $config
- * @return bool
- */
- public function prepare($config)
- {
- $this->blacklist = $config->get('URI.HostBlacklist');
- return true;
- }
-
- /**
- * @param HTMLPurifier_URI $uri
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function filter(&$uri, $config, $context)
- {
- foreach ($this->blacklist as $blacklisted_host_fragment) {
- if (strpos($uri->host, $blacklisted_host_fragment) !== false) {
- return false;
- }
- }
- return true;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+// It's not clear to me whether or not Punycode means that hostnames
+// do not have canonical forms anymore. As far as I can tell, it's
+// not a problem (punycoding should be identity when no Unicode
+// points are involved), but I'm not 100% sure
+class HTMLPurifier_URIFilter_HostBlacklist extends HTMLPurifier_URIFilter
+{
+ /**
+ * @type string
+ */
+ public $name = 'HostBlacklist';
+
+ /**
+ * @type array
+ */
+ protected $blacklist = array();
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function prepare($config)
+ {
+ $this->blacklist = $config->get('URI.HostBlacklist');
+ return true;
+ }
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function filter(&$uri, $config, $context)
+ {
+ foreach ($this->blacklist as $blacklisted_host_fragment) {
+ if (strpos($uri->host, $blacklisted_host_fragment) !== false) {
+ return false;
+ }
+ }
+ return true;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/MakeAbsolute.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/MakeAbsolute.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/MakeAbsolute.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/MakeAbsolute.php
index c873bce..c507bbf 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/MakeAbsolute.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/MakeAbsolute.php
@@ -1,158 +1,158 @@
-<?php
-
-// does not support network paths
-
-class HTMLPurifier_URIFilter_MakeAbsolute extends HTMLPurifier_URIFilter
-{
- /**
- * @type string
- */
- public $name = 'MakeAbsolute';
-
- /**
- * @type
- */
- protected $base;
-
- /**
- * @type array
- */
- protected $basePathStack = array();
-
- /**
- * @param HTMLPurifier_Config $config
- * @return bool
- */
- public function prepare($config)
- {
- $def = $config->getDefinition('URI');
- $this->base = $def->base;
- if (is_null($this->base)) {
- trigger_error(
- 'URI.MakeAbsolute is being ignored due to lack of ' .
- 'value for URI.Base configuration',
- E_USER_WARNING
- );
- return false;
- }
- $this->base->fragment = null; // fragment is invalid for base URI
- $stack = explode('/', $this->base->path);
- array_pop($stack); // discard last segment
- $stack = $this->_collapseStack($stack); // do pre-parsing
- $this->basePathStack = $stack;
- return true;
- }
-
- /**
- * @param HTMLPurifier_URI $uri
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function filter(&$uri, $config, $context)
- {
- if (is_null($this->base)) {
- return true;
- } // abort early
- if ($uri->path === '' && is_null($uri->scheme) &&
- is_null($uri->host) && is_null($uri->query) && is_null($uri->fragment)) {
- // reference to current document
- $uri = clone $this->base;
- return true;
- }
- if (!is_null($uri->scheme)) {
- // absolute URI already: don't change
- if (!is_null($uri->host)) {
- return true;
- }
- $scheme_obj = $uri->getSchemeObj($config, $context);
- if (!$scheme_obj) {
- // scheme not recognized
- return false;
- }
- if (!$scheme_obj->hierarchical) {
- // non-hierarchal URI with explicit scheme, don't change
- return true;
- }
- // special case: had a scheme but always is hierarchical and had no authority
- }
- if (!is_null($uri->host)) {
- // network path, don't bother
- return true;
- }
- if ($uri->path === '') {
- $uri->path = $this->base->path;
- } elseif ($uri->path[0] !== '/') {
- // relative path, needs more complicated processing
- $stack = explode('/', $uri->path);
- $new_stack = array_merge($this->basePathStack, $stack);
- if ($new_stack[0] !== '' && !is_null($this->base->host)) {
- array_unshift($new_stack, '');
- }
- $new_stack = $this->_collapseStack($new_stack);
- $uri->path = implode('/', $new_stack);
- } else {
- // absolute path, but still we should collapse
- $uri->path = implode('/', $this->_collapseStack(explode('/', $uri->path)));
- }
- // re-combine
- $uri->scheme = $this->base->scheme;
- if (is_null($uri->userinfo)) {
- $uri->userinfo = $this->base->userinfo;
- }
- if (is_null($uri->host)) {
- $uri->host = $this->base->host;
- }
- if (is_null($uri->port)) {
- $uri->port = $this->base->port;
- }
- return true;
- }
-
- /**
- * Resolve dots and double-dots in a path stack
- * @param array $stack
- * @return array
- */
- private function _collapseStack($stack)
- {
- $result = array();
- $is_folder = false;
- for ($i = 0; isset($stack[$i]); $i++) {
- $is_folder = false;
- // absorb an internally duplicated slash
- if ($stack[$i] == '' && $i && isset($stack[$i + 1])) {
- continue;
- }
- if ($stack[$i] == '..') {
- if (!empty($result)) {
- $segment = array_pop($result);
- if ($segment === '' && empty($result)) {
- // error case: attempted to back out too far:
- // restore the leading slash
- $result[] = '';
- } elseif ($segment === '..') {
- $result[] = '..'; // cannot remove .. with ..
- }
- } else {
- // relative path, preserve the double-dots
- $result[] = '..';
- }
- $is_folder = true;
- continue;
- }
- if ($stack[$i] == '.') {
- // silently absorb
- $is_folder = true;
- continue;
- }
- $result[] = $stack[$i];
- }
- if ($is_folder) {
- $result[] = '';
- }
- return $result;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+// does not support network paths
+
+class HTMLPurifier_URIFilter_MakeAbsolute extends HTMLPurifier_URIFilter
+{
+ /**
+ * @type string
+ */
+ public $name = 'MakeAbsolute';
+
+ /**
+ * @type
+ */
+ protected $base;
+
+ /**
+ * @type array
+ */
+ protected $basePathStack = array();
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function prepare($config)
+ {
+ $def = $config->getDefinition('URI');
+ $this->base = $def->base;
+ if (is_null($this->base)) {
+ trigger_error(
+ 'URI.MakeAbsolute is being ignored due to lack of ' .
+ 'value for URI.Base configuration',
+ E_USER_WARNING
+ );
+ return false;
+ }
+ $this->base->fragment = null; // fragment is invalid for base URI
+ $stack = explode('/', $this->base->path);
+ array_pop($stack); // discard last segment
+ $stack = $this->_collapseStack($stack); // do pre-parsing
+ $this->basePathStack = $stack;
+ return true;
+ }
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function filter(&$uri, $config, $context)
+ {
+ if (is_null($this->base)) {
+ return true;
+ } // abort early
+ if ($uri->path === '' && is_null($uri->scheme) &&
+ is_null($uri->host) && is_null($uri->query) && is_null($uri->fragment)) {
+ // reference to current document
+ $uri = clone $this->base;
+ return true;
+ }
+ if (!is_null($uri->scheme)) {
+ // absolute URI already: don't change
+ if (!is_null($uri->host)) {
+ return true;
+ }
+ $scheme_obj = $uri->getSchemeObj($config, $context);
+ if (!$scheme_obj) {
+ // scheme not recognized
+ return false;
+ }
+ if (!$scheme_obj->hierarchical) {
+ // non-hierarchal URI with explicit scheme, don't change
+ return true;
+ }
+ // special case: had a scheme but always is hierarchical and had no authority
+ }
+ if (!is_null($uri->host)) {
+ // network path, don't bother
+ return true;
+ }
+ if ($uri->path === '') {
+ $uri->path = $this->base->path;
+ } elseif ($uri->path[0] !== '/') {
+ // relative path, needs more complicated processing
+ $stack = explode('/', $uri->path);
+ $new_stack = array_merge($this->basePathStack, $stack);
+ if ($new_stack[0] !== '' && !is_null($this->base->host)) {
+ array_unshift($new_stack, '');
+ }
+ $new_stack = $this->_collapseStack($new_stack);
+ $uri->path = implode('/', $new_stack);
+ } else {
+ // absolute path, but still we should collapse
+ $uri->path = implode('/', $this->_collapseStack(explode('/', $uri->path)));
+ }
+ // re-combine
+ $uri->scheme = $this->base->scheme;
+ if (is_null($uri->userinfo)) {
+ $uri->userinfo = $this->base->userinfo;
+ }
+ if (is_null($uri->host)) {
+ $uri->host = $this->base->host;
+ }
+ if (is_null($uri->port)) {
+ $uri->port = $this->base->port;
+ }
+ return true;
+ }
+
+ /**
+ * Resolve dots and double-dots in a path stack
+ * @param array $stack
+ * @return array
+ */
+ private function _collapseStack($stack)
+ {
+ $result = array();
+ $is_folder = false;
+ for ($i = 0; isset($stack[$i]); $i++) {
+ $is_folder = false;
+ // absorb an internally duplicated slash
+ if ($stack[$i] == '' && $i && isset($stack[$i + 1])) {
+ continue;
+ }
+ if ($stack[$i] == '..') {
+ if (!empty($result)) {
+ $segment = array_pop($result);
+ if ($segment === '' && empty($result)) {
+ // error case: attempted to back out too far:
+ // restore the leading slash
+ $result[] = '';
+ } elseif ($segment === '..') {
+ $result[] = '..'; // cannot remove .. with ..
+ }
+ } else {
+ // relative path, preserve the double-dots
+ $result[] = '..';
+ }
+ $is_folder = true;
+ continue;
+ }
+ if ($stack[$i] == '.') {
+ // silently absorb
+ $is_folder = true;
+ continue;
+ }
+ $result[] = $stack[$i];
+ }
+ if ($is_folder) {
+ $result[] = '';
+ }
+ return $result;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/Munge.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/Munge.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/Munge.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/Munge.php
index 4b4f0cf..6e03315 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/Munge.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/Munge.php
@@ -1,115 +1,115 @@
-<?php
-
-class HTMLPurifier_URIFilter_Munge extends HTMLPurifier_URIFilter
-{
- /**
- * @type string
- */
- public $name = 'Munge';
-
- /**
- * @type bool
- */
- public $post = true;
-
- /**
- * @type string
- */
- private $target;
-
- /**
- * @type HTMLPurifier_URIParser
- */
- private $parser;
-
- /**
- * @type bool
- */
- private $doEmbed;
-
- /**
- * @type string
- */
- private $secretKey;
-
- /**
- * @type array
- */
- protected $replace = array();
-
- /**
- * @param HTMLPurifier_Config $config
- * @return bool
- */
- public function prepare($config)
- {
- $this->target = $config->get('URI.' . $this->name);
- $this->parser = new HTMLPurifier_URIParser();
- $this->doEmbed = $config->get('URI.MungeResources');
- $this->secretKey = $config->get('URI.MungeSecretKey');
- if ($this->secretKey && !function_exists('hash_hmac')) {
- throw new Exception("Cannot use %URI.MungeSecretKey without hash_hmac support.");
- }
- return true;
- }
-
- /**
- * @param HTMLPurifier_URI $uri
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function filter(&$uri, $config, $context)
- {
- if ($context->get('EmbeddedURI', true) && !$this->doEmbed) {
- return true;
- }
-
- $scheme_obj = $uri->getSchemeObj($config, $context);
- if (!$scheme_obj) {
- return true;
- } // ignore unknown schemes, maybe another postfilter did it
- if (!$scheme_obj->browsable) {
- return true;
- } // ignore non-browseable schemes, since we can't munge those in a reasonable way
- if ($uri->isBenign($config, $context)) {
- return true;
- } // don't redirect if a benign URL
-
- $this->makeReplace($uri, $config, $context);
- $this->replace = array_map('rawurlencode', $this->replace);
-
- $new_uri = strtr($this->target, $this->replace);
- $new_uri = $this->parser->parse($new_uri);
- // don't redirect if the target host is the same as the
- // starting host
- if ($uri->host === $new_uri->host) {
- return true;
- }
- $uri = $new_uri; // overwrite
- return true;
- }
-
- /**
- * @param HTMLPurifier_URI $uri
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- */
- protected function makeReplace($uri, $config, $context)
- {
- $string = $uri->toString();
- // always available
- $this->replace['%s'] = $string;
- $this->replace['%r'] = $context->get('EmbeddedURI', true);
- $token = $context->get('CurrentToken', true);
- $this->replace['%n'] = $token ? $token->name : null;
- $this->replace['%m'] = $context->get('CurrentAttr', true);
- $this->replace['%p'] = $context->get('CurrentCSSProperty', true);
- // not always available
- if ($this->secretKey) {
- $this->replace['%t'] = hash_hmac("sha256", $string, $this->secretKey);
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+class HTMLPurifier_URIFilter_Munge extends HTMLPurifier_URIFilter
+{
+ /**
+ * @type string
+ */
+ public $name = 'Munge';
+
+ /**
+ * @type bool
+ */
+ public $post = true;
+
+ /**
+ * @type string
+ */
+ private $target;
+
+ /**
+ * @type HTMLPurifier_URIParser
+ */
+ private $parser;
+
+ /**
+ * @type bool
+ */
+ private $doEmbed;
+
+ /**
+ * @type string
+ */
+ private $secretKey;
+
+ /**
+ * @type array
+ */
+ protected $replace = array();
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function prepare($config)
+ {
+ $this->target = $config->get('URI.' . $this->name);
+ $this->parser = new HTMLPurifier_URIParser();
+ $this->doEmbed = $config->get('URI.MungeResources');
+ $this->secretKey = $config->get('URI.MungeSecretKey');
+ if ($this->secretKey && !function_exists('hash_hmac')) {
+ throw new Exception("Cannot use %URI.MungeSecretKey without hash_hmac support.");
+ }
+ return true;
+ }
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function filter(&$uri, $config, $context)
+ {
+ if ($context->get('EmbeddedURI', true) && !$this->doEmbed) {
+ return true;
+ }
+
+ $scheme_obj = $uri->getSchemeObj($config, $context);
+ if (!$scheme_obj) {
+ return true;
+ } // ignore unknown schemes, maybe another postfilter did it
+ if (!$scheme_obj->browsable) {
+ return true;
+ } // ignore non-browseable schemes, since we can't munge those in a reasonable way
+ if ($uri->isBenign($config, $context)) {
+ return true;
+ } // don't redirect if a benign URL
+
+ $this->makeReplace($uri, $config, $context);
+ $this->replace = array_map('rawurlencode', $this->replace);
+
+ $new_uri = strtr($this->target, $this->replace);
+ $new_uri = $this->parser->parse($new_uri);
+ // don't redirect if the target host is the same as the
+ // starting host
+ if ($uri->host === $new_uri->host) {
+ return true;
+ }
+ $uri = $new_uri; // overwrite
+ return true;
+ }
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ */
+ protected function makeReplace($uri, $config, $context)
+ {
+ $string = $uri->toString();
+ // always available
+ $this->replace['%s'] = $string;
+ $this->replace['%r'] = $context->get('EmbeddedURI', true);
+ $token = $context->get('CurrentToken', true);
+ $this->replace['%n'] = $token ? $token->name : null;
+ $this->replace['%m'] = $context->get('CurrentAttr', true);
+ $this->replace['%p'] = $context->get('CurrentCSSProperty', true);
+ // not always available
+ if ($this->secretKey) {
+ $this->replace['%t'] = hash_hmac("sha256", $string, $this->secretKey);
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/SafeIframe.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/SafeIframe.php
similarity index 93%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/SafeIframe.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/SafeIframe.php
index 49ac09d..f609c47 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIFilter/SafeIframe.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIFilter/SafeIframe.php
@@ -1,68 +1,68 @@
-<?php
-
-/**
- * Implements safety checks for safe iframes.
- *
- * @warning This filter is *critical* for ensuring that %HTML.SafeIframe
- * works safely.
- */
-class HTMLPurifier_URIFilter_SafeIframe extends HTMLPurifier_URIFilter
-{
- /**
- * @type string
- */
- public $name = 'SafeIframe';
-
- /**
- * @type bool
- */
- public $always_load = true;
-
- /**
- * @type string
- */
- protected $regexp = null;
-
- // XXX: The not so good bit about how this is all set up now is we
- // can't check HTML.SafeIframe in the 'prepare' step: we have to
- // defer till the actual filtering.
- /**
- * @param HTMLPurifier_Config $config
- * @return bool
- */
- public function prepare($config)
- {
- $this->regexp = $config->get('URI.SafeIframeRegexp');
- return true;
- }
-
- /**
- * @param HTMLPurifier_URI $uri
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function filter(&$uri, $config, $context)
- {
- // check if filter not applicable
- if (!$config->get('HTML.SafeIframe')) {
- return true;
- }
- // check if the filter should actually trigger
- if (!$context->get('EmbeddedURI', true)) {
- return true;
- }
- $token = $context->get('CurrentToken', true);
- if (!($token && $token->name == 'iframe')) {
- return true;
- }
- // check if we actually have some whitelists enabled
- if ($this->regexp === null) {
- return false;
- }
- // actually check the whitelists
- return preg_match($this->regexp, $uri->toString());
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Implements safety checks for safe iframes.
+ *
+ * @warning This filter is *critical* for ensuring that %HTML.SafeIframe
+ * works safely.
+ */
+class HTMLPurifier_URIFilter_SafeIframe extends HTMLPurifier_URIFilter
+{
+ /**
+ * @type string
+ */
+ public $name = 'SafeIframe';
+
+ /**
+ * @type bool
+ */
+ public $always_load = true;
+
+ /**
+ * @type string
+ */
+ protected $regexp = null;
+
+ // XXX: The not so good bit about how this is all set up now is we
+ // can't check HTML.SafeIframe in the 'prepare' step: we have to
+ // defer till the actual filtering.
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function prepare($config)
+ {
+ $this->regexp = $config->get('URI.SafeIframeRegexp');
+ return true;
+ }
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function filter(&$uri, $config, $context)
+ {
+ // check if filter not applicable
+ if (!$config->get('HTML.SafeIframe')) {
+ return true;
+ }
+ // check if the filter should actually trigger
+ if (!$context->get('EmbeddedURI', true)) {
+ return true;
+ }
+ $token = $context->get('CurrentToken', true);
+ if (!($token && $token->name == 'iframe')) {
+ return true;
+ }
+ // check if we actually have some whitelists enabled
+ if ($this->regexp === null) {
+ return false;
+ }
+ // actually check the whitelists
+ return preg_match($this->regexp, $uri->toString());
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIParser.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIParser.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIParser.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIParser.php
index 699978d..0e7381a 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIParser.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIParser.php
@@ -1,71 +1,71 @@
-<?php
-
-/**
- * Parses a URI into the components and fragment identifier as specified
- * by RFC 3986.
- */
-class HTMLPurifier_URIParser
-{
-
- /**
- * Instance of HTMLPurifier_PercentEncoder to do normalization with.
- */
- protected $percentEncoder;
-
- public function __construct()
- {
- $this->percentEncoder = new HTMLPurifier_PercentEncoder();
- }
-
- /**
- * Parses a URI.
- * @param $uri string URI to parse
- * @return HTMLPurifier_URI representation of URI. This representation has
- * not been validated yet and may not conform to RFC.
- */
- public function parse($uri)
- {
- $uri = $this->percentEncoder->normalize($uri);
-
- // Regexp is as per Appendix B.
- // Note that ["<>] are an addition to the RFC's recommended
- // characters, because they represent external delimeters.
- $r_URI = '!'.
- '(([a-zA-Z0-9\.\+\-]+):)?'. // 2. Scheme
- '(//([^/?#"<>]*))?'. // 4. Authority
- '([^?#"<>]*)'. // 5. Path
- '(\?([^#"<>]*))?'. // 7. Query
- '(#([^"<>]*))?'. // 8. Fragment
- '!';
-
- $matches = array();
- $result = preg_match($r_URI, $uri, $matches);
-
- if (!$result) return false; // *really* invalid URI
-
- // seperate out parts
- $scheme = !empty($matches[1]) ? $matches[2] : null;
- $authority = !empty($matches[3]) ? $matches[4] : null;
- $path = $matches[5]; // always present, can be empty
- $query = !empty($matches[6]) ? $matches[7] : null;
- $fragment = !empty($matches[8]) ? $matches[9] : null;
-
- // further parse authority
- if ($authority !== null) {
- $r_authority = "/^((.+?)@)?(\[[^\]]+\]|[^:]*)(:(\d*))?/";
- $matches = array();
- preg_match($r_authority, $authority, $matches);
- $userinfo = !empty($matches[1]) ? $matches[2] : null;
- $host = !empty($matches[3]) ? $matches[3] : '';
- $port = !empty($matches[4]) ? (int) $matches[5] : null;
- } else {
- $port = $host = $userinfo = null;
- }
-
- return new HTMLPurifier_URI(
- $scheme, $userinfo, $host, $port, $path, $query, $fragment);
- }
-
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Parses a URI into the components and fragment identifier as specified
+ * by RFC 3986.
+ */
+class HTMLPurifier_URIParser
+{
+
+ /**
+ * Instance of HTMLPurifier_PercentEncoder to do normalization with.
+ */
+ protected $percentEncoder;
+
+ public function __construct()
+ {
+ $this->percentEncoder = new HTMLPurifier_PercentEncoder();
+ }
+
+ /**
+ * Parses a URI.
+ * @param $uri string URI to parse
+ * @return HTMLPurifier_URI representation of URI. This representation has
+ * not been validated yet and may not conform to RFC.
+ */
+ public function parse($uri)
+ {
+ $uri = $this->percentEncoder->normalize($uri);
+
+ // Regexp is as per Appendix B.
+ // Note that ["<>] are an addition to the RFC's recommended
+ // characters, because they represent external delimeters.
+ $r_URI = '!'.
+ '(([a-zA-Z0-9\.\+\-]+):)?'. // 2. Scheme
+ '(//([^/?#"<>]*))?'. // 4. Authority
+ '([^?#"<>]*)'. // 5. Path
+ '(\?([^#"<>]*))?'. // 7. Query
+ '(#([^"<>]*))?'. // 8. Fragment
+ '!';
+
+ $matches = array();
+ $result = preg_match($r_URI, $uri, $matches);
+
+ if (!$result) return false; // *really* invalid URI
+
+ // seperate out parts
+ $scheme = !empty($matches[1]) ? $matches[2] : null;
+ $authority = !empty($matches[3]) ? $matches[4] : null;
+ $path = $matches[5]; // always present, can be empty
+ $query = !empty($matches[6]) ? $matches[7] : null;
+ $fragment = !empty($matches[8]) ? $matches[9] : null;
+
+ // further parse authority
+ if ($authority !== null) {
+ $r_authority = "/^((.+?)@)?(\[[^\]]+\]|[^:]*)(:(\d*))?/";
+ $matches = array();
+ preg_match($r_authority, $authority, $matches);
+ $userinfo = !empty($matches[1]) ? $matches[2] : null;
+ $host = !empty($matches[3]) ? $matches[3] : '';
+ $port = !empty($matches[4]) ? (int) $matches[5] : null;
+ } else {
+ $port = $host = $userinfo = null;
+ }
+
+ return new HTMLPurifier_URI(
+ $scheme, $userinfo, $host, $port, $path, $query, $fragment);
+ }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme.php
index 03602ab..fe9e82c 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme.php
@@ -1,102 +1,102 @@
-<?php
-
-/**
- * Validator for the components of a URI for a specific scheme
- */
-abstract class HTMLPurifier_URIScheme
-{
-
- /**
- * Scheme's default port (integer). If an explicit port number is
- * specified that coincides with the default port, it will be
- * elided.
- * @type int
- */
- public $default_port = null;
-
- /**
- * Whether or not URIs of this scheme are locatable by a browser
- * http and ftp are accessible, while mailto and news are not.
- * @type bool
- */
- public $browsable = false;
-
- /**
- * Whether or not data transmitted over this scheme is encrypted.
- * https is secure, http is not.
- * @type bool
- */
- public $secure = false;
-
- /**
- * Whether or not the URI always uses <hier_part>, resolves edge cases
- * with making relative URIs absolute
- * @type bool
- */
- public $hierarchical = false;
-
- /**
- * Whether or not the URI may omit a hostname when the scheme is
- * explicitly specified, ala file:///path/to/file. As of writing,
- * 'file' is the only scheme that browsers support his properly.
- * @type bool
- */
- public $may_omit_host = false;
-
- /**
- * Validates the components of a URI for a specific scheme.
- * @param HTMLPurifier_URI $uri Reference to a HTMLPurifier_URI object
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool success or failure
- */
- abstract public function doValidate(&$uri, $config, $context);
-
- /**
- * Public interface for validating components of a URI. Performs a
- * bunch of default actions. Don't overload this method.
- * @param HTMLPurifier_URI $uri Reference to a HTMLPurifier_URI object
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool success or failure
- */
- public function validate(&$uri, $config, $context)
- {
- if ($this->default_port == $uri->port) {
- $uri->port = null;
- }
- // kludge: browsers do funny things when the scheme but not the
- // authority is set
- if (!$this->may_omit_host &&
- // if the scheme is present, a missing host is always in error
- (!is_null($uri->scheme) && ($uri->host === '' || is_null($uri->host))) ||
- // if the scheme is not present, a *blank* host is in error,
- // since this translates into '///path' which most browsers
- // interpret as being 'http://path'.
- (is_null($uri->scheme) && $uri->host === '')
- ) {
- do {
- if (is_null($uri->scheme)) {
- if (substr($uri->path, 0, 2) != '//') {
- $uri->host = null;
- break;
- }
- // URI is '////path', so we cannot nullify the
- // host to preserve semantics. Try expanding the
- // hostname instead (fall through)
- }
- // first see if we can manually insert a hostname
- $host = $config->get('URI.Host');
- if (!is_null($host)) {
- $uri->host = $host;
- } else {
- // we can't do anything sensible, reject the URL.
- return false;
- }
- } while (false);
- }
- return $this->doValidate($uri, $config, $context);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validator for the components of a URI for a specific scheme
+ */
+abstract class HTMLPurifier_URIScheme
+{
+
+ /**
+ * Scheme's default port (integer). If an explicit port number is
+ * specified that coincides with the default port, it will be
+ * elided.
+ * @type int
+ */
+ public $default_port = null;
+
+ /**
+ * Whether or not URIs of this scheme are locatable by a browser
+ * http and ftp are accessible, while mailto and news are not.
+ * @type bool
+ */
+ public $browsable = false;
+
+ /**
+ * Whether or not data transmitted over this scheme is encrypted.
+ * https is secure, http is not.
+ * @type bool
+ */
+ public $secure = false;
+
+ /**
+ * Whether or not the URI always uses <hier_part>, resolves edge cases
+ * with making relative URIs absolute
+ * @type bool
+ */
+ public $hierarchical = false;
+
+ /**
+ * Whether or not the URI may omit a hostname when the scheme is
+ * explicitly specified, ala file:///path/to/file. As of writing,
+ * 'file' is the only scheme that browsers support his properly.
+ * @type bool
+ */
+ public $may_omit_host = false;
+
+ /**
+ * Validates the components of a URI for a specific scheme.
+ * @param HTMLPurifier_URI $uri Reference to a HTMLPurifier_URI object
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool success or failure
+ */
+ abstract public function doValidate(&$uri, $config, $context);
+
+ /**
+ * Public interface for validating components of a URI. Performs a
+ * bunch of default actions. Don't overload this method.
+ * @param HTMLPurifier_URI $uri Reference to a HTMLPurifier_URI object
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool success or failure
+ */
+ public function validate(&$uri, $config, $context)
+ {
+ if ($this->default_port == $uri->port) {
+ $uri->port = null;
+ }
+ // kludge: browsers do funny things when the scheme but not the
+ // authority is set
+ if (!$this->may_omit_host &&
+ // if the scheme is present, a missing host is always in error
+ (!is_null($uri->scheme) && ($uri->host === '' || is_null($uri->host))) ||
+ // if the scheme is not present, a *blank* host is in error,
+ // since this translates into '///path' which most browsers
+ // interpret as being 'http://path'.
+ (is_null($uri->scheme) && $uri->host === '')
+ ) {
+ do {
+ if (is_null($uri->scheme)) {
+ if (substr($uri->path, 0, 2) != '//') {
+ $uri->host = null;
+ break;
+ }
+ // URI is '////path', so we cannot nullify the
+ // host to preserve semantics. Try expanding the
+ // hostname instead (fall through)
+ }
+ // first see if we can manually insert a hostname
+ $host = $config->get('URI.Host');
+ if (!is_null($host)) {
+ $uri->host = $host;
+ } else {
+ // we can't do anything sensible, reject the URL.
+ return false;
+ }
+ } while (false);
+ }
+ return $this->doValidate($uri, $config, $context);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/callto.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/callto.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/callto.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/callto.php
index 44fa8fc..0789898 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/callto.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/callto.php
@@ -1,31 +1,31 @@
-<?php
-
-/**
- * Validates 'callto:' phone number in URI to included only alphanumeric, hyphens, underscore, and optional leading "+"
- */
-class HTMLPurifier_URIScheme_callto extends HTMLPurifier_URIScheme {
-
- public $browsable = false;
- public $may_omit_host = true;
-
- public function doValidate(&$uri, $config, $context) {
- $uri->userinfo = null;
- $uri->host = null;
- $uri->port = null;
-
- // my legal phone # chars: alphanumeric, underscore, hyphen, optional "+" for the first character. That's it. But you can allow whatever you want. Just change this:
- $validCalltoPhoneNumberPattern = '/^\+?[a-zA-Z0-9_-]+$/i'; // <---whatever pattern you want to force phone numbers to match
- $proposedPhoneNumber = $uri->path;
-
- if (preg_match($validCalltoPhoneNumberPattern, $proposedPhoneNumber) !== 1) {
-
- // submitted phone # inside the href attribute value looks bad; reject the phone number, and let HTMLpurifier remove the whole href attribute on the submitted <a> tag.
- return false;
- } else {
- // submitted phone # inside the href attribute value looks OK; accept the phone number; HTMLpurifier should NOT strip the href attribute on the submitted <a> tag.
- return true;
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates 'callto:' phone number in URI to included only alphanumeric, hyphens, underscore, and optional leading "+"
+ */
+class HTMLPurifier_URIScheme_callto extends HTMLPurifier_URIScheme {
+
+ public $browsable = false;
+ public $may_omit_host = true;
+
+ public function doValidate(&$uri, $config, $context) {
+ $uri->userinfo = null;
+ $uri->host = null;
+ $uri->port = null;
+
+ // my legal phone # chars: alphanumeric, underscore, hyphen, optional "+" for the first character. That's it. But you can allow whatever you want. Just change this:
+ $validCalltoPhoneNumberPattern = '/^\+?[a-zA-Z0-9_-]+$/i'; // <---whatever pattern you want to force phone numbers to match
+ $proposedPhoneNumber = $uri->path;
+
+ if (preg_match($validCalltoPhoneNumberPattern, $proposedPhoneNumber) !== 1) {
+
+ // submitted phone # inside the href attribute value looks bad; reject the phone number, and let HTMLpurifier remove the whole href attribute on the submitted <a> tag.
+ return false;
+ } else {
+ // submitted phone # inside the href attribute value looks OK; accept the phone number; HTMLpurifier should NOT strip the href attribute on the submitted <a> tag.
+ return true;
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/data.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/data.php
similarity index 90%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/data.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/data.php
index 3bd93a8..41c49d5 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/data.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/data.php
@@ -1,127 +1,136 @@
-<?php
-
-/**
- * Implements data: URI for base64 encoded images supported by GD.
- */
-class HTMLPurifier_URIScheme_data extends HTMLPurifier_URIScheme
-{
- /**
- * @type bool
- */
- public $browsable = true;
-
- /**
- * @type array
- */
- public $allowed_types = array(
- // you better write validation code for other types if you
- // decide to allow them
- 'image/jpeg' => true,
- 'image/gif' => true,
- 'image/png' => true,
- );
- // this is actually irrelevant since we only write out the path
- // component
- /**
- * @type bool
- */
- public $may_omit_host = true;
-
- /**
- * @param HTMLPurifier_URI $uri
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function doValidate(&$uri, $config, $context)
- {
- $result = explode(',', $uri->path, 2);
- $is_base64 = false;
- $charset = null;
- $content_type = null;
- if (count($result) == 2) {
- list($metadata, $data) = $result;
- // do some legwork on the metadata
- $metas = explode(';', $metadata);
- while (!empty($metas)) {
- $cur = array_shift($metas);
- if ($cur == 'base64') {
- $is_base64 = true;
- break;
- }
- if (substr($cur, 0, 8) == 'charset=') {
- // doesn't match if there are arbitrary spaces, but
- // whatever dude
- if ($charset !== null) {
- continue;
- } // garbage
- $charset = substr($cur, 8); // not used
- } else {
- if ($content_type !== null) {
- continue;
- } // garbage
- $content_type = $cur;
- }
- }
- } else {
- $data = $result[0];
- }
- if ($content_type !== null && empty($this->allowed_types[$content_type])) {
- return false;
- }
- if ($charset !== null) {
- // error; we don't allow plaintext stuff
- $charset = null;
- }
- $data = rawurldecode($data);
- if ($is_base64) {
- $raw_data = base64_decode($data);
- } else {
- $raw_data = $data;
- }
- // XXX probably want to refactor this into a general mechanism
- // for filtering arbitrary content types
- $file = tempnam("/tmp", "");
- file_put_contents($file, $raw_data);
- if (function_exists('exif_imagetype')) {
- $image_code = exif_imagetype($file);
- unlink($file);
- } elseif (function_exists('getimagesize')) {
- set_error_handler(array($this, 'muteErrorHandler'));
- $info = getimagesize($file);
- restore_error_handler();
- unlink($file);
- if ($info == false) {
- return false;
- }
- $image_code = $info[2];
- } else {
- trigger_error("could not find exif_imagetype or getimagesize functions", E_USER_ERROR);
- }
- $real_content_type = image_type_to_mime_type($image_code);
- if ($real_content_type != $content_type) {
- // we're nice guys; if the content type is something else we
- // support, change it over
- if (empty($this->allowed_types[$real_content_type])) {
- return false;
- }
- $content_type = $real_content_type;
- }
- // ok, it's kosher, rewrite what we need
- $uri->userinfo = null;
- $uri->host = null;
- $uri->port = null;
- $uri->fragment = null;
- $uri->query = null;
- $uri->path = "$content_type;base64," . base64_encode($raw_data);
- return true;
- }
-
- /**
- * @param int $errno
- * @param string $errstr
- */
- public function muteErrorHandler($errno, $errstr)
- {
- }
-}
+<?php
+
+/**
+ * Implements data: URI for base64 encoded images supported by GD.
+ */
+class HTMLPurifier_URIScheme_data extends HTMLPurifier_URIScheme
+{
+ /**
+ * @type bool
+ */
+ public $browsable = true;
+
+ /**
+ * @type array
+ */
+ public $allowed_types = array(
+ // you better write validation code for other types if you
+ // decide to allow them
+ 'image/jpeg' => true,
+ 'image/gif' => true,
+ 'image/png' => true,
+ );
+ // this is actually irrelevant since we only write out the path
+ // component
+ /**
+ * @type bool
+ */
+ public $may_omit_host = true;
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function doValidate(&$uri, $config, $context)
+ {
+ $result = explode(',', $uri->path, 2);
+ $is_base64 = false;
+ $charset = null;
+ $content_type = null;
+ if (count($result) == 2) {
+ list($metadata, $data) = $result;
+ // do some legwork on the metadata
+ $metas = explode(';', $metadata);
+ while (!empty($metas)) {
+ $cur = array_shift($metas);
+ if ($cur == 'base64') {
+ $is_base64 = true;
+ break;
+ }
+ if (substr($cur, 0, 8) == 'charset=') {
+ // doesn't match if there are arbitrary spaces, but
+ // whatever dude
+ if ($charset !== null) {
+ continue;
+ } // garbage
+ $charset = substr($cur, 8); // not used
+ } else {
+ if ($content_type !== null) {
+ continue;
+ } // garbage
+ $content_type = $cur;
+ }
+ }
+ } else {
+ $data = $result[0];
+ }
+ if ($content_type !== null && empty($this->allowed_types[$content_type])) {
+ return false;
+ }
+ if ($charset !== null) {
+ // error; we don't allow plaintext stuff
+ $charset = null;
+ }
+ $data = rawurldecode($data);
+ if ($is_base64) {
+ $raw_data = base64_decode($data);
+ } else {
+ $raw_data = $data;
+ }
+ if ( strlen($raw_data) < 12 ) {
+ // error; exif_imagetype throws exception with small files,
+ // and this likely indicates a corrupt URI/failed parse anyway
+ return false;
+ }
+ // XXX probably want to refactor this into a general mechanism
+ // for filtering arbitrary content types
+ if (function_exists('sys_get_temp_dir')) {
+ $file = tempnam(sys_get_temp_dir(), "");
+ } else {
+ $file = tempnam("/tmp", "");
+ }
+ file_put_contents($file, $raw_data);
+ if (function_exists('exif_imagetype')) {
+ $image_code = exif_imagetype($file);
+ unlink($file);
+ } elseif (function_exists('getimagesize')) {
+ set_error_handler(array($this, 'muteErrorHandler'));
+ $info = getimagesize($file);
+ restore_error_handler();
+ unlink($file);
+ if ($info == false) {
+ return false;
+ }
+ $image_code = $info[2];
+ } else {
+ trigger_error("could not find exif_imagetype or getimagesize functions", E_USER_ERROR);
+ }
+ $real_content_type = image_type_to_mime_type($image_code);
+ if ($real_content_type != $content_type) {
+ // we're nice guys; if the content type is something else we
+ // support, change it over
+ if (empty($this->allowed_types[$real_content_type])) {
+ return false;
+ }
+ $content_type = $real_content_type;
+ }
+ // ok, it's kosher, rewrite what we need
+ $uri->userinfo = null;
+ $uri->host = null;
+ $uri->port = null;
+ $uri->fragment = null;
+ $uri->query = null;
+ $uri->path = "$content_type;base64," . base64_encode($raw_data);
+ return true;
+ }
+
+ /**
+ * @param int $errno
+ * @param string $errstr
+ */
+ public function muteErrorHandler($errno, $errstr)
+ {
+ }
+}
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/file.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/file.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/file.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/file.php
index a220a6a..215be4b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/file.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/file.php
@@ -1,44 +1,44 @@
-<?php
-
-/**
- * Validates file as defined by RFC 1630 and RFC 1738.
- */
-class HTMLPurifier_URIScheme_file extends HTMLPurifier_URIScheme
-{
- /**
- * Generally file:// URLs are not accessible from most
- * machines, so placing them as an img src is incorrect.
- * @type bool
- */
- public $browsable = false;
-
- /**
- * Basically the *only* URI scheme for which this is true, since
- * accessing files on the local machine is very common. In fact,
- * browsers on some operating systems don't understand the
- * authority, though I hear it is used on Windows to refer to
- * network shares.
- * @type bool
- */
- public $may_omit_host = true;
-
- /**
- * @param HTMLPurifier_URI $uri
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function doValidate(&$uri, $config, $context)
- {
- // Authentication method is not supported
- $uri->userinfo = null;
- // file:// makes no provisions for accessing the resource
- $uri->port = null;
- // While it seems to work on Firefox, the querystring has
- // no possible effect and is thus stripped.
- $uri->query = null;
- return true;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates file as defined by RFC 1630 and RFC 1738.
+ */
+class HTMLPurifier_URIScheme_file extends HTMLPurifier_URIScheme
+{
+ /**
+ * Generally file:// URLs are not accessible from most
+ * machines, so placing them as an img src is incorrect.
+ * @type bool
+ */
+ public $browsable = false;
+
+ /**
+ * Basically the *only* URI scheme for which this is true, since
+ * accessing files on the local machine is very common. In fact,
+ * browsers on some operating systems don't understand the
+ * authority, though I hear it is used on Windows to refer to
+ * network shares.
+ * @type bool
+ */
+ public $may_omit_host = true;
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function doValidate(&$uri, $config, $context)
+ {
+ // Authentication method is not supported
+ $uri->userinfo = null;
+ // file:// makes no provisions for accessing the resource
+ $uri->port = null;
+ // While it seems to work on Firefox, the querystring has
+ // no possible effect and is thus stripped.
+ $uri->query = null;
+ return true;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/ftp.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/ftp.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/ftp.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/ftp.php
index 8e7fb8c..1eb43ee 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/ftp.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/ftp.php
@@ -1,58 +1,58 @@
-<?php
-
-/**
- * Validates ftp (File Transfer Protocol) URIs as defined by generic RFC 1738.
- */
-class HTMLPurifier_URIScheme_ftp extends HTMLPurifier_URIScheme
-{
- /**
- * @type int
- */
- public $default_port = 21;
-
- /**
- * @type bool
- */
- public $browsable = true; // usually
-
- /**
- * @type bool
- */
- public $hierarchical = true;
-
- /**
- * @param HTMLPurifier_URI $uri
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function doValidate(&$uri, $config, $context)
- {
- $uri->query = null;
-
- // typecode check
- $semicolon_pos = strrpos($uri->path, ';'); // reverse
- if ($semicolon_pos !== false) {
- $type = substr($uri->path, $semicolon_pos + 1); // no semicolon
- $uri->path = substr($uri->path, 0, $semicolon_pos);
- $type_ret = '';
- if (strpos($type, '=') !== false) {
- // figure out whether or not the declaration is correct
- list($key, $typecode) = explode('=', $type, 2);
- if ($key !== 'type') {
- // invalid key, tack it back on encoded
- $uri->path .= '%3B' . $type;
- } elseif ($typecode === 'a' || $typecode === 'i' || $typecode === 'd') {
- $type_ret = ";type=$typecode";
- }
- } else {
- $uri->path .= '%3B' . $type;
- }
- $uri->path = str_replace(';', '%3B', $uri->path);
- $uri->path .= $type_ret;
- }
- return true;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates ftp (File Transfer Protocol) URIs as defined by generic RFC 1738.
+ */
+class HTMLPurifier_URIScheme_ftp extends HTMLPurifier_URIScheme
+{
+ /**
+ * @type int
+ */
+ public $default_port = 21;
+
+ /**
+ * @type bool
+ */
+ public $browsable = true; // usually
+
+ /**
+ * @type bool
+ */
+ public $hierarchical = true;
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function doValidate(&$uri, $config, $context)
+ {
+ $uri->query = null;
+
+ // typecode check
+ $semicolon_pos = strrpos($uri->path, ';'); // reverse
+ if ($semicolon_pos !== false) {
+ $type = substr($uri->path, $semicolon_pos + 1); // no semicolon
+ $uri->path = substr($uri->path, 0, $semicolon_pos);
+ $type_ret = '';
+ if (strpos($type, '=') !== false) {
+ // figure out whether or not the declaration is correct
+ list($key, $typecode) = explode('=', $type, 2);
+ if ($key !== 'type') {
+ // invalid key, tack it back on encoded
+ $uri->path .= '%3B' . $type;
+ } elseif ($typecode === 'a' || $typecode === 'i' || $typecode === 'd') {
+ $type_ret = ";type=$typecode";
+ }
+ } else {
+ $uri->path .= '%3B' . $type;
+ }
+ $uri->path = str_replace(';', '%3B', $uri->path);
+ $uri->path .= $type_ret;
+ }
+ return true;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/http.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/http.php
similarity index 94%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/http.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/http.php
index 63c8c92..ce69ec4 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/http.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/http.php
@@ -1,36 +1,36 @@
-<?php
-
-/**
- * Validates http (HyperText Transfer Protocol) as defined by RFC 2616
- */
-class HTMLPurifier_URIScheme_http extends HTMLPurifier_URIScheme
-{
- /**
- * @type int
- */
- public $default_port = 80;
-
- /**
- * @type bool
- */
- public $browsable = true;
-
- /**
- * @type bool
- */
- public $hierarchical = true;
-
- /**
- * @param HTMLPurifier_URI $uri
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function doValidate(&$uri, $config, $context)
- {
- $uri->userinfo = null;
- return true;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates http (HyperText Transfer Protocol) as defined by RFC 2616
+ */
+class HTMLPurifier_URIScheme_http extends HTMLPurifier_URIScheme
+{
+ /**
+ * @type int
+ */
+ public $default_port = 80;
+
+ /**
+ * @type bool
+ */
+ public $browsable = true;
+
+ /**
+ * @type bool
+ */
+ public $hierarchical = true;
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function doValidate(&$uri, $config, $context)
+ {
+ $uri->userinfo = null;
+ return true;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/https.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/https.php
similarity index 94%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/https.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/https.php
index 4de3909..0e96882 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/https.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/https.php
@@ -1,18 +1,18 @@
-<?php
-
-/**
- * Validates https (Secure HTTP) according to http scheme.
- */
-class HTMLPurifier_URIScheme_https extends HTMLPurifier_URIScheme_http
-{
- /**
- * @type int
- */
- public $default_port = 443;
- /**
- * @type bool
- */
- public $secure = true;
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates https (Secure HTTP) according to http scheme.
+ */
+class HTMLPurifier_URIScheme_https extends HTMLPurifier_URIScheme_http
+{
+ /**
+ * @type int
+ */
+ public $default_port = 443;
+ /**
+ * @type bool
+ */
+ public $secure = true;
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/mailto.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/mailto.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/mailto.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/mailto.php
index b8a40d7..c3a6b60 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/mailto.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/mailto.php
@@ -1,40 +1,40 @@
-<?php
-
-// VERY RELAXED! Shouldn't cause problems, not even Firefox checks if the
-// email is valid, but be careful!
-
-/**
- * Validates mailto (for E-mail) according to RFC 2368
- * @todo Validate the email address
- * @todo Filter allowed query parameters
- */
-
-class HTMLPurifier_URIScheme_mailto extends HTMLPurifier_URIScheme
-{
- /**
- * @type bool
- */
- public $browsable = false;
-
- /**
- * @type bool
- */
- public $may_omit_host = true;
-
- /**
- * @param HTMLPurifier_URI $uri
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function doValidate(&$uri, $config, $context)
- {
- $uri->userinfo = null;
- $uri->host = null;
- $uri->port = null;
- // we need to validate path against RFC 2368's addr-spec
- return true;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+// VERY RELAXED! Shouldn't cause problems, not even Firefox checks if the
+// email is valid, but be careful!
+
+/**
+ * Validates mailto (for E-mail) according to RFC 2368
+ * @todo Validate the email address
+ * @todo Filter allowed query parameters
+ */
+
+class HTMLPurifier_URIScheme_mailto extends HTMLPurifier_URIScheme
+{
+ /**
+ * @type bool
+ */
+ public $browsable = false;
+
+ /**
+ * @type bool
+ */
+ public $may_omit_host = true;
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function doValidate(&$uri, $config, $context)
+ {
+ $uri->userinfo = null;
+ $uri->host = null;
+ $uri->port = null;
+ // we need to validate path against RFC 2368's addr-spec
+ return true;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/news.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/news.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/news.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/news.php
index 22c9ebc..7490927 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/news.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/news.php
@@ -1,35 +1,35 @@
-<?php
-
-/**
- * Validates news (Usenet) as defined by generic RFC 1738
- */
-class HTMLPurifier_URIScheme_news extends HTMLPurifier_URIScheme
-{
- /**
- * @type bool
- */
- public $browsable = false;
-
- /**
- * @type bool
- */
- public $may_omit_host = true;
-
- /**
- * @param HTMLPurifier_URI $uri
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function doValidate(&$uri, $config, $context)
- {
- $uri->userinfo = null;
- $uri->host = null;
- $uri->port = null;
- $uri->query = null;
- // typecode check needed on path
- return true;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates news (Usenet) as defined by generic RFC 1738
+ */
+class HTMLPurifier_URIScheme_news extends HTMLPurifier_URIScheme
+{
+ /**
+ * @type bool
+ */
+ public $browsable = false;
+
+ /**
+ * @type bool
+ */
+ public $may_omit_host = true;
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function doValidate(&$uri, $config, $context)
+ {
+ $uri->userinfo = null;
+ $uri->host = null;
+ $uri->port = null;
+ $uri->query = null;
+ // typecode check needed on path
+ return true;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/nntp.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/nntp.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/nntp.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/nntp.php
index 803ed13..f211d71 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/nntp.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/nntp.php
@@ -1,32 +1,32 @@
-<?php
-
-/**
- * Validates nntp (Network News Transfer Protocol) as defined by generic RFC 1738
- */
-class HTMLPurifier_URIScheme_nntp extends HTMLPurifier_URIScheme
-{
- /**
- * @type int
- */
- public $default_port = 119;
-
- /**
- * @type bool
- */
- public $browsable = false;
-
- /**
- * @param HTMLPurifier_URI $uri
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function doValidate(&$uri, $config, $context)
- {
- $uri->userinfo = null;
- $uri->query = null;
- return true;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates nntp (Network News Transfer Protocol) as defined by generic RFC 1738
+ */
+class HTMLPurifier_URIScheme_nntp extends HTMLPurifier_URIScheme
+{
+ /**
+ * @type int
+ */
+ public $default_port = 119;
+
+ /**
+ * @type bool
+ */
+ public $browsable = false;
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function doValidate(&$uri, $config, $context)
+ {
+ $uri->userinfo = null;
+ $uri->query = null;
+ return true;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/skype.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/skype.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/skype.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/skype.php
index 133d29c..cd969ed 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/skype.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/skype.php
@@ -1,32 +1,32 @@
-<?php
-
-/**
- * Validates 'skype:skype_user?call' number in URI
- */
-class HTMLPurifier_URIScheme_skype extends HTMLPurifier_URIScheme {
-
- public $browsable = false;
- public $may_omit_host = true;
-
- public function doValidate(&$uri, $config, $context) {
- $uri->userinfo = null;
- $uri->host = null;
- $uri->port = null;
-
- // my legal phone # chars: alphanumeric, underscore, hyphen, optional "+" for the first character. That's it. But you can allow whatever you want. Just change this:
- $validCalltoPhoneNumberPattern = '/^[a-zA-Z0-9_\-,\.]+$/i'; // <---whatever pattern you want to force phone numbers to match
- $proposedPhoneNumber = $uri->path;
-
- if (preg_match($validCalltoPhoneNumberPattern, $proposedPhoneNumber) !== 1) {
-
- // submitted phone # inside the href attribute value looks bad; reject the phone number, and let HTMLpurifier remove the whole href attribute on the submitted <a> tag.
- return false;
- } else {
- // submitted phone # inside the href attribute value looks OK; accept the phone number; HTMLpurifier should NOT strip the href attribute on the submitted <a> tag.
- return true;
- }
-
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates 'skype:skype_user?call' number in URI
+ */
+class HTMLPurifier_URIScheme_skype extends HTMLPurifier_URIScheme {
+
+ public $browsable = false;
+ public $may_omit_host = true;
+
+ public function doValidate(&$uri, $config, $context) {
+ $uri->userinfo = null;
+ $uri->host = null;
+ $uri->port = null;
+
+ // my legal phone # chars: alphanumeric, underscore, hyphen, optional "+" for the first character. That's it. But you can allow whatever you want. Just change this:
+ $validCalltoPhoneNumberPattern = '/^[a-zA-Z0-9_\-,\.]+$/i'; // <---whatever pattern you want to force phone numbers to match
+ $proposedPhoneNumber = $uri->path;
+
+ if (preg_match($validCalltoPhoneNumberPattern, $proposedPhoneNumber) !== 1) {
+
+ // submitted phone # inside the href attribute value looks bad; reject the phone number, and let HTMLpurifier remove the whole href attribute on the submitted <a> tag.
+ return false;
+ } else {
+ // submitted phone # inside the href attribute value looks OK; accept the phone number; HTMLpurifier should NOT strip the href attribute on the submitted <a> tag.
+ return true;
+ }
+
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/sms.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/sms.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/sms.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/sms.php
index 9f2ab8c..8148395 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/sms.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/sms.php
@@ -1,31 +1,31 @@
-<?php
-
-/**
- * Validates 'sms:' phone number in URI to included only alphanumeric, hyphens, underscore, and optional leading "+"
- */
-class HTMLPurifier_URIScheme_sms extends HTMLPurifier_URIScheme {
-
- public $browsable = false;
- public $may_omit_host = true;
-
- public function doValidate(&$uri, $config, $context) {
- $uri->userinfo = null;
- $uri->host = null;
- $uri->port = null;
-
- // my legal phone # chars: alphanumeric, underscore, hyphen, optional "+" for the first character. That's it. But you can allow whatever you want. Just change this:
- $validCalltoPhoneNumberPattern = '/^\+?[a-zA-Z0-9_-]+$/i'; // <---whatever pattern you want to force phone numbers to match
- $proposedPhoneNumber = $uri->path;
-
- if (preg_match($validCalltoPhoneNumberPattern, $proposedPhoneNumber) !== 1) {
-
- // submitted phone # inside the href attribute value looks bad; reject the phone number, and let HTMLpurifier remove the whole href attribute on the submitted <a> tag.
- return false;
- } else {
- // submitted phone # inside the href attribute value looks OK; accept the phone number; HTMLpurifier should NOT strip the href attribute on the submitted <a> tag.
- return true;
- }
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates 'sms:' phone number in URI to included only alphanumeric, hyphens, underscore, and optional leading "+"
+ */
+class HTMLPurifier_URIScheme_sms extends HTMLPurifier_URIScheme {
+
+ public $browsable = false;
+ public $may_omit_host = true;
+
+ public function doValidate(&$uri, $config, $context) {
+ $uri->userinfo = null;
+ $uri->host = null;
+ $uri->port = null;
+
+ // my legal phone # chars: alphanumeric, underscore, hyphen, optional "+" for the first character. That's it. But you can allow whatever you want. Just change this:
+ $validCalltoPhoneNumberPattern = '/^\+?[a-zA-Z0-9_-]+$/i'; // <---whatever pattern you want to force phone numbers to match
+ $proposedPhoneNumber = $uri->path;
+
+ if (preg_match($validCalltoPhoneNumberPattern, $proposedPhoneNumber) !== 1) {
+
+ // submitted phone # inside the href attribute value looks bad; reject the phone number, and let HTMLpurifier remove the whole href attribute on the submitted <a> tag.
+ return false;
+ } else {
+ // submitted phone # inside the href attribute value looks OK; accept the phone number; HTMLpurifier should NOT strip the href attribute on the submitted <a> tag.
+ return true;
+ }
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/tel.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/tel.php
new file mode 100755
index 0000000..8cd1933
--- /dev/null
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/tel.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Validates tel (for phone numbers).
+ *
+ * The relevant specifications for this protocol are RFC 3966 and RFC 5341,
+ * but this class takes a much simpler approach: we normalize phone
+ * numbers so that they only include (possibly) a leading plus,
+ * and then any number of digits and x'es.
+ */
+
+class HTMLPurifier_URIScheme_tel extends HTMLPurifier_URIScheme
+{
+ /**
+ * @type bool
+ */
+ public $browsable = false;
+
+ /**
+ * @type bool
+ */
+ public $may_omit_host = true;
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function doValidate(&$uri, $config, $context)
+ {
+ $uri->userinfo = null;
+ $uri->host = null;
+ $uri->port = null;
+
+ // Delete all non-numeric characters, non-x characters
+ // from phone number, EXCEPT for a leading plus sign.
+ $uri->path = preg_replace('/(?!^\+)[^\dx]/', '',
+ // Normalize e(x)tension to lower-case
+ str_replace('X', 'x', $uri->path));
+
+ return true;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/whatsapp.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/whatsapp.php
similarity index 94%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/whatsapp.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/whatsapp.php
index 2868221..9dce503 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URIScheme/whatsapp.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URIScheme/whatsapp.php
@@ -1,31 +1,31 @@
-<?php
-
-/**
- * Validates whatsapp://
- */
-class HTMLPurifier_URIScheme_whatsapp extends HTMLPurifier_URIScheme
-{
- /**
- * @type bool
- */
- public $browsable = false;
-
- /**
- * @type bool
- */
- public $hierarchical = true;
-
- /**
- * @param HTMLPurifier_URI $uri
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return bool
- */
- public function doValidate(&$uri, $config, $context)
- {
- $uri->userinfo = null;
- return true;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Validates whatsapp://
+ */
+class HTMLPurifier_URIScheme_whatsapp extends HTMLPurifier_URIScheme
+{
+ /**
+ * @type bool
+ */
+ public $browsable = false;
+
+ /**
+ * @type bool
+ */
+ public $hierarchical = true;
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function doValidate(&$uri, $config, $context)
+ {
+ $uri->userinfo = null;
+ return true;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URISchemeRegistry.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URISchemeRegistry.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URISchemeRegistry.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URISchemeRegistry.php
index 2428063..4ac8a0b 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/URISchemeRegistry.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/URISchemeRegistry.php
@@ -1,81 +1,81 @@
-<?php
-
-/**
- * Registry for retrieving specific URI scheme validator objects.
- */
-class HTMLPurifier_URISchemeRegistry
-{
-
- /**
- * Retrieve sole instance of the registry.
- * @param HTMLPurifier_URISchemeRegistry $prototype Optional prototype to overload sole instance with,
- * or bool true to reset to default registry.
- * @return HTMLPurifier_URISchemeRegistry
- * @note Pass a registry object $prototype with a compatible interface and
- * the function will copy it and return it all further times.
- */
- public static function instance($prototype = null)
- {
- static $instance = null;
- if ($prototype !== null) {
- $instance = $prototype;
- } elseif ($instance === null || $prototype == true) {
- $instance = new HTMLPurifier_URISchemeRegistry();
- }
- return $instance;
- }
-
- /**
- * Cache of retrieved schemes.
- * @type HTMLPurifier_URIScheme[]
- */
- protected $schemes = array();
-
- /**
- * Retrieves a scheme validator object
- * @param string $scheme String scheme name like http or mailto
- * @param HTMLPurifier_Config $config
- * @param HTMLPurifier_Context $context
- * @return HTMLPurifier_URIScheme
- */
- public function getScheme($scheme, $config, $context)
- {
- if (!$config) {
- $config = HTMLPurifier_Config::createDefault();
- }
-
- // important, otherwise attacker could include arbitrary file
- $allowed_schemes = $config->get('URI.AllowedSchemes');
- if (!$config->get('URI.OverrideAllowedSchemes') &&
- !isset($allowed_schemes[$scheme])
- ) {
- return;
- }
-
- if (isset($this->schemes[$scheme])) {
- return $this->schemes[$scheme];
- }
- if (!isset($allowed_schemes[$scheme])) {
- return;
- }
-
- $class = 'HTMLPurifier_URIScheme_' . $scheme;
- if (!class_exists($class)) {
- return;
- }
- $this->schemes[$scheme] = new $class();
- return $this->schemes[$scheme];
- }
-
- /**
- * Registers a custom scheme to the cache, bypassing reflection.
- * @param string $scheme Scheme name
- * @param HTMLPurifier_URIScheme $scheme_obj
- */
- public function register($scheme, $scheme_obj)
- {
- $this->schemes[$scheme] = $scheme_obj;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Registry for retrieving specific URI scheme validator objects.
+ */
+class HTMLPurifier_URISchemeRegistry
+{
+
+ /**
+ * Retrieve sole instance of the registry.
+ * @param HTMLPurifier_URISchemeRegistry $prototype Optional prototype to overload sole instance with,
+ * or bool true to reset to default registry.
+ * @return HTMLPurifier_URISchemeRegistry
+ * @note Pass a registry object $prototype with a compatible interface and
+ * the function will copy it and return it all further times.
+ */
+ public static function instance($prototype = null)
+ {
+ static $instance = null;
+ if ($prototype !== null) {
+ $instance = $prototype;
+ } elseif ($instance === null || $prototype == true) {
+ $instance = new HTMLPurifier_URISchemeRegistry();
+ }
+ return $instance;
+ }
+
+ /**
+ * Cache of retrieved schemes.
+ * @type HTMLPurifier_URIScheme[]
+ */
+ protected $schemes = array();
+
+ /**
+ * Retrieves a scheme validator object
+ * @param string $scheme String scheme name like http or mailto
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return HTMLPurifier_URIScheme
+ */
+ public function getScheme($scheme, $config, $context)
+ {
+ if (!$config) {
+ $config = HTMLPurifier_Config::createDefault();
+ }
+
+ // important, otherwise attacker could include arbitrary file
+ $allowed_schemes = $config->get('URI.AllowedSchemes');
+ if (!$config->get('URI.OverrideAllowedSchemes') &&
+ !isset($allowed_schemes[$scheme])
+ ) {
+ return;
+ }
+
+ if (isset($this->schemes[$scheme])) {
+ return $this->schemes[$scheme];
+ }
+ if (!isset($allowed_schemes[$scheme])) {
+ return;
+ }
+
+ $class = 'HTMLPurifier_URIScheme_' . $scheme;
+ if (!class_exists($class)) {
+ return;
+ }
+ $this->schemes[$scheme] = new $class();
+ return $this->schemes[$scheme];
+ }
+
+ /**
+ * Registers a custom scheme to the cache, bypassing reflection.
+ * @param string $scheme Scheme name
+ * @param HTMLPurifier_URIScheme $scheme_obj
+ */
+ public function register($scheme, $scheme_obj)
+ {
+ $this->schemes[$scheme] = $scheme_obj;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/UnitConverter.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/UnitConverter.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/UnitConverter.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/UnitConverter.php
index e663b32..166f3bf 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/UnitConverter.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/UnitConverter.php
@@ -1,307 +1,307 @@
-<?php
-
-/**
- * Class for converting between different unit-lengths as specified by
- * CSS.
- */
-class HTMLPurifier_UnitConverter
-{
-
- const ENGLISH = 1;
- const METRIC = 2;
- const DIGITAL = 3;
-
- /**
- * Units information array. Units are grouped into measuring systems
- * (English, Metric), and are assigned an integer representing
- * the conversion factor between that unit and the smallest unit in
- * the system. Numeric indexes are actually magical constants that
- * encode conversion data from one system to the next, with a O(n^2)
- * constraint on memory (this is generally not a problem, since
- * the number of measuring systems is small.)
- */
- protected static $units = array(
- self::ENGLISH => array(
- 'px' => 3, // This is as per CSS 2.1 and Firefox. Your mileage may vary
- 'pt' => 4,
- 'pc' => 48,
- 'in' => 288,
- self::METRIC => array('pt', '0.352777778', 'mm'),
- ),
- self::METRIC => array(
- 'mm' => 1,
- 'cm' => 10,
- self::ENGLISH => array('mm', '2.83464567', 'pt'),
- ),
- );
-
- /**
- * Minimum bcmath precision for output.
- * @type int
- */
- protected $outputPrecision;
-
- /**
- * Bcmath precision for internal calculations.
- * @type int
- */
- protected $internalPrecision;
-
- /**
- * Whether or not BCMath is available.
- * @type bool
- */
- private $bcmath;
-
- public function __construct($output_precision = 4, $internal_precision = 10, $force_no_bcmath = false)
- {
- $this->outputPrecision = $output_precision;
- $this->internalPrecision = $internal_precision;
- $this->bcmath = !$force_no_bcmath && function_exists('bcmul');
- }
-
- /**
- * Converts a length object of one unit into another unit.
- * @param HTMLPurifier_Length $length
- * Instance of HTMLPurifier_Length to convert. You must validate()
- * it before passing it here!
- * @param string $to_unit
- * Unit to convert to.
- * @return HTMLPurifier_Length|bool
- * @note
- * About precision: This conversion function pays very special
- * attention to the incoming precision of values and attempts
- * to maintain a number of significant figure. Results are
- * fairly accurate up to nine digits. Some caveats:
- * - If a number is zero-padded as a result of this significant
- * figure tracking, the zeroes will be eliminated.
- * - If a number contains less than four sigfigs ($outputPrecision)
- * and this causes some decimals to be excluded, those
- * decimals will be added on.
- */
- public function convert($length, $to_unit)
- {
- if (!$length->isValid()) {
- return false;
- }
-
- $n = $length->getN();
- $unit = $length->getUnit();
-
- if ($n === '0' || $unit === false) {
- return new HTMLPurifier_Length('0', false);
- }
-
- $state = $dest_state = false;
- foreach (self::$units as $k => $x) {
- if (isset($x[$unit])) {
- $state = $k;
- }
- if (isset($x[$to_unit])) {
- $dest_state = $k;
- }
- }
- if (!$state || !$dest_state) {
- return false;
- }
-
- // Some calculations about the initial precision of the number;
- // this will be useful when we need to do final rounding.
- $sigfigs = $this->getSigFigs($n);
- if ($sigfigs < $this->outputPrecision) {
- $sigfigs = $this->outputPrecision;
- }
-
- // BCMath's internal precision deals only with decimals. Use
- // our default if the initial number has no decimals, or increase
- // it by how ever many decimals, thus, the number of guard digits
- // will always be greater than or equal to internalPrecision.
- $log = (int)floor(log(abs($n), 10));
- $cp = ($log < 0) ? $this->internalPrecision - $log : $this->internalPrecision; // internal precision
-
- for ($i = 0; $i < 2; $i++) {
-
- // Determine what unit IN THIS SYSTEM we need to convert to
- if ($dest_state === $state) {
- // Simple conversion
- $dest_unit = $to_unit;
- } else {
- // Convert to the smallest unit, pending a system shift
- $dest_unit = self::$units[$state][$dest_state][0];
- }
-
- // Do the conversion if necessary
- if ($dest_unit !== $unit) {
- $factor = $this->div(self::$units[$state][$unit], self::$units[$state][$dest_unit], $cp);
- $n = $this->mul($n, $factor, $cp);
- $unit = $dest_unit;
- }
-
- // Output was zero, so bail out early. Shouldn't ever happen.
- if ($n === '') {
- $n = '0';
- $unit = $to_unit;
- break;
- }
-
- // It was a simple conversion, so bail out
- if ($dest_state === $state) {
- break;
- }
-
- if ($i !== 0) {
- // Conversion failed! Apparently, the system we forwarded
- // to didn't have this unit. This should never happen!
- return false;
- }
-
- // Pre-condition: $i == 0
-
- // Perform conversion to next system of units
- $n = $this->mul($n, self::$units[$state][$dest_state][1], $cp);
- $unit = self::$units[$state][$dest_state][2];
- $state = $dest_state;
-
- // One more loop around to convert the unit in the new system.
-
- }
-
- // Post-condition: $unit == $to_unit
- if ($unit !== $to_unit) {
- return false;
- }
-
- // Useful for debugging:
- //echo "<pre>n";
- //echo "$n\nsigfigs = $sigfigs\nnew_log = $new_log\nlog = $log\nrp = $rp\n</pre>\n";
-
- $n = $this->round($n, $sigfigs);
- if (strpos($n, '.') !== false) {
- $n = rtrim($n, '0');
- }
- $n = rtrim($n, '.');
-
- return new HTMLPurifier_Length($n, $unit);
- }
-
- /**
- * Returns the number of significant figures in a string number.
- * @param string $n Decimal number
- * @return int number of sigfigs
- */
- public function getSigFigs($n)
- {
- $n = ltrim($n, '0+-');
- $dp = strpos($n, '.'); // decimal position
- if ($dp === false) {
- $sigfigs = strlen(rtrim($n, '0'));
- } else {
- $sigfigs = strlen(ltrim($n, '0.')); // eliminate extra decimal character
- if ($dp !== 0) {
- $sigfigs--;
- }
- }
- return $sigfigs;
- }
-
- /**
- * Adds two numbers, using arbitrary precision when available.
- * @param string $s1
- * @param string $s2
- * @param int $scale
- * @return string
- */
- private function add($s1, $s2, $scale)
- {
- if ($this->bcmath) {
- return bcadd($s1, $s2, $scale);
- } else {
- return $this->scale((float)$s1 + (float)$s2, $scale);
- }
- }
-
- /**
- * Multiples two numbers, using arbitrary precision when available.
- * @param string $s1
- * @param string $s2
- * @param int $scale
- * @return string
- */
- private function mul($s1, $s2, $scale)
- {
- if ($this->bcmath) {
- return bcmul($s1, $s2, $scale);
- } else {
- return $this->scale((float)$s1 * (float)$s2, $scale);
- }
- }
-
- /**
- * Divides two numbers, using arbitrary precision when available.
- * @param string $s1
- * @param string $s2
- * @param int $scale
- * @return string
- */
- private function div($s1, $s2, $scale)
- {
- if ($this->bcmath) {
- return bcdiv($s1, $s2, $scale);
- } else {
- return $this->scale((float)$s1 / (float)$s2, $scale);
- }
- }
-
- /**
- * Rounds a number according to the number of sigfigs it should have,
- * using arbitrary precision when available.
- * @param float $n
- * @param int $sigfigs
- * @return string
- */
- private function round($n, $sigfigs)
- {
- $new_log = (int)floor(log(abs($n), 10)); // Number of digits left of decimal - 1
- $rp = $sigfigs - $new_log - 1; // Number of decimal places needed
- $neg = $n < 0 ? '-' : ''; // Negative sign
- if ($this->bcmath) {
- if ($rp >= 0) {
- $n = bcadd($n, $neg . '0.' . str_repeat('0', $rp) . '5', $rp + 1);
- $n = bcdiv($n, '1', $rp);
- } else {
- // This algorithm partially depends on the standardized
- // form of numbers that comes out of bcmath.
- $n = bcadd($n, $neg . '5' . str_repeat('0', $new_log - $sigfigs), 0);
- $n = substr($n, 0, $sigfigs + strlen($neg)) . str_repeat('0', $new_log - $sigfigs + 1);
- }
- return $n;
- } else {
- return $this->scale(round($n, $sigfigs - $new_log - 1), $rp + 1);
- }
- }
-
- /**
- * Scales a float to $scale digits right of decimal point, like BCMath.
- * @param float $r
- * @param int $scale
- * @return string
- */
- private function scale($r, $scale)
- {
- if ($scale < 0) {
- // The f sprintf type doesn't support negative numbers, so we
- // need to cludge things manually. First get the string.
- $r = sprintf('%.0f', (float)$r);
- // Due to floating point precision loss, $r will more than likely
- // look something like 4652999999999.9234. We grab one more digit
- // than we need to precise from $r and then use that to round
- // appropriately.
- $precise = (string)round(substr($r, 0, strlen($r) + $scale), -1);
- // Now we return it, truncating the zero that was rounded off.
- return substr($precise, 0, -1) . str_repeat('0', -$scale + 1);
- }
- return sprintf('%.' . $scale . 'f', (float)$r);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Class for converting between different unit-lengths as specified by
+ * CSS.
+ */
+class HTMLPurifier_UnitConverter
+{
+
+ const ENGLISH = 1;
+ const METRIC = 2;
+ const DIGITAL = 3;
+
+ /**
+ * Units information array. Units are grouped into measuring systems
+ * (English, Metric), and are assigned an integer representing
+ * the conversion factor between that unit and the smallest unit in
+ * the system. Numeric indexes are actually magical constants that
+ * encode conversion data from one system to the next, with a O(n^2)
+ * constraint on memory (this is generally not a problem, since
+ * the number of measuring systems is small.)
+ */
+ protected static $units = array(
+ self::ENGLISH => array(
+ 'px' => 3, // This is as per CSS 2.1 and Firefox. Your mileage may vary
+ 'pt' => 4,
+ 'pc' => 48,
+ 'in' => 288,
+ self::METRIC => array('pt', '0.352777778', 'mm'),
+ ),
+ self::METRIC => array(
+ 'mm' => 1,
+ 'cm' => 10,
+ self::ENGLISH => array('mm', '2.83464567', 'pt'),
+ ),
+ );
+
+ /**
+ * Minimum bcmath precision for output.
+ * @type int
+ */
+ protected $outputPrecision;
+
+ /**
+ * Bcmath precision for internal calculations.
+ * @type int
+ */
+ protected $internalPrecision;
+
+ /**
+ * Whether or not BCMath is available.
+ * @type bool
+ */
+ private $bcmath;
+
+ public function __construct($output_precision = 4, $internal_precision = 10, $force_no_bcmath = false)
+ {
+ $this->outputPrecision = $output_precision;
+ $this->internalPrecision = $internal_precision;
+ $this->bcmath = !$force_no_bcmath && function_exists('bcmul');
+ }
+
+ /**
+ * Converts a length object of one unit into another unit.
+ * @param HTMLPurifier_Length $length
+ * Instance of HTMLPurifier_Length to convert. You must validate()
+ * it before passing it here!
+ * @param string $to_unit
+ * Unit to convert to.
+ * @return HTMLPurifier_Length|bool
+ * @note
+ * About precision: This conversion function pays very special
+ * attention to the incoming precision of values and attempts
+ * to maintain a number of significant figure. Results are
+ * fairly accurate up to nine digits. Some caveats:
+ * - If a number is zero-padded as a result of this significant
+ * figure tracking, the zeroes will be eliminated.
+ * - If a number contains less than four sigfigs ($outputPrecision)
+ * and this causes some decimals to be excluded, those
+ * decimals will be added on.
+ */
+ public function convert($length, $to_unit)
+ {
+ if (!$length->isValid()) {
+ return false;
+ }
+
+ $n = $length->getN();
+ $unit = $length->getUnit();
+
+ if ($n === '0' || $unit === false) {
+ return new HTMLPurifier_Length('0', false);
+ }
+
+ $state = $dest_state = false;
+ foreach (self::$units as $k => $x) {
+ if (isset($x[$unit])) {
+ $state = $k;
+ }
+ if (isset($x[$to_unit])) {
+ $dest_state = $k;
+ }
+ }
+ if (!$state || !$dest_state) {
+ return false;
+ }
+
+ // Some calculations about the initial precision of the number;
+ // this will be useful when we need to do final rounding.
+ $sigfigs = $this->getSigFigs($n);
+ if ($sigfigs < $this->outputPrecision) {
+ $sigfigs = $this->outputPrecision;
+ }
+
+ // BCMath's internal precision deals only with decimals. Use
+ // our default if the initial number has no decimals, or increase
+ // it by how ever many decimals, thus, the number of guard digits
+ // will always be greater than or equal to internalPrecision.
+ $log = (int)floor(log(abs($n), 10));
+ $cp = ($log < 0) ? $this->internalPrecision - $log : $this->internalPrecision; // internal precision
+
+ for ($i = 0; $i < 2; $i++) {
+
+ // Determine what unit IN THIS SYSTEM we need to convert to
+ if ($dest_state === $state) {
+ // Simple conversion
+ $dest_unit = $to_unit;
+ } else {
+ // Convert to the smallest unit, pending a system shift
+ $dest_unit = self::$units[$state][$dest_state][0];
+ }
+
+ // Do the conversion if necessary
+ if ($dest_unit !== $unit) {
+ $factor = $this->div(self::$units[$state][$unit], self::$units[$state][$dest_unit], $cp);
+ $n = $this->mul($n, $factor, $cp);
+ $unit = $dest_unit;
+ }
+
+ // Output was zero, so bail out early. Shouldn't ever happen.
+ if ($n === '') {
+ $n = '0';
+ $unit = $to_unit;
+ break;
+ }
+
+ // It was a simple conversion, so bail out
+ if ($dest_state === $state) {
+ break;
+ }
+
+ if ($i !== 0) {
+ // Conversion failed! Apparently, the system we forwarded
+ // to didn't have this unit. This should never happen!
+ return false;
+ }
+
+ // Pre-condition: $i == 0
+
+ // Perform conversion to next system of units
+ $n = $this->mul($n, self::$units[$state][$dest_state][1], $cp);
+ $unit = self::$units[$state][$dest_state][2];
+ $state = $dest_state;
+
+ // One more loop around to convert the unit in the new system.
+
+ }
+
+ // Post-condition: $unit == $to_unit
+ if ($unit !== $to_unit) {
+ return false;
+ }
+
+ // Useful for debugging:
+ //echo "<pre>n";
+ //echo "$n\nsigfigs = $sigfigs\nnew_log = $new_log\nlog = $log\nrp = $rp\n</pre>\n";
+
+ $n = $this->round($n, $sigfigs);
+ if (strpos($n, '.') !== false) {
+ $n = rtrim($n, '0');
+ }
+ $n = rtrim($n, '.');
+
+ return new HTMLPurifier_Length($n, $unit);
+ }
+
+ /**
+ * Returns the number of significant figures in a string number.
+ * @param string $n Decimal number
+ * @return int number of sigfigs
+ */
+ public function getSigFigs($n)
+ {
+ $n = ltrim($n, '0+-');
+ $dp = strpos($n, '.'); // decimal position
+ if ($dp === false) {
+ $sigfigs = strlen(rtrim($n, '0'));
+ } else {
+ $sigfigs = strlen(ltrim($n, '0.')); // eliminate extra decimal character
+ if ($dp !== 0) {
+ $sigfigs--;
+ }
+ }
+ return $sigfigs;
+ }
+
+ /**
+ * Adds two numbers, using arbitrary precision when available.
+ * @param string $s1
+ * @param string $s2
+ * @param int $scale
+ * @return string
+ */
+ private function add($s1, $s2, $scale)
+ {
+ if ($this->bcmath) {
+ return bcadd($s1, $s2, $scale);
+ } else {
+ return $this->scale((float)$s1 + (float)$s2, $scale);
+ }
+ }
+
+ /**
+ * Multiples two numbers, using arbitrary precision when available.
+ * @param string $s1
+ * @param string $s2
+ * @param int $scale
+ * @return string
+ */
+ private function mul($s1, $s2, $scale)
+ {
+ if ($this->bcmath) {
+ return bcmul($s1, $s2, $scale);
+ } else {
+ return $this->scale((float)$s1 * (float)$s2, $scale);
+ }
+ }
+
+ /**
+ * Divides two numbers, using arbitrary precision when available.
+ * @param string $s1
+ * @param string $s2
+ * @param int $scale
+ * @return string
+ */
+ private function div($s1, $s2, $scale)
+ {
+ if ($this->bcmath) {
+ return bcdiv($s1, $s2, $scale);
+ } else {
+ return $this->scale((float)$s1 / (float)$s2, $scale);
+ }
+ }
+
+ /**
+ * Rounds a number according to the number of sigfigs it should have,
+ * using arbitrary precision when available.
+ * @param float $n
+ * @param int $sigfigs
+ * @return string
+ */
+ private function round($n, $sigfigs)
+ {
+ $new_log = (int)floor(log(abs($n), 10)); // Number of digits left of decimal - 1
+ $rp = $sigfigs - $new_log - 1; // Number of decimal places needed
+ $neg = $n < 0 ? '-' : ''; // Negative sign
+ if ($this->bcmath) {
+ if ($rp >= 0) {
+ $n = bcadd($n, $neg . '0.' . str_repeat('0', $rp) . '5', $rp + 1);
+ $n = bcdiv($n, '1', $rp);
+ } else {
+ // This algorithm partially depends on the standardized
+ // form of numbers that comes out of bcmath.
+ $n = bcadd($n, $neg . '5' . str_repeat('0', $new_log - $sigfigs), 0);
+ $n = substr($n, 0, $sigfigs + strlen($neg)) . str_repeat('0', $new_log - $sigfigs + 1);
+ }
+ return $n;
+ } else {
+ return $this->scale(round($n, $sigfigs - $new_log - 1), $rp + 1);
+ }
+ }
+
+ /**
+ * Scales a float to $scale digits right of decimal point, like BCMath.
+ * @param float $r
+ * @param int $scale
+ * @return string
+ */
+ private function scale($r, $scale)
+ {
+ if ($scale < 0) {
+ // The f sprintf type doesn't support negative numbers, so we
+ // need to cludge things manually. First get the string.
+ $r = sprintf('%.0f', (float)$r);
+ // Due to floating point precision loss, $r will more than likely
+ // look something like 4652999999999.9234. We grab one more digit
+ // than we need to precise from $r and then use that to round
+ // appropriately.
+ $precise = (string)round(substr($r, 0, strlen($r) + $scale), -1);
+ // Now we return it, truncating the zero that was rounded off.
+ return substr($precise, 0, -1) . str_repeat('0', -$scale + 1);
+ }
+ return sprintf('%.' . $scale . 'f', (float)$r);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/VarParser.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/VarParser.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/VarParser.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/VarParser.php
index 4bf7771..50cba69 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/VarParser.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/VarParser.php
@@ -1,198 +1,198 @@
-<?php
-
-/**
- * Parses string representations into their corresponding native PHP
- * variable type. The base implementation does a simple type-check.
- */
-class HTMLPurifier_VarParser
-{
-
- const STRING = 1;
- const ISTRING = 2;
- const TEXT = 3;
- const ITEXT = 4;
- const INT = 5;
- const FLOAT = 6;
- const BOOL = 7;
- const LOOKUP = 8;
- const ALIST = 9;
- const HASH = 10;
- const MIXED = 11;
-
- /**
- * Lookup table of allowed types. Mainly for backwards compatibility, but
- * also convenient for transforming string type names to the integer constants.
- */
- public static $types = array(
- 'string' => self::STRING,
- 'istring' => self::ISTRING,
- 'text' => self::TEXT,
- 'itext' => self::ITEXT,
- 'int' => self::INT,
- 'float' => self::FLOAT,
- 'bool' => self::BOOL,
- 'lookup' => self::LOOKUP,
- 'list' => self::ALIST,
- 'hash' => self::HASH,
- 'mixed' => self::MIXED
- );
-
- /**
- * Lookup table of types that are string, and can have aliases or
- * allowed value lists.
- */
- public static $stringTypes = array(
- self::STRING => true,
- self::ISTRING => true,
- self::TEXT => true,
- self::ITEXT => true,
- );
-
- /**
- * Validate a variable according to type.
- * It may return NULL as a valid type if $allow_null is true.
- *
- * @param mixed $var Variable to validate
- * @param int $type Type of variable, see HTMLPurifier_VarParser->types
- * @param bool $allow_null Whether or not to permit null as a value
- * @return string Validated and type-coerced variable
- * @throws HTMLPurifier_VarParserException
- */
- final public function parse($var, $type, $allow_null = false)
- {
- if (is_string($type)) {
- if (!isset(HTMLPurifier_VarParser::$types[$type])) {
- throw new HTMLPurifier_VarParserException("Invalid type '$type'");
- } else {
- $type = HTMLPurifier_VarParser::$types[$type];
- }
- }
- $var = $this->parseImplementation($var, $type, $allow_null);
- if ($allow_null && $var === null) {
- return null;
- }
- // These are basic checks, to make sure nothing horribly wrong
- // happened in our implementations.
- switch ($type) {
- case (self::STRING):
- case (self::ISTRING):
- case (self::TEXT):
- case (self::ITEXT):
- if (!is_string($var)) {
- break;
- }
- if ($type == self::ISTRING || $type == self::ITEXT) {
- $var = strtolower($var);
- }
- return $var;
- case (self::INT):
- if (!is_int($var)) {
- break;
- }
- return $var;
- case (self::FLOAT):
- if (!is_float($var)) {
- break;
- }
- return $var;
- case (self::BOOL):
- if (!is_bool($var)) {
- break;
- }
- return $var;
- case (self::LOOKUP):
- case (self::ALIST):
- case (self::HASH):
- if (!is_array($var)) {
- break;
- }
- if ($type === self::LOOKUP) {
- foreach ($var as $k) {
- if ($k !== true) {
- $this->error('Lookup table contains value other than true');
- }
- }
- } elseif ($type === self::ALIST) {
- $keys = array_keys($var);
- if (array_keys($keys) !== $keys) {
- $this->error('Indices for list are not uniform');
- }
- }
- return $var;
- case (self::MIXED):
- return $var;
- default:
- $this->errorInconsistent(get_class($this), $type);
- }
- $this->errorGeneric($var, $type);
- }
-
- /**
- * Actually implements the parsing. Base implementation does not
- * do anything to $var. Subclasses should overload this!
- * @param mixed $var
- * @param int $type
- * @param bool $allow_null
- * @return string
- */
- protected function parseImplementation($var, $type, $allow_null)
- {
- return $var;
- }
-
- /**
- * Throws an exception.
- * @throws HTMLPurifier_VarParserException
- */
- protected function error($msg)
- {
- throw new HTMLPurifier_VarParserException($msg);
- }
-
- /**
- * Throws an inconsistency exception.
- * @note This should not ever be called. It would be called if we
- * extend the allowed values of HTMLPurifier_VarParser without
- * updating subclasses.
- * @param string $class
- * @param int $type
- * @throws HTMLPurifier_Exception
- */
- protected function errorInconsistent($class, $type)
- {
- throw new HTMLPurifier_Exception(
- "Inconsistency in $class: " . HTMLPurifier_VarParser::getTypeName($type) .
- " not implemented"
- );
- }
-
- /**
- * Generic error for if a type didn't work.
- * @param mixed $var
- * @param int $type
- */
- protected function errorGeneric($var, $type)
- {
- $vtype = gettype($var);
- $this->error("Expected type " . HTMLPurifier_VarParser::getTypeName($type) . ", got $vtype");
- }
-
- /**
- * @param int $type
- * @return string
- */
- public static function getTypeName($type)
- {
- static $lookup;
- if (!$lookup) {
- // Lazy load the alternative lookup table
- $lookup = array_flip(HTMLPurifier_VarParser::$types);
- }
- if (!isset($lookup[$type])) {
- return 'unknown';
- }
- return $lookup[$type];
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Parses string representations into their corresponding native PHP
+ * variable type. The base implementation does a simple type-check.
+ */
+class HTMLPurifier_VarParser
+{
+
+ const STRING = 1;
+ const ISTRING = 2;
+ const TEXT = 3;
+ const ITEXT = 4;
+ const INT = 5;
+ const FLOAT = 6;
+ const BOOL = 7;
+ const LOOKUP = 8;
+ const ALIST = 9;
+ const HASH = 10;
+ const MIXED = 11;
+
+ /**
+ * Lookup table of allowed types. Mainly for backwards compatibility, but
+ * also convenient for transforming string type names to the integer constants.
+ */
+ public static $types = array(
+ 'string' => self::STRING,
+ 'istring' => self::ISTRING,
+ 'text' => self::TEXT,
+ 'itext' => self::ITEXT,
+ 'int' => self::INT,
+ 'float' => self::FLOAT,
+ 'bool' => self::BOOL,
+ 'lookup' => self::LOOKUP,
+ 'list' => self::ALIST,
+ 'hash' => self::HASH,
+ 'mixed' => self::MIXED
+ );
+
+ /**
+ * Lookup table of types that are string, and can have aliases or
+ * allowed value lists.
+ */
+ public static $stringTypes = array(
+ self::STRING => true,
+ self::ISTRING => true,
+ self::TEXT => true,
+ self::ITEXT => true,
+ );
+
+ /**
+ * Validate a variable according to type.
+ * It may return NULL as a valid type if $allow_null is true.
+ *
+ * @param mixed $var Variable to validate
+ * @param int $type Type of variable, see HTMLPurifier_VarParser->types
+ * @param bool $allow_null Whether or not to permit null as a value
+ * @return string Validated and type-coerced variable
+ * @throws HTMLPurifier_VarParserException
+ */
+ final public function parse($var, $type, $allow_null = false)
+ {
+ if (is_string($type)) {
+ if (!isset(HTMLPurifier_VarParser::$types[$type])) {
+ throw new HTMLPurifier_VarParserException("Invalid type '$type'");
+ } else {
+ $type = HTMLPurifier_VarParser::$types[$type];
+ }
+ }
+ $var = $this->parseImplementation($var, $type, $allow_null);
+ if ($allow_null && $var === null) {
+ return null;
+ }
+ // These are basic checks, to make sure nothing horribly wrong
+ // happened in our implementations.
+ switch ($type) {
+ case (self::STRING):
+ case (self::ISTRING):
+ case (self::TEXT):
+ case (self::ITEXT):
+ if (!is_string($var)) {
+ break;
+ }
+ if ($type == self::ISTRING || $type == self::ITEXT) {
+ $var = strtolower($var);
+ }
+ return $var;
+ case (self::INT):
+ if (!is_int($var)) {
+ break;
+ }
+ return $var;
+ case (self::FLOAT):
+ if (!is_float($var)) {
+ break;
+ }
+ return $var;
+ case (self::BOOL):
+ if (!is_bool($var)) {
+ break;
+ }
+ return $var;
+ case (self::LOOKUP):
+ case (self::ALIST):
+ case (self::HASH):
+ if (!is_array($var)) {
+ break;
+ }
+ if ($type === self::LOOKUP) {
+ foreach ($var as $k) {
+ if ($k !== true) {
+ $this->error('Lookup table contains value other than true');
+ }
+ }
+ } elseif ($type === self::ALIST) {
+ $keys = array_keys($var);
+ if (array_keys($keys) !== $keys) {
+ $this->error('Indices for list are not uniform');
+ }
+ }
+ return $var;
+ case (self::MIXED):
+ return $var;
+ default:
+ $this->errorInconsistent(get_class($this), $type);
+ }
+ $this->errorGeneric($var, $type);
+ }
+
+ /**
+ * Actually implements the parsing. Base implementation does not
+ * do anything to $var. Subclasses should overload this!
+ * @param mixed $var
+ * @param int $type
+ * @param bool $allow_null
+ * @return string
+ */
+ protected function parseImplementation($var, $type, $allow_null)
+ {
+ return $var;
+ }
+
+ /**
+ * Throws an exception.
+ * @throws HTMLPurifier_VarParserException
+ */
+ protected function error($msg)
+ {
+ throw new HTMLPurifier_VarParserException($msg);
+ }
+
+ /**
+ * Throws an inconsistency exception.
+ * @note This should not ever be called. It would be called if we
+ * extend the allowed values of HTMLPurifier_VarParser without
+ * updating subclasses.
+ * @param string $class
+ * @param int $type
+ * @throws HTMLPurifier_Exception
+ */
+ protected function errorInconsistent($class, $type)
+ {
+ throw new HTMLPurifier_Exception(
+ "Inconsistency in $class: " . HTMLPurifier_VarParser::getTypeName($type) .
+ " not implemented"
+ );
+ }
+
+ /**
+ * Generic error for if a type didn't work.
+ * @param mixed $var
+ * @param int $type
+ */
+ protected function errorGeneric($var, $type)
+ {
+ $vtype = gettype($var);
+ $this->error("Expected type " . HTMLPurifier_VarParser::getTypeName($type) . ", got $vtype");
+ }
+
+ /**
+ * @param int $type
+ * @return string
+ */
+ public static function getTypeName($type)
+ {
+ static $lookup;
+ if (!$lookup) {
+ // Lazy load the alternative lookup table
+ $lookup = array_flip(HTMLPurifier_VarParser::$types);
+ }
+ if (!isset($lookup[$type])) {
+ return 'unknown';
+ }
+ return $lookup[$type];
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/VarParser/Flexible.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/VarParser/Flexible.php
similarity index 97%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/VarParser/Flexible.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/VarParser/Flexible.php
index b2ed860..b15016c 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/VarParser/Flexible.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/VarParser/Flexible.php
@@ -1,130 +1,130 @@
-<?php
-
-/**
- * Performs safe variable parsing based on types which can be used by
- * users. This may not be able to represent all possible data inputs,
- * however.
- */
-class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser
-{
- /**
- * @param mixed $var
- * @param int $type
- * @param bool $allow_null
- * @return array|bool|float|int|mixed|null|string
- * @throws HTMLPurifier_VarParserException
- */
- protected function parseImplementation($var, $type, $allow_null)
- {
- if ($allow_null && $var === null) {
- return null;
- }
- switch ($type) {
- // Note: if code "breaks" from the switch, it triggers a generic
- // exception to be thrown. Specific errors can be specifically
- // done here.
- case self::MIXED:
- case self::ISTRING:
- case self::STRING:
- case self::TEXT:
- case self::ITEXT:
- return $var;
- case self::INT:
- if (is_string($var) && ctype_digit($var)) {
- $var = (int)$var;
- }
- return $var;
- case self::FLOAT:
- if ((is_string($var) && is_numeric($var)) || is_int($var)) {
- $var = (float)$var;
- }
- return $var;
- case self::BOOL:
- if (is_int($var) && ($var === 0 || $var === 1)) {
- $var = (bool)$var;
- } elseif (is_string($var)) {
- if ($var == 'on' || $var == 'true' || $var == '1') {
- $var = true;
- } elseif ($var == 'off' || $var == 'false' || $var == '0') {
- $var = false;
- } else {
- throw new HTMLPurifier_VarParserException("Unrecognized value '$var' for $type");
- }
- }
- return $var;
- case self::ALIST:
- case self::HASH:
- case self::LOOKUP:
- if (is_string($var)) {
- // special case: technically, this is an array with
- // a single empty string item, but having an empty
- // array is more intuitive
- if ($var == '') {
- return array();
- }
- if (strpos($var, "\n") === false && strpos($var, "\r") === false) {
- // simplistic string to array method that only works
- // for simple lists of tag names or alphanumeric characters
- $var = explode(',', $var);
- } else {
- $var = preg_split('/(,|[\n\r]+)/', $var);
- }
- // remove spaces
- foreach ($var as $i => $j) {
- $var[$i] = trim($j);
- }
- if ($type === self::HASH) {
- // key:value,key2:value2
- $nvar = array();
- foreach ($var as $keypair) {
- $c = explode(':', $keypair, 2);
- if (!isset($c[1])) {
- continue;
- }
- $nvar[trim($c[0])] = trim($c[1]);
- }
- $var = $nvar;
- }
- }
- if (!is_array($var)) {
- break;
- }
- $keys = array_keys($var);
- if ($keys === array_keys($keys)) {
- if ($type == self::ALIST) {
- return $var;
- } elseif ($type == self::LOOKUP) {
- $new = array();
- foreach ($var as $key) {
- $new[$key] = true;
- }
- return $new;
- } else {
- break;
- }
- }
- if ($type === self::ALIST) {
- trigger_error("Array list did not have consecutive integer indexes", E_USER_WARNING);
- return array_values($var);
- }
- if ($type === self::LOOKUP) {
- foreach ($var as $key => $value) {
- if ($value !== true) {
- trigger_error(
- "Lookup array has non-true value at key '$key'; " .
- "maybe your input array was not indexed numerically",
- E_USER_WARNING
- );
- }
- $var[$key] = true;
- }
- }
- return $var;
- default:
- $this->errorInconsistent(__CLASS__, $type);
- }
- $this->errorGeneric($var, $type);
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Performs safe variable parsing based on types which can be used by
+ * users. This may not be able to represent all possible data inputs,
+ * however.
+ */
+class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser
+{
+ /**
+ * @param mixed $var
+ * @param int $type
+ * @param bool $allow_null
+ * @return array|bool|float|int|mixed|null|string
+ * @throws HTMLPurifier_VarParserException
+ */
+ protected function parseImplementation($var, $type, $allow_null)
+ {
+ if ($allow_null && $var === null) {
+ return null;
+ }
+ switch ($type) {
+ // Note: if code "breaks" from the switch, it triggers a generic
+ // exception to be thrown. Specific errors can be specifically
+ // done here.
+ case self::MIXED:
+ case self::ISTRING:
+ case self::STRING:
+ case self::TEXT:
+ case self::ITEXT:
+ return $var;
+ case self::INT:
+ if (is_string($var) && ctype_digit($var)) {
+ $var = (int)$var;
+ }
+ return $var;
+ case self::FLOAT:
+ if ((is_string($var) && is_numeric($var)) || is_int($var)) {
+ $var = (float)$var;
+ }
+ return $var;
+ case self::BOOL:
+ if (is_int($var) && ($var === 0 || $var === 1)) {
+ $var = (bool)$var;
+ } elseif (is_string($var)) {
+ if ($var == 'on' || $var == 'true' || $var == '1') {
+ $var = true;
+ } elseif ($var == 'off' || $var == 'false' || $var == '0') {
+ $var = false;
+ } else {
+ throw new HTMLPurifier_VarParserException("Unrecognized value '$var' for $type");
+ }
+ }
+ return $var;
+ case self::ALIST:
+ case self::HASH:
+ case self::LOOKUP:
+ if (is_string($var)) {
+ // special case: technically, this is an array with
+ // a single empty string item, but having an empty
+ // array is more intuitive
+ if ($var == '') {
+ return array();
+ }
+ if (strpos($var, "\n") === false && strpos($var, "\r") === false) {
+ // simplistic string to array method that only works
+ // for simple lists of tag names or alphanumeric characters
+ $var = explode(',', $var);
+ } else {
+ $var = preg_split('/(,|[\n\r]+)/', $var);
+ }
+ // remove spaces
+ foreach ($var as $i => $j) {
+ $var[$i] = trim($j);
+ }
+ if ($type === self::HASH) {
+ // key:value,key2:value2
+ $nvar = array();
+ foreach ($var as $keypair) {
+ $c = explode(':', $keypair, 2);
+ if (!isset($c[1])) {
+ continue;
+ }
+ $nvar[trim($c[0])] = trim($c[1]);
+ }
+ $var = $nvar;
+ }
+ }
+ if (!is_array($var)) {
+ break;
+ }
+ $keys = array_keys($var);
+ if ($keys === array_keys($keys)) {
+ if ($type == self::ALIST) {
+ return $var;
+ } elseif ($type == self::LOOKUP) {
+ $new = array();
+ foreach ($var as $key) {
+ $new[$key] = true;
+ }
+ return $new;
+ } else {
+ break;
+ }
+ }
+ if ($type === self::ALIST) {
+ trigger_error("Array list did not have consecutive integer indexes", E_USER_WARNING);
+ return array_values($var);
+ }
+ if ($type === self::LOOKUP) {
+ foreach ($var as $key => $value) {
+ if ($value !== true) {
+ trigger_error(
+ "Lookup array has non-true value at key '$key'; " .
+ "maybe your input array was not indexed numerically",
+ E_USER_WARNING
+ );
+ }
+ $var[$key] = true;
+ }
+ }
+ return $var;
+ default:
+ $this->errorInconsistent(__CLASS__, $type);
+ }
+ $this->errorGeneric($var, $type);
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/VarParser/Native.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/VarParser/Native.php
similarity index 95%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/VarParser/Native.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/VarParser/Native.php
index c28055b..f11c318 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/VarParser/Native.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/VarParser/Native.php
@@ -1,38 +1,38 @@
-<?php
-
-/**
- * This variable parser uses PHP's internal code engine. Because it does
- * this, it can represent all inputs; however, it is dangerous and cannot
- * be used by users.
- */
-class HTMLPurifier_VarParser_Native extends HTMLPurifier_VarParser
-{
-
- /**
- * @param mixed $var
- * @param int $type
- * @param bool $allow_null
- * @return null|string
- */
- protected function parseImplementation($var, $type, $allow_null)
- {
- return $this->evalExpression($var);
- }
-
- /**
- * @param string $expr
- * @return mixed
- * @throws HTMLPurifier_VarParserException
- */
- protected function evalExpression($expr)
- {
- $var = null;
- $result = eval("\$var = $expr;");
- if ($result === false) {
- throw new HTMLPurifier_VarParserException("Fatal error in evaluated code");
- }
- return $var;
- }
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * This variable parser uses PHP's internal code engine. Because it does
+ * this, it can represent all inputs; however, it is dangerous and cannot
+ * be used by users.
+ */
+class HTMLPurifier_VarParser_Native extends HTMLPurifier_VarParser
+{
+
+ /**
+ * @param mixed $var
+ * @param int $type
+ * @param bool $allow_null
+ * @return null|string
+ */
+ protected function parseImplementation($var, $type, $allow_null)
+ {
+ return $this->evalExpression($var);
+ }
+
+ /**
+ * @param string $expr
+ * @return mixed
+ * @throws HTMLPurifier_VarParserException
+ */
+ protected function evalExpression($expr)
+ {
+ $var = null;
+ $result = eval("\$var = $expr;");
+ if ($result === false) {
+ throw new HTMLPurifier_VarParserException("Fatal error in evaluated code");
+ }
+ return $var;
+ }
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/VarParserException.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/VarParserException.php
similarity index 93%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/VarParserException.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/VarParserException.php
index 82e465d..5df3414 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/VarParserException.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/VarParserException.php
@@ -1,11 +1,11 @@
-<?php
-
-/**
- * Exception type for HTMLPurifier_VarParser
- */
-class HTMLPurifier_VarParserException extends HTMLPurifier_Exception
-{
-
-}
-
-// vim: et sw=4 sts=4
+<?php
+
+/**
+ * Exception type for HTMLPurifier_VarParser
+ */
+class HTMLPurifier_VarParserException extends HTMLPurifier_Exception
+{
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Zipper.php b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Zipper.php
similarity index 96%
rename from plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Zipper.php
rename to plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Zipper.php
index a358fff..6e21ea0 100755
--- a/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.6.0/library/HTMLPurifier/Zipper.php
+++ b/plugins/wordpress-mobile-pack/libs/htmlpurifier-4.8.0/library/HTMLPurifier/Zipper.php
@@ -1,157 +1,157 @@
-<?php
-
-/**
- * A zipper is a purely-functional data structure which contains
- * a focus that can be efficiently manipulated. It is known as
- * a "one-hole context". This mutable variant implements a zipper
- * for a list as a pair of two arrays, laid out as follows:
- *
- * Base list: 1 2 3 4 [ ] 6 7 8 9
- * Front list: 1 2 3 4
- * Back list: 9 8 7 6
- *
- * User is expected to keep track of the "current element" and properly
- * fill it back in as necessary. (ToDo: Maybe it's more user friendly
- * to implicitly track the current element?)
- *
- * Nota bene: the current class gets confused if you try to store NULLs
- * in the list.
- */
-
-class HTMLPurifier_Zipper
-{
- public $front, $back;
-
- public function __construct($front, $back) {
- $this->front = $front;
- $this->back = $back;
- }
-
- /**
- * Creates a zipper from an array, with a hole in the
- * 0-index position.
- * @param Array to zipper-ify.
- * @return Tuple of zipper and element of first position.
- */
- static public function fromArray($array) {
- $z = new self(array(), array_reverse($array));
- $t = $z->delete(); // delete the "dummy hole"
- return array($z, $t);
- }
-
- /**
- * Convert zipper back into a normal array, optionally filling in
- * the hole with a value. (Usually you should supply a $t, unless you
- * are at the end of the array.)
- */
- public function toArray($t = NULL) {
- $a = $this->front;
- if ($t !== NULL) $a[] = $t;
- for ($i = count($this->back)-1; $i >= 0; $i--) {
- $a[] = $this->back[$i];
- }
- return $a;
- }
-
- /**
- * Move hole to the next element.
- * @param $t Element to fill hole with
- * @return Original contents of new hole.
- */
- public function next($t) {
- if ($t !== NULL) array_push($this->front, $t);
- return empty($this->back) ? NULL : array_pop($this->back);
- }
-
- /**
- * Iterated hole advancement.
- * @param $t Element to fill hole with
- * @param $i How many forward to advance hole
- * @return Original contents of new hole, i away
- */
- public function advance($t, $n) {
- for ($i = 0; $i < $n; $i++) {
- $t = $this->next($t);
- }
- return $t;
- }
-
- /**
- * Move hole to the previous element
- * @param $t Element to fill hole with
- * @return Original contents of new hole.
- */
- public function prev($t) {
- if ($t !== NULL) array_push($this->back, $t);
- return empty($this->front) ? NULL : array_pop($this->front);
- }
-
- /**
- * Delete contents of current hole, shifting hole to
- * next element.
- * @return Original contents of new hole.
- */
- public function delete() {
- return empty($this->back) ? NULL : array_pop($this->back);
- }
-
- /**
- * Returns true if we are at the end of the list.
- * @return bool
- */
- public function done() {
- return empty($this->back);
- }
-
- /**
- * Insert element before hole.
- * @param Element to insert
- */
- public function insertBefore($t) {
- if ($t !== NULL) array_push($this->front, $t);
- }
-
- /**
- * Insert element after hole.
- * @param Element to insert
- */
- public function insertAfter($t) {
- if ($t !== NULL) array_push($this->back, $t);
- }
-
- /**
- * Splice in multiple elements at hole. Functional specification
- * in terms of array_splice:
- *
- * $arr1 = $arr;
- * $old1 = array_splice($arr1, $i, $delete, $replacement);
- *
- * list($z, $t) = HTMLPurifier_Zipper::fromArray($arr);
- * $t = $z->advance($t, $i);
- * list($old2, $t) = $z->splice($t, $delete, $replacement);
- * $arr2 = $z->toArray($t);
- *
- * assert($old1 === $old2);
- * assert($arr1 === $arr2);
- *
- * NB: the absolute index location after this operation is
- * *unchanged!*
- *
- * @param Current contents of hole.
- */
- public function splice($t, $delete, $replacement) {
- // delete
- $old = array();
- $r = $t;
- for ($i = $delete; $i > 0; $i--) {
- $old[] = $r;
- $r = $this->delete();
- }
- // insert
- for ($i = count($replacement)-1; $i >= 0; $i--) {
- $this->insertAfter($r);
- $r = $replacement[$i];
- }
- return array($old, $r);
- }
-}
+<?php
+
+/**
+ * A zipper is a purely-functional data structure which contains
+ * a focus that can be efficiently manipulated. It is known as
+ * a "one-hole context". This mutable variant implements a zipper
+ * for a list as a pair of two arrays, laid out as follows:
+ *
+ * Base list: 1 2 3 4 [ ] 6 7 8 9
+ * Front list: 1 2 3 4
+ * Back list: 9 8 7 6
+ *
+ * User is expected to keep track of the "current element" and properly
+ * fill it back in as necessary. (ToDo: Maybe it's more user friendly
+ * to implicitly track the current element?)
+ *
+ * Nota bene: the current class gets confused if you try to store NULLs
+ * in the list.
+ */
+
+class HTMLPurifier_Zipper
+{
+ public $front, $back;
+
+ public function __construct($front, $back) {
+ $this->front = $front;
+ $this->back = $back;
+ }
+
+ /**
+ * Creates a zipper from an array, with a hole in the
+ * 0-index position.
+ * @param Array to zipper-ify.
+ * @return Tuple of zipper and element of first position.
+ */
+ static public function fromArray($array) {
+ $z = new self(array(), array_reverse($array));
+ $t = $z->delete(); // delete the "dummy hole"
+ return array($z, $t);
+ }
+
+ /**
+ * Convert zipper back into a normal array, optionally filling in
+ * the hole with a value. (Usually you should supply a $t, unless you
+ * are at the end of the array.)
+ */
+ public function toArray($t = NULL) {
+ $a = $this->front;
+ if ($t !== NULL) $a[] = $t;
+ for ($i = count($this->back)-1; $i >= 0; $i--) {
+ $a[] = $this->back[$i];
+ }
+ return $a;
+ }
+
+ /**
+ * Move hole to the next element.
+ * @param $t Element to fill hole with
+ * @return Original contents of new hole.
+ */
+ public function next($t) {
+ if ($t !== NULL) array_push($this->front, $t);
+ return empty($this->back) ? NULL : array_pop($this->back);
+ }
+
+ /**
+ * Iterated hole advancement.
+ * @param $t Element to fill hole with
+ * @param $i How many forward to advance hole
+ * @return Original contents of new hole, i away
+ */
+ public function advance($t, $n) {
+ for ($i = 0; $i < $n; $i++) {
+ $t = $this->next($t);
+ }
+ return $t;
+ }
+
+ /**
+ * Move hole to the previous element
+ * @param $t Element to fill hole with
+ * @return Original contents of new hole.
+ */
+ public function prev($t) {
+ if ($t !== NULL) array_push($this->back, $t);
+ return empty($this->front) ? NULL : array_pop($this->front);
+ }
+
+ /**
+ * Delete contents of current hole, shifting hole to
+ * next element.
+ * @return Original contents of new hole.
+ */
+ public function delete() {
+ return empty($this->back) ? NULL : array_pop($this->back);
+ }
+
+ /**
+ * Returns true if we are at the end of the list.
+ * @return bool
+ */
+ public function done() {
+ return empty($this->back);
+ }
+
+ /**
+ * Insert element before hole.
+ * @param Element to insert
+ */
+ public function insertBefore($t) {
+ if ($t !== NULL) array_push($this->front, $t);
+ }
+
+ /**
+ * Insert element after hole.
+ * @param Element to insert
+ */
+ public function insertAfter($t) {
+ if ($t !== NULL) array_push($this->back, $t);
+ }
+
+ /**
+ * Splice in multiple elements at hole. Functional specification
+ * in terms of array_splice:
+ *
+ * $arr1 = $arr;
+ * $old1 = array_splice($arr1, $i, $delete, $replacement);
+ *
+ * list($z, $t) = HTMLPurifier_Zipper::fromArray($arr);
+ * $t = $z->advance($t, $i);
+ * list($old2, $t) = $z->splice($t, $delete, $replacement);
+ * $arr2 = $z->toArray($t);
+ *
+ * assert($old1 === $old2);
+ * assert($arr1 === $arr2);
+ *
+ * NB: the absolute index location after this operation is
+ * *unchanged!*
+ *
+ * @param Current contents of hole.
+ */
+ public function splice($t, $delete, $replacement) {
+ // delete
+ $old = array();
+ $r = $t;
+ for ($i = $delete; $i > 0; $i--) {
+ $old[] = $r;
+ $r = $this->delete();
+ }
+ // insert
+ for ($i = count($replacement)-1; $i >= 0; $i--) {
+ $this->insertAfter($r);
+ $r = $replacement[$i];
+ }
+ return array($old, $r);
+ }
+}
diff --git a/plugins/wordpress-mobile-pack/readme.txt b/plugins/wordpress-mobile-pack/readme.txt
index 48e7f72..ec65a1d 100755
--- a/plugins/wordpress-mobile-pack/readme.txt
+++ b/plugins/wordpress-mobile-pack/readme.txt
@@ -2,8 +2,8 @@
Contributors: jamesgpearce, andreatrasatti, edent, cborodescu, anghelalexandra
Tags: android, iOS, html5, iphone, mobile, mobile internet, mobile web, mobile web app, responsive ui, safari, sencha touch, smartphone, webkit, progressive web apps, app builder, apple, apps, convert to app, create blog app, ios app, ipad, make an app, mobile app plugin, mobile application, mobile blog app, mobile converter, mobile plugin, native app plugin, app theme, website to mobile app, WordPress android, WordPress app, WordPress iphone, WordPress mobile, WordPress mobile app
Requires at least: 3.6
-Tested up to: 4.7
-Stable tag: 2.2.8
+Tested up to: 4.7.3
+Stable tag: 2.2.9
License: GPLv2 or later
Mobile plugin to package your content into a progressive web app, build a hybrid mobile app and submit it to App Stores. Multiple mobile app themes.
@@ -157,6 +157,12 @@ There are almost 50,000 plugins in the WordPress.org repository. It's impossible
== Changelog ==
+= 2.2.9 =
+* Add background color for the browser's address bar and splash screen (Progressive Web Apps features)
+* Update HTMLPurifier library to 4.8.0 for compatibility with PHP7
+* Fix notice from exporting posts and pages images
+* Eliminate WP 3.6 conditions for custom fonts selects
+
= 2.2.8 =
* App theme - fix articles carousel on Firefox
* Exclude pages with inactive ancestors from exports, rel=alternate meta tags and smart app banner links
@@ -377,8 +383,8 @@ Two major issues were introduced in beta 1, now solved:
== Upgrade Notice ==
-= 2.2.8 =
-* WordPress Mobile Pack packages your content into a progressive web app or a hybrid mobile app that can submitted to App Stores. The latest version comes with an opt-in for activating the mobile theme on iPad and Android tablets.
+= 2.2.9 =
+* WordPress Mobile Pack packages your content into a progressive web app or a hybrid mobile app that can submitted to App Stores. The latest version comes with new Progressive Web Apps features - background color for the browser's address bar and splash screen.
== Screenshots ==
diff --git a/plugins/wordpress-mobile-pack/wordpress-mobile-pack.php b/plugins/wordpress-mobile-pack/wordpress-mobile-pack.php
index c6e44a3..ccb60d9 100755
--- a/plugins/wordpress-mobile-pack/wordpress-mobile-pack.php
+++ b/plugins/wordpress-mobile-pack/wordpress-mobile-pack.php
@@ -3,9 +3,9 @@
* Plugin Name: WordPress Mobile Pack
* Plugin URI: http://wordpress.org/plugins/wordpress-mobile-pack/
* Description: WordPress Mobile Pack 2.0+ has been completely rebuilt from the ground up and repurposed to empower bloggers, publishers and other content creators to go beyond responsiveness and 'appify' the content of their blog.
- * Author: Appticles.com
- * Author URI: http://www.appticles.com/
- * Version: 2.2.8
+ * Author: WPMobilePack.com
+ * Author URI: https://wpmobilepack.com/
+ * Version: 2.2.9
* Copyright (c) 2009 - 2015 James Pearce, mTLD Top Level Domain Limited, ribot, Forum Nokia, Appticles.com
* License: The WordPress Mobile Pack is Licensed under the Apache License, Version 2.0
* Text Domain: wordpress-mobile-pack
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-03-25 17:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-25 17:27 [gentoo-commits] proj/blogs-gentoo:master commit in: , Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox