From b1164584fb8c3a4aadcef8c45f323ca6e8efb39c Mon Sep 17 00:00:00 2001 From: "Fletcher T. Penney" Date: Wed, 5 Jul 2017 14:36:12 -0400 Subject: [PATCH] CHANGED: Remove odf files; replace convenience scripts --- CMakeLists.txt | 8 +- Sources/libMultiMarkdown/odf.c | 117 --------------------------- Sources/libMultiMarkdown/odf.h | 116 -------------------------- scripts/mmd2fodt | 29 +++++++ scripts/mmd2fodt.bat | 8 ++ scripts/{mmd2odf => mmd2odt} | 6 +- scripts/{mmd2odf.bat => mmd2odt.bat} | 2 +- 7 files changed, 45 insertions(+), 241 deletions(-) delete mode 100644 Sources/libMultiMarkdown/odf.c delete mode 100644 Sources/libMultiMarkdown/odf.h create mode 100755 scripts/mmd2fodt create mode 100755 scripts/mmd2fodt.bat rename scripts/{mmd2odf => mmd2odt} (80%) rename scripts/{mmd2odf.bat => mmd2odt.bat} (58%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 78c4066..9ba959d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -190,7 +190,6 @@ set(src_files Sources/libMultiMarkdown/memoir.c Sources/libMultiMarkdown/miniz.c Sources/libMultiMarkdown/mmd.c - Sources/libMultiMarkdown/odf.c Sources/libMultiMarkdown/object_pool.c Sources/libMultiMarkdown/opendocument.c Sources/libMultiMarkdown/opendocument-content.c @@ -223,7 +222,6 @@ set(header_files Sources/libMultiMarkdown/memoir.h Sources/libMultiMarkdown/miniz.h Sources/libMultiMarkdown/mmd.h - Sources/libMultiMarkdown/odf.c Sources/libMultiMarkdown/object_pool.h Sources/libMultiMarkdown/opendocument.h Sources/libMultiMarkdown/opendocument-content.h @@ -244,7 +242,8 @@ if (WIN32) scripts/mmd.bat scripts/mmd2all.bat scripts/mmd2epub.bat - scripts/mmd2odf.bat + scripts/mmd2fodt.bat + scripts/mmd2odt.bat scripts/mmd2opml.bat scripts/mmd2tex.bat scripts/markdown.bat @@ -254,7 +253,8 @@ else() scripts/mmd scripts/mmd2all scripts/mmd2epub - scripts/mmd2odf + scripts/mmd2fodt + scripts/mmd2odt scripts/mmd2opml scripts/mmd2pdf scripts/mmd2tex diff --git a/Sources/libMultiMarkdown/odf.c b/Sources/libMultiMarkdown/odf.c deleted file mode 100644 index 61290cb..0000000 --- a/Sources/libMultiMarkdown/odf.c +++ /dev/null @@ -1,117 +0,0 @@ -/** - - MultiMarkdown -- Lightweight markup processor to produce HTML, LaTeX, and more. - - @file odf.c - - @brief - - - @author Fletcher T. Penney - @bug - -**/ - -/* - - Copyright © 2016 - 2017 Fletcher T. Penney. - - - The `MultiMarkdown 6` project is released under the MIT License.. - - GLibFacade.c and GLibFacade.h are from the MultiMarkdown v4 project: - - https://github.com/fletcher/MultiMarkdown-4/ - - MMD 4 is released under both the MIT License and GPL. - - - CuTest is released under the zlib/libpng license. See CuTest.c for the - text of the license. - - uthash library: - Copyright (c) 2005-2016, Troy D. Hanson - - Licensed under Revised BSD license - - miniz library: - Copyright 2013-2014 RAD Game Tools and Valve Software - Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC - - Licensed under the MIT license - - argtable3 library: - Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann - - All rights reserved. - - Licensed under the Revised BSD License - - - ## The MIT License ## - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - - ## Revised BSD License ## - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of the nor the - names of its contributors may be used to endorse or promote - products derived from this software without specific prior - written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES LOSS OF USE, DATA, OR - PROFITS OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -*/ - - -#include "odf.h" - -static int void_function(void) { - return 0; -} - -#ifdef TEST -static void Test_void_function(CuTest* tc) { - int test = void_function(); - - CuAssertIntEquals(tc, 0, test); -} -#endif diff --git a/Sources/libMultiMarkdown/odf.h b/Sources/libMultiMarkdown/odf.h deleted file mode 100644 index 8dc7d01..0000000 --- a/Sources/libMultiMarkdown/odf.h +++ /dev/null @@ -1,116 +0,0 @@ -/** - - MultiMarkdown -- Lightweight markup processor to produce HTML, LaTeX, and more. - - @file odf.h - - @brief - - - @author Fletcher T. Penney - @bug - -**/ - -/* - - Copyright © 2016 - 2017 Fletcher T. Penney. - - - The `MultiMarkdown 6` project is released under the MIT License.. - - GLibFacade.c and GLibFacade.h are from the MultiMarkdown v4 project: - - https://github.com/fletcher/MultiMarkdown-4/ - - MMD 4 is released under both the MIT License and GPL. - - - CuTest is released under the zlib/libpng license. See CuTest.c for the - text of the license. - - uthash library: - Copyright (c) 2005-2016, Troy D. Hanson - - Licensed under Revised BSD license - - miniz library: - Copyright 2013-2014 RAD Game Tools and Valve Software - Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC - - Licensed under the MIT license - - argtable3 library: - Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann - - All rights reserved. - - Licensed under the Revised BSD License - - - ## The MIT License ## - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - - ## Revised BSD License ## - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of the nor the - names of its contributors may be used to endorse or promote - products derived from this software without specific prior - written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES LOSS OF USE, DATA, OR - PROFITS OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -*/ - - -#ifndef ODF_MULTIMARKDOWN_H -#define ODF_MULTIMARKDOWN_H - -#ifdef TEST -#include "CuTest.h" -#endif - - -/// This is a sample function with a doxygen description. -// void void_f(void); - -#endif diff --git a/scripts/mmd2fodt b/scripts/mmd2fodt new file mode 100755 index 0000000..64258d1 --- /dev/null +++ b/scripts/mmd2fodt @@ -0,0 +1,29 @@ +#!/bin/sh +# +# mmd2fodt --- MultiMarkdown convenience script +# +# Fletcher T. Penney +# +# Pass arguments on to the binary to convert text to OpenDocument +# + +# Be sure to include multimarkdown in our PATH +export PATH="$PWD:/usr/local/bin:$PATH" + +which multimarkdown > /dev/null +if [ $? = 1 ] +then + echo multimarkdown executable not found! >&2 + exit 1 +fi + +if [ $# = 0 ] +then + multimarkdown -t fodt +else +until [ "$*" = "" ] +do + multimarkdown -b -t fodt "$1" + shift +done +fi diff --git a/scripts/mmd2fodt.bat b/scripts/mmd2fodt.bat new file mode 100755 index 0000000..9409b53 --- /dev/null +++ b/scripts/mmd2fodt.bat @@ -0,0 +1,8 @@ +@ECHO OFF +:Loop +IF "%1"=="" GOTO Continue + "%~dp0\multimarkdown" -b -t fodt "%1" +SHIFT +GOTO Loop +:Continue + diff --git a/scripts/mmd2odf b/scripts/mmd2odt similarity index 80% rename from scripts/mmd2odf rename to scripts/mmd2odt index 0109cab..a0acc66 100755 --- a/scripts/mmd2odf +++ b/scripts/mmd2odt @@ -1,6 +1,6 @@ #!/bin/sh # -# mmd2odf --- MultiMarkdown convenience script +# mmd2odt --- MultiMarkdown convenience script # # Fletcher T. Penney # @@ -19,11 +19,11 @@ fi if [ $# = 0 ] then - multimarkdown -t odf + multimarkdown -t odt else until [ "$*" = "" ] do - multimarkdown -b -t odf "$1" + multimarkdown -b -t odt "$1" shift done fi diff --git a/scripts/mmd2odf.bat b/scripts/mmd2odt.bat similarity index 58% rename from scripts/mmd2odf.bat rename to scripts/mmd2odt.bat index 3e82996..4facc2a 100755 --- a/scripts/mmd2odf.bat +++ b/scripts/mmd2odt.bat @@ -1,7 +1,7 @@ @ECHO OFF :Loop IF "%1"=="" GOTO Continue - "%~dp0\multimarkdown" -b -t odf "%1" + "%~dp0\multimarkdown" -b -t odt "%1" SHIFT GOTO Loop :Continue -- 2.40.0