New upstream version 1.19.2.1~dfsg+really1.19.1

4 files changed, 16 insertions, 27 deletions

diff --git a/data/sample.lua b/data/sample.lua
index 1e3a08731..e23154a96 100644
--- a/data/sample.lua
+++ b/data/sample.lua
@@ -173,8 +173,6 @@ end
 function RawInline(format, str)
   if format == "html" then
     return str
-  else
-    return ''
   end
 end
 
@@ -323,8 +321,6 @@ end
 function RawBlock(format, str)
   if format == "html" then
     return str
-  else
-    return ''
   end
 end
 
diff --git a/data/templates/default.beamer b/data/templates/default.beamer
index 680a4121d..1dcc77e4e 100644
--- a/data/templates/default.beamer
+++ b/data/templates/default.beamer
@@ -97,9 +97,6 @@ $for(bibliography)$
 \addbibresource{$bibliography$}
 $endfor$
 $endif$
-$if(verbatim-in-note)$
-\usepackage{fancyvrb}
-$endif$
 \hypersetup{
 $if(title-meta)$
             pdftitle={$title-meta$},
@@ -108,7 +105,7 @@ $if(author-meta)$
             pdfauthor={$author-meta$},
 $endif$
 $if(keywords)$
-            pdfkeywords={$for(keywords)$$keywords$$sep$, $endfor$},
+            pdfkeywords={$for(keywords)$$keywords$$sep$; $endfor$},
 $endif$
 $if(colorlinks)$
             colorlinks=true,
@@ -119,10 +116,6 @@ $else$
             pdfborder={0 0 0},
 $endif$
             breaklinks=true}
-\urlstyle{same}  % don't use monospace font for urls
-$if(verbatim-in-note)$
-\VerbatimFootnotes % allows verbatim text in footnotes
-$endif$
 $if(listings)$
 \usepackage{listings}
 $endif$
@@ -132,6 +125,10 @@ $endif$
 $if(highlighting-macros)$
 $highlighting-macros$
 $endif$
+$if(verbatim-in-note)$
+\usepackage{fancyvrb}
+\VerbatimFootnotes % allows verbatim text in footnotes
+$endif$
 $if(tables)$
 \usepackage{longtable,booktabs}
 \usepackage{caption}
@@ -192,7 +189,7 @@ $endif$
 \providecommand{\tightlist}{%
   \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
 $if(numbersections)$
-\setcounter{secnumdepth}{$if(secnumdepth)$$secnumdepth$$else$5$endif$}
+\setcounter{secnumdepth}{5}
 $else$
 \setcounter{secnumdepth}{0}
 $endif$
diff --git a/data/templates/default.docbook5 b/data/templates/default.docbook5
index 415ccf9c3..b3a0b6def 100644
--- a/data/templates/default.docbook5
+++ b/data/templates/default.docbook5
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE article>
-<article
-  xmlns="http://docbook.org/ns/docbook" version="5.0"
 $if(mathml)$
-  xmlns:mml="http://www.w3.org/1998/Math/MathML"
+<article xmlns="http://docbook.org/ns/docbook" version="5.0">
+$else$
+<article xmlns="http://docbook.org/ns/docbook" version="5.0">
 $endif$
-  xmlns:xlink="http://www.w3.org/1999/xlink" >
   <info>
     <title>$title$</title>
 $if(author)$
diff --git a/data/templates/default.latex b/data/templates/default.latex
index 128f79d8d..3b80d3cdc 100644
--- a/data/templates/default.latex
+++ b/data/templates/default.latex
@@ -54,12 +54,11 @@ $endif$
 \IfFileExists{upquote.sty}{\usepackage{upquote}}{}
 % use microtype if available
 \IfFileExists{microtype.sty}{%
-\usepackage[$for(microtypeoptions)$$microtypeoptions$$sep$,$endfor$]{microtype}
+\usepackage{microtype}
 \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
 }{}
-\PassOptionsToPackage{hyphens}{url} % url is loaded by hyperref
-$if(verbatim-in-note)$
-\usepackage{fancyvrb}
+$if(geometry)$
+\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
 $endif$
 \usepackage[unicode=true]{hyperref}
 $if(colorlinks)$
@@ -85,12 +84,6 @@ $else$
 $endif$
             breaklinks=true}
 \urlstyle{same}  % don't use monospace font for urls
-$if(verbatim-in-note)$
-\VerbatimFootnotes % allows verbatim text in footnotes
-$endif$
-$if(geometry)$
-\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
-$endif$
 $if(lang)$
 \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
   \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$,$endfor$main=$babel-lang$]{babel}
@@ -124,6 +117,10 @@ $endif$
 $if(highlighting-macros)$
 $highlighting-macros$
 $endif$
+$if(verbatim-in-note)$
+\usepackage{fancyvrb}
+\VerbatimFootnotes % allows verbatim text in footnotes
+$endif$
 $if(tables)$
 \usepackage{longtable,booktabs}
 % Fix footnotes in tables (requires footnote package)