[git] gnupg-doc - branch, master, updated. 4a02511aa4f85d12ca77964ee21edc83e8a41d39
by Werner Koch
cvs at cvs.gnupg.org
Thu Nov 7 15:40:41 CET 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GnuPG website and other docs".
The branch, master has been updated
via 4a02511aa4f85d12ca77964ee21edc83e8a41d39 (commit)
from 3f8a20bb5d2cd0a379b90341cc04d66ae57cd99a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4a02511aa4f85d12ca77964ee21edc83e8a41d39
Author: Werner Koch <wk at gnupg.org>
Date: Thu Nov 7 12:32:36 2013 +0100
Add disable-copyright-footer flag.
* web/share/gpgweb.el: Autoload cl-macs.
(gpgweb-setup-project): Change sitemap format.
(gpgweb-insert-footer): Implement disable-copyright-footer flag.
* web/faq/gnupg-faq.org: Add disable-copyright-footer flag/
* web/aegypten/: Add disable-copyright-footer flag to all org files.
* web/aegypten2/: Ditto.
diff --git a/web/aegypten/development.org b/web/aegypten/development.org
index b58be92..0857d51 100644
--- a/web/aegypten/development.org
+++ b/web/aegypten/development.org
@@ -849,3 +849,5 @@ X.509/PKIX certificate authority (uses OpenSSL)
for Unix
[[http://cryp.to/librfc822/][RFC822 Address Parser Library]]
+
+#+HTML:<!--disable-copyright-footer-->
diff --git a/web/aegypten/glossary.org b/web/aegypten/glossary.org
index 3eafc5a..934ad2d 100644
--- a/web/aegypten/glossary.org
+++ b/web/aegypten/glossary.org
@@ -53,3 +53,4 @@ words/acronyms not clear in their meaning.
(C) Intevation, Verbatim copying and distribution of this entire page
is permitted in any medium, provided this notice is preserved.
+#+HTML:<!--disable-copyright-footer-->
diff --git a/web/aegypten/index.org b/web/aegypten/index.org
index 21f6cb1..07709df 100644
--- a/web/aegypten/index.org
+++ b/web/aegypten/index.org
@@ -137,3 +137,4 @@ Detailed list of results:
(C) Intevation, Verbatim copying and distribution of this entire page
is permitted in any medium, provided this notice is preserved.
+#+HTML:<!--disable-copyright-footer-->
diff --git a/web/aegypten/pr.org b/web/aegypten/pr.org
index 25e4e1a..acead95 100644
--- a/web/aegypten/pr.org
+++ b/web/aegypten/pr.org
@@ -171,3 +171,5 @@ Digital:
Paper:
- c't 2001, Heft 22, page 49: Sichere E-Mail (german)
+
+#+HTML:<!--disable-copyright-footer-->
diff --git a/web/aegypten/tech.org b/web/aegypten/tech.org
index 3c6bd12..d3e2b7b 100644
--- a/web/aegypten/tech.org
+++ b/web/aegypten/tech.org
@@ -188,3 +188,4 @@ Smartcard.
(C) Intevation, Verbatim copying and distribution of this entire page
is permitted in any medium, provided this notice is preserved.
+#+HTML:<!--disable-copyright-footer-->
diff --git a/web/aegypten/time.org b/web/aegypten/time.org
index 985752d..f0b96f7 100644
--- a/web/aegypten/time.org
+++ b/web/aegypten/time.org
@@ -39,3 +39,4 @@ definitions ready to start implementation work
(C) Intevation, Verbatim copying and distribution of this entire page
is permitted in any medium, provided this notice is preserved.
+#+HTML:<!--disable-copyright-footer-->
diff --git a/web/aegypten/who.org b/web/aegypten/who.org
index 13ab467..348a833 100644
--- a/web/aegypten/who.org
+++ b/web/aegypten/who.org
@@ -54,3 +54,4 @@
(C) Intevation, Verbatim copying and distribution of this entire page
is permitted in any medium, provided this notice is preserved.
+#+HTML:<!--disable-copyright-footer-->
diff --git a/web/aegypten2/index.org b/web/aegypten2/index.org
index 12c2e17..ccd128a 100644
--- a/web/aegypten2/index.org
+++ b/web/aegypten2/index.org
@@ -216,3 +216,4 @@
(C) Intevation, Verbatim copying and distribution of this entire page
is permitted in any medium, provided this notice is preserved.
+#+HTML:<!--disable-copyright-footer-->
diff --git a/web/documentation/faqs.org b/web/documentation/faqs.org
index 0f45e71..497eb26 100644
--- a/web/documentation/faqs.org
+++ b/web/documentation/faqs.org
@@ -9,3 +9,6 @@
- [[../faq/gnupg-faq.html][HTML]]
- [[ftp://ftp.gnupg.org/gcrypt/gnupg/GnuPG-FAQ.txt][Text]]
- [[http://git.gnupg.org/cgi-bin/gitweb.cgi?p%3Dgnupg-doc.git%3Ba%3Dblob_plain%3Bf%3Dweb/faq/gnupg-faq.org][Org-mode]]
+
+
+# eof
diff --git a/web/faq/gnupg-faq.org b/web/faq/gnupg-faq.org
index 68b2fd4..c8f8937 100644
--- a/web/faq/gnupg-faq.org
+++ b/web/faq/gnupg-faq.org
@@ -51,6 +51,8 @@ released under terms of the [[http://creativecommons.org/licenses/by-nc/2.5/][Cr
2.5]] license; alternately, you may make use of it under terms of the
GNU General Public License (version 3 or, at your discretion, any
later version), again excepting Mr. Munroe’s works.
+#+HTML:<!--disable-copyright-footer-->
+
** Disclaimer of liability
:PROPERTIES:
diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index 60c7f1d..64c22b6 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -1,6 +1,9 @@
;;; gpgweb.el --- elisp helper code for the GnuPG web pages
(require 'org-exp)
+;; cl-macs is required by ox-html.el but for whatever reasons not
+;; autoloaded.
+(load-library "cl-macs")
(defun gpgweb-setup-project ()
(progn
@@ -19,6 +22,8 @@
:makeindex t
:auto-sitemap t
:sitemap-title "GnuPG - Sitemap"
+ :sitemap-sort-folders "last"
+ :sitemap-file-entry-format "%t @@html:<span id=\"smallnote\">@@(%d)@@html:</span>@@"
:style-include-default nil
:timestamp-file t
:html-head "<link rel=\"stylesheet\" href=\"gnupg.css\" type=\"text/css\" />"
@@ -36,6 +41,8 @@
'(:components ("gpgweb-org" "gpgweb-other")))))
+
+
(defun gpgweb-insert-header (title)
(goto-char (point-min))
(insert "<?xml version=\"1.0\" encoding=\"utf-8\"?>
@@ -108,8 +115,10 @@
"))
(defun gpgweb-insert-footer ()
- (goto-char (point-max))
- (insert "<div id=\"cpyright\">
+ (goto-char (point-min))
+ (unless (search-forward "<!--disable-copyright-footer-->" nil t)
+ (goto-char (point-max))
+ (insert "<div id=\"cpyright\">
<a rel=\"license\" href=\"http://creativecommons.org/licenses/by-sa/3.0/\"
><img alt=\"CC-BY-SA 3.0\" style=\"border: 0\"
src=\"share/cc-by-sa-3.0_80x15.png\"/></a><br/>
@@ -119,7 +128,9 @@
<a rel=\"license\" href=\"http://creativecommons.org/licenses/by-sa/3.0/\"
>Creative Commons Attribution-ShareAlike 3.0 Unported License</a>. See
<a href=\"copying.html\">copying<a/> for details.
- </div>
+</div>"))
+ (goto-char (point-max))
+ (insert "
</main>
</body>
</html>
@@ -137,7 +148,6 @@
(let ((fname (file-name-nondirectory htmlfile))
(title (org-publish-find-title orgfile))
(generated-at (org-today)))
- (message "post processing %s (%s)" htmlfile orgfile)
(gpgweb-insert-header title)
(gpgweb-insert-footer)
(when (string-match "\\.\\([a-z][a-z]\\.\\)?html$" fname)
@@ -147,15 +157,21 @@
(replace-match (concat "href=\"" ) t nil))
(goto-char (point-min))
(while (search-forward "@MENU-ACTIVE@" nil t)
- (replace-match "" t nil)))
- (basic-save-buffer))
- (unless visitingp (kill-buffer work-buffer)))))
+ (replace-match "" t nil))
+ (when (string-equal fname "sitemap")
+ (goto-char (point-min))
+ (while (re-search-forward
+ "^.*<li>.*>\\(GnuPG - \\).*<span.*$" nil t)
+ (replace-match "" t nil nil 1)))
+ (basic-save-buffer))
+ (unless visitingp (kill-buffer work-buffer))))))
(defun gpgweb-org-to-html (plist filename pub-dir)
(gpgweb-postprocess-html plist filename
(org-html-publish-to-html plist filename pub-dir)))
+
(defun gpgweb-upload ()
(let ((stagedir (plist-get project-plist :publishing-directory)))
(message "gpgweb rootdir '%s'" gpgweb-root-dir)
@@ -168,3 +184,29 @@
(provide 'gpgweb)
+
+;; commit 6f5180bd9fc230a31913cbdb9a4dd48cc247adc2
+;; Author: Rick Frankel <rick at rickster.com>
+;; Date: Wed Oct 2 18:26:27 2013 -0400
+;;
+;; Fix escaping of links in html export.
+;;
+;; * lisp/ox-html.el (org-html-link): Unescape org-escaped links an
+;; re-escape for html (browser).
+;;
+;;
+;; diff --git a/lisp/ox-html.el b/lisp/ox-html.el
+;; index 66862bc..0600204 100644
+;; --- a/lisp/ox-html.el
+;; +++ b/lisp/ox-html.el
+;; @@ -2624,7 +2624,9 @@ INFO is a plist holding contextual information. See
+;; (path
+;; (cond
+;; ((member type '("http" "https" "ftp" "mailto"))
+;; - (concat type ":" raw-path))
+;; + (org-link-escape
+;; + (org-link-unescape
+;; + (concat type ":" raw-path)) org-link-escape-chars-browser))
+;; ((string= type "file")
+;; ;; Treat links to ".org" files as ".html", if needed.
+;; (setq raw-path
diff --git a/web/site_map.org b/web/site_map.org
deleted file mode 100644
index f72596e..0000000
--- a/web/site_map.org
+++ /dev/null
@@ -1,4 +0,0 @@
-
-* Site Map
-
-This site map is automagically generated at each site rebuild.
-----------------------------------------------------------------------
Summary of changes:
web/aegypten/development.org | 2 ++
web/aegypten/glossary.org | 1 +
web/aegypten/index.org | 1 +
web/aegypten/pr.org | 2 ++
web/aegypten/tech.org | 1 +
web/aegypten/time.org | 1 +
web/aegypten/who.org | 1 +
web/aegypten2/index.org | 1 +
web/documentation/faqs.org | 3 +++
web/faq/gnupg-faq.org | 2 ++
web/share/gpgweb.el | 56 ++++++++++++++++++++++++++++++++++++------
web/site_map.org | 4 ---
12 files changed, 64 insertions(+), 11 deletions(-)
delete mode 100644 web/site_map.org
hooks/post-receive
--
The GnuPG website and other docs
http://git.gnupg.org
More information about the Gnupg-commits
mailing list