From 691c251c8e1e7eba0ec7ef1814481f49af64f25e Mon Sep 17 00:00:00 2001
From: Kevin McCarthy <kevin@8t8.us>
Date: Sun, 28 Jul 2019 19:23:12 -0700
Subject: [PATCH] Improve gen-map-doc work on multi-word maps

Co-authored-by: Richard Russon <rich@flatcap.org>
---
 doc/gen-map-doc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/gen-map-doc b/doc/gen-map-doc
index 79ff237fa..4f1733dc6 100644
--- a/doc/gen-map-doc
+++ b/doc/gen-map-doc
@@ -56,21 +56,21 @@ open XML, $xml or die "$xml: $!";
 while (<XML>) {
   if (/__print_map\((.*)\)/) {
     my $map = $1;
+    my $mapid = $1;
     my $maptitle = $1;
-    $maptitle =~ s/^(.)/\U$1\E/;
+    $mapid =~ s/\s+/-/g;
+    $maptitle =~ s/\b(\w)/\u$1/g;
     unless ($MAP{$map}) {
       warn "map $map undefined";
       next;
     }
-    my $title = $map;
-    $title =~ s/(.)(.+)/\U$1\E$2/;
     print <<EOT;
-<sect2 id="${map}-map">
+<sect2 id="${mapid}-map">
 <title>$maptitle Menu</title>
 $DOC{$map}
 
-<table id="tab-${map}-bindings">
-<title>Default $title Menu Bindings</title>
+<table id="tab-${mapid}-bindings">
+<title>Default $maptitle Menu Bindings</title>
 <tgroup cols="3">
 <thead>
 <row><entry>Function</entry><entry>Default key</entry><entry>Description</entry></row>
-- 
2.40.0