Now mostly reading entire CLHS structure.

src-exe/Main.hs

@@ -27,6 +27,8 @@ main = do
   outputTexinfo "./out.texi" newGraph
   putStrLn "Finished Output"
 
+--   putStrLn $ exportAsIs sGraph
+
 --  (subcommand:args) <- getArgs
 --  case subcommand of
 --    "analyze" -> analyzeMain args

src/Graphdoc/Analysis/HTML.hs

@@ -76,7 +76,3 @@ analyzeHTML topdir = do
 
   fileEdgeList <- getEveryFileEdge files
   return (docMap, edges $ fileEdgeList)
-
-
-
-

src/Graphdoc/Conversion/Texinfo.hs

@@ -33,5 +33,4 @@ convertToTexinfo :: DocGraph -> DocGraph
 convertToTexinfo (docMap, docGraph) = 
   let nodeConverter = liftConverter convertPandoc
       newMap = Map.map nodeConverter docMap
-      newGraph = gmap (-<.> "texi") docGraph
   in (newMap, docGraph)

src/Graphdoc/Output/Texinfo.hs

@@ -33,14 +33,14 @@ findVertexWithBaseName path (_, docGraph) =
 
 simplifiedGraph :: DocGraph -> Unlabelled.AdjacencyMap FilePath
 simplifiedGraph (_, docGraph) =
-  let isTopEdge = ("TOP" == ) . (\(s, _, _) -> s)
-      labelledTopEdges = filter isTopEdge $ edgeList docGraph
-      unlabelledTopEdges = map (\(_, a, b) -> (b, a)) labelledTopEdges
-  in Unlabelled.edges unlabelledTopEdges
+  let isUpEdge = ("UP" == ) . (\(s, _, _) -> s)
+      labelledUpEdges = filter isUpEdge $ edgeList docGraph
+      unlabelledUpEdges = map (\(_, a, b) -> (b, a)) labelledUpEdges
+  in Unlabelled.edges unlabelledUpEdges
 
 flattenGraph :: DocGraph -> [(Int, FilePath)]
 flattenGraph graph =
-  let rootNode = findVertexWithBaseName "index" graph
+  let rootNode = findVertexWithBaseName "Chapter-Index" graph
       simpleGraph = simplifiedGraph graph
   in dfsWithDepth [rootNode] simpleGraph 
 
@@ -69,7 +69,3 @@ outputTexinfo destination graph@(docMap, _) =
       docText = simpleConverter totalDoc
   in withFile destination WriteMode
      (\h -> TIO.hPutStr h docText)
-
-
-
-