aboutsummaryrefslogtreecommitdiffstats
path: root/FMark
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2018-03-23 01:38:30 +0000
committerYann Herklotz <ymherklotz@gmail.com>2018-03-23 01:38:30 +0000
commit9ec652af449a03dad646fc82a381f61e75090ec4 (patch)
tree39c28406700ac22e1f76672d37bd972fe7888768 /FMark
parentaec5955e14eda3a5f2b41ad8e1ba1bc6f15a4ca3 (diff)
downloadFMark-9ec652af449a03dad646fc82a381f61e75090ec4.tar.gz
FMark-9ec652af449a03dad646fc82a381f61e75090ec4.zip
[Clean] Cleaning up a bit
Diffstat (limited to 'FMark')
-rw-r--r--FMark/src/Common/MarkdownGen/MarkdownGen.fs21
-rw-r--r--FMark/src/FMarkCLI/FMarkCLI.fs19
2 files changed, 19 insertions, 21 deletions
diff --git a/FMark/src/Common/MarkdownGen/MarkdownGen.fs b/FMark/src/Common/MarkdownGen/MarkdownGen.fs
index 8abf61c..13008ef 100644
--- a/FMark/src/Common/MarkdownGen/MarkdownGen.fs
+++ b/FMark/src/Common/MarkdownGen/MarkdownGen.fs
@@ -74,9 +74,9 @@ let mdTable (rows: PRow list) =
| false ->
mdInlineElements line
|> (fun cellContent -> pStr + cellContent + "|")
-
+
List.fold (cellsFolder alignRow) "|" row
-
+
let foldRows alignRow rows =
let rowsFolder alignRow pStr row =
pStr + (foldCells alignRow) row + "\n"
@@ -90,20 +90,20 @@ let mdTable (rows: PRow list) =
/// recursively process a list
let rec mdList list =
let mdListItem ord tab (pStr,pCount) li =
- let makeTabs num =
+ let makeTabs num =
if num <= 0 then "" else String.replicate num "\t"
- let retFold s = pStr + s, pCount + 1;
+ let retFold s = pStr + s, pCount + 1
match li with
- | StringItem(line) -> mdInlineElements line |> (fun s ->
+ | StringItem(line) -> mdInlineElements line |> (fun s ->
match ord,s with
| _,"" -> ""
- | true,_ ->
+ | true,_ ->
sprintf "%s%i. %s\n" (makeTabs tab) pCount s
|> logPassN logger.Debug
- | false,_ ->
+ | false,_ ->
sprintf "%s- %s\n" (makeTabs tab) s) |> retFold
| NestedList(list) -> mdList list |> retFold
-
+
match list with
| {ListType=lt; ListItem=liS; Depth=d} ->
let ord = match lt with | OL _ -> true | UL -> false
@@ -115,7 +115,7 @@ let mdHeader header =
match header with
| {HeaderName=line;Level=lv} ->
(line |> mdInlineElements)
- |> sprintf "%s %s\n" (String.replicate lv "#")
+ |> sprintf "%s %s\n" (String.replicate lv "#")
/// process HTML body part
let mdBody pObjs =
@@ -131,6 +131,3 @@ let mdBody pObjs =
//| Footnote (fnId, _) -> mdInlineFootnote fnId
| _ -> sprintf "%A is not implemented" pObj
List.fold folder "" pObjs
-
-
-
diff --git a/FMark/src/FMarkCLI/FMarkCLI.fs b/FMark/src/FMarkCLI/FMarkCLI.fs
index 667a720..0364bb9 100644
--- a/FMark/src/FMarkCLI/FMarkCLI.fs
+++ b/FMark/src/FMarkCLI/FMarkCLI.fs
@@ -48,6 +48,7 @@ let setLoggerLevel (r:ParseResults<CLIArguments>)=
r.GetResult(Loglevel,defaultValue=LogLevel.FATAL)
|> function | l -> globLog <- Logger(l) // update the global logger with the new log value
r
+
let welcomeMsg a =
globLog.Info None "Welcome to FMark!"
a
@@ -69,15 +70,15 @@ let processCLI argv =
|> ifFlagRunTests
|> ifFileReadFrom
|> function
- | None(_) -> () // Do nothing
- | Some(instr,fname) ->
- let format = results.GetResult(Format,defaultValue = HTML) // Find out format and output file name, convert.
- let defaultOutfile = if format=HTML then replaceChars "\.[a-zA-Z]+$" ".html" fname else replaceChars "\.[a-zA-Z]+$" "1.md" fname
- let outFile = results.GetResult(Output,defaultValue=defaultOutfile)
- FMark.processString "" format instr
- |> function
- | Ok(s)
- | Error(s) -> FileIO.writeToFile outFile s
+ | None(_) -> () // Do nothing
+ | Some(instr,fname) ->
+ let format = results.GetResult(Format,defaultValue = HTML) // Find out format and output file name, convert.
+ let defaultOutfile = if format=HTML then replaceChars "\.[a-zA-Z]+$" ".html" fname else replaceChars "\.[a-zA-Z]+$" "1.md" fname
+ let outFile = results.GetResult(Output,defaultValue=defaultOutfile)
+ FMark.processString "" format instr
+ |> function
+ | Ok(s)
+ | Error(s) -> FileIO.writeToFile outFile s
[<EntryPoint>]
let main argv =