diff --git a/Makefile b/Makefile index 362565f..503bf2f 100644 --- a/Makefile +++ b/Makefile @@ -36,9 +36,9 @@ version_html/tmp/index.html: version_html/tmp/guide.html version_html/tmp/index.xhtml: version_html/tmp/index.html cd $(dir $<) &&\ - (tidy -c -e -utf8 --output-xhtml 1 --fix-uri 1 $(notdir $<) > $(notdir $@) || test -f $(notdir $@)) &&\ - (for file in guide*.html; do tidy -utf8 --output-xhtml 1 $$file > `basename $$file html`xhtml; done || /bin/true) &&\ - (tidy -utf8 --output-xhtml 1 index.html > index.xhtml || test -f index.xhtml) &&\ + (tidy -c -e -utf8 -asxhtml --doctype strict --fix-uri 1 $(notdir $<) > $(notdir $@) || test -f $(notdir $@)) &&\ + (for file in guide*.html; do tidy -utf8 -asxhtml --doctype strict $$file > `basename $$file html`xhtml; done || /bin/true) &&\ + (tidy -utf8 -asxhtml --doctype strict index.html > index.xhtml || test -f index.xhtml) &&\ sed -i -e 's/guide\([0-9]*\)\.html/guide\1.xhtml/g' *.xhtml version_html/guide.html: version_html/tmp/index.xhtml $(wildcard version_html/tmp/*.xhtml) diff --git a/README b/README index 097c0ab..5721c9f 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ installée, ainsi que les build-essential. === Pour construire le guide, version html === -La procédure est faite sur une Debian Wheezy, avec une distribution LaTeX -installée, ainsi que les build-essential, hevea et xsltproc. +La procédure est faite sur une Debian Buster, avec une distribution LaTeX +installée, ainsi que les build-essential, hevea, tidy et xsltproc. -- Dans un terminal, tapez "make version_html/index.html". +- Dans un terminal, tapez "make version_html/guide.html". diff --git a/lolipop.hva b/lolipop.hva index 0b378ef..287d671 100644 --- a/lolipop.hva +++ b/lolipop.hva @@ -87,7 +87,7 @@ \newenvironment{capture}[2][]{\begin{rawhtml}
- + \end{rawhtml}} {\begin{rawhtml}
\end{rawhtml}} @@ -133,7 +133,7 @@ class="guide_screenshot_fullscreen"> \newenvironment{ressource}[1] {\begin{rawhtml}

-\end{rawhtml}} +\end{rawhtml}} {\begin{rawhtml}

\end{rawhtml}\par} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/tools/xslt/xslt-html.sh b/tools/xslt/xslt-html.sh index 18813c1..7ffe5e3 100755 --- a/tools/xslt/xslt-html.sh +++ b/tools/xslt/xslt-html.sh @@ -1,4 +1,4 @@ #!/bin/bash export XML_CATALOG_FILES="dtd/catalog" -xsltproc -o ../../version_html/guide.html guide-html.xsl conf.xml +xsltproc -o ../../version_html/guide.html guide-html.xsl conf.xml