GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — feat: check stylesheets declared in SVG · w3c/epubcheck@003234a

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

src
- main/java/com/adobe/epubcheck
  - css
    - CSSHandler.java
  - ops
    - OPSHandler.java
- test/resources/epub3
  - 03-resources
    - files
      - file-url-in-svg-content-error.svg
      - file-url-in-xhtml-content-error.xhtml
      - resources-remote-stylesheet-svg-import-error
        EPUB
        content_001.svg
        nav.xhtml
        package.opf
        META-INF
        container.xml
        mimetype
      - resources-remote-stylesheet-svg-xmlpi-error
        EPUB
        content_001.svg
        nav.xhtml
        package.opf
        META-INF
        container.xml
        mimetype
    - resources.feature
  - 09-media-overlays
    - files
      - mediaoverlays-active-class-svg-inline-style-valid
        EPUB
        content_001.mp3
        content_001.smil
        content_001.svg
        nav.xhtml
        package.opf
        META-INF
        container.xml
        mimetype
      - mediaoverlays-active-class-svg-style-not-found-error
        EPUB
        content_001.mp3
        content_001.smil
        content_001.svg
        nav.xhtml
        package.opf
        META-INF
        container.xml
        mimetype
      - mediaoverlays-active-class-svg-stylesheet-import-valid
        EPUB
        content_001.mp3
        content_001.smil
        content_001.svg
        nav.xhtml
        package.opf
        styles.css
        META-INF
        container.xml
        mimetype
      - mediaoverlays-active-class-svg-stylesheet-link-valid
        EPUB
        content_001.mp3
        content_001.smil
        content_001.svg
        nav.xhtml
        package.opf
        styles.css
        META-INF
        container.xml
        mimetype
      - mediaoverlays-active-class-svg-stylesheet-xml-pi-valid
        EPUB
        content_001.mp3
        content_001.smil
        content_001.svg
        nav.xhtml
        package.opf
        styles.css
        META-INF
        container.xml
        mimetype
    - media-overlays.feature

Some content is hidden

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

Dismiss banner

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/main/java/com/adobe/epubcheck/css/CSSHandler.java‎`

Copy file name to clipboardExpand all lines: src/main/java/com/adobe/epubcheck/css/CSSHandler.java

+5-2Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ else if (uriOrString.getType() == CssConstruct.Type.STRING)`
`159`	`159`	`}`
`160`	`160`	`if (uri != null)`
`161`	`161`	`{`
`162`		`- resolveAndRegister(uri, line, col, atRule.toCssString(), Reference.Type.GENERIC);`
	`162`	`+ resolveAndRegister(uri, line, col, atRule.toCssString(), Reference.Type.STYLESHEET);`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`}`
`@@ -390,7 +390,10 @@ private void resolveAndRegister(String uriString, int line, int col, String cssC`
`390`	`390`	`if (url != null && context.referenceRegistry.isPresent())`
`391`	`391`	`{`
`392`	`392`	`context.referenceRegistry.get().registerReference(url, type, getCorrectedEPUBLocation(line, col, cssContext));`
`393`		`- if (context.isRemote(url))`
	`393`	`+ // register that a remote resource was found`
	`394`	`+ // no need to register a remote stylesheet, as these are disallowed`
	`395`	`+ // and will be reported elsewhere`
	`396`	`+ if (type != Reference.Type.STYLESHEET && context.isRemote(url))`
`394`	`397`	`{`
`395`	`398`	`detectedProperties.add(ITEM_PROPERTIES.REMOTE_RESOURCES);`
`396`	`399`	`}`

Collapse file

`‎src/main/java/com/adobe/epubcheck/ops/OPSHandler.java‎`

Copy file name to clipboardExpand all lines: src/main/java/com/adobe/epubcheck/ops/OPSHandler.java

+56-15Lines changed: 56 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,10 @@`
`25`	`25`	`import java.util.Locale;`
`26`	`26`	`import java.util.Stack;`
`27`	`27`
	`28`	`+import org.w3c.epubcheck.constants.MIMEType;`
`28`	`29`	`import org.w3c.epubcheck.core.references.Reference;`
	`30`	`+import org.w3c.epubcheck.core.references.Reference.Type;`
	`31`	`+import org.xml.sax.SAXException;`
`29`	`32`
`30`	`33`	`import com.adobe.epubcheck.api.EPUBLocation;`
`31`	`34`	`import com.adobe.epubcheck.css.CSSChecker;`
`@@ -40,6 +43,8 @@`
`40`	`43`	`import com.adobe.epubcheck.xml.model.XMLElement;`
`41`	`44`
`42`	`45`	`import io.mola.galimatias.URL;`
	`46`	`+import net.sf.saxon.trans.XPathException;`
	`47`	`+import net.sf.saxon.tree.util.ProcInstParser;`
`43`	`48`
`44`	`49`	`public class OPSHandler extends XMLHandler`
`45`	`50`	`{`
`@@ -190,6 +195,10 @@ public void startElement()`
`190`	`195`	`Reference.Type resourceType = Reference.Type.GENERIC;`
`191`	`196`	`if (ns != null)`
`192`	`197`	`{`
	`198`	`+ if (name.equals("style"))`
	`199`	`+ {`
	`200`	`+ textNode = new StringBuilder();`
	`201`	`+ }`
`193`	`202`	`if (ns.equals("http://www.w3.org/2000/svg"))`
`194`	`203`	`{`
`195`	`204`	`if (name.equals("lineargradient") \|\| name.equals("radialgradient")`
`@@ -246,10 +255,6 @@ else if (name.equals("link"))`
`246`	`255`	`{`
`247`	`256`	`checkLink();`
`248`	`257`	`}`
`249`		`- else if (name.equals("style"))`
`250`		`- {`
`251`		`- textNode = new StringBuilder();`
`252`		`- }`
`253`	`258`	`else if (name.equals("iframe"))`
`254`	`259`	`{`
`255`	`260`	`checkIFrame();`
`@@ -341,20 +346,21 @@ public void endElement()`
`341`	`346`
`342`	`347`	`EPUBLocation currentLocation = elementLocationStack.pop();`
`343`	`348`
`344`		`- if (EpubConstants.HtmlNamespaceUri.equals(ns))`
	`349`	`+ if ("style".equals(name))`
`345`	`350`	`{`
`346`		`-`
`347`		`- if ("style".equals(name))`
	`351`	`+ String style = textNode.toString();`
	`352`	`+ if (style.length() > 0)`
`348`	`353`	`{`
`349`		`- String style = textNode.toString();`
`350`		`- if (style.length() > 0)`
`351`		`- {`
`352`		`- this.hasCSS = true;`
`353`		`- new CSSChecker(context, style, currentLocation.getLine(), false).check();`
`354`		`- }`
`355`		`- textNode = null;`
	`354`	`+ this.hasCSS = true;`
	`355`	`+ new CSSChecker(context, style, currentLocation.getLine(), false).check();`
`356`	`356`	`}`
`357`		`- else if ("table".equals(name))`
	`357`	`+ textNode = null;`
	`358`	`+ }`
	`359`	`+`
	`360`	`+ if (EpubConstants.HtmlNamespaceUri.equals(ns))`
	`361`	`+ {`
	`362`	`+`
	`363`	`+ if ("table".equals(name))`
`358`	`364`	`{`
`359`	`365`	`if (tableDepth > 0)`
`360`	`366`	`{`
`@@ -392,4 +398,39 @@ public void characters(char[] chars, int start, int length)`
`392`	`398`	`}`
`393`	`399`	`}`
`394`	`400`
	`401`	`+ @Override`
	`402`	`+ public void processingInstruction(String target, String data)`
	`403`	`+ throws SAXException`
	`404`	`+ {`
	`405`	`+ super.processingInstruction(target, data);`
	`406`	`+`
	`407`	`+ // for SVG documents, parse 'xml-stylesheet' processing instructions`
	`408`	`+ if (MIMEType.SVG.is(context.mimeType) && "xml-stylesheet".equals(target))`
	`409`	`+ {`
	`410`	`+ checkXMLStylesheetPI(data);`
	`411`	`+ }`
	`412`	`+ }`
	`413`	`+`
	`414`	`+ protected void checkXMLStylesheetPI(String data)`
	`415`	`+ {`
	`416`	`+ assert data != null;`
	`417`	`+ try`
	`418`	`+ {`
	`419`	`+ String type = ProcInstParser.getPseudoAttribute(data, "type");`
	`420`	`+ if (type == null \|\| MIMEType.CSS.is(type))`
	`421`	`+ {`
	`422`	`+ String href = ProcInstParser.getPseudoAttribute(data, "href");`
	`423`	`+ URL url = checkURL(href);`
	`424`	`+ if (url != null)`
	`425`	`+ {`
	`426`	`+ hasCSS = true;`
	`427`	`+ registerReference(url, Type.STYLESHEET);`
	`428`	`+ }`
	`429`	`+ }`
	`430`	`+ } catch (XPathException e1)`
	`431`	`+ {`
	`432`	`+ // ignore invalid declaration, must have been reported earlier`
	`433`	`+ }`
	`434`	`+ }`
	`435`	`+`
`395`	`436`	`}`

Collapse file

`‎src/test/resources/epub3/03-resources/files/file-url-in-svg-content-error.svg‎`

Copy file name to clipboard

+10Lines changed: 10 additions & 0 deletions

Display the source diff
Display the rich diff

Collapse file

`‎src/test/resources/epub3/03-resources/files/file-url-in-xhtml-content-error.xhtml‎`

Copy file name to clipboardExpand all lines: src/test/resources/epub3/03-resources/files/file-url-in-xhtml-content-error.xhtml

+3Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,9 @@`
`3`	`3`	`<head>`
`4`	`4`	`<meta charset="utf-8"/>`
`5`	`5`	`<title>Minimal EPUB</title>`
	`6`	`+ <style>`
	`7`	`+ @import url(file:example);`
	`8`	`+ </style>`
`6`	`9`	`</head>`
`7`	`10`	`<body>`
`8`	`11`	`<h1>Loomings</h1>`

Collapse file

`‎src/test/resources/epub3/03-resources/files/resources-remote-stylesheet-svg-import-error/EPUB/content_001.svg‎`

Copy file name to clipboard

+9Lines changed: 9 additions & 0 deletions

Display the source diff
Display the rich diff

Collapse file

`‎src/test/resources/epub3/03-resources/files/resources-remote-stylesheet-svg-import-error/EPUB/nav.xhtml‎`

Copy file name to clipboard

+14Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,14 @@`
	`1`	`+<!DOCTYPE html>`
	`2`	`+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="en" lang="en">`
	`3`	`+ <head>`
	`4`	`+ <meta charset="utf-8"/>`
	`5`	`+ <title>Minimal Nav</title>`
	`6`	`+ </head>`
	`7`	`+ <body>`
	`8`	`+ <nav epub:type="toc">`
	`9`	`+ <ol>`
	`10`	`+ <li><a href="content_001.svg">content 001</a></li>`
	`11`	`+ </ol>`
	`12`	`+ </nav>`
	`13`	`+ </body>`
	`14`	`+</html>`

Collapse file

`‎src/test/resources/epub3/03-resources/files/resources-remote-stylesheet-svg-import-error/EPUB/package.opf‎`

Copy file name to clipboard

+16Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,16 @@`
	`1`	`+<?xml version="1.0" encoding="UTF-8"?>`
	`2`	`+<package xmlns="http://www.idpf.org/2007/opf" version="3.0" xml:lang="en" unique-identifier="q">`
	`3`	`+<metadata xmlns:dc="http://purl.org/dc/elements/1.1/">`
	`4`	`+ <dc:title id="title">Minimal EPUB 3.0</dc:title>`
	`5`	`+ <dc:language>en</dc:language>`
	`6`	`+ <dc:identifier id="q">NOID</dc:identifier>`
	`7`	`+ <meta property="dcterms:modified">2017-06-14T00:00:01Z</meta>`
	`8`	`+</metadata>`
	`9`	`+<manifest>`
	`10`	`+ <item id="content_001" href="content_001.svg" media-type="image/svg+xml"/>`
	`11`	`+ <item id="nav" href="nav.xhtml" media-type="application/xhtml+xml" properties="nav"/>`
	`12`	`+</manifest>`
	`13`	`+<spine>`
	`14`	`+ <itemref idref="content_001" />`
	`15`	`+</spine>`
	`16`	`+</package>`

Collapse file

`‎src/test/resources/epub3/03-resources/files/resources-remote-stylesheet-svg-import-error/META-INF/container.xml‎`

Copy file name to clipboard

+6Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,6 @@`
	`1`	`+<?xml version="1.0" encoding="UTF-8" ?>`
	`2`	`+<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">`
	`3`	`+ <rootfiles>`
	`4`	`+ <rootfile full-path="EPUB/package.opf" media-type="application/oebps-package+xml"/>`
	`5`	`+ </rootfiles>`
	`6`	`+</container>`

Collapse file

`‎src/test/resources/epub3/03-resources/files/resources-remote-stylesheet-svg-import-error/mimetype‎`

Copy file name to clipboard

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+application/epub+zip`

Collapse file

`‎src/test/resources/epub3/03-resources/files/resources-remote-stylesheet-svg-xmlpi-error/EPUB/content_001.svg‎`

Copy file name to clipboard

+7Lines changed: 7 additions & 0 deletions

Display the source diff
Display the rich diff

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.