diff options
| author | ache <ache@ache.one> | 2017-08-20 19:50:47 +0000 |
|---|---|---|
| committer | ache <ache@ache.one> | 2017-08-20 19:50:47 +0000 |
| commit | 919d7c2fbdce46fd98e894098074c64dc671611c (patch) | |
| tree | dcf17e6822f683fc52244278e322162326ebd98d | |
| parent | Implémente link canonical (diff) | |
W3C HTML Nu modification
| -rw-r--r-- | article/article.m4 | 4 | ||||
| -rw-r--r-- | article/intro.m4 | 2 | ||||
| -rw-r--r-- | headers.m4 | 4 | ||||
| -rw-r--r-- | makefile | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/article/article.m4 b/article/article.m4 index 49816d2..73d977b 100644 --- a/article/article.m4 +++ b/article/article.m4 @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html> +<html lang="fr"> include(HEADER_HEADER) @@ -9,7 +9,7 @@ include(HEADER_HEADER) include(left.htm) -<article id="contenu" role="article" class="post hentry clearfix"> +<article id="contenu" class="post hentry clearfix"> include(tmpFileNameArticle) </article> diff --git a/article/intro.m4 b/article/intro.m4 index 0fe196b..4027c6d 100644 --- a/article/intro.m4 +++ b/article/intro.m4 @@ -1,4 +1,4 @@ -<article id="contenu" role="article" class="post hentry clearfix"> +<article id="contenu" class="post hentry clearfix"> undivert(tmpFileNameArticle) <a class="suite" href="linkFileNameArticle">Lire la suite</a> </article> @@ -2,8 +2,8 @@ <meta charset="utf-8" /> <title>TITLE_TITLE</title> <meta name="viewport" content="width=device-width, initial-scale=1" /> - <link rel="canonical" src="CANONIC"/> - <link rel="shortcut icon" type="image/svg" src="res/ache.ico" /> + <link rel="canonical" href="CANONIC"/> + <link rel="shortcut icon" type="image/svg" href="res/ache.ico" /> <style>@import url("/design/design.css");</style> <meta name= "description" content="Site d'ache : Articles et présentation de mes projets" /> </head> @@ -28,12 +28,12 @@ bin/introFilter: src/introFilter.hs src/Id.hs article/%.html: article/%.md bin/articleFilter bin/titleFilter $(BASE_HTML) pandoc --filter bin/articleFilter $< > ${@:.html=.htm} m4 -D TITLE_TITLE="`pandoc --filter bin/titleFilter $<`" headers.m4 > ${basename $@}_header.html - m4 -D tmpFileNameArticle=${@:.html=.htm} -D linkFileNameArticle=${<:.md=.html} -D HEADER_HEADER=${basename $@}_header.html -D CANONIC="//$@" article/article.m4 > $@ + m4 -D tmpFileNameArticle=${@:.html=.htm} -D linkFileNameArticle=${<:.md=.html} -D HEADER_HEADER=${basename $@}_header.html -D CANONIC="/$@" article/article.m4 > $@ contact/index.html: contact/index.md bin/titleFilter pandoc $< > ${@:.html=.htm} m4 -D TITLE_TITLE="`pandoc --filter bin/titleFilter $<`" headers.m4 > ${basename $@}_header.html - m4 -D tmpFileNameArticle=${@:.html=.htm} -D linkFileNameArticle=${<:.md=.html} -D HEADER_HEADER=${basename $@}_header.html -D CANONIC="//contact" article/article.m4 > $@ + m4 -D tmpFileNameArticle=${@:.html=.htm} -D linkFileNameArticle=${<:.md=.html} -D HEADER_HEADER=${basename $@}_header.html -D CANONIC="/contact" article/article.m4 > $@ article/%_intro.html: article/%.md bin/introFilter pandoc --filter bin/introFilter $< > ${@:.html=.htm} @@ -43,7 +43,7 @@ articles.htm: $(ALL_ARTICLES_INTRO_OUT) bin/introFilter cat $(ALL_ARTICLES_INTRO_OUT) > $@ headers_index.htm: - m4 -D TITLE_TITLE="Licornes, hérissons et renards" -D CANONIC="//" headers.m4 > $@ + m4 -D TITLE_TITLE="Licornes, hérissons et renards" -D CANONIC="/" headers.m4 > $@ index.html: index.m4 $(BASE_HTML) headers_index.htm m4 $< > $@ |