Fix defaults with zoom

css/dist/ReadiumCSS-after.css

@@ -27,8 +27,6 @@
 
   --RS__pageGutter:0;
 
-  --RS__defaultLineLength:40rem;
-
   --RS__colGap:0;
 
   --RS__colCount:1;
@@ -70,7 +68,7 @@
 
 body{
   width:100%;
-  max-width:var(--RS__defaultLineLength) !important;
+  max-width:100% !important;
   padding:0 var(--RS__pageGutter) !important;
   margin:0 auto !important;
   box-sizing:border-box;
@@ -105,7 +103,7 @@ body{
 }
 
 :root[style*="readium-scroll-on"] body{
-  max-width:var(--RS__defaultLineLength) !important;
+  max-width:100% !important;
   box-sizing:border-box !important;
 }
 

css/dist/ReadiumCSS-before.css

@@ -402,11 +402,15 @@ ruby > rt, ruby > rp{
 
 :root{
   --RS__maxMediaWidth:100%;
-  --RS__maxMediaHeight:95vh;
+  --RS__maxMediaHeight:calc(95vh * (1 / var(--USER__fontSize, 1)));
   --RS__boxSizingMedia:border-box;
   --RS__boxSizingTable:border-box;
 }
 
+:root:not([style*="readium-deprecatedFontSize-on"]):not([style*="readium-iOSPatch-on"]){
+  --RS__maxMediaHeight:95vh;
+}
+
 a, a span, span a, h1, h2, h3, h4, h5, h6{
   word-wrap:break-word;
 }

css/dist/cjk-horizontal/ReadiumCSS-after.css

@@ -27,8 +27,6 @@
 
   --RS__pageGutter:0;
 
-  --RS__defaultLineLength:40rem;
-
   --RS__colGap:0;
 
   --RS__colCount:1;
@@ -70,7 +68,7 @@
 
 body{
   width:100%;
-  max-width:var(--RS__defaultLineLength) !important;
+  max-width:100% !important;
   padding:0 var(--RS__pageGutter) !important;
   margin:0 auto !important;
   box-sizing:border-box;
@@ -105,7 +103,7 @@ body{
 }
 
 :root[style*="readium-scroll-on"] body{
-  max-width:var(--RS__defaultLineLength) !important;
+  max-width:100% !important;
   box-sizing:border-box !important;
 }
 

css/dist/cjk-horizontal/ReadiumCSS-before.css

@@ -374,11 +374,15 @@ ruby > rt, ruby > rp{
 
 :root{
   --RS__maxMediaWidth:100%;
-  --RS__maxMediaHeight:95vh;
+  --RS__maxMediaHeight:calc(95vh * (1 / var(--USER__fontSize, 1)));
   --RS__boxSizingMedia:border-box;
   --RS__boxSizingTable:border-box;
 }
 
+:root:not([style*="readium-deprecatedFontSize-on"]):not([style*="readium-iOSPatch-on"]){
+  --RS__maxMediaHeight:95vh;
+}
+
 a, a span, span a, h1, h2, h3, h4, h5, h6{
   word-wrap:break-word;
 }

css/dist/cjk-vertical/ReadiumCSS-after.css

@@ -27,8 +27,6 @@
 
    --RS__pageGutter:0;
 
-   --RS__defaultLineLength:40rem;
-
    --RS__colGap:0;
 
    --RS__colCount:1;
@@ -81,7 +79,7 @@
 
 body{
   width:100%;
-  max-height:var(--RS__defaultLineLength) !important;
+  max-height:100% !important;
   padding:var(--RS__pageGutter) 0 !important;
   margin:auto 0 !important;
   box-sizing:border-box;
@@ -116,7 +114,7 @@ body{
 
 :root[style*="readium-scroll-on"] body,
 :root[style*="readium-noVerticalPagination-on"] body{
-  max-width:var(--RS__defaultLineLength) !important;
+  max-width:100% !important;
   box-sizing:border-box !important;
 }
 

css/dist/cjk-vertical/ReadiumCSS-before.css

@@ -374,11 +374,15 @@ ruby > rt, ruby > rp{
 
 :root{
   --RS__maxMediaWidth:100%;
-  --RS__maxMediaHeight:100vw;
+  --RS__maxMediaHeight:calc(100vw * (1 / var(--USER__fontSize, 1)));
   --RS__boxSizingMedia:border-box;
   --RS__boxSizingTable:border-box;
 }
 
+:root:not([style*="readium-deprecatedFontSize-on"]):not([style*="readium-iOSPatch-on"]){
+  --RS__maxMediaHeight:100vw;
+}
+
 a, a span, span a, h1, h2, h3, h4, h5, h6{
   word-wrap:break-word;
 }

css/dist/rtl/ReadiumCSS-after.css

@@ -27,8 +27,6 @@
 
   --RS__pageGutter:0;
 
-  --RS__defaultLineLength:40rem;
-
   --RS__colGap:0;
 
   --RS__colCount:1;
@@ -70,7 +68,7 @@
 
 body{
   width:100%;
-  max-width:var(--RS__defaultLineLength) !important;
+  max-width:100% !important;
   padding:0 var(--RS__pageGutter) !important;
   margin:0 auto !important;
   box-sizing:border-box;
@@ -105,7 +103,7 @@ body{
 }
 
 :root[style*="readium-scroll-on"] body{
-  max-width:var(--RS__defaultLineLength) !important;
+  max-width:100% !important;
   box-sizing:border-box !important;
 }
 

css/dist/rtl/ReadiumCSS-before.css

@@ -374,11 +374,15 @@ ruby > rt, ruby > rp{
 
 :root{
   --RS__maxMediaWidth:100%;
-  --RS__maxMediaHeight:95vh;
+  --RS__maxMediaHeight:calc(95vh * (1 / var(--USER__fontSize, 1)));
   --RS__boxSizingMedia:border-box;
   --RS__boxSizingTable:border-box;
 }
 
+:root:not([style*="readium-deprecatedFontSize-on"]):not([style*="readium-iOSPatch-on"]){
+  --RS__maxMediaHeight:95vh;
+}
+
 a, a span, span a, h1, h2, h3, h4, h5, h6{
   word-wrap:break-word;
 }

css/src/modules/ReadiumCSS-pagination-vertical.css

@@ -87,7 +87,7 @@ body {
   /* Limit line-length but we have to reset when 2 columns and control the viewport.
      By using max-width + margin auto, margins will shrink when font-size increases,
      which is what would be expected in terms of typography. */
-  max-height: var(--RS__defaultLineLength) !important;
+  max-height: 100% !important;
   margin: auto 0 !important;
 
   /* We need a minimum padding on body so that descandants/ascendants in italic/script are not cut-off.

css/src/modules/ReadiumCSS-pagination.css

@@ -73,7 +73,7 @@ body {
   /* Limit line-length but we have to reset when 2 columns and control the viewport.
      By using max-width + margin auto, margins will shrink when font-size increases,
      which is what would be expected in terms of typography. */
-  max-width: var(--RS__defaultLineLength) !important;
+  max-width: 100% !important;
   margin: 0 auto !important;
 
   /* We need a minimum padding on body so that descandants/ascendants in italic/script are not cut-off.

css/src/modules/ReadiumCSS-safeguards-vertical.css

@@ -13,7 +13,7 @@
   --RS__maxMediaWidth: 100%;
 
   /* max-height for media, you can override that via JS if not compiled to static  */
-  --RS__maxMediaHeight: 100vw;
+  --RS__maxMediaHeight: calc(100vw * (1 / var(--USER__fontSize, 1)));
 
   /* value for medias’ box-sizing */
   --RS__boxSizingMedia: border-box;
@@ -22,6 +22,10 @@
   --RS__boxSizingTable: border-box;
 }
 
+:root:not(:--deprecated-font-size):not(:--iOS-patch) {
+  --RS__maxMediaHeight: 100vw;
+}
+
 /* Wrap long strings if larger than line-length */
 a, a span, span a, h1, h2, h3, h4, h5, h6 {
   word-wrap: break-word;

css/src/modules/ReadiumCSS-safeguards.css

@@ -14,7 +14,7 @@
 
   /* max-height for media, you can override that via JS if not compiled to static
      Please consider figures might have a figcaption, which is why 95vh in the first place */
-  --RS__maxMediaHeight: 95vh;
+  --RS__maxMediaHeight: calc(95vh * (1 / var(--USER__fontSize, 1)));
 
   /* value for medias’ box-sizing */
   --RS__boxSizingMedia: border-box;
@@ -23,6 +23,10 @@
   --RS__boxSizingTable: border-box;
 }
 
+:root:not(:--deprecated-font-size):not(:--iOS-patch) {
+  --RS__maxMediaHeight: 95vh;
+}
+
 /* Wrap long strings if larger than line-length */
 a, a span, span a, h1, h2, h3, h4, h5, h6 {
   word-wrap: break-word;

css/src/modules/ReadiumCSS-scroll-vertical.css

@@ -25,7 +25,7 @@
 :root:--scroll-view body,
 :root:--no-vertical-pagination body {
   box-sizing: border-box !important;
-  max-width: var(--RS__defaultLineLength) !important;
+  max-width: 100% !important;
 }
 
 @supports (overflow: clip) {

css/src/modules/ReadiumCSS-scroll.css

@@ -24,7 +24,7 @@
 /* Make sure line-length is limited in all configs */
 :root:--scroll-view body {
   box-sizing: border-box !important;
-  max-width: var(--RS__defaultLineLength) !important;
+  max-width: 100% !important;
 }
 
 :root:--scroll-view:not(:--no-overflow) body {

css/vars/pagination.json

@@ -2,7 +2,6 @@
   "RS__colWidth": "100vw",
   "RS__colCount": 1,
   "RS__colGap": 0,
-  "RS__defaultLineLength": "40rem",
   "RS__pageGutter": 0,
   "RS__viewportWidth": "100%"
 }

docs/CSS03-injection_and_pagination.md

@@ -75,7 +75,7 @@ This is the model you’re dealing with. It’s been simplified in version 2 in
 
 ![The single page model relies on the column width of the :root element. Line-length is constrained by the max-width of the body element, including its padding. Finally an auto margin centers the content.](assets/Page-Model.jpg)
 
-Page gutters are part of `body` (`--RS__pageGutter`), hence `--USER__lineLength` (or `--RS__defaultLineLength` if no user preference is set). Contents are centered in `:root` using the `auto` value for `body` margins.
+Page gutters are part of `body` (`--RS__pageGutter`), hence `--USER__lineLength`. Contents are centered in `:root` using the `auto` value for `body` margins.
 
 By default, `--RS__pageGutter` is set to `0`. You can set it as you wish, but take into account it will substract from `--USER__lineLength`. 
 
@@ -119,14 +119,6 @@ The inline (horizontal by default, vertical in vertical-writing) page margins.
 
 * * *
 
-```
---RS__defaultLineLength
-```
-
-The default line-length when none is set by the user. It should be set in `rem` in order to take `:root`’s `font-size` as a reference, whichever the `body`’s `font-size` might be.
-
-* * *
-
 ```
 --USER__lineLength
 ```

docs/CSS19-api.md

@@ -267,14 +267,6 @@ You must account for this gap when scrolling.
 
 The inline (horizontal by default, vertical in vertical-writing) page margins.
 
-* * *
-
-```
---RS__defaultLineLength
-```
-
-The default line-length when none is set by the user. It must be set in `rem` in order to take `:root`’s `font-size` as a reference, whichever the `body`’s `font-size` might be.
-
 ### Scroll
 
 * * *

docs/ReadiumCSS_docs/OEBPS/Text/Section-003.xhtml

@@ -120,7 +120,7 @@
           <img src="../Images/Page-Model.jpg" alt="The single page model relies on the column width of the :root element. Line-length is constrained by the max-width of the body element, including its padding. Finally an auto margin centers the content."/>
         </figure>
 
-        <p>Page gutters are part of <code>body</code> (<code>--RS__pageGutter</code>), hence <code>--USER__lineLength</code> (or <code>--RS__defaultLineLength</code> if no user preference is set). Contents are centered in <code>:root</code> using the <code>auto</code> value for <code>body</code> margins.</p>
+        <p>Page gutters are part of <code>body</code> (<code>--RS__pageGutter</code>), hence <code>--USER__lineLength</code>. Contents are centered in <code>:root</code> using the <code>auto</code> value for <code>body</code> margins.</p>
 
         <p>By default, <code>--RS__pageGutter</code> is set to <code>0</code>. You can set it as you wish, but take into account it will substract from <code>--USER__lineLength</code>. </p>
 		</section>
@@ -156,12 +156,6 @@
 
           <p>The inline (horizontal by default, vertical in vertical-writing) page margins.</p>
 
-		  <hr/>
-
-          <pre><code>--RS__defaultLineLength</code></pre>
-
-          <p>The default line-length when none is set by the user. It must be set in <code>rem</code> in order to take <code>:root</code>’s <code>font-size</code> as a reference, whichever the <code>body</code>’s <code>font-size</code> might be.</p>
-
       <hr/>
 
           <pre><code>--USER__lineLength</code></pre>

docs/ReadiumCSS_docs/OEBPS/Text/Section-019.xhtml

@@ -242,12 +242,6 @@
         <pre><code>--RS__pageGutter</code></pre>
 
         <p>The inline (horizontal by default, vertical in vertical-writing) page margins.</p>
-
-        <hr/>
-
-        <pre><code>--RS__defaultLineLength</code></pre>
-
-        <p>The default line-length when none is set by the user. It must be set in <code>rem</code> in order to take <code>:root</code>’s <code>font-size</code> as a reference, whichever the <code>body</code>’s <code>font-size</code> might be.</p>
       </section>
 
       <section id="scroll" class="level3">