From df8bab3fbccef2aaa6ab9d2e462dec6eb624b126 Mon Sep 17 00:00:00 2001 From: Paul Fossati Date: Sat, 27 Feb 2016 12:00:50 +0000 Subject: [PATCH 01/43] Added a filter to convert mathematical expressions --- mkdocs_pandoc/filters/math.py | 27 +++++++++++++++++++++++++++ mkdocs_pandoc/pandoc_converter.py | 6 ++++++ 2 files changed, 33 insertions(+) create mode 100644 mkdocs_pandoc/filters/math.py diff --git a/mkdocs_pandoc/filters/math.py b/mkdocs_pandoc/filters/math.py new file mode 100644 index 0000000..ebdc8e0 --- /dev/null +++ b/mkdocs_pandoc/filters/math.py @@ -0,0 +1,27 @@ +# Copyright 2015 Johannes Grassler +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +import re + +class MathFilter(object): + """Turn the \( \) Markdown math notation into LaTex $$ inlines""" + + def run(self, lines): + """Filter method""" + ret = [] + for line in lines: + ret.append(re.sub(r'\\\((*?)\\\)', '$\1$', line)) + + return ret diff --git a/mkdocs_pandoc/pandoc_converter.py b/mkdocs_pandoc/pandoc_converter.py index 2ba4dbb..9e339ec 100644 --- a/mkdocs_pandoc/pandoc_converter.py +++ b/mkdocs_pandoc/pandoc_converter.py @@ -1,4 +1,5 @@ import mkdocs_pandoc.filters.anchors +import mkdocs_pandoc.filters.math import mkdocs_pandoc.filters.chapterhead import mkdocs_pandoc.filters.headlevels import mkdocs_pandoc.filters.images @@ -26,6 +27,7 @@ def __init__(self, **kwargs): self.filter_xrefs = kwargs.get('filter_xrefs', True) self.image_ext = kwargs.get('image_ext', None) self.strip_anchors = kwargs.get('strip_anchors', True) + self.convert_math = kwargs.get('convert_math', True) self.width = kwargs.get('width', 100) try: @@ -146,6 +148,10 @@ def convert(self): if self.strip_anchors: lines = mkdocs_pandoc.filters.anchors.AnchorFilter().run(lines) + # Convert math expressions + if self.convert_math: + lines = mkdocs_pandoc.filters.anchors.MathFilter().run(lines) + # Fix cross references if self.filter_xrefs: lines = mkdocs_pandoc.filters.xref.XrefFilter().run(lines) From 76cc54a4df9756a713c8e69346a4b1176106ed3c Mon Sep 17 00:00:00 2001 From: Paul Fossati Date: Sat, 27 Feb 2016 12:09:42 +0000 Subject: [PATCH 02/43] Fixed path to math filter --- mkdocs_pandoc/pandoc_converter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs_pandoc/pandoc_converter.py b/mkdocs_pandoc/pandoc_converter.py index 9e339ec..10913a7 100644 --- a/mkdocs_pandoc/pandoc_converter.py +++ b/mkdocs_pandoc/pandoc_converter.py @@ -150,7 +150,7 @@ def convert(self): # Convert math expressions if self.convert_math: - lines = mkdocs_pandoc.filters.anchors.MathFilter().run(lines) + lines = mkdocs_pandoc.filters.math.MathFilter().run(lines) # Fix cross references if self.filter_xrefs: From b70c09f3e2b4442a620442b4bd967dd39cb745ac Mon Sep 17 00:00:00 2001 From: Paul Fossati Date: Sat, 27 Feb 2016 12:12:03 +0000 Subject: [PATCH 03/43] Fixed regex in math filter --- mkdocs_pandoc/filters/math.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs_pandoc/filters/math.py b/mkdocs_pandoc/filters/math.py index ebdc8e0..30510bd 100644 --- a/mkdocs_pandoc/filters/math.py +++ b/mkdocs_pandoc/filters/math.py @@ -22,6 +22,6 @@ def run(self, lines): """Filter method""" ret = [] for line in lines: - ret.append(re.sub(r'\\\((*?)\\\)', '$\1$', line)) + ret.append(re.sub(r'\\\((*?)\\\)', r'$\1$', line)) return ret From 82b1a729abefbb89c0519da809652687bc52e96c Mon Sep 17 00:00:00 2001 From: Paul Fossati Date: Sat, 27 Feb 2016 12:14:29 +0000 Subject: [PATCH 04/43] Fixed regex in math filter --- mkdocs_pandoc/filters/math.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs_pandoc/filters/math.py b/mkdocs_pandoc/filters/math.py index 30510bd..24e04be 100644 --- a/mkdocs_pandoc/filters/math.py +++ b/mkdocs_pandoc/filters/math.py @@ -22,6 +22,6 @@ def run(self, lines): """Filter method""" ret = [] for line in lines: - ret.append(re.sub(r'\\\((*?)\\\)', r'$\1$', line)) + ret.append(re.sub(r'\\\((.*)\\\)', r'$\1$', line)) return ret From 129395e373197a07032245334414e03c2d9af1cb Mon Sep 17 00:00:00 2001 From: Paul Fossati Date: Sat, 27 Feb 2016 12:43:01 +0000 Subject: [PATCH 05/43] Added metadata filter --- mkdocs_pandoc/filters/metadata.py | 34 +++++++++++++++++++++++++++++++ mkdocs_pandoc/pandoc_converter.py | 6 ++++++ 2 files changed, 40 insertions(+) create mode 100644 mkdocs_pandoc/filters/metadata.py diff --git a/mkdocs_pandoc/filters/metadata.py b/mkdocs_pandoc/filters/metadata.py new file mode 100644 index 0000000..03a8040 --- /dev/null +++ b/mkdocs_pandoc/filters/metadata.py @@ -0,0 +1,34 @@ +# Copyright 2015 Johannes Grassler +# Copyright 2016 Kergonath +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +import re + +class MetadataFilter(object): + """Turn the \( \) Markdown math notation into LaTex $$ inlines""" + + def run(self, lines): + """Filter method""" + ret = [] + header = True + for line in lines: + if header: + if not re.match(r'^[a-zA-Z\ ]:', line): + header = False + ret.append(line) + else: + ret.append(line) + + return ret diff --git a/mkdocs_pandoc/pandoc_converter.py b/mkdocs_pandoc/pandoc_converter.py index 10913a7..5dfb95f 100644 --- a/mkdocs_pandoc/pandoc_converter.py +++ b/mkdocs_pandoc/pandoc_converter.py @@ -3,6 +3,7 @@ import mkdocs_pandoc.filters.chapterhead import mkdocs_pandoc.filters.headlevels import mkdocs_pandoc.filters.images +import mkdocs_pandoc.filters.metadata import mkdocs_pandoc.filters.exclude import mkdocs_pandoc.filters.include import mkdocs_pandoc.filters.tables @@ -27,6 +28,7 @@ def __init__(self, **kwargs): self.filter_xrefs = kwargs.get('filter_xrefs', True) self.image_ext = kwargs.get('image_ext', None) self.strip_anchors = kwargs.get('strip_anchors', True) + self.strip_metadata = kwargs.get('strip_metadata', True) self.convert_math = kwargs.get('convert_math', True) self.width = kwargs.get('width', 100) @@ -152,6 +154,10 @@ def convert(self): if self.convert_math: lines = mkdocs_pandoc.filters.math.MathFilter().run(lines) + # Ignore metadata + if self.strip_metadata: + lines = mkdocs_pandoc.filters.metadata.MetadataFilter().run(lines) + # Fix cross references if self.filter_xrefs: lines = mkdocs_pandoc.filters.xref.XrefFilter().run(lines) From 37c6200a2033771d0a806d3678c6029b33c7d3fd Mon Sep 17 00:00:00 2001 From: Paul Fossati Date: Sat, 27 Feb 2016 13:15:38 +0000 Subject: [PATCH 06/43] Updated metadata filter --- mkdocs_pandoc/filters/math.py | 1 + mkdocs_pandoc/pandoc_converter.py | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/mkdocs_pandoc/filters/math.py b/mkdocs_pandoc/filters/math.py index 24e04be..e563ef6 100644 --- a/mkdocs_pandoc/filters/math.py +++ b/mkdocs_pandoc/filters/math.py @@ -1,4 +1,5 @@ # Copyright 2015 Johannes Grassler +# Copyright 2016 Kergonath # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/mkdocs_pandoc/pandoc_converter.py b/mkdocs_pandoc/pandoc_converter.py index 5dfb95f..2c9189c 100644 --- a/mkdocs_pandoc/pandoc_converter.py +++ b/mkdocs_pandoc/pandoc_converter.py @@ -137,7 +137,8 @@ def convert(self): if self.filter_include: lines_tmp = f_include.run(lines_tmp) - + + lines_tmp = mkdocs_pandoc.filters.metadata.MetadataFilter().run(lines_tmp) lines_tmp = f_headlevel.run(lines_tmp) lines_tmp = f_chapterhead.run(lines_tmp) lines_tmp = f_image.run(lines_tmp) @@ -154,10 +155,6 @@ def convert(self): if self.convert_math: lines = mkdocs_pandoc.filters.math.MathFilter().run(lines) - # Ignore metadata - if self.strip_metadata: - lines = mkdocs_pandoc.filters.metadata.MetadataFilter().run(lines) - # Fix cross references if self.filter_xrefs: lines = mkdocs_pandoc.filters.xref.XrefFilter().run(lines) From 277cf84c635765724752bd137c7ce7aaf8560f25 Mon Sep 17 00:00:00 2001 From: Chun-da Chen Date: Wed, 1 Jun 2016 13:46:29 +0800 Subject: [PATCH 07/43] Support structured pages. --- mkdocs_pandoc/pandoc_converter.py | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/mkdocs_pandoc/pandoc_converter.py b/mkdocs_pandoc/pandoc_converter.py index 7b89a8b..e5d64ac 100644 --- a/mkdocs_pandoc/pandoc_converter.py +++ b/mkdocs_pandoc/pandoc_converter.py @@ -86,6 +86,14 @@ def flatten_pages(self, pages, level=1): 'level': level, }) if type(list(page.values())[0]) is list: + # Add the parent section + flattened.append( + { + 'file': None, + 'title': list(page.keys())[0], + 'level': level, + }) + # Add children sections flattened.extend( self.flatten_pages( list(page.values())[0], @@ -115,12 +123,17 @@ def convert(self): f_headlevel = mkdocs_pandoc.filters.headlevels.HeadlevelFilter(pages) for page in pages: - fname = os.path.join(self.config['docs_dir'], page['file']) - try: - p = codecs.open(fname, 'r', self.encoding) - except IOError as e: - raise FatalError("Couldn't open %s for reading: %s" % (fname, - e.strerror), 1) + lines_tmp = [] + if page['file']: + fname = os.path.join(self.config['docs_dir'], page['file']) + try: + with codecs.open(fname, 'r', self.encoding) as p: + for line in p.readlines(): + lines_tmp.append(line.rstrip()) + except IOError as e: + raise FatalError("Couldn't open %s for reading: %s" % (fname, + e.strerror), 1) + f_chapterhead = mkdocs_pandoc.filters.chapterhead.ChapterheadFilter( headlevel=page['level'], title=page['title'] @@ -131,11 +144,6 @@ def convert(self): image_path=self.config['site_dir'], image_ext=self.image_ext) - lines_tmp = [] - - for line in p.readlines(): - lines_tmp.append(line.rstrip()) - if self.exclude: lines_tmp = f_exclude.run(lines_tmp) From f00f6ae13307dca3ee9ee40960118e977c0ca99a Mon Sep 17 00:00:00 2001 From: Chun-da Chen Date: Tue, 26 Jul 2016 17:18:52 +0800 Subject: [PATCH 08/43] Remove chapter numbering. --- mkdocs_pandoc/pandoc_converter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mkdocs_pandoc/pandoc_converter.py b/mkdocs_pandoc/pandoc_converter.py index e5d64ac..b1a4e79 100644 --- a/mkdocs_pandoc/pandoc_converter.py +++ b/mkdocs_pandoc/pandoc_converter.py @@ -74,7 +74,7 @@ def flatten_pages(self, pages, level=1): flattened.append( { 'file': page[0], - 'title': page[1], + 'title': '%s {.unnumbered}' % page[1], 'level': level, }) if type(page) is dict: @@ -82,7 +82,7 @@ def flatten_pages(self, pages, level=1): flattened.append( { 'file': list(page.values())[0], - 'title': list(page.keys())[0], + 'title': '%s {.unnumbered}' % list(page.keys())[0], 'level': level, }) if type(list(page.values())[0]) is list: @@ -90,7 +90,7 @@ def flatten_pages(self, pages, level=1): flattened.append( { 'file': None, - 'title': list(page.keys())[0], + 'title': '%s {.unnumbered}' % list(page.keys())[0], 'level': level, }) # Add children sections From fc59336064c3a6ed54db84476419e8122807220b Mon Sep 17 00:00:00 2001 From: Mihkel Selgal Date: Fri, 29 Jul 2016 16:08:57 +0300 Subject: [PATCH 09/43] Remove extra added header # symbol --- mkdocs_pandoc/cli/mkdocs2pandoc.py | 2 ++ mkdocs_pandoc/filters/headlevels.py | 5 ++--- setup.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mkdocs_pandoc/cli/mkdocs2pandoc.py b/mkdocs_pandoc/cli/mkdocs2pandoc.py index 5cb12a2..0174944 100644 --- a/mkdocs_pandoc/cli/mkdocs2pandoc.py +++ b/mkdocs_pandoc/cli/mkdocs2pandoc.py @@ -50,6 +50,8 @@ def main(): opts.add_argument('-o', '--outfile', default=None, help="File to write finished pandoc document to (default: STDOUT)") + opts.add_argument('-v', '--version', action='version', version='%(prog)s 0.2.7') + args = opts.parse_args() # Python 2 and Python 3 have mutually incompatible approaches to writing diff --git a/mkdocs_pandoc/filters/headlevels.py b/mkdocs_pandoc/filters/headlevels.py index 64a4728..ff07263 100644 --- a/mkdocs_pandoc/filters/headlevels.py +++ b/mkdocs_pandoc/filters/headlevels.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # - import re # TODO: Implement handling for Setext style headers. @@ -26,7 +25,7 @@ def __init__(self, pages): # Determine maximum header level from nesting in mkdocs.yml for page in pages: if page['level'] > max_offset: - max_offset = page['level'] + max_offset = page['level'] - 1 self.offset = max_offset @@ -35,6 +34,6 @@ def run(self, lines): """Filter method""" ret = [] for line in lines: - ret.append(re.sub(r'^#', '#' + ('#' * self.offset), line)) + ret.append(re.sub(r'^#', ('#' * self.offset), line)) return ret diff --git a/setup.py b/setup.py index 68dcf29..d0bda0f 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ setup( name='mkdocs-pandoc', - version='0.2.6', + version='0.2.7', description='A translator from mkdocs style markdown to pandoc style ' + 'markdown', From 1cd3cf4a3a46e6a93a863ab8d8616e910cc1a3e5 Mon Sep 17 00:00:00 2001 From: Adam Twardoch Date: Sat, 7 Jan 2017 14:45:54 +0100 Subject: [PATCH 10/43] Added support for pages without titles specified in mkdocs.yml --- .gitignore | 136 ++++++++++++++++++++++++++++- .idea/vcs.xml | 6 ++ CHANGES | 4 + mkdocs_pandoc/cli/mkdocs2pandoc.py | 6 +- mkdocs_pandoc/pandoc_converter.py | 8 ++ setup.py | 2 +- 6 files changed, 155 insertions(+), 7 deletions(-) create mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index 1994c11..e36b4de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,133 @@ -*.egg-info -*.pyc -*.swp +/srcdocs/wiki + +# Mac OS X internals +*.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Bower and NPM libraries +bower_components +node_modules + +# Build files +build +MANIFEST +site + +# PyCharm CE files +.idea/ + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*,cover +.hypothesis/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# dotenv +.env + +# virtualenv +.venv/ +venv/ +ENV/ + +# Spyder project settings +.spyderproject + +# Rope project settings +.ropeproject diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/CHANGES b/CHANGES index 84de39e..6f7dc55 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +0.2.7: + + * Added support for pages without titles specified in mkdocs.yml + 0.2.6: * Fixed issues/11 (added support for underwide header rows in tables) diff --git a/mkdocs_pandoc/cli/mkdocs2pandoc.py b/mkdocs_pandoc/cli/mkdocs2pandoc.py index 5cb12a2..4ee19e8 100644 --- a/mkdocs_pandoc/cli/mkdocs2pandoc.py +++ b/mkdocs_pandoc/cli/mkdocs2pandoc.py @@ -29,14 +29,14 @@ def main(): opts = argparse.ArgumentParser( - description="mdtableconv.py " + - "- converts pipe delimited tables to Pandoc's grid tables") + description="mkdocs2pandoc.py " + + "- flattens an MkDocs source site into a single Markdown document") opts.add_argument('-e', '--encoding', default='utf-8', help="Set encoding for input files (default: utf-8)") opts.add_argument('-f', '--config-file', default='mkdocs.yml', - help="mkdocs configuration file to use") + help="MkDocs configuration file to use") opts.add_argument('-i', '--image-ext', default=None, help="Extension to substitute image extensions by (default: no replacement)") diff --git a/mkdocs_pandoc/pandoc_converter.py b/mkdocs_pandoc/pandoc_converter.py index 7b89a8b..585b6a3 100644 --- a/mkdocs_pandoc/pandoc_converter.py +++ b/mkdocs_pandoc/pandoc_converter.py @@ -7,6 +7,7 @@ import mkdocs_pandoc.filters.tables import mkdocs_pandoc.filters.toc import mkdocs_pandoc.filters.xref +import mkdocs.utils from mkdocs_pandoc.exceptions import FatalError @@ -70,6 +71,13 @@ def flatten_pages(self, pages, level=1): flattened = [] for page in pages: + if type(page) is str: + flattened.append( + { + 'file' : page, + 'title': mkdocs.utils.filename_to_title(page), + 'level': level, + }) if type(page) is list: flattened.append( { diff --git a/setup.py b/setup.py index 68dcf29..d0bda0f 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ setup( name='mkdocs-pandoc', - version='0.2.6', + version='0.2.7', description='A translator from mkdocs style markdown to pandoc style ' + 'markdown', From ddb48936459f05b2cd9753d12daf500ffd343332 Mon Sep 17 00:00:00 2001 From: Adam Twardoch Date: Sat, 7 Jan 2017 14:46:12 +0100 Subject: [PATCH 11/43] Added support for pages without titles specified in mkdocs.yml --- .idea/dbnavigator.xml | 445 +++++++++++++++++++ .idea/inspectionProfiles/Project_Default.xml | 15 + .idea/misc.xml | 74 +++ .idea/mkdocs-pandoc.iml | 12 + .idea/modules.xml | 8 + .idea/workspace.xml | 443 ++++++++++++++++++ 6 files changed, 997 insertions(+) create mode 100644 .idea/dbnavigator.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/mkdocs-pandoc.iml create mode 100644 .idea/modules.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml new file mode 100644 index 0000000..792a196 --- /dev/null +++ b/.idea/dbnavigator.xml @@ -0,0 +1,445 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..280893b --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,15 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..9eafce5 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/mkdocs-pandoc.iml b/.idea/mkdocs-pandoc.iml new file mode 100644 index 0000000..6f63a63 --- /dev/null +++ b/.idea/mkdocs-pandoc.iml @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..4f94860 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..68199cd --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,443 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Python + + + + + PyCompatibilityInspection + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 1c95ea9f5c84bfc8094b5d97863257ce67018c19 Mon Sep 17 00:00:00 2001 From: Adam Twardoch Date: Sat, 7 Jan 2017 14:48:24 +0100 Subject: [PATCH 12/43] Added support for pages without titles specified in mkdocs.yml --- .idea/vcs.xml | 6 + .idea/workspace.xml | 285 ++++++++++++++++++++++---------------------- 2 files changed, 148 insertions(+), 143 deletions(-) create mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 68199cd..b90305e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,12 +2,7 @@ - - - - - - + - - + + - - + + @@ -64,116 +59,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -194,7 +104,7 @@ - + @@ -212,6 +122,7 @@ + @@ -277,7 +188,6 @@ - @@ -288,31 +198,31 @@ - + - - - - - - - - - + + + + + + + + + - - + + - + - - + + @@ -325,31 +235,42 @@ - + - - - + + + + + - + + + + + + + + + + + - - + - - + + - + @@ -367,7 +288,7 @@ - + @@ -383,7 +304,7 @@ - + @@ -405,19 +326,32 @@ - + - - - - - + + + - + + + + + + + + + + + + + + + + - + @@ -425,19 +359,84 @@ - - + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From ef5ace8fe614294acb30e7cbf089f4f54f528bfe Mon Sep 17 00:00:00 2001 From: Adam Twardoch Date: Sat, 7 Jan 2017 15:10:56 +0100 Subject: [PATCH 13/43] Added support for pages without titles specified in mkdocs.yml --- CHANGES | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 6f7dc55..a026261 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -0.2.7: +0.2.6.3: * Added support for pages without titles specified in mkdocs.yml diff --git a/setup.py b/setup.py index d0bda0f..17ae995 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ setup( name='mkdocs-pandoc', - version='0.2.7', + version='0.2.6.3', description='A translator from mkdocs style markdown to pandoc style ' + 'markdown', From 4bf9204c32b84bd81d612c86f9bb548cf27ce522 Mon Sep 17 00:00:00 2001 From: Adam Twardoch Date: Tue, 10 Jan 2017 03:53:50 +0100 Subject: [PATCH 14/43] renamed 'mkdocs-pandoc' to 'mkdocs-combine' --- .idea/misc.xml | 64 -- .idea/workspace.xml | 545 ++++++++++++++++-- CHANGES | 5 + mkdocs_combine/__init__.py | 1 + .../cli/__init__.py | 0 mkdocs_combine/cli/mkdocscombine.py | 138 +++++ .../exceptions.py | 0 .../filters/__init__.py | 0 .../filters/anchors.py | 0 .../filters/chapterhead.py | 0 .../filters/exclude.py | 0 .../filters/headlevels.py | 0 .../filters/images.py | 0 .../filters/include.py | 0 .../filters/math.py | 0 .../filters/metadata.py | 0 .../filters/tables.py | 0 .../filters/toc.py | 0 .../filters/xref.py | 0 .../mkdocs_combiner.py | 54 +- mkdocs_pandoc/__init__.py | 1 - mkdocs_pandoc/cli/mkdocs2pandoc.py | 84 --- setup.py | 71 ++- 23 files changed, 706 insertions(+), 257 deletions(-) create mode 100644 mkdocs_combine/__init__.py rename {mkdocs_pandoc => mkdocs_combine}/cli/__init__.py (100%) create mode 100644 mkdocs_combine/cli/mkdocscombine.py rename {mkdocs_pandoc => mkdocs_combine}/exceptions.py (100%) rename {mkdocs_pandoc => mkdocs_combine}/filters/__init__.py (100%) rename {mkdocs_pandoc => mkdocs_combine}/filters/anchors.py (100%) rename {mkdocs_pandoc => mkdocs_combine}/filters/chapterhead.py (100%) rename {mkdocs_pandoc => mkdocs_combine}/filters/exclude.py (100%) rename {mkdocs_pandoc => mkdocs_combine}/filters/headlevels.py (100%) rename {mkdocs_pandoc => mkdocs_combine}/filters/images.py (100%) rename {mkdocs_pandoc => mkdocs_combine}/filters/include.py (100%) rename {mkdocs_pandoc => mkdocs_combine}/filters/math.py (100%) rename {mkdocs_pandoc => mkdocs_combine}/filters/metadata.py (100%) rename {mkdocs_pandoc => mkdocs_combine}/filters/tables.py (100%) rename {mkdocs_pandoc => mkdocs_combine}/filters/toc.py (100%) rename {mkdocs_pandoc => mkdocs_combine}/filters/xref.py (100%) rename mkdocs_pandoc/pandoc_converter.py => mkdocs_combine/mkdocs_combiner.py (78%) delete mode 100644 mkdocs_pandoc/__init__.py delete mode 100644 mkdocs_pandoc/cli/mkdocs2pandoc.py diff --git a/.idea/misc.xml b/.idea/misc.xml index 9eafce5..2f5d239 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,69 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -