diff options
| author | Karl Berry <karl@freefriends.org> | 2017-04-01 23:07:20 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-04-01 23:07:20 +0000 |
| commit | fceb32d12e17fcd07f3b4de87d966e02b07a9810 (patch) | |
| tree | e33ed49f559443348c1f4642afed38cf679612e5 | |
| parent | c4df601f3413d12ee1ae1348cbd63c0016a077b0 (diff) | |
html5 fixes: no tabular cellspacing/cellpadding (r268), xmlns in <html> (r267), lang in <html> (r266)
git-svn-id: svn://tug.org/texlive/trunk@43674 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/html5.4ht | 114 |
1 files changed, 105 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html5.4ht b/Master/texmf-dist/tex/generic/tex4ht/html5.4ht index 8ae0f721466..c240b4f3b5a 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/html5.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/html5.4ht @@ -1,5 +1,5 @@ -% html5.4ht (2016-11-25-14:49), generated from tex4ht-html5.tex -% Copyright 2016 TeX Users Group +% html5.4ht (2017-04-01-16:06), generated from tex4ht-html5.tex +% Copyright 2016-2017 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -16,9 +16,10 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2016-11-25-14:49} +\immediate\write-1{version 2017-04-01-16:06} -\exit:ifnot{tex4ht} +\exit:ifnot{latex,% +tex4ht} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -30,23 +31,99 @@ } \def\use:charset{% \expandafter\ifx\csname a:charset\endcsname\relax% - \expandafter\:charset:quotes\A:charset. + \expandafter\expandafter\expandafter\:charset:quotes\csname A:charset\endcsname. \else% - \expandafter\:charset:quotes\a:charset. + \expandafter\expandafter\expandafter\:charset:quotes\csname a:charset\endcsname. \fi } \Configure{VERSION}{} \Configure{DOCTYPE}{\HCode{<!DOCTYPE html>\Hnewline}} -\Configure{HTML}{\HCode{<html>\Hnewline}}{\HCode{\Hnewline</html>}} +\Configure{HTML}{\HCode{<html lang="\Get:Language" xml:lang="\Get:Language" \html:xmlns>\Hnewline}}{\HCode{\Hnewline</html>}} \Configure{@HEAD}{} \Configure{@HEAD}{\HCode{<meta \use:charset />\Hnewline}} \Configure{@HEAD}{\HCode{<meta name="generator" content="TeX4ht (http://www.tug.org/tex4ht/)" />\Hnewline}} \Configure{@HEAD}{\HCode{<link - rel="stylesheet" type="text/css" -href="\expandafter\csname aa:CssFile\endcsname" />\Hnewline}} + rel="stylesheet" type="text/css" + href="\expandafter\csname aa:CssFile\endcsname" />\Hnewline}} +\def\Declare:Language#1#2{% +\expandafter\gdef\csname rfclang#1\endcsname{#2}% +} +\def\Get:Language{% +\ifx\bbl@main@language\@undefined en-US% +\else% +\expandafter\ifdefined\csname rfclang\bbl@main@language\endcsname \csname rfclang\bbl@main@language\endcsname\fi% +\fi% +} +\Declare:Language{english}{en} +\Declare:Language{czech}{cs} +\Declare:Language{french}{fr} +\Declare:Language{polish}{pl} +\Declare:Language{german}{de} +\Declare:Language{bulgarian}{bg} +\Declare:Language{catalan}{ca} +\Declare:Language{croatian}{hr} +\Declare:Language{danish}{da} +\Declare:Language{dutch}{nl} +\Declare:Language{USenglish}{en} +\Declare:Language{american}{en} +\Declare:Language{UKenglish}{en} +\Declare:Language{british}{en} +\Declare:Language{canadian}{en} +\Declare:Language{australian}{en} +\Declare:Language{newzealand}{en} +\Declare:Language{esperanto}{eo} +\Declare:Language{estonian}{et} +\Declare:Language{finnish}{f\/i} +\Declare:Language{francais}{fr} +\Declare:Language{canadien}{fr} +\Declare:Language{acadian}{fr} +\Declare:Language{galician}{gl} +\Declare:Language{austrian}{de} +\Declare:Language{german}{de} +\Declare:Language{germanb}{de} +\Declare:Language{ngerman}{de} +\Declare:Language{naustrian}{de} +\Declare:Language{greek}{el} +\Declare:Language{polutonikogreek}{el} +\Declare:Language{hebrew}{he} +\Declare:Language{magyar}{hu} +\Declare:Language{hungarian}{hu} +\Declare:Language{icelandic}{is} +\Declare:Language{interlingua}{ie} +\Declare:Language{irish}{ga} +\Declare:Language{italian}{it} +\Declare:Language{latin}{la} +\Declare:Language{lowersorbian}{dsb} +\Declare:Language{samin}{se} +\Declare:Language{norsk}{no} +\Declare:Language{nynorsk}{no} +\Declare:Language{portuges}{pt} +\Declare:Language{portuguese}{pt} +\Declare:Language{brazilian}{pt} +\Declare:Language{brazil}{pt} +\Declare:Language{romanian}{ro} +\Declare:Language{russian}{ru} +\Declare:Language{scottish}{gd} +\Declare:Language{spanish}{es} +\Declare:Language{slovak}{sk} +\Declare:Language{slovene}{sl} +\Declare:Language{swedish}{sv} +\Declare:Language{serbian}{sr} +\Declare:Language{turkish}{tr} +\Declare:Language{ukrainian}{uk} +\Declare:Language{uppersorbian}{hsb} +\Declare:Language{welsh}{cy} +\edef\html:xmlns{} +\NewConfigure{xmlns}[2]{% + \ifx\relax#2\relax% + \edef\html:xmlns{}% + \else% + \edef\html:xmlns{\html:xmlns xmlns\ifx\relax#1\relax\else :#1\fi="#2"}% + \fi% +} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -57,6 +134,25 @@ href="\expandafter\csname aa:CssFile\endcsname" />\Hnewline}} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \ConfigureHinput{latex} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \Configure{halignTB<>}{tabular}{\HCode{id="TBL-\TableNo" class="tabular"\Hnewline \GROUPS\Hnewline + }<>\HAlign} +\Css{table.tabular{border-collapse: collapse; border-spacing: 0;}} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput\empty\empty\empty\empty\empty\empty +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + + + + + |