diff --git a/chapterbib.hva b/chapterbib.hva
index 0fd3caf3..800e220e 100644
--- a/chapterbib.hva
+++ b/chapterbib.hva
@@ -1,8 +1,8 @@
 \let\chapterbib@include\include
 \newcounter{chap@included}
 \newcommand{\maketocbibitem}{}
-\newcommand{\@sectionbib@maketocbibitem}{\@auxdowrite{\@print{\@addcontentsline{htoc}}\{0\}\{\@print{\ahrefloc}\{bib:chap\thechap@included\}\{\refname{}\}\}\@print{
-}}}
+\newcommand{\@sectionbib@maketocbibitem}{%
+  \@auxdowrite{\@print{\@addcontentsline{htoc}}\{0\}\{\@print{\ahrefloc}\{bib:chap\thechap@included\}\{\refname{}\}\}\@print@endline{}}}
 \renewcommand{\include}[1]
 {\stepcounter{chap@included}%
 \def\chapterbib@include@name{#1}%
diff --git a/cut.mll b/cut.mll
index e2dbbe3f..9ca5191f 100644
--- a/cut.mll
+++ b/cut.mll
@@ -859,8 +859,7 @@ and collect_header = parse
     end}
 | '\n'? "<title" [^'>']* '>'
     {skip_title lexbuf ; collect_header lexbuf}
-| "<style" blank+ "type" blank* '=' blank* '"' "text/css" '"' blank* '>'
-    '\n'?
+| "<style>" '\n'?
     {collect_style lexbuf ;  collect_header lexbuf}
 | _ as lxm
     {adjoin_to_header_char lxm;
@@ -869,7 +868,7 @@ and collect_header = parse
 and repeat_header = parse
 | "</head>" as lxm
     {put (!link_style) ; put lxm }
-| "<style" blank+ "type" blank* '=' blank* '"' "text/css" '"' blank* '>'
+| "<style>"
     {skip_style lexbuf ; repeat_header lexbuf}
 | _ as lxm
     {put_char lxm ; repeat_header lexbuf}
diff --git a/doc/text.tex b/doc/text.tex
index 08bcffe7..c898f694 100644
--- a/doc/text.tex
+++ b/doc/text.tex
@@ -19,6 +19,7 @@
 \usepackage{mathpartir}
 \usepackage{alltt}
 \usepackage{moreverb}
+\usepackage{ragged2e}
 \usepackage[dvips]{color}
 \definecolor{abricot}{cmyk}{0,0.32,0.52,0}
 \input{macros.tex}
@@ -2726,6 +2727,7 @@ \subsection{Internal \label{internal}macros}
 
 
 \index{"@print@\texttt{\char92"@print}|defocc}
+\index{"@print"@endline@\texttt{\char92"@print"@endline}|defocc}
 \index{"@getprint@\texttt{\char92"@getprint}|defocc}
 \index{"@print"@u@\texttt{\char92"@print"@u}|defocc}
 \index{"@hr@\texttt{\char92"@hr}|defocc}
@@ -2739,7 +2741,7 @@ \subsection{Internal \label{internal}macros}
 \index{"@fontsize@\texttt{\char92"@fontsize}|defocc}
 \index{"@fontcolor@\texttt{\char92"@fontcolor}|defocc}
 It is important to notice that primitive arguments \emph{are}
-processed (except for the \verb+\@print+~primitive, and for some of
+processed (except for the \verb+\@print+~primitives, and for some of
 the basic style primitives).  Thus, some characters cannot be given
 directly (e.g. \verb+#+ and \verb+%+ must be given as \verb+\#+ and
 \verb+\%+).
@@ -2749,6 +2751,9 @@ \subsection{Internal \label{internal}macros}
   \textit{text} verbatim.  As a consequence use only ASCII in
   \textit{text}.
 
+\item[{\tt\char92 @print@endline\char123}{\it text}{\tt\char125}] Same
+  as \verb+\@print+ but appends a newline character to the output.
+
 \item[{\tt\char92 @getprint\char123}{\it text}{\tt\char125}] Process
   \textit{text} using a special output mode that strips off
   \html~tags.  This macro is the one to use for processed attributes
@@ -6657,55 +6662,133 @@ \subsection{The \texttt{calc}\label{calc} package}
 \hevea{} does not implement this extension, since it does not
 implement length registers in the first place.
 
-\subsection{Specifying \label{inputenc}the document input encoding, the \texttt{inputenc} package}
+\subsection{\label{inputenc}Specifying the document input encoding:
+  package \texttt{inputenc}}
 \ttindex{inputenc}{package}%
-The \ahref{\catalog/inputenc.html}{\texttt{inputenc}}
-package enables \LaTeX{} to process a file
-according to various \emph{8~bits} encodings, plus \texttt{UTF-8}.
-The one used encoding is specified as an option while loading the package
-\verb+\usepackage[+\textit{encoding}\verb+]{inputenc}+.
-At the moment, \hevea{} recognises ten latin encodings
-(from \texttt{latin1} to \texttt{latin10}),
-the \texttt{koi8-r} encoding,
-the \texttt{ascii} encoding,
-four windows encodings, the \texttt{applemac} encoding, and the
-\texttt{utf8} encoding.
-It is important to notice that loading the \verb+inputenc+ package
-alters the \html{} document charset.
-For instance if the \texttt{latin9} input encoding is selected by:
+
+The \ahref{\catalog/inputenc.html}{\texttt{inputenc}} package enables
+\LaTeX{} to process a file according to various \emph{8-bit}
+encodings, plus UTF-8.  The encoding to be applied is specified as an
+option while loading the package
+\verb+\usepackage[+\textit{encoding}\verb+]{inputenc}+.  At the
+moment, \hevea{} recognizes several Latin encodings, KOI8-R, ASCII,
+Macintosh, UTF-8 and also some windows encodings.
+Table~\ref{tab:encoding} summarizes the supported encodings.
+
+\begin{table}[htbp]
+  \newcommand*{\tabelnoteref}[1]{\mbox{$^{\ref{#1}}$}}
+  \newcommand*{\htmlcharset}{\tabelnoteref{enum:html-meta-charset}}
+  \newcommand*{\na}{\tabelnoteref{enum:encoding-not-available-in-latex}}
+  \newcommand*{\pref}{\tabelnoteref{enum:utf8-is-preferred}}
+  \centering
+  \begin{tabular}{l@{\quad}l@{\quad}l}
+    Encoding  &  Character Set\htmlcharset  &  Languages covered  \\
+    \hline
+    \texttt{ansinew}    &  windows-1252  &  West European  \\
+    \texttt{applemac}   &  macintosh     &  English and others  \\
+    \texttt{ascii}      &  US-ASCII      &  English  \\
+    \texttt{cp1250}     &  windows-1250  &  Central and East European  \\
+    \texttt{cp1251}\na  &  windows-1251  &  Cyrillic/Russian, Bulgarian, Serbian  \\
+    \texttt{cp1252}     &  windows-1252  &  West European  \\
+    \texttt{cp1257}     &  windows-1257  &  Estonian, Latvian, Lithuanian  \\
+    \texttt{koi8-r}\na  &  KOI8-R        &  Cyrillic/Russian  \\
+    \texttt{latin1}     &  ISO-8859-1    &  West European (Latin-1)  \\
+    \texttt{latin2}     &  ISO-8859-2    &  Central and East European (Latin-2)  \\
+    \texttt{latin3}     &  ISO-8859-3    &  Southeast European and other (Latin-3)  \\
+    \texttt{latin4}     &  ISO-8859-4    &  Scandinavian/Baltic (Latin-4)  \\
+    \texttt{latin5}     &  ISO-8859-9    &  Latin-1 modification for Turkish (Latin-5)  \\
+    \texttt{latin6}\na  &  ISO-8859-10   &  Lappish/Nordic/Eskimo (Latin-6)  \\
+    \texttt{latin7}\na  &  ISO-8859-13   &  Baltic Rim (Latin-7)  \\
+    \texttt{latin8}\na  &  ISO-8859-14   &  Celtic (Latin-8)  \\
+    \texttt{latin9}     &  ISO-8859-15   &  West European (Latin-9)  \\
+    \texttt{latin10}    &  ISO-8859-16   &  Romanian (Latin-10)  \\
+    \texttt{thai}\na, \texttt{tis-620}\na
+    {}                  &  ISO-8859-11   &  Latin/Thai  \\
+    \texttt{utf8}\pref, \texttt{utf8x}\na
+    {}                  &  UTF-8         &  \textit{Really many!}
+  \end{tabular}
+
+  \begin{quote}
+    \begin{RaggedRight}\footnotesize
+      \textbf{Notes}
+      \begin{enumerate}
+      \item\label{enum:html-meta-charset}For
+        \verb+\usepackage[+\textit{encoding}\verb+]{inputenc}+ this
+        will become the HTML~document's character set as in
+        \verb+<meta charset="+\textit{encoding}\verb+">+ unless
+        overridden with \verb+\@def@charset{...}+ as explained in the
+        text.
+
+      \item\label{enum:encoding-not-available-in-latex}The encoding is
+        available in \hevea{} but may not have been installed for all
+        \LaTeX~distributions.
+
+      \item\label{enum:utf8-is-preferred}The UTF-8 encoding is
+        preferred.  Existing \LaTeX{} sources can be converted to
+        UTF-8 for example with
+        \footahref{https://pubs.opengroup.org/onlinepubs/9699919799/utilities/iconv.html}{\textbf{iconv}}
+        (POSIX) or \textbf{recode}.
+      \end{enumerate}
+    \end{RaggedRight}
+  \end{quote}
+
+  \caption[Input/output encodings]{\label{tab:encoding}Encodings known
+    to \hevea, the output character sets they induce, and a selection
+    of languages which can be expressed with these encodings.}
+\end{table}
+
+\noindent It is important to keep in mind that loading the
+\verb+inputenc+~package alters the \html~document's charset!  For
+instance, if the \texttt{latin9}~input encoding is selected by
+
 \begin{verbatim}
 \usepackage[latin9]{inputenc}
 \end{verbatim}
-Then, the document charset is \verb+ISO-8859-15+, which is an
-enhanced version of \verb+ISO-8859-1+ with some characters
-for \OE, \oe{} and \texteuro.
-The rationale behind changing the output document charset at the same
-time as changing the input encoding is to allow
-non-ascii bytes in the input file to be replicated as
-themselves in the output file.
 
-\index{"@def"@charset@\texttt{\char92"@def"@charset}}
-However, one can change the document charset (and the output
+\noindent the document charset will be \verb+ISO-8859-15+, an enhanced
+version of \verb+ISO-8859-1+ with, for example, characters for
+``\OE'', ``\oe'', and ``\texteuro''.  The rationale behind changing
+the output document charset at the same time as changing the input
+encoding is to allow non-ASCII bytes in the input file to be
+replicated as themselves in the output file.
+
+\index{"@def"@charset@\texttt{\char92"@def"@charset}}%
+However, the user can change the document charset (and the output
 translator) by using the internal command \verb+\@def@charset+.
-For instance, one can specify \texttt{latin1} encoding, while
-producing \html{} pages in ascii:
+For instance, one can specify \texttt{latin1}~encoding, while
+producing \html{} pages in ASCII:
+
 \begin{verbatim}
 \usepackage[latin1]{inputenc}
 %HEVEA\@def@charset{US-ASCII}
 \end{verbatim}
-See section~\ref{encodings} for a more thorough description of \html{}
-charset management.
-
-\comdefindex{inputencoding}The \texttt{inputenc} package also provides the
-command~\verb+\inputcoding{+\textit{encoding}\verb+}+ that
-changes the input encoding at any time.
-The argument \textit{encoding} can be any of the options accepted
-by \verb+\usepackage[+\textit{encoding}\verb+]{inputenc}+.
-The command~\verb+\inputcoding+ of \hevea{}
-follows the behaviour of its \LaTeX{} counterpart, it the sense
-that it obeys scope rules.
-Notice that \verb+\inputcoding+ does not change the document output
-encoding and charset.
+
+\noindent or equivalently, if package~\texttt{hevea.sty} has already
+been imported in the document
+
+\begin{verbatim}
+\usepackage{hevea}
+\usepackage[latin1]{inputenc}
+
+\ifhevea
+  \@def@charset{US-ASCII}
+\fi
+\end{verbatim}
+
+\noindent See section~\ref{encodings} for a more thorough description
+of \html~charset management.
+
+\comdefindex{inputencoding}%
+The \texttt{inputenc}~package also provides the
+command~\verb+\inputcoding{+\textit{encoding}\verb+}+ that changes the
+input encoding at any time.  The argument~\textit{encoding} can be any
+of the options accepted by
+\verb+\usepackage[+\textit{encoding}\verb+]{inputenc}+ (see
+Table~\ref{tab:encoding} for valid \textit{encoding\/}s).  The
+command~\verb+\inputcoding+ of \hevea{} follows the behavior of its
+\LaTeX{} counterpart, it the sense that it obeys scope rules.  Notice
+that \verb+\inputcoding+ neither changes the document output encoding
+nor the character set.
 
 \subsection{The \texttt{hyphenat} package}
 Control of hyphenation on the HTML-side is much more limited than on
diff --git a/html/hevea.hva b/html/hevea.hva
index a9a29477..f184e3d2 100644
--- a/html/hevea.hva
+++ b/html/hevea.hva
@@ -12,14 +12,14 @@
 % Linking to external style sheets
 \newtokens{\css@link}%
 \newcommand{\addcssfile}[1]{\addtokens{\css@link}{#1}}%
-\newcommand{\loadcssfile}[1]{\addcssfile{\@print{<}\@getprint{link rel="stylesheet" type=\char34 text/css\char34\@print{ }href=\char34#1\char34\char62\@print{
-}}}}%
+\newcommand{\loadcssfile}[1]{%
+  \addcssfile{\@print{<link rel="stylesheet" type="text/css" href="}\@getprint{#1}\@print@endline{">}}%
+}
 %%%%%%
 % Styles definition in the <HEAD> element
 \newtokens{\hevea@css}%
 \newcommand{\addstyle}[1]{\addtokens{\hevea@css}{#1}}%
-\newcommand{\newstyle}[2]{\addstyle{\@getprint{#1\char123#2\char125\@print{
-}}}}%
+\newcommand{\newstyle}[2]{\addstyle{\@getprint{#1\char123#2\char125\@print@endline{}}}}%
 \newif\ifexternalcss\externalcssfalse
 %
 %%Style attributes are normaly set through an indirection.
@@ -82,11 +82,9 @@
 \newcommand{\htmlfoot}[1]{\sbox{\@htmlfoot}{#1}}
 \newcommand{\htmlprefix}[1]{\sbox{\@htmlprefix}{#1}}
 \AtEndDocument
-{\@close@par{\@nostyle\@print{<!--HTMLFOOT-->
-}}%
+{\@close@par{\@nostyle\@print@endline{<!--HTMLFOOT-->}}%
 \usebox{\@htmlfoot}%
-{\@nostyle\@print{<!--ENDHTML-->
-}}}
+{\@nostyle\@print@endline{<!--ENDHTML-->}}}
 %%%%% Footnotes, html dependant part
 \newcommand{\@noteref}[4]{\@locnameref{#2#3}{#1#3}{#4}}
 \newcommand{\@notepointer}[3]{\@locref{#1#2}{#3}}
@@ -109,13 +107,13 @@
 \newstyle{.footnoterule}{margin:1em auto 1em 0px;width:50\%;}
 \newcommand{\footnoterule}{\@hr[\envclass@attr{footnoterule}]{}{}}
 \newenvironment{thefootnotes}[2][]
-  {\@out@par{{\@nostyle\@print{<!--BEGIN }\@getprint{#1}\@print{NOTES }\@getprint{\@footnotelevel}\@print{-->
-}}}\footnoterule%
-  \setlistclass{thefootnotes}%
-  \begin{list}{}{\renewcommand{\makelabel}[1]{##1}}}
-  {\end{list}\@out@par{{\@nostyle\@print{
-<!--END NOTES-->
-}}}}
+  {\@out@par{{\@nostyle\@print{<!--BEGIN }%
+   \@getprint{#1}\@print{NOTES }\@getprint{\@footnotelevel}%
+   \@print@endline{-->}}}\footnoterule%
+   \setlistclass{thefootnotes}%
+   \begin{list}{}{\renewcommand{\makelabel}[1]{##1}}}
+  {\end{list}\@out@par{{\@nostyle\@print@endline{
+<!--END NOTES-->}}}}
 %%% Captions html dependent part
 \newstyle{.caption}
 {padding-left:2ex; padding-right:2ex; margin-left:auto; margin-right:auto}
@@ -130,8 +128,7 @@
 \newcommand{\cutdef*}[2][]
 {\@out@par{{\@nostyle\@print{<!--CUT DEF }#2\@print{ }#1\@print{ -->}}}}
 \newcommand{\cutend*}
-{\@out@par{{\@nostyle\@print{<!--CUT END -->
-}}}}
+{\@out@par{{\@nostyle\@print@endline{<!--CUT END -->}}}}
 %%% New cutdef/cutend, with footnote managment
 \hva@newstack{@foot}
 \newcommand{\cutdef}[2][]{%
@@ -139,8 +136,7 @@
 \@out@par{{\@nostyle\@print{<!--CUT DEF }#2\@print{ }#1\@print{ -->}}}}
 \newcommand{\cutend}{%
 \footnoteflush{\@footnotelevel}%
-\@out@par{{\@nostyle\@print{<!--CUT END -->
-}}}%
+\@out@par{{\@nostyle\@print@endline{<!--CUT END -->}}}%
 \@endfootnotesub\@pop@foot{\@footnotelevel}}
 %%%Close/Re-open toplevel pars
 \newcommand{\@secbegin}{\@close@par}
@@ -151,8 +147,7 @@
 \@footnoteflush{#1}%
 {\@out@par{{\@nostyle\@print{<!--TOC }\@getprint{#1}\@print{ }}%
 {\@nostyle{}\@print{id="}\@getprint{\@sec@id@attr}\@print{" }}%
-\begin{@norefs}#2\end{@norefs}{\@nostyle\@print{-->
-}}}}}
+\begin{@norefs}#2\end{@norefs}{\@nostyle\@print@endline{-->}}}}}
 \newcommand{\@hacha@arg}[2]
 {{\@nostyle\@print{<arg }\@getprint{#1}\@print{>}{#2}\@print{</arg>}}}
 \newenvironment{@cutflow}[2]
@@ -166,8 +161,7 @@
 \newenvironment{cutflow}[1]{\begin{@cutflow}{YES}{#1}}{\end{@cutflow}}
 \newenvironment{cutflow*}[1]{\begin{@cutflow}{NO}{#1}}{\end{@cutflow}}
 \newcommand{\cutname}[1]
-{\@out@par{{\@nostyle\@print{<!--NAME }\@getprint{#1}\@print{-->
-}}}}
+{\@out@par{{\@nostyle\@print{<!--NAME }\@getprint{#1}\@print@endline{-->}}}}
 \newcommand{\@link@arg}[2]
   {\ifthenelse{\equal{#2}{}}{}
   {\@hacha@arg{#1}{#2}}}
@@ -217,14 +211,14 @@
   {\@forcecommand{#1}{\begin{toimage}#1\end{toimage}#2}}
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%   \maketitle (is no longer redefined by fancysection)		%
-%   Thus defining different styles explicitly will have to 	%
-%     be done using the respective classes :			%
+%   \maketitle (is no longer redefined by fancysection)         %
+%   Thus defining different styles explicitly will have to      %
+%     be done using the respective classes :                    %
 %     .title     : table containing the title and supplements   %
-%     .titlemain : h1 containing title name		        %
+%     .titlemain : h1 containing title name                     %
 %     .titlerest : h3 containing other fields (author,date,etc.)%
 %   'checkbox' now takes three instead of two arguments,        %
-%     one for the class.					%
+%     one for the class.                                        %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 \newcommand{\title@tohaux}[1]
@@ -272,55 +266,55 @@
 %%%%%%%%%%%% Language translation
 \input{html/lang.hva}
 %%% Environment document.
-\newcommand{\@charset}{US-ASCII}
-\newcommand{\@def@charset}[1]
-{\renewcommand{\@charset}{#1}\@set@out@translator{mappings/#1.map}}
+\newcommand{\@charset}{utf-8}
+\newcommand{\@def@charset}[1]{\renewcommand{\@charset}{#1}\@set@out@translator{mappings/#1.map}}
 \newcommand{\@bodyargs}{}
 \newcommand{\@htmlargs}{}
-\newcommand{\@meta}
-{\@print{<meta http-equiv="Content-Type" content="text/html; charset=}%
-\@getprint{\@charset}%
-\@print{">
-<meta name="generator" content="hevea }%
-\@getprint{\usebox{\@heveaversion}}\@print{">
-}%
-\ife\hevea@css\else
-\ifexternalcss\loadcssfile{\hva@dump@css}\else
-\@print{<style type="text/css">}
-\hevea@css\@print{</style>
-}\fi\fi
-\ife\css@link\else\css@link\fi
-\undef\hevea@css\undef\newstyle}
+\newcommand{\@meta}{%
+  \@print{<meta charset="}\@getprint{\@charset}\@print@endline{">}%
+  \@print{<meta name="generator" content="hevea }\@getprint{\usebox{\@heveaversion}}\@print@endline{">}%
+  \ife\hevea@css
+    \relax
+  \else
+    \ifexternalcss
+      \loadcssfile{\hva@dump@css}%
+    \else
+      \@print@endline{<style>}%
+      \hevea@css
+      \@print@endline{</style>}%
+    \fi
+  \fi
+  \ife\css@link
+    \relax
+  \else
+    \css@link
+  \fi
+  \undef\hevea@css
+  \undef\newstyle
+}
 \newenvironment{document}{%
 \@end{document}%
 \@atbegindocument%
 \@restartoutput\unskip%
-\@print{<!DOCTYPE html>
-}\@print{<html }\@getprint{\@htmlargs}\@print{>
+\@print@endline{<!DOCTYPE html>}%
+\@print{<html }\@getprint{\@htmlargs}\@print{>
 <head>}
 \@meta%
 \@print{<title>}%
 \ifu\@title\jobname\else
 \@notags{\begin{@norefs}\let\@print@u\@print@u@default\@getprint{\@title}\end{@norefs}}
 \fi
-\@print{</title>
-}%
-\ifmathml\@print{<style type="text/css">
-  math.centered { text-align: center}
-</style>
-}\fi
-\@print{</head>
-}%
-\@print{<body }\@notags{\@bodyargs}\@print{>
-}%
-\@print{<!--HEVEA command line is: }\usebox{\@heveacomline}\@print{-->
-}%
+\@print@endline{</title>}%
+\ifmathml\@print@endline{<style>
+  math.centered {text-align: center}
+</style>}\fi
+\@print@endline{</head>}%
+\@print{<body }\@notags{\@bodyargs}\@print@endline{>}%
+\@print{<!--HEVEA command line is: }\usebox{\@heveacomline}\@print@endline{-->}%
 {\@nostyle\@print{<!--CUT STYLE }\hacha@style\@print{-->}}%
-\ife\@htmlhead\else{\@nostyle\@print{<!--HTMLHEAD-->
-}}%
+\ife\@htmlhead\else{\@nostyle\@print@endline{<!--HTMLHEAD-->}}%
 \usebox{\@htmlhead}%
-{\@nostyle\@print{<!--ENDHTML-->
-}}\fi%
+{\@nostyle\@print@endline{<!--ENDHTML-->}}\fi%
 \ife\@htmlprefix\else\@printnostyle{<!--PREFIX }%
 \@hacha@arg{}{\usebox{\@htmlprefix}}%
 \@printnostyle{-->
@@ -336,9 +330,9 @@
 \@atenddocument%
 \@final@footer%
 \@clearstyle%
-\@print{</body>
-</html>
-}\@raise@enddocument}
+\@print@endline{</body>
+</html>}%
+\@raise@enddocument}
 \newstyle{.center}{text-align:center;margin-left:auto;margin-right:auto;}%
 \newstyle{.flushleft}{text-align:left;margin-left:0ex;margin-right:auto;}%
 \newstyle{.flushright}{text-align:right;margin-left:auto;margin-right:0ex;}%
@@ -578,16 +572,16 @@
 \newcommand{\@table@attributes@border}{style="border-spacing:0" class="cellpadding1"}
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%   Redefining \textoverline of latexcommon.hva			%
-%   Here we can use HTML primitives				%
+%   Redefining \textoverline of latexcommon.hva                 %
+%   Here we can use HTML primitives                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 \newcommand{\overlinedbox}[1]%
-     {{\@styleattr{span}{style="text-decoration:overline"}#1}}% 
+     {{\@styleattr{span}{style="text-decoration:overline"}#1}}%
 \renewcommand{\textoverline}[1]{\overlinedbox{#1}}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%   Redefining \fbox of latexcommon.hva	         		%
-%   Here we can use HTML primitives				%
+%   Redefining \fbox of latexcommon.hva                         %
+%   Here we can use HTML primitives                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \newstyle{.lrbox}{box-sizing:border-box;display:inline-block;overflow:visible;white-space:nowrap;}
 \newstyle{.center-lrbox}{display:inline-block;margin-left:50\%;transform:translateX(-50\%);}
diff --git a/html/symb-mathml.hva b/html/symb-mathml.hva
index 4cbf93f8..81553ab5 100644
--- a/html/symb-mathml.hva
+++ b/html/symb-mathml.hva
@@ -47,20 +47,17 @@
 
 % Roots
 \newcommand{\sqrt}[2][!*!]{\ifthenelse{\equal{#1}{!*!}}%
-{\@print{<msqrt>
-}%
+{\@print@endline{<msqrt>}%
 #2\@print{
 </msqrt>}%
-}{\@print{<mroot>
-}\@open{display}{}%
+}{\@print@endline{<mroot>}\@open{display}{}%
 #2
 \@close{display}{}%
 \@open{display}{}%
 #1%
 \@close{display}{}%
-\@print{
-</mroot>
-}}}
+\@print@endline{
+</mroot>}}}
 
 % Ellipsis
 \renewcommand{\ldots}{\ifmath\@mop{TripleDot}\else{...}\fi}
diff --git a/labeltype.hva b/labeltype.hva
index 7eadecff..62606cd5 100644
--- a/labeltype.hva
+++ b/labeltype.hva
@@ -9,8 +9,7 @@
 \let\@rt@old@label\label
 \renewcommand{\label}[2][]
 {\@rt@old@label[#1]{#2}%
-\@auxdowrite{\@print{\@deflabeltype}\{#2\}\{\currentlabeltype\}\@print{
-}}}
+\@auxdowrite{\@print{\@deflabeltype}\{#2\}\{\currentlabeltype\}\@print@endline{}}}
 %%Hum also redefines \enumerate...
 \let\@rt@oldenumerate\enumerate
 \renewcommand{\enumerate}{\def\currentlabeltype{item}\@rt@oldenumerate}
diff --git a/latexcommon.hva b/latexcommon.hva
index 5a955dcd..e01dde7b 100644
--- a/latexcommon.hva
+++ b/latexcommon.hva
@@ -85,7 +85,7 @@
 \renewcommand{\@hevea@amper}
   {\ifthenelse{\value{@eqna@col}<2}
     {\stepcounter{@eqna@col}\@PAM}
-    {\hva@warn{Extra column in eqnarray}}}     
+    {\hva@warn{Extra column in eqnarray}}}
 \renewcommand{\\}[1][]{\@eqna@complete\@PAM\@number\setcounter{@eqna@col}{0}\@yesnumber\stepcounter{equation}\@PBS}
 \@array{rclr}}
 {\\{}\addtocounter{equation}{-1}\end@array\]\@close{div}}
@@ -227,11 +227,11 @@
   \setcounter{\@itemcount}{0}}
   {\@close{OL}\addtocounter{enumcount}{-1}}
 %
-%% Modified to support styles e.g. 
+%% Modified to support styles e.g.
 %%                <DL class=list>,
 %%                <DT class=dt-list>
 %% ONLY CHANGES : 1) class=list added to \@open{DL} argument
-%%                2) \@dt replaced by \@list@dtdd 
+%%                2) \@dt replaced by \@list@dtdd
 %% Remove these to get original behaviour
 %
 \newcommand{\setlistclass}[1]
@@ -565,8 +565,7 @@
 %}}}
 \newcommand{\@doaddtoc}[3]
 {%\stepcounter{tocanchor}%
-\@auxdowrite{\@print{\@@addtocsec{htoc}}\{\@getprintnostyle{\@sec@id@attr}\}\{#1\}\{\@checkdepth{#1}{\@print{\@print}\{#2\}\@print{\quad{}}}\begin{@norefs}\@subst@expn{#3}\end{@norefs}\}\@print{
-}}}
+\@auxdowrite{\@print{\@@addtocsec{htoc}}\{\@getprintnostyle{\@sec@id@attr}\}\{#1\}\{\@checkdepth{#1}{\@print{\@print}\{#2\}\@print{\quad{}}}\begin{@norefs}\@subst@expn{#3}\end{@norefs}\}\@print@endline{}}}
 %%section identifiers
 \newcounter{@sec}
 \newcommand{\@fmt@sec}{sec\arabic{@sec}}
@@ -688,8 +687,7 @@
 \@iffileexists{\jobname.#1}{\input{\jobname.#1}}{}}
 \newcommand{\tableofcontents}{\@readtoc{htoc}{\contentsname}}
 \newcommand{\addcontentsline}[3]
-{\@auxdowrite{{\@nostyle\@print{\@addcontentsline}{\{h#1\}\{\csname @#2@level\endcsname\}}\{\@subst{#3}\}\@print{
-}}}}
+{\@auxdowrite{{\@nostyle\@print{\@addcontentsline}{\{h#1\}\{\csname @#2@level\endcsname\}}\{\@subst{#3}\}\@print@endline{}}}}
 %%%%%%%%% Minipage
 %Manage footnotes in minipage, as latex does
 % 1. Use counter mpfootnote
diff --git a/latexscan.mll b/latexscan.mll
index 44914729..3698bbe7 100644
--- a/latexscan.mll
+++ b/latexscan.mll
@@ -2382,6 +2382,13 @@ def_code "\\@print"
     Dest.put arg)
 ;;
 
+def_code "\\@print@endline"
+  (fun lexbuf ->
+    let {arg=arg} = save_arg lexbuf in
+    Dest.put arg;
+    Dest.put_char '\n')
+;;
+
 let put_unicode_default uc =
   try
     let txt = OutUnicode.get_default uc in
diff --git a/lexstyle.mll b/lexstyle.mll
index 000f206d..3a1db645 100644
--- a/lexstyle.mll
+++ b/lexstyle.mll
@@ -70,8 +70,7 @@ and skip_comment = parse
 | "" { error "comment" lexbuf }
 
 and dump m out = parse
-| "<style" blank+ "type" blank* "=" blank* '"' "text/css" '"' blank* '>' '\n'?
-  as lxm
+| "<style>" '\n'? as lxm
    { fprintf out "%s" lxm ;
      Emisc.StringMap.iter
        (fun st cl -> Emisc.dump_class out cl st)
diff --git a/spaces.hva b/spaces.hva
index 2017f69f..13ee979a 100644
--- a/spaces.hva
+++ b/spaces.hva
@@ -6,8 +6,7 @@
 \def\!{}
 \def\;{\@print@u{8196}}% TeX: thick space: 5/18 quad; Unicode: emsp13, 6/18 quad!
 \def\
-{\@print{
-}}
+{\@print@endline{}}
 \def\frenchspacing{}
 \def\nonfrenchspacing{}
 \def\/{}