Fix more links

16 files changed, 39 insertions, 24 deletions

diff --git a/pelican/content/BerlinWorkshop.md b/pelican/content/BerlinWorkshop.md
index ff8ce0b..8c38e01 100644
--- a/pelican/content/BerlinWorkshop.md
+++ b/pelican/content/BerlinWorkshop.md
@@ -28,8 +28,8 @@ Alpha Board cost: if you are an alpha tester and plan to take an alpha board hom
 |      | - PKCS11, client-side software, how to configure the board (attachment:2016-07-15-berlin-fw.pdf)
 | 1100 | Break
 | 1130 | Hands-on testing
-|      | - get binary packages running on participants' own laptops ([[BinaryPackages]])
-|      | - [[OpenDNSSEC]] is a guide for how to initialize a rev03 board and use it to sign a zone using OpenDNNSSEC - use as a baseline for own testing and experimentation with PKCS11-based applications.
+|      | - get binary packages running on participants' own laptops ([BinaryPackages](BinaryPackages))
+|      | - [OpenDNSSEC](OpenDNSSEC) is a guide for how to initialize a rev03 board and use it to sign a zone using OpenDNNSSEC - use as a baseline for own testing and experimentation with PKCS11-based applications.
 | 1230 | Buffet lunch
 | 1330 | Hands-on testing continues
 | 1500 | Coffee break
diff --git a/pelican/content/BinaryPackages.md b/pelican/content/BinaryPackages.md
index cf2c070..34525c6 100644
--- a/pelican/content/BinaryPackages.md
+++ b/pelican/content/BinaryPackages.md
@@ -2,7 +2,7 @@ Title: BinaryPackages
 Date: 2016-12-15 22:44
 Modified: 2019-09-03 15:23
 
-[[PageOutline]]
+
 
 # Binary Packages for Cryptech Software and Firmware
 
diff --git a/pelican/content/BuildingFromSource.md b/pelican/content/BuildingFromSource.md
index cfe29c1..7bc2d6e 100644
--- a/pelican/content/BuildingFromSource.md
+++ b/pelican/content/BuildingFromSource.md
@@ -2,7 +2,7 @@ Title: BuildingFromSource
 Date: 2017-05-13 17:47
 Modified: 2017-05-17 21:28
 
-[[PageOutline]]
+
 
 # Building Cryptech Software/Firmware/Bitstream From Source
 
diff --git a/pelican/content/DevBridgeBoard.md b/pelican/content/DevBridgeBoard.md
index fd94f0f..baadc97 100644
--- a/pelican/content/DevBridgeBoard.md
+++ b/pelican/content/DevBridgeBoard.md
@@ -2,7 +2,7 @@ Title: DevBridgeBoard
 Date: 2016-12-15 22:43
 Modified: 2021-02-14 17:30
 
-[[PageOutline]]
+
 
 # dev-bridge board
 In the process of developing the [wiki:AlphaBoardComponents] design, the project has made what is known as the "dev-bridge board".
diff --git a/pelican/content/GettingStartedNovena.md b/pelican/content/GettingStartedNovena.md
index 08a0583..1777d7f 100644
--- a/pelican/content/GettingStartedNovena.md
+++ b/pelican/content/GettingStartedNovena.md
@@ -1,7 +1,7 @@
 Title: GettingStartedNovena
 Date: 2016-12-15 22:44
 
-[[PageOutline]]
+
 
 # Getting Started on the Novena
 
@@ -140,7 +140,7 @@ The PKCS11 token is in /usr/lib/libpkcs11.so. In order to start using it you nee
 (echo 12345678;echo 1234) | sudo p11util --set-so-pin --set-user-pin --pin-from-stdin
 ```
 
-It is strongly suggested to change the so pin and pin (in that order above) to something sensible. Now your token is ready to use. Your favorite PKCS11-client may or may not work depending on the state of support for PKCS11 function calls - please open tickets for whatever is missing. If you want/need to talk PKCS11 from another host, you could install and configure [[PKCS11Proxy]] on both the novena and your host. Note that currently pkcs11-proxy doesn't handle differing word-lengths so your client-side will have to be 32bit (since the novena is).
+It is strongly suggested to change the so pin and pin (in that order above) to something sensible. Now your token is ready to use. Your favorite PKCS11-client may or may not work depending on the state of support for PKCS11 function calls - please open tickets for whatever is missing. If you want/need to talk PKCS11 from another host, you could install and configure [PKCS11Proxy](PKCS11Proxy) on both the novena and your host. Note that currently pkcs11-proxy doesn't handle differing word-lengths so your client-side will have to be 32bit (since the novena is).
 
 
 ## Setting up the lab signer
diff --git a/pelican/content/OpenCryptoChip.md b/pelican/content/OpenCryptoChip.md
index 9591f49..72dc28f 100644
--- a/pelican/content/OpenCryptoChip.md
+++ b/pelican/content/OpenCryptoChip.md
@@ -1,7 +1,7 @@
 Title: OpenCryptoChip
 Date: 2016-12-15 22:44
 
-[[PageOutline]]
+
 
 # An Open Crypto Chip
 
diff --git a/pelican/content/PrahaWorkshop.md b/pelican/content/PrahaWorkshop.md
index 19611fd..0890799 100644
--- a/pelican/content/PrahaWorkshop.md
+++ b/pelican/content/PrahaWorkshop.md
@@ -1,7 +1,7 @@
 Title: PrahaWorkshop
 Date: 2016-12-15 22:44
 
-[[PageOutline]]
+
 
 # CrypTech Workshop - 2015.07.18 Praha
 
diff --git a/pelican/content/ProjectManagement.md b/pelican/content/ProjectManagement.md
index 9a6c018..8f46342 100644
--- a/pelican/content/ProjectManagement.md
+++ b/pelican/content/ProjectManagement.md
@@ -1,7 +1,7 @@
 Title: ProjectManagement
 Date: 2016-12-15 22:44
 
-[[PageOutline]]
+
 
 # v0.1 Resources
 
diff --git a/pelican/content/QuickStart.md b/pelican/content/QuickStart.md
index a510db1..f2cee63 100644
--- a/pelican/content/QuickStart.md
+++ b/pelican/content/QuickStart.md
@@ -2,7 +2,7 @@ Title: QuickStart
 Date: 2016-12-15 22:43
 Modified: 2017-05-13 20:39
 
-[[PageOutline]]
+
 *Page Under Development*
 
 # Git Repositories
@@ -27,4 +27,4 @@ The Alpha board currently ships with very old firmware, but you can [wiki:Upgrad
 
 # DNSSEC signing using OpenDNSSEC
 
-* [[OpenDNSSEC]]
+* [OpenDNSSEC](OpenDNSSEC)
diff --git a/pelican/content/ReleaseNotes.md b/pelican/content/ReleaseNotes.md
index 822e122..f352098 100644
--- a/pelican/content/ReleaseNotes.md
+++ b/pelican/content/ReleaseNotes.md
@@ -2,7 +2,7 @@ Title: ReleaseNotes
 Date: 2017-05-13 19:06
 Modified: 2017-05-13 19:18
 
-[[PageOutline]]
+
 
 # Release Notes
 
diff --git a/pelican/content/RoughV1.md b/pelican/content/RoughV1.md
index 09d93ec..2126f91 100644
--- a/pelican/content/RoughV1.md
+++ b/pelican/content/RoughV1.md
@@ -4,7 +4,7 @@ Modified: 2021-02-14 17:33
 
 # Rough Cut at v0.01 Proof of Concept Feature Set
 
-[[PageOutline]]
+
 
 This is a proposed version 0.01 product as a proof of concept.  The
 intent is not to have a very useful product, but rather to gain
diff --git a/pelican/content/StateOfPlay.md b/pelican/content/StateOfPlay.md
index edfa862..446a2bd 100644
--- a/pelican/content/StateOfPlay.md
+++ b/pelican/content/StateOfPlay.md
@@ -1,7 +1,7 @@
 Title: StateOfPlay
 Date: 2016-12-15 22:44
 
-[[PageOutline]]
+
 
 # A Completely Informal Snapshot Of The Current State Of The Cryptech Project As Of 2014-11-06
 
diff --git a/pelican/content/UpgradeToKSNG.md b/pelican/content/UpgradeToKSNG.md
index b4a7db7..e061fcf 100644
--- a/pelican/content/UpgradeToKSNG.md
+++ b/pelican/content/UpgradeToKSNG.md
@@ -2,7 +2,7 @@ Title: UpgradeToKSNG
 Date: 2016-12-22 22:33
 Modified: 2016-12-22 22:53
 
-[[PageOutline]]
+
 
 # Upgrading Cryptech Alpha HSM to "ksng" development package
 
diff --git a/pelican/content/Upgrading.md b/pelican/content/Upgrading.md
index 3cb22c9..fd3ed34 100644
--- a/pelican/content/Upgrading.md
+++ b/pelican/content/Upgrading.md
@@ -2,7 +2,7 @@ Title: Upgrading
 Date: 2017-05-12 23:15
 Modified: 2018-04-07 23:03
 
- [[PageOutline]]
+ 
 
 # Upgrading the Cryptech Alpha HSM
 
diff --git a/pelican/content/WikiStart.md b/pelican/content/WikiStart.md
index f9c5109..b2d8f3e 100644
--- a/pelican/content/WikiStart.md
+++ b/pelican/content/WikiStart.md
@@ -2,7 +2,7 @@ Title: WikiStart
 Date: 2016-12-15 20:46
 Modified: 2017-05-13 20:30
 
-[[PageOutline]]
+
 
 # Overview
 
diff --git a/trac2md.py b/trac2md.py
index ee9d80a..f7816ce 100755
--- a/trac2md.py
+++ b/trac2md.py
@@ -14,8 +14,9 @@ from base64 import b64decode
 from datetime import datetime
 from urllib.parse import quote
 
-wikilink_pattern = re.compile('\[http(.*)\]')
-wikilink_extract = re.compile('\[(.*)\]')
+wikilink_1_pattern = re.compile('\[http(.*)\]')
+wikilink_1_extract = re.compile('\[(.*)\]')
+wikilink_2_pattern = re.compile('\[\[([a-zA-Z0-9_]+)\]\]')
 strikethrough_pattern = re.compile('~~(.*)~~')
 camelcase_pattern = re.compile("!(\w+)")
 image_pattern = re.compile("\[\[Image\((.*)\)\]\]")
@@ -70,12 +71,12 @@ def convert_headers(line):
     return line
 
 
-def convert_wikilinks(line):
+def convert_wikilinks_1(line):
     ''' Convert wikiformat links
     '''
-    if wikilink_pattern.search(line):
+    if wikilink_1_pattern.search(line):
         try:
-            result = wikilink_extract.search(line).group(1)
+            result = wikilink_1_extract.search(line).group(1)
             if result:
                 parts = result.split(' ', 1)
                 if len(parts) == 1:
@@ -90,6 +91,19 @@ def convert_wikilinks(line):
     return line
 
 
+def convert_wikilinks_2(line):
+    ''' Convert more wiki links'''
+    m = wikilink_2_pattern.search(line)
+    if m:
+        text = m.group(1)
+        if text.lower() == "pageoutline":
+            link = ""
+        else:
+            link = "[{0}]({0})".format(text)
+        line = line.replace(m.group(0), link)
+    return line
+
+
 def convert_strike(line):
     ''' Convert wikiformat striked text
     '''
@@ -217,7 +231,8 @@ def WikiToMD(content, slug):
             line = convert_headers(line)
 
             # Convert wiki links
-            line = convert_wikilinks(line)
+            line = convert_wikilinks_1(line)
+            line = convert_wikilinks_2(line)
 
             # Convert striked through text
             line = convert_strike(line)