Merge pull request #1848 from psychon/appearance

Fix cyclic build dependency for 06-appearance.md.lua

docs/06-appearance.md.lua

@@ -62,31 +62,30 @@ local function path_to_module(path)
     error("Cannot figure out module for " .. tostring(path))
 end
 
-local function module_to_html(mod)
+local function path_to_html(path)
-    mod = mod:gsub(".init", "")
+    local mod = path_to_module(path):gsub(".init", "")
-
+    local f = assert(io.open(path))
-    local f = io.open("doc/classes/".. mod ..".html","r")
+    while true do
-
+        local line = f:read()
-    if f~=nil then
+        if not line then break end
-        f:close()
+        if line:match("@classmod") then
-        return "../classes/".. mod ..".html"
+            f:close()
+            return "../classes/".. mod ..".html"
+        end
+        if line:match("@module") or line:match("@submodule") then
+            f:close()
+            return "../libraries/".. mod ..".html"
+        end
     end
+    f:close()
 
-    f = io.open("doc/libraries/".. mod ..".html","r")
+    error("Cannot figure out if module or class: " .. tostring(path))
-
-    if f~=nil then
-        f:close()
-        return "../libraries/".. mod ..".html"
-    end
-
-    -- This can happen
-    return ""
 end
 
 local function get_link(file, element)
     return table.concat {
         "<a href='",
-        module_to_html(path_to_module(file)),
+        path_to_html(file),
         "#",
         element,
         "'>",
@@ -243,3 +242,4 @@ f:close()
 --TODO generate a complete sample theme
 --TODO also parse C files.
 
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80