Merge branch 'develop' into experimental-webPub

Author: JayPanoz

css/dist/ReadiumCSS-after.css

@@ -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;
@@ -350,7 +354,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;
 }
 

css/dist/rtl/ReadiumCSS-after.css

@@ -292,7 +292,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;
 }
 

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,

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;
 }