From a6614bd0168e42bd1d6b9414eed9c6524f4f4559 Mon Sep 17 00:00:00 2001
From: William Daniau <william.daniau@femto-st.fr>
Date: Mon, 21 Oct 2019 17:52:23 +0200
Subject: [PATCH] Changement de nom pour les variables underlined et ajout
 d'une variable pour la largeur de texte en sod

---
 style-template.conf                          | 4 ++--
 templates/html/Wize_with_index_sod.html      | 2 +-
 templates/html/common-blue/zim-variables.css | 9 +++++----
 templates/html/common-wize/zim-variables.css | 9 +++++----
 templates/html/common/zim-style.css          | 4 ++--
 wize.rb                                      | 6 +++---
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/style-template.conf b/style-template.conf
index 8f79965..83db978 100644
--- a/style-template.conf
+++ b/style-template.conf
@@ -16,8 +16,8 @@ weight=PANGO_WEIGHT_BOLD
 style=PANGO_STYLE_ITALIC
 
 [Tag mark]
-underline=%%--main-menu-u-decoration%%
-background=%%--main-menu-u-background-color%%
+underline=%%--main-u-decoration%%
+background=%%--main-u-background-color%%
 
 [Tag strike]
 strikethrough=True
diff --git a/templates/html/Wize_with_index_sod.html b/templates/html/Wize_with_index_sod.html
index 8fdf283..dbea3f6 100644
--- a/templates/html/Wize_with_index_sod.html
+++ b/templates/html/Wize_with_index_sod.html
@@ -24,7 +24,7 @@
         /* Comme on a le menu sur le côté   */
         /* On augmente la taille de la page */
         :root {
-            --main-page-width: 80em;
+            --main-page-width: var(--main-page-width-sod);
         }
     
         *           { font-family: sans-serif }
diff --git a/templates/html/common-blue/zim-variables.css b/templates/html/common-blue/zim-variables.css
index 439e2cc..275a7d3 100644
--- a/templates/html/common-blue/zim-variables.css
+++ b/templates/html/common-blue/zim-variables.css
@@ -27,12 +27,13 @@
         
         --main-menu-background-color: #fafafa;          /* Backroung color of side menu     */
         /* Underline really underlined */
-        --main-menu-u-decoration: underline;
-        --main-menu-u-background-color: white;
+        --main-u-decoration: underline;
+        --main-u-background-color: white;
         /* Underline Stabilo Version */
-        /*--main-menu-u-decoration: none;
-        --main-menu-u-background-color: yellow;*/
+        /*--main-u-decoration: none;
+        --main-u-background-color: yellow;*/
         --main-page-width: 72em;                    /* Page width */
+        --main-page-width-sod: 80em;                /* Page width for sod version */        
         
         
         /* Tables */
diff --git a/templates/html/common-wize/zim-variables.css b/templates/html/common-wize/zim-variables.css
index f47d12e..d1c30b1 100644
--- a/templates/html/common-wize/zim-variables.css
+++ b/templates/html/common-wize/zim-variables.css
@@ -26,12 +26,13 @@
                 
         --main-menu-background-color: #fafafa;          /* Backroung color of side menu     */
         /* Underline really underlined */
-        --main-menu-u-decoration: underline;
-        --main-menu-u-background-color: white;
+        --main-u-decoration: underline;
+        --main-u-background-color: white;
         /* Underline Stabilo Version */
-        /*--main-menu-u-decoration: none;
-        --main-menu-u-background-color: yellow;*/
+        /*--main-u-decoration: none;
+        --main-u-background-color: yellow;*/
         --main-page-width: 72em;                    /* Page width */
+        --main-page-width-sod: 80em;                /* Page width for sod version */        
         
         
         /* Tables */
diff --git a/templates/html/common/zim-style.css b/templates/html/common/zim-style.css
index 032f8ac..771c49b 100644
--- a/templates/html/common/zim-style.css
+++ b/templates/html/common/zim-style.css
@@ -13,8 +13,8 @@
                      
         strike     { color: var(--main-strike-color);}
         
-        u          { text-decoration: var(--main-menu-u-decoration);
-                     background-color: var(--main-menu-u-background-color);}
+        u          { text-decoration: var(--main-u-decoration);
+                     background-color: var(--main-u-background-color);}
                      
         tt         { color: var(--main-tt-color);
                      font-family: monospace;
diff --git a/wize.rb b/wize.rb
index 1ae5fc3..d6b0865 100755
--- a/wize.rb
+++ b/wize.rb
@@ -163,8 +163,8 @@ end
 # Create style-name.conf according to common-name/zim-variables.css
 def createStyleFile(name)
   lfTags = ["--main-header-color",
-            "--main-menu-u-decoration",
-            "--main-menu-u-background-color",
+            "--main-u-decoration",
+            "--main-u-background-color",
             "--main-strike-color",
             "--main-tt-color",
             "--main-pre-color",
@@ -188,7 +188,7 @@ def createStyleFile(name)
     sCSS =~ reg
     sTags[tag] = $1
     # On traite le cas particulier du u-decoration
-    if tag == "--main-menu-u-decoration"
+    if tag == "--main-u-decoration"
       sTags[tag] = sTags[tag] == 'underline' ? 'PANGO_UNDERLINE_SINGLE' : ''
     end
   }
-- 
2.16.4