You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by ss...@apache.org on 2023/11/24 15:39:07 UTC
(xmlgraphics-batik) branch main updated: BATIK-1363: Ignore inkscape properties
This is an automated email from the ASF dual-hosted git repository.
ssteiner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/xmlgraphics-batik.git
The following commit(s) were added to refs/heads/main by this push:
new f6610f7f1 BATIK-1363: Ignore inkscape properties
f6610f7f1 is described below
commit f6610f7f1cd0ca97874222d787c62e69a8c33128
Author: Simon Steiner <ss...@apache.org>
AuthorDate: Fri Nov 24 15:38:46 2023 +0000
BATIK-1363: Ignore inkscape properties
---
batik-css/pom.xml | 6 ++++
.../java/org/apache/batik/css/parser/Scanner.java | 3 ++
.../apache/batik/css/parser/ParserTestCase.java | 42 ++++++++++++++++++++++
3 files changed, 51 insertions(+)
diff --git a/batik-css/pom.xml b/batik-css/pom.xml
index a635a110c..e3a915c66 100644
--- a/batik-css/pom.xml
+++ b/batik-css/pom.xml
@@ -55,6 +55,12 @@
<artifactId>xml-apis-ext</artifactId>
<version>${xmlapisext.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/batik-css/src/main/java/org/apache/batik/css/parser/Scanner.java b/batik-css/src/main/java/org/apache/batik/css/parser/Scanner.java
index e6790e13a..ddcce74fc 100644
--- a/batik-css/src/main/java/org/apache/batik/css/parser/Scanner.java
+++ b/batik-css/src/main/java/org/apache/batik/css/parser/Scanner.java
@@ -394,6 +394,9 @@ public class Scanner {
reader.getColumn());
case '-':
nextChar();
+ if (current == 'i') {
+ return;
+ }
if (current != '-') {
type = LexicalUnits.MINUS;
return;
diff --git a/batik-css/src/test/java/org/apache/batik/css/parser/ParserTestCase.java b/batik-css/src/test/java/org/apache/batik/css/parser/ParserTestCase.java
new file mode 100644
index 000000000..94f2f608c
--- /dev/null
+++ b/batik-css/src/test/java/org/apache/batik/css/parser/ParserTestCase.java
@@ -0,0 +1,42 @@
+/*
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+package org.apache.batik.css.parser;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.w3c.css.sac.CSSException;
+import org.w3c.css.sac.LexicalUnit;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ParserTestCase {
+ @Test
+ public void testStyleDeclaration() throws Exception {
+ Parser parser = new Parser();
+ List<String> properties = new ArrayList<>();
+ parser.setDocumentHandler(new DefaultDocumentHandler() {
+ public void property(String name, LexicalUnit value, boolean important) throws CSSException {
+ properties.add(name);
+ }
+ });
+ parser.parseStyleDeclaration("a:b;-inkscape-font-specification:'Calibri, Normal';c:d");
+ Assert.assertTrue(properties.toString(), properties.contains("c"));
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org