Merge pull request #200 from readium/submodule-improvements

JayPanoz · web-flow · commit a9eda0f7bcde · 2025-11-06T15:45:05.000+01:00
Submodule improvements
diff --git a/css/dist/ReadiumCSS-after.css b/css/dist/ReadiumCSS-after.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.20
+ * Readium CSS v.2.0.0-beta.21
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
@@ -272,9 +272,13 @@ body{
   font-weight:inherit !important;
 }
 
+:root[style*="AccessibleDfA"] body *:not(a),:root[style*="IA Writer Duospace"] body *:not(a),
+:root[style*="readium-a11y-on"] body *:not(a){
+  text-decoration:none !important;
+}
+
 :root[style*="AccessibleDfA"] body *,:root[style*="IA Writer Duospace"] body *,
 :root[style*="readium-a11y-on"] body *{
-  text-decoration:none !important;
   font-variant-caps:normal !important;
   font-variant-numeric:normal !important;
   font-variant-position:normal !important;
@@ -324,7 +328,7 @@ body{
   margin-bottom:var(--USER__paraSpacing) !important;
 }
 
-:root[style*="--USER__paraIndent"] p{
+:root[style*="--USER__paraIndent"] p:not([class*="title"]):not(blockquote p):not(figcaption p):not(header p):not(hgroup p):not(div:has(+ *) > h1 + p):not(div:has(+ *) > p:has(+ h1)){
   text-indent:var(--USER__paraIndent) !important;
 }
 
diff --git a/css/dist/ReadiumCSS-before.css b/css/dist/ReadiumCSS-before.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.20
+ * Readium CSS v.2.0.0-beta.21
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git a/css/dist/ReadiumCSS-default.css b/css/dist/ReadiumCSS-default.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.20
+ * Readium CSS v.2.0.0-beta.21
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git a/css/dist/cjk-horizontal/ReadiumCSS-after.css b/css/dist/cjk-horizontal/ReadiumCSS-after.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.20
+ * Readium CSS v.2.0.0-beta.21
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git a/css/dist/cjk-horizontal/ReadiumCSS-before.css b/css/dist/cjk-horizontal/ReadiumCSS-before.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.20
+ * Readium CSS v.2.0.0-beta.21
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git a/css/dist/cjk-horizontal/ReadiumCSS-default.css b/css/dist/cjk-horizontal/ReadiumCSS-default.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.20
+ * Readium CSS v.2.0.0-beta.21
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git a/css/dist/cjk-vertical/ReadiumCSS-after.css b/css/dist/cjk-vertical/ReadiumCSS-after.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.20
+ * Readium CSS v.2.0.0-beta.21
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git a/css/dist/cjk-vertical/ReadiumCSS-before.css b/css/dist/cjk-vertical/ReadiumCSS-before.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.20
+ * Readium CSS v.2.0.0-beta.21
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git a/css/dist/cjk-vertical/ReadiumCSS-default.css b/css/dist/cjk-vertical/ReadiumCSS-default.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.20
+ * Readium CSS v.2.0.0-beta.21
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git a/css/dist/rtl/ReadiumCSS-after.css b/css/dist/rtl/ReadiumCSS-after.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.20
+ * Readium CSS v.2.0.0-beta.21
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
@@ -266,7 +266,7 @@ body{
   margin-bottom:var(--USER__paraSpacing) !important;
 }
 
-:root[style*="--USER__paraIndent"] p{
+:root[style*="--USER__paraIndent"] p:not([class*="title"]):not(blockquote p):not(figcaption p):not(header p):not(hgroup p):not(div:has(+ *) > h1 + p):not(div:has(+ *) > p:has(+ h1)){
   text-indent:var(--USER__paraIndent) !important;
 }
 
diff --git a/css/dist/rtl/ReadiumCSS-before.css b/css/dist/rtl/ReadiumCSS-before.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.20
+ * Readium CSS v.2.0.0-beta.21
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git a/css/dist/rtl/ReadiumCSS-default.css b/css/dist/rtl/ReadiumCSS-default.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.20
+ * Readium CSS v.2.0.0-beta.21
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git a/css/src/modules/user-settings-submodules/ReadiumCSS-a11yFont_pref.css b/css/src/modules/user-settings-submodules/ReadiumCSS-a11yFont_pref.css
@@ -34,15 +34,21 @@
   font-style: inherit !important;
 }
 
-/* Normalizing text-decoration, subs and sups */
+/* Normalizing text-decoration */
+:root:--a11y-font body *:not(a),
+:root:--a11y-normalize body *:not(a) {
+  text-decoration: none !important;
+}
+
+/* Normalizing font-variant */
 :root:--a11y-font body *,
 :root:--a11y-normalize body * {
-  text-decoration: none !important;
   font-variant-caps: normal !important;
   font-variant-position: normal !important;
   font-variant-numeric: normal !important;
 }
 
+/* Normalizing sup and sub */
 :root:--a11y-font sup,
 :root:--a11y-normalize sup,
 :root:--a11y-font sub,
diff --git a/css/src/modules/user-settings-submodules/ReadiumCSS-paraIndent_pref.css b/css/src/modules/user-settings-submodules/ReadiumCSS-paraIndent_pref.css
@@ -6,7 +6,7 @@
 
    Repo: https://github.com/readium/css */
 
-:root[style*="--USER__paraIndent"] p {
+:root[style*="--USER__paraIndent"] p:not([class*="title"]):not(blockquote p):not(figcaption p):not(header p):not(hgroup p):not(div:has(+ *) > h1 + p):not(div:has(+ *) > p:has(+ h1)) {
   text-indent: var(--USER__paraIndent) !important;
 }
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@readium/css",
   "description": "A set of reference stylesheets for EPUB Reading Systems",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "homepage": "https://github.com/readium/css",
   "license": "BSD-3-Clause",
   "keywords": [

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*!`
`2`		`- * Readium CSS v.2.0.0-beta.20`
	`2`	`+ * Readium CSS v.2.0.0-beta.21`
`3`	`3`	`* Copyright (c) 2017–2025. Readium Foundation. All rights reserved.`
`4`	`4`	`* Use of this source code is governed by a BSD-style license which is detailed in the`
`5`	`5`	`* LICENSE file present in the project repository where this source code is maintained.`
`@@ -266,7 +266,7 @@ body{`
`266`	`266`	`margin-bottom:var(--USER__paraSpacing) !important;`
`267`	`267`	`}`
`268`	`268`
`269`		`-:root[style*="--USER__paraIndent"] p{`
	`269`	`+:root[style="--USER__paraIndent"] p:not([class="title"]):not(blockquote p):not(figcaption p):not(header p):not(hgroup p):not(div:has(+ ) > h1 + p):not(div:has(+ ) > p:has(+ h1)){`
`270`	`270`	`text-indent:var(--USER__paraIndent) !important;`
`271`	`271`	`}`
`272`	`272`