diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ ParseSyntaxFiles: ParseSyntaxFiles.hs cabal install HXT regex-posix - ghc --make -Wall ParseSyntaxFiles.hs # requires HXT >= 9.0.0 + cabal exec ghc -- --make -Wall ParseSyntaxFiles.hs # requires HXT >= 9.0.0 clean: rm -rf Text/Highlighting/Kate/Syntax/* diff --git a/Text/Highlighting/Kate/Format/HTML.hs b/Text/Highlighting/Kate/Format/HTML.hs --- a/Text/Highlighting/Kate/Format/HTML.hs +++ b/Text/Highlighting/Kate/Format/HTML.hs @@ -72,12 +72,14 @@ -- | Format tokens as an HTML @pre@ block. If line numbering is -- selected, this is put into a table row with line numbers in the --- left cell and the table is wrapped in a @pre@ block. +-- left cell. The whole code block is wrapped in a @div@ element +-- to aid styling (e.g. the overflow-x property). formatHtmlBlock :: FormatOptions -> [SourceLine] -> Html -formatHtmlBlock opts ls = container ! A.class_ (toValue $ unwords classes) +formatHtmlBlock opts ls = H.div ! A.class_ sourceCode $ + container ! A.class_ (toValue $ unwords classes) where container = if numberLines opts - then H.pre $ H.table $ H.tr ! A.class_ sourceCode - $ nums >> source + then H.table $ H.tr ! A.class_ sourceCode $ + nums >> source else pre sourceCode = toValue "sourceCode" classes = "sourceCode" : @@ -93,9 +95,10 @@ >> toHtml "\n" else toHtml $ show n ++ "\n" where nStr = show n + -- | Returns CSS for styling highlighted code according to the given style. styleToCss :: Style -> String -styleToCss f = unlines $ tablespec ++ colorspec ++ map toCss (tokenStyles f) +styleToCss f = unlines $ divspec ++ tablespec ++ colorspec ++ map toCss (tokenStyles f) where colorspec = case (defaultColor f, backgroundColor f) of (Nothing, Nothing) -> [] (Just c, Nothing) -> ["pre, code { color: " ++ fromColor c ++ "; }"] @@ -116,6 +119,7 @@ "}" ,"td.sourceCode { padding-left: 5px; }" ] + divspec = [ "div.sourceCode { overflow-x: auto; }" ] toCss :: (TokenType, TokenStyle) -> String toCss (t,tf) = "code > span." ++ short t ++ " { " diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,14 @@ +highlighting-kate 0.5.14 (28 Mar 2015) + + * Put code blocks in a div. This reverts the change in 0.5.13, + wrapping all blocks in a pre element. (Pre elements are only + supposed to contain flow content, not block-level elements like + tables.) Instead we now wrap each code block in a div with class + `sourceCode`. + * The default CSS now includes `div.sourceCode { x-overflow: auto; }`, + so that a scroll bar will appear on small screens. See jgm/pandoc#1903 + and jgm/highlighting-kate#65 for background. + highlighting-kate 0.5.13 (27 Mar 2015) * Wrap HTML table with line numbers in a pre element (Adam Sapek). diff --git a/highlighting-kate.cabal b/highlighting-kate.cabal --- a/highlighting-kate.cabal +++ b/highlighting-kate.cabal @@ -1,5 +1,5 @@ Name: highlighting-kate -Version: 0.5.13 +Version: 0.5.14 Cabal-Version: >= 1.10 Build-Type: Simple Category: Text diff --git a/tests/abc.ada.html b/tests/abc.ada.html --- a/tests/abc.ada.html +++ b/tests/abc.ada.html @@ -1,4 +1,5 @@ -
with Ada.Characters.Handling;
+
with Ada.Characters.Handling;
 use Ada.Characters.Handling;
 
 
@@ -93,4 +94,4 @@
         Put_Line ( To_String(words(I)) & ": " & Boolean'Image(Can_Make_Word(To_String(words(I)),Blocks)) );
     end loop;
 end Abc_Problem;
-

+
diff --git a/tests/abc.c.html b/tests/abc.c.html --- a/tests/abc.c.html +++ b/tests/abc.c.html @@ -1,4 +1,5 @@ -
#include <stdio.h>
+
#include <stdio.h>
 #include <ctype.h>
 
 int can_make_words(char **b, char *word)
@@ -55,4 +56,4 @@
                 printf("%s\t%d\n", *w, can_make_words(blocks, *w));
 
         return 0;
-}

+}
diff --git a/tests/abc.clojure.html b/tests/abc.clojure.html --- a/tests/abc.clojure.html +++ b/tests/abc.clojure.html @@ -1,4 +1,5 @@ -

+

 (def blocks
   (-> "BO XK DQ CP NA GT RE TG QD FS JW HU VI AN OB ER FS LY PC ZM" (.split " ") vec))
 
@@ -36,4 +37,4 @@
     
       
 (doseq [word ["A" "BARK" "Book" "treat" "COMMON" "SQUAD" "CONFUSE"]]
-  (->> word .toUpperCase (abc blocks) first (printf "%s: %b\n" word)))

+  (->> word .toUpperCase (abc blocks) first (printf "%s: %b\n" word)))
diff --git a/tests/abc.cpp.html b/tests/abc.cpp.html --- a/tests/abc.cpp.html +++ b/tests/abc.cpp.html @@ -1,4 +1,5 @@ -
#include <iostream>
+
#include <iostream>
 #include <vector>
 #include <string>
 #include <set>
@@ -51,4 +52,4 @@
         std::cout << w << ": " << std::boolalpha << can_make_word(w,vals) << ".\n";
     }
 
-}

+}
diff --git a/tests/abc.cs.html b/tests/abc.cs.html --- a/tests/abc.cs.html +++ b/tests/abc.cs.html @@ -1,4 +1,5 @@ -
using System.Collections.Generic;
+
using System.Collections.Generic;
 using System.Linq;
 
 void Main()
@@ -97,4 +98,4 @@
                 return false;
         }
 }
-

+
diff --git a/tests/abc.d.html b/tests/abc.d.html --- a/tests/abc.d.html +++ b/tests/abc.d.html @@ -1,4 +1,5 @@ -
import std.stdio, std.ascii, std.algorithm, std.array, std.range;
+
import std.stdio, std.ascii, std.algorithm, std.array, std.range;
 
 alias Block = char[2];
 
@@ -56,4 +57,4 @@
     immutable Block[] blocks2 = ["AB", "AB", "AC", "AC"];
     immutable word = "abba";
     writefln(`"%s" %s`, word, blocks2.canMakeWord(word));
-}

+}
diff --git a/tests/abc.fortran.html b/tests/abc.fortran.html --- a/tests/abc.fortran.html +++ b/tests/abc.fortran.html @@ -1,4 +1,5 @@ -
!-*- mode: compilation; default-directory: "/tmp/" -*-
+
!-*- mode: compilation; default-directory: "/tmp/" -*-
 !Compilation started at Thu Jun  5 01:52:03
 !
 !make f && for a in '' a bark book treat common squad confuse ; do echo $a | ./f ; done
@@ -84,4 +85,4 @@
     end do
   end subroutine ucase
 
-end program abc

+end program abc
diff --git a/tests/abc.go.html b/tests/abc.go.html --- a/tests/abc.go.html +++ b/tests/abc.go.html @@ -1,4 +1,5 @@ -
package main
+
package main
 
 import (
         "fmt"
@@ -53,4 +54,4 @@
                 "A", "BARK", "BOOK", "TREAT", "COMMON", "SQUAD", "CONFUSE"} {
                 fmt.Println(word, sp(word))
         }
-}

+}
diff --git a/tests/abc.haskell.html b/tests/abc.haskell.html --- a/tests/abc.haskell.html +++ b/tests/abc.haskell.html @@ -1,4 +1,5 @@ -
import Data.List (delete)
+
import Data.List (delete)
 import Data.Char (toUpper)
 
 -- returns list of all solutions, each solution being a list of blocks
@@ -29,4 +30,4 @@
 
 main :: IO ()
 main = mapM_ (\w -> print (w, not . null $ abc blocks (map toUpper w)))
-         ["", "A", "BARK", "BoOK", "TrEAT", "COmMoN", "SQUAD", "conFUsE"]

+         ["", "A", "BARK", "BoOK", "TrEAT", "COmMoN", "SQUAD", "conFUsE"]
diff --git a/tests/abc.java.html b/tests/abc.java.html --- a/tests/abc.java.html +++ b/tests/abc.java.html @@ -1,4 +1,5 @@ -
import java.util.Arrays;
+
import java.util.Arrays;
 
 public class ABC{
         private static void swap(int i, int j, Object... arr){
@@ -58,4 +59,4 @@
                 System.out.println("CONFUSE: " + canMakeWord("CONFUSE", blocks));
                 
         }
-}

+}
diff --git a/tests/abc.javascript.html b/tests/abc.javascript.html --- a/tests/abc.javascript.html +++ b/tests/abc.javascript.html @@ -1,4 +1,5 @@ -
let characters = "BO XK DQ CP NA GT RE TG QD FS JW HU VI AN OB ER FS LY PC ZM";
+
let characters = "BO XK DQ CP NA GT RE TG QD FS JW HU VI AN OB ER FS LY PC ZM";
 let blocks = characters.split(" ").map(pair => pair.split(""));
  
 function isWordPossible(word) {
@@ -47,4 +48,4 @@
   "SQUAD", 
   "CONFUSE" 
 ].forEach(word => console.log(`${word}: ${isWordPossible(word)}`));
-

+
diff --git a/tests/abc.julia.html b/tests/abc.julia.html --- a/tests/abc.julia.html +++ b/tests/abc.julia.html @@ -1,4 +1,5 @@ -
function abc (str, list)
+
function abc (str, list)
   isempty(str) && return true
   for i = 1:length(list)
     str[end] in list[i] && 
@@ -23,4 +24,4 @@
     return true
   end
   false
-end

+end
diff --git a/tests/abc.lisp.html b/tests/abc.lisp.html --- a/tests/abc.lisp.html +++ b/tests/abc.lisp.html @@ -15,7 +15,7 @@ code > span.al { color: #ff0000; font-weight: bold; } code > span.fu { color: #06287e; } code > span.er { color: #ff0000; font-weight: bold; } -

+

 (defun word-possible-p (word blocks)
   (cond 
     ((= (length word) 0) t)
@@ -29,4 +29,4 @@
                (loop for b in bs
                      collect (word-possible-p
                                (subseq word 1)
-                               (remove b blocks))))))))

+                               (remove b blocks))))))))
diff --git a/tests/abc.matlab.html b/tests/abc.matlab.html --- a/tests/abc.matlab.html +++ b/tests/abc.matlab.html @@ -1,4 +1,5 @@ -
function testABC
+
function testABC
     combos = ['BO' ; 'XK' ; 'DQ' ; 'CP' ; 'NA' ; 'GT' ; 'RE' ; 'TG' ; 'QD' ; ...
         'FS' ; 'JW' ; 'HU' ; 'VI' ; 'AN' ; 'OB' ; 'ER' ; 'FS' ; 'LY' ; ...
         'PC' ; 'ZM'];
@@ -40,4 +41,4 @@
         end
         k = k+1;
     end
-end

+end
diff --git a/tests/abc.ocaml.html b/tests/abc.ocaml.html --- a/tests/abc.ocaml.html +++ b/tests/abc.ocaml.html @@ -1,4 +1,5 @@ -
let blocks = [
+
let blocks = [
   ('B', 'O');  ('X', 'K');  ('D', 'Q');  ('C', 'P');
   ('N', 'A');  ('G', 'T');  ('R', 'E');  ('T', 'G');
   ('Q', 'D');  ('F', 'S');  ('J', 'W');  ('H', 'U');
@@ -54,4 +55,4 @@
     "COMMON", false;
     "SQUAD", true;
     "CONFUSE", true;
-  ]

+  ]
diff --git a/tests/abc.perl.html b/tests/abc.perl.html --- a/tests/abc.perl.html +++ b/tests/abc.perl.html @@ -1,4 +1,5 @@ -
use Test::More tests => 8;
+
use Test::More tests => 8;
 
 my @blocks1 = qw(BO XK DQ CP NA GT RE TG QD FS JW HU VI AN OB ER FS LY PC ZM);
 is(can_make_word("A",       @blocks1), 1);
@@ -28,4 +29,4 @@
 
 my @blocks2 = qw(US TZ AO QA);
 is(can_make_word('auto', @blocks2), 1);
-

+
diff --git a/tests/abc.php.html b/tests/abc.php.html --- a/tests/abc.php.html +++ b/tests/abc.php.html @@ -1,4 +1,5 @@ -

+

 <?php
 $words = array("A", "BARK", "BOOK", "TREAT", "COMMON", "SQUAD", "Confuse");
 
@@ -44,4 +45,4 @@
     echo $word.': ';
     echo canMakeWord($word) ? "True" : "False";
     echo "\r\n";
-}

+}
diff --git a/tests/abc.prolog.html b/tests/abc.prolog.html --- a/tests/abc.prolog.html +++ b/tests/abc.prolog.html @@ -1,4 +1,5 @@ -
abc_problem :-
+
abc_problem :-
         maplist(abc_problem, ['', 'A', bark, bOOk, treAT, 'COmmon', sQuaD, 'CONFUSE']).
 
 
@@ -37,4 +38,4 @@
 can_makeword(L, [H | T]) :-
         (   select([H, _], L, L1); select([_, H], L, L1)),
         can_makeword(L1, T).
-

+
diff --git a/tests/abc.python.html b/tests/abc.python.html --- a/tests/abc.python.html +++ b/tests/abc.python.html @@ -1,4 +1,5 @@ -
def mkword(w, b):
+
def mkword(w, b):
     if not w: return []
 
     c,w = w[0],w[1:]
@@ -30,4 +31,4 @@
 blocks = 'BO XK DQ CP NA GT RE TG QD FS JW HU VI AN OB ER FS LY PC ZM'.split()
 
 for w in ", A, bark, book, treat, common, SQUAD, conFUsEd".split(', '):
-    print '\'' + w + '\'' + ' ->', abc(w, blocks)

+    print '\'' + w + '\'' + ' ->', abc(w, blocks)
diff --git a/tests/abc.r.html b/tests/abc.r.html --- a/tests/abc.r.html +++ b/tests/abc.r.html @@ -1,4 +1,5 @@ -
canMakeNoRecursion <- function(x) {
+
canMakeNoRecursion <- function(x) {
   x <- toupper(x)
   charList <- strsplit(x, character(0))
   getCombos <- function(chars) {
@@ -35,4 +36,4 @@
            "TREAT",
            "COMMON",
            "SQUAD",
-           "CONFUSE"))

+           "CONFUSE"))
diff --git a/tests/abc.ruby.html b/tests/abc.ruby.html --- a/tests/abc.ruby.html +++ b/tests/abc.ruby.html @@ -1,4 +1,5 @@ -
words = %w(A BaRK BOoK tREaT COmMOn SqUAD CoNfuSE) << ""
+
words = %w(A BaRK BOoK tREaT COmMOn SqUAD CoNfuSE) << ""
 
 words.each do |word|
   blocks = "BO XK DQ CP NA GT RE TG QD FS JW HU VI AN OB ER FS LY PC ZM"
   res = word.each_char.all?{|c| blocks.sub!(/\w?#{c}\w?/i, "")}  #regexps can be interpolated like strings
   puts "#{word.inspect}: #{res}"
 end
-

+
diff --git a/tests/abc.scala.html b/tests/abc.scala.html --- a/tests/abc.scala.html +++ b/tests/abc.scala.html @@ -1,4 +1,5 @@ -
object AbcBlocks extends App {
+
object AbcBlocks extends App {
 
   protected class Block(face1: Char, face2: Char) {
 
@@ -64,4 +65,4 @@
   //words(7).mkString.permutations.foreach(s => assert(isMakeable(s, blocks)))
 
   words.foreach(w => println(s"$w can${if (isMakeable(w, blocks)) " " else "not "}be made."))
-}

+}
diff --git a/tests/abc.scheme.html b/tests/abc.scheme.html --- a/tests/abc.scheme.html +++ b/tests/abc.scheme.html @@ -1,4 +1,5 @@ -
#lang racket
+
#lang racket
 (define block-strings
   (list "BO" "XK" "DQ" "CP" "NA"
         "GT" "RE" "TG" "QD" "FS"
@@ -57,4 +58,4 @@
   (check-true  (can-make-word? "TREAT"))
   (check-false (can-make-word? "COMMON"))
   (check-true  (can-make-word? "SQUAD"))
-  (check-true  (can-make-word? "CONFUSE")))

+  (check-true  (can-make-word? "CONFUSE")))
diff --git a/tests/abc.tcl.html b/tests/abc.tcl.html --- a/tests/abc.tcl.html +++ b/tests/abc.tcl.html @@ -1,4 +1,5 @@ -
package require Tcl 8.6
+
package require Tcl 8.6
 
 proc abc {word {blocks {BO XK DQ CP NA GT RE TG QD FS JW HU VI AN OB ER FS LY PC ZM}}} {
     set abc {{letters blocks abc} {
@@ -35,4 +36,4 @@
 
 foreach word {"" A BARK BOOK TREAT COMMON SQUAD CONFUSE} {
     puts [format "Can we spell %9s? %s" '$word' [abc $word]]
-}

+}
diff --git a/tests/archive.rhtml.html b/tests/archive.rhtml.html --- a/tests/archive.rhtml.html +++ b/tests/archive.rhtml.html @@ -1,4 +1,5 @@ -
<h1>Event Archive</h1>
+
<h1>Event Archive</h1>
 
 
 <% form_for :to_date, @to_date, :url => {:action => 'archive'} do |f| %>
@@ -37,4 +38,4 @@
 <%
 end
 %>
-</ul>

+</ul>
diff --git a/tests/life.lua.html b/tests/life.lua.html --- a/tests/life.lua.html +++ b/tests/life.lua.html @@ -1,4 +1,5 @@ -
-- life.lua
+
-- life.lua
 -- original by Dave Bollinger <DBollinger@compuserve.com> posted to lua-l
 -- modified to use ANSI terminal escape sequences
 -- modified to use for instead of while
@@ -125,4 +126,4 @@
   end
 end
 
-LIFE(40,20)

+LIFE(40,20)