itMerge branch 'master' of z3bra.org:monochromatic - monochromatic - monochromatic blog: http://blog.z3bra.org	Err	z3bra.org	70
hgit clone git://z3bra.org/monochromatic	URL:git://z3bra.org/monochromatic	z3bra.org	70
1Log	/scm/monochromatic/log.gph	z3bra.org	70
1Files	/scm/monochromatic/files.gph	z3bra.org	70
1Refs	/scm/monochromatic/refs.gph	z3bra.org	70
i---	Err	z3bra.org	70
1commit 607588b14657ed7c53dfca329389e0d44cca734e	/scm/monochromatic/commit/607588b14657ed7c53dfca329389e0d44cca734e.gph	z3bra.org	70
1parent 6c75041a5a65bacae3ea5828252336f08dd8ed16	/scm/monochromatic/commit/6c75041a5a65bacae3ea5828252336f08dd8ed16.gph	z3bra.org	70
hAuthor: z3bra <willy@mailoo.org>	URL:mailto:willy@mailoo.org	z3bra.org	70
iDate:   Mon, 20 Apr 2015 01:01:38 +0200	Err	z3bra.org	70
i	Err	z3bra.org	70
iMerge branch 'master' of z3bra.org:monochromatic	Err	z3bra.org	70
i	Err	z3bra.org	70
iConflicts:	Err	z3bra.org	70
i        css/monochrome.css	Err	z3bra.org	70
i	Err	z3bra.org	70
iDiffstat:	Err	z3bra.org	70
i  M css/monochrome.css                  |      24 ++++++++++++++++--------	Err	z3bra.org	70
i  M publi.sh                            |      14 +++++++++-----	Err	z3bra.org	70
i	Err	z3bra.org	70
i2 files changed, 25 insertions(+), 13 deletions(-)	Err	z3bra.org	70
i---	Err	z3bra.org	70
1diff --git a/css/monochrome.css b/css/monochrome.css	/scm/monochromatic/file/css/monochrome.css.gph	z3bra.org	70
it@@ -85,15 +85,21 @@ header h1 a:hover {	Err	z3bra.org	70
i /* }}} */	Err	z3bra.org	70
i 	Err	z3bra.org	70
i /* Coding style (<code>) {{{ */	Err	z3bra.org	70
i-code {	Err	z3bra.org	70
i+code, pre {	Err	z3bra.org	70
i     color: inherit;	Err	z3bra.org	70
i-    padding: 2px;	Err	z3bra.org	70
i     font-family: monospace;	Err	z3bra.org	70
i+    font-size: 90%;	Err	z3bra.org	70
i+    padding: 4px;	Err	z3bra.org	70
i+    background-color: #eee;	Err	z3bra.org	70
i+    border: 1px solid #bbb;	Err	z3bra.org	70
i+    border-radius: 4px;	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-code:before, code:after {	Err	z3bra.org	70
i-    content: "`";	Err	z3bra.org	70
i-}	Err	z3bra.org	70
i+/*	Err	z3bra.org	70
i+ * code:before, code:after {	Err	z3bra.org	70
i+ *     content: "`";	Err	z3bra.org	70
i+ * }	Err	z3bra.org	70
i+ */	Err	z3bra.org	70
i 	Err	z3bra.org	70
i pre code:before, pre code:after {	Err	z3bra.org	70
i     content: none;	Err	z3bra.org	70
it@@ -101,12 +107,14 @@ pre code:before, pre code:after {	Err	z3bra.org	70
i 	Err	z3bra.org	70
i pre {	Err	z3bra.org	70
i     padding: 10px;	Err	z3bra.org	70
i-    background-color: #ddd;	Err	z3bra.org	70
i-    border: 1px solid #666;	Err	z3bra.org	70
i-    border-radius: 4px;	Err	z3bra.org	70
i     overflow-x: auto;	Err	z3bra.org	70
i     overflow-y: hidden;	Err	z3bra.org	70
i }	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+pre code {	Err	z3bra.org	70
i+    padding: 0;	Err	z3bra.org	70
i+    border: none;	Err	z3bra.org	70
i+}	Err	z3bra.org	70
i /* }}} */	Err	z3bra.org	70
i 	Err	z3bra.org	70
i /* Text Formatting {{{ */	Err	z3bra.org	70
1diff --git a/publi.sh b/publi.sh	/scm/monochromatic/file/publi.sh.gph	z3bra.org	70
it@@ -4,16 +4,20 @@ link=$(ls -l last.txt | sed 's
^.*-> 
/
')	Err	z3bra.org	70
i 	Err	z3bra.org	70
i test -z "$EDITOR" && EDITOR=vi	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-sed '1s/^# /* 0x0000 - /;1p;d' last.txt > tmp.txt	Err	z3bra.org	70
i-sed -i "s
(#)
(${link/.txt/.html})
" tmp.txt	Err	z3bra.org	70
i+# get last number used (in hexa) and increment it	Err	z3bra.org	70
i+last=$(<index.txt cut -d' ' -f2 | sed 's/0x0*//;1q')	Err	z3bra.org	70
i+next=$(printf "0x%04x" `echo "1 16i${last}+p"|dc`)	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-$EDITOR tmp.txt	Err	z3bra.org	70
i+# format our title and put it in a temp file	Err	z3bra.org	70
i+sed '1s/^# /* '$next' - /;1p;d' last.txt > tmp.txt	Err	z3bra.org	70
i+sed -i "s
(#)
(${link/.txt/.html})
" tmp.txt	Err	z3bra.org	70
i 	Err	z3bra.org	70
i+# present out the final index for reviewing	Err	z3bra.org	70
i cat index.txt >> tmp.txt	Err	z3bra.org	70
i-	Err	z3bra.org	70
i sed 10q tmp.txt	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-echo -n 'Is everything okay? [N/y] '	Err	z3bra.org	70
i+printf 'Is everything okay? [N/y] '	Err	z3bra.org	70
i read choice	Err	z3bra.org	70
i 	Err	z3bra.org	70
i+# replace the index with the temp file	Err	z3bra.org	70
i test "$choice" = "y" && mv tmp.txt index.txt	Err	z3bra.org	70
.