git subrepo pull libs/braille-css

subrepo: subdir: "libs/braille-css" merged: "af53b73c02" upstream: origin: "[email protected]:daisy/braille-css.git" branch: "master" commit: "e6c06331ca" git-subrepo: version: "0.3.1" origin: "???" commit: "???"
daisy · Jan 4, 2025 · 1801fa5 · 1801fa5
1 parent 0c360c6
commit 1801fa5
Show file tree

Hide file tree

Showing 6 changed files with 352 additions and 94 deletions.
diff --git a/libs/braille-css/.gitrepo b/libs/braille-css/.gitrepo
@@ -6,6 +6,6 @@
 [subrepo]
 	remote = [email protected]:daisy/braille-css.git
 	branch = master
-	commit = 736f91081e0290d80dc5e7f704fa02f6f1ff2d4e
-	parent = f3eb86656b125cb243df7567702ca9d7bfa64f45
+	commit = e6c06331cae8b14733a9f4d4a4e5807dc6b35c49
+	parent = 4246b2ae5a9789366f5a65b19bc14ff86cd9e488
 	cmdver = 0.3.1
diff --git a/libs/braille-css/pom.xml b/libs/braille-css/pom.xml
@@ -6,13 +6,13 @@
   <parent>
     <groupId>org.daisy</groupId>
     <artifactId>daisy</artifactId>
-    <version>3</version>
+    <version>5</version>
     <relativePath />
   </parent>
 
   <groupId>org.daisy.braille</groupId>
   <artifactId>braille-css</artifactId>
-  <version>1.25.0-SNAPSHOT</version>
+  <version>1.25.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>braille-css</name>
@@ -29,7 +29,7 @@
       <dependency>
         <groupId>org.daisy.libs</groupId>
         <artifactId>jstyleparser</artifactId>
-        <version>1.20-p22-SNAPSHOT</version>
+        <version>1.20-p22</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>

diff --git a/libs/braille-css/src/main/antlr3/org/daisy/braille/css/BrailleCSSLexer.g b/libs/braille-css/src/main/antlr3/org/daisy/braille/css/BrailleCSSLexer.g
@@ -22,11 +22,11 @@ import CSSLexer;
     }
 }
 
-VOLUME : '@volume' ;
+VOLUME : '@' PREFIX? 'volume' ;
 
 VOLUME_AREA
-    : '@begin'
-    | '@end'
+    : '@' PREFIX? 'begin'
+    | '@' PREFIX? 'end'
     ;
 
 MARGIN_AREA
@@ -36,9 +36,9 @@ MARGIN_AREA
   | '@bottom-left'
   | '@bottom-center'
   | '@bottom-right'
-  | '@left'
-  | '@right'
-  | '@footnotes'
+  | '@' PREFIX? 'left'
+  | '@' PREFIX? 'right'
+  | '@' PREFIX? 'footnotes'
   ;
 
 NOT : 'not(' ;
@@ -50,14 +50,17 @@ LANG
   : 'lang(' S* LANGUAGE_RANGE S* (COMMA S* LANGUAGE_RANGE S*)* RPAREN
   ;
 
-TEXT_TRANSFORM : '@text-transform' ;
+TEXT_TRANSFORM : '@' PREFIX? 'text-transform' ;
 
-HYPHENATION_RESOURCE : '@hyphenation-resource' ;
+HYPHENATION_RESOURCE : '@' PREFIX? 'hyphenation-resource' ;
 
 COUNTER_STYLE : '@counter-style' ;
 
 VENDOR_ATRULE : '@' MINUS IDENT_MACR ;
 
+fragment
+PREFIX : '-daisy-' ;
+
 fragment
 LANGUAGE_RANGE : LANGUAGE_RANGE_IDENT | LANGUAGE_RANGE_STRING ;
 

diff --git a/libs/braille-css/src/main/antlr3/org/daisy/braille/css/BrailleCSSTreeParser.g b/libs/braille-css/src/main/antlr3/org/daisy/braille/css/BrailleCSSTreeParser.g
@@ -106,7 +106,7 @@ volume_areas returns [List<RuleVolumeArea> list]
       )
     ;
 
-volume_area returns [RuleVolumeArea area]
+volume_area returns [RuleVolumeArea rule]
 @init {
     List<RulePage> pages = null;
 }
@@ -118,7 +118,14 @@ volume_area returns [RuleVolumeArea area]
              pages.add(p);
          })*)
       {
-        $area = preparator.prepareRuleVolumeArea(a.getText().substring(1), decl, pages);
+        String area = a.getText().substring(1);
+        String prf = "-daisy-";
+        if (area.startsWith(prf)) {
+            area = area.substring(prf.length());
+            gCSSTreeParser.warn("Unexpected prefix '{}' in rule '@{}{}', assuming '@{}' was meant",
+                                prf, prf, area, area);
+        }
+        $rule = preparator.prepareRuleVolumeArea(area, decl, pages);
       }
     ;