[Cryptech-Commits] [user/sra/pelican] 59/68: Fix one kind of link farble by processing Creole before CamelCase

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

sra at hactrn.net pushed a commit to branch pelican
in repository user/sra/pelican.

commit 96f8ab4641056020192175c0a02c562e8113dbd7
Author: Rob Austein <sra at hactrn.net>
AuthorDate: Sun May 9 21:17:14 2021 +0000

    Fix one kind of link farble by processing Creole before CamelCase
    
    Still some messes due to lack of bang-quoting of "CrypTech".
---
 pelican/content/DocMeet.md                | 2 +-
 pelican/content/ExternalProjectsTorHSM.md | 2 +-
 trac2md.py                                | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pelican/content/DocMeet.md b/pelican/content/DocMeet.md
index 224998a..9df8e95 100644
--- a/pelican/content/DocMeet.md
+++ b/pelican/content/DocMeet.md
@@ -13,4 +13,4 @@ Date: 2016-12-15 22:39
 ## Documents
 
 * [140109.cryptech.pdf Presentation - Overview of Project with Funding Requests]({attach}DocMeet/140109.cryptech.pdf)
-* [attachment:141002.cryptech-iij.pdf 141002.cryptech-iij.pdf [CrypTech]({filename}CrypTech.md) Presentation at Open IIJ Seminar]
+* [[attachment:141002.cryptech-iij.pdf|141002.cryptech-iij.pdf [CrypTech]({filename}CrypTech.md) Presentation at Open IIJ Seminar]]
diff --git a/pelican/content/ExternalProjectsTorHSM.md b/pelican/content/ExternalProjectsTorHSM.md
index 40ff4ee..46fe696 100644
--- a/pelican/content/ExternalProjectsTorHSM.md
+++ b/pelican/content/ExternalProjectsTorHSM.md
@@ -90,6 +90,6 @@ The system at MS6 (to MS8) does not make any part of the process worse from a //
 
 
 * [Tor directory protocol, version 3](https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt)
-* [https://www.crowdsupply.com/cryptech/open-hardware-security-module [CrypTech]({filename}CrypTech.md) Alpha system]
+* [CrypTech Alpha system](https://www.crowdsupply.com/cryptech/open-hardware-security-module)
 
 
diff --git a/trac2md.py b/trac2md.py
index c7cf85e..37c70ba 100755
--- a/trac2md.py
+++ b/trac2md.py
@@ -73,12 +73,12 @@ class Trac2Markdown:
         self.source_url = source_url
         self.pattern_actions = (
 
-            # Convert CamelCase links to explicit links
-            (self.camelcase_pattern,                                                    r"[[\1]]"),
-
             # Convert TracLinks to WikiCreole syntax to simplify remaining processing
             (re.compile(r"(?<!\[)\[([^][]+)\]"),                                        self.convert_to_creole),
 
+            # Convert CamelCase links to explicit links
+            (self.camelcase_pattern,                                                    r"[[\1]]"),
+
             # Convert !x quoting
             (re.compile(r"!((?:\w|[#])+)"),                                             r"\1"),