Merge pull request #82 from Leo-Nicolle/develop

Take account of paper size in print
Leo-Nicolle · Mar 26, 2024 · 41b2a01 · 41b2a01
2 parents 828ee94 + 9996ff6
commit 41b2a01
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/client/src/components/Book.vue b/client/src/components/Book.vue
@@ -2,9 +2,9 @@
   <div class="book" v-if="grids && style && solutionStyle">
     <GridPaper v-for="(grid, i) in grids" :key="grid.id" :grid="grid" :style="style" :exportOptions="gridExport"
       :pagination="solutionStyle.pagination" :page="solutionStyle.pagination.startIdx + i" />
-    <IndexPaper :grids="grids" :solutionStyle="solutionStyle" :exportOptions="solutionExport"
+    <IndexPaper :grids="grids" :solutionStyle="solutionStyle" :format="style.paper" :exportOptions="solutionExport"
       :page="solutionStyle.pagination.startIdx + grids.length" @pageCount="evt => indexPages = evt" />
-    <SolutionPaper :grids="grids" :solutionStyle="solutionStyle" :exportOptions="solutionExport"
+    <SolutionPaper :grids="grids" :solutionStyle="solutionStyle" :format="style.paper" :exportOptions="solutionExport"
       :page="solutionStyle.pagination.startIdx + grids.length + indexPages" />
   </div>
 </template>

diff --git a/client/src/components/Solutions.vue b/client/src/components/Solutions.vue
@@ -1,13 +1,13 @@
 <template>
   <div v-if="grids && solutionStyle">
     <FontLoader :value="solutionStyle.grids.gridN" />
-    <Paper v-for="(gs, i) in gridsPerPage" :key="i" :format="solutionStyle.paper" :showMargins="exportOptions.margins"
+    <Paper v-for="(gs, i) in gridsPerPage" :key="i" :format="printFormat" :showMargins="exportOptions.margins"
       :page-number="page + i" :showPagination="exportOptions.pagination" :pagination="solutionStyle.pagination">
       <div class="grids">
         <div v-for="(grid, j) in gs" :key="j" class="grid-c">
           <span class="gridN">{{ j + solutionStyle.pagination.startIdx }}</span>
-          <SVGGrid :grid="grid" :focus="nullCell" dir="horizontal" :style="solutionStyle" :export-options="exportOptions"
-            :export-style="exportOptions" />
+          <SVGGrid :grid="grid" :focus="nullCell" dir="horizontal" :style="solutionStyle"
+            :export-options="exportOptions" :export-style="exportOptions" />
         </div>
       </div>
     </Paper>
@@ -19,7 +19,7 @@ import { defineProps, defineEmits } from "vue";
 import SVGGrid from "./svg-renderer/Grid.vue";
 import Paper from "./Paper.vue";
 import FontLoader from "./fonts/FontLoader.vue";
-import { Grid, nullCell, SolutionStyle } from "grid";
+import { Format, Grid, nullCell, SolutionStyle } from "grid";
 import { computed } from "vue";
 import { ExportOptions } from "../types";
 import { getFont } from "../js/useFont";
@@ -44,11 +44,14 @@ const props = defineProps<{
    * What to export
    */
   exportOptions: ExportOptions;
+
+  format?: Format;
   /**
    * number of the first page
    */
   page: number;
 }>();
+const printFormat = computed(() => props.format || props.solutionStyle.paper);
 const rows = computed(() => {
   if (!props.solutionStyle) return "";
   return `repeat(${props.solutionStyle.grids.rows},0)`;

diff --git a/client/src/components/WordsIndex.vue b/client/src/components/WordsIndex.vue
@@ -1,19 +1,19 @@
 <template>
   <div v-if="grids && solutionStyle">
-
     <FontLoader :value="solutionStyle.grids.gridN" />
     <FontLoader :value="solutionStyle.words" />
-    <Paper v-for="(words, i) in layout.wordsPerPage" :key="i" :format="solutionStyle.paper"
-      :showMargins="exportOptions.margins" :showPagination="exportOptions.pagination" :pageNumber="page + i"
-      :pagination="solutionStyle.pagination" bodyClass="body-index">
+    <Paper v-for="(words, i) in layout.wordsPerPage" :key="i" :format="printFormat" :showMargins="exportOptions.margins"
+      :showPagination="exportOptions.pagination" :pageNumber="page + i" :pagination="solutionStyle.pagination"
+      bodyClass="body-index">
       <span class="words" ref="wordsContainer">
         <span v-for="(word, j) in words" :class="typeof word === 'number' ? 'size' : 'word'" :key="word">
           {{ word }}
         </span>
       </span>
     </Paper>
     <Teleport to="#outside">
-      <Paper class="paper ruler" :format="solutionStyle.paper" :showMargins="true" :showPagination="true" :pageNumber="1">
+      <Paper class="paper ruler" :format="solutionStyle.paper" :showMargins="true" :showPagination="true"
+        :pageNumber="1">
         <span class="words ruler" ref="ruler"> </span>
       </Paper>
     </Teleport>
@@ -22,7 +22,7 @@
 
 <script setup lang="ts">
 import { defineProps, ref, defineEmits, watch } from "vue";
-import { Grid, getAllWords, SolutionStyle } from "grid";
+import { Grid, getAllWords, SolutionStyle, Format } from "grid";
 import { computed } from "vue";
 import Paper from "./Paper.vue";
 import FontLoader from "./fonts/FontLoader.vue";
@@ -47,13 +47,14 @@ const props = defineProps<{
    * The styles to render list
    */
   solutionStyle: SolutionStyle;
+  format?: Format;
   page: number;
 }>();
 
 const emit = defineEmits<{
   (event: "pageCount", value: number): void;
 }>();
-
+const printFormat = computed(() => props.format || props.solutionStyle.paper);
 const wordFont = computed(() => getFont(props.solutionStyle.words));
 const wordsColor = computed(() => props.solutionStyle.words.color);
 const sizeFont = computed(() => getFont(props.solutionStyle.size));