diff --git a/CliClient/tests/EnexToMd.js b/CliClient/tests/EnexToMd.js index 0b40857b053..dbeb0fa6bd1 100644 --- a/CliClient/tests/EnexToMd.js +++ b/CliClient/tests/EnexToMd.js @@ -35,7 +35,7 @@ describe('EnexToMd', function() { const htmlPath = basePath + '/' + htmlFilename; const mdPath = basePath + '/' + filename(htmlFilename) + '.md'; - // if (htmlFilename !== 'text2.html') continue; + // if (htmlFilename !== 'list5.html') continue; const html = await shim.fsDriver().readFile(htmlPath); let expectedMd = await shim.fsDriver().readFile(mdPath); diff --git a/CliClient/tests/enex_to_md/list5.html b/CliClient/tests/enex_to_md/list5.html new file mode 100644 index 00000000000..21549080f32 --- /dev/null +++ b/CliClient/tests/enex_to_md/list5.html @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/CliClient/tests/enex_to_md/list5.md b/CliClient/tests/enex_to_md/list5.md new file mode 100644 index 00000000000..1e0f3d04464 --- /dev/null +++ b/CliClient/tests/enex_to_md/list5.md @@ -0,0 +1,7 @@ +- Protocols + + - two common network protocols used to send data packets over a network + + - TCP Transmission control protocol + +- Network port - a network port is a process-specific or an application-specific software construct serving as a communication endpoint, which is used by the Transport Layer protocols of Internet Protocol suite, such as UDP and TCP \ No newline at end of file diff --git a/ReactNativeClient/lib/import-enex-md-gen.js b/ReactNativeClient/lib/import-enex-md-gen.js index 76ff0319753..c201402ba8b 100644 --- a/ReactNativeClient/lib/import-enex-md-gen.js +++ b/ReactNativeClient/lib/import-enex-md-gen.js @@ -497,10 +497,12 @@ function enexXmlToMdArray(stream, resources) { let container = state.lists[state.lists.length - 1]; container.startedText = false; + + const indent = ' '.repeat(state.lists.length - 1); if (container.tag == "ul") { - section.lines.push("- "); + section.lines.push(indent + "- "); } else { - section.lines.push(container.counter + '. '); + section.lines.push(indent + container.counter + '. '); container.counter++; } } else if (isStrongTag(n)) {