Fix dupplicate attribute issue and clean the code

chrisaga · chrisaga · commit b503494f662d · 2022-01-26T12:41:13.000+01:00
diff --git a/column-div/column-div.lua b/column-div/column-div.lua
@@ -14,7 +14,6 @@ Usage:                          classname   attributes
             balanced columns    .columns    column-count
             columns(container)  .columns
             column(each column) .column     width(percent) valign(t|c|b)
-            other divs          .<somename> data-latex
 
             See README.md for details
 
@@ -23,9 +22,6 @@ Note:       You need to include multicol latex package to get balanced columns
             I tried to use well known html or latex parameter.
             Even if lua doen't like hyphens like in column-count.
 
-Bugs:       * html rendering throws a warning [WARNING] Ignoring duplicate attribute style="width:60%;".
-            when width AND color are set and totally ignore the width
-            attribute. Don't know if this bug is mine
 --]]
 local List = require 'pandoc.List'
 
@@ -39,9 +35,6 @@ function Div(div)
 
   -- if the div has no class, the object is left unchanged
   -- if the div has no class but an id, div.classes ~= nil
-  -- TODO: use a div with no class to build a 'scope' in Latex
-  --        usefull for user who would throw inline Latex code and limit it's
-  --        effect.
   if not div.classes or #div.classes == 0 then return nil end
 
   -- if the format is latex then do minipage and others (like multicol)
@@ -101,16 +94,6 @@ function Div(div)
         -- process supported options
         opt = div.attributes['column-count']
         if opt then options = '{' .. opt .. '}' end
-      --[[ This functionality will be moved in another filter since it can't be consistent with the positionless classname requirement
-      else
-        -- Latex skilled users can use arbitrary environments passed as
-        -- the first (and only signifiant) class name.
-        env = div.classes[1]
-        -- default if no known options
-        if options == '' and div.attributes['data-latex'] then
-          options = div.attributes['data-latex']
-        end
-      --]]
       end
 
       begin_env = List:new{pandoc.RawBlock('tex',
@@ -146,9 +129,15 @@ function Div(div)
     end
     -- if we have style then build returned list
     if style then
+      -- process width attribute since Pandoc complains about duplicate
+      -- style attribute and ignores it.
+      opt = div.attributes.width
+      if opt then
+        style = 'width: ' .. opt .. ';' .. (style or '')
+        div.attributes.width = nil    -- consume attribute
+      end
       div.attributes.style = style .. (div.attributes.style or '')
       returned_list = List:new{pandoc.Div(div.content, div.attr)}
-      --returned_list = List:new{pandoc.Div(div.content)}
     end
   end
   return returned_list
diff --git a/column-div/expected.html b/column-div/expected.html
@@ -145,10 +145,10 @@
     ul.task-list{list-style: none;}
     .display.math{display: block; text-align: center; margin: 0.5rem auto;}
   </style>
+  
   <!--[if lt IE 9]>
     <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
   <![endif]-->
-  
 </head>
 <body>
 <header id="title-block-header">
@@ -167,9 +167,9 @@ <h2 id="three-columns">Three columns</h2>
 </div>
 <h2 id="two-uneven-columns">Two uneven columns</h2>
 <div class="columns">
-<div class="column" data-valign="b" style="width:40%;">
+<div class="column" data-valign="b" style="width:30%;">
 <p>contents…</p>
-</div><div class="column" data-valign="b" style="width:60%;">
+</div><div class="column" data-valign="b" style="width:70%;">
 <p>contents…</p>
 </div>
 </div>
@@ -199,14 +199,15 @@ <h2 id="columns-in-columns">Columns in columns</h2>
 </div>
 <h2 id="columns-and-colors">Columns and Colors</h2>
 <div class="columns">
-<div class="column" style="color: blue;">
+<div class="column" style="width: 40%;color: blue;">
 <p>blue content…</p>
-</div><div class="column" style="background-color: red;">
+</div><div class="column" style="width: 60%;background-color: red;">
 <p>content on red background…</p>
 </div>
 </div>
 <div class="columns">
-<div class="column" style="background-color: red;color: blue;">
+<div class="column"
+style="width: 60%;background-color: red;color: blue;">
 <p>blue content on red background…</p>
 </div><div class="column" style="width:40%;">
 <p>contents…</p>
diff --git a/column-div/expected.tex b/column-div/expected.tex
@@ -24,13 +24,13 @@ \subsection{Two uneven columns}\label{two-uneven-columns}}
 
 \mbox{
 
-\begin{minipage}[b]{0.4\columnwidth}
+\begin{minipage}[b]{0.3\columnwidth}
 
 contents\ldots{}
 
 \end{minipage}
 
-\begin{minipage}[b]{0.6\columnwidth}
+\begin{minipage}[b]{0.7\columnwidth}
 
 contents\ldots{}
 
diff --git a/column-div/sample.md b/column-div/sample.md
@@ -26,10 +26,10 @@ content...
 
 ## Two uneven columns
 :::::: {.columns}
-::: {.column width="40%" valign="b"}
+::: {.column width="30%" valign="b"}
 contents...
 :::
-::: {.column width="60%" valign="b"}
+::: {.column width="70%" valign="b"}
 contents...
 :::
 ::::::
