pyeasyphd 0.0.2__tar.gz → 0.0.4__tar.gz

{pyeasyphd-0.0.2 → pyeasyphd-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyeasyphd
-Version: 0.0.2
+Version: 0.0.4
 Summary: pyeasyphd
 License: GPL-3.0-or-later
 Keywords: Python,Markdown,LaTex
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: pyadvtools (>=0.0.3,<0.0.4)
+Requires-Dist: pyadvtools (>=0.0.5,<0.0.6)
 Project-URL: Documentation, https://github.com/NextArtifIntell/pyeasyphd
 Project-URL: Homepage, https://github.com/NextArtifIntell/pyeasyphd
 Project-URL: Repository, https://github.com/NextArtifIntell/pyeasyphd

{pyeasyphd-0.0.2 → pyeasyphd-0.0.4}/pyeasyphd/main/basic_input.py

@@ -128,18 +128,18 @@ class BasicInput(object):
         csl_name = options.get("csl_name", "apa-no-ampersand")
         if len(csl_name) == 0:
             csl_name = "apa-no-ampersand"
-        self.full_csl_style_pandoc = os.path.join(self.path_templates, f"CSL/{csl_name}.csl")
-        self.full_tex_article_template_pandoc = os.path.join(self.path_templates, "TEX/eisvogel.tex")
+        self.full_csl_style_pandoc = os.path.join(self.path_templates, "CSL", f"{csl_name}.csl")
+        self.full_tex_article_template_pandoc = os.path.join(self.path_templates, "TEX", "eisvogel.tex")
 
-        self.article_template_tex = read_list(os.path.join(self.path_templates, "TEX/Article.tex"))
+        self.article_template_tex = read_list(os.path.join(self.path_templates, "TEX", "Article.tex"))
 
     def _initialize_python_run_tex(self, options: Dict[str, Any]) -> None:
-        self.article_template_header_tex = read_list(os.path.join(self.path_templates, "TEX/Article_Header.tex"))
-        self.article_template_tail_tex = read_list(os.path.join(self.path_templates, "TEX/Article_Tail.tex"))
-        self.beamer_template_header_tex = read_list(os.path.join(self.path_templates, "TEX/Beamer_Header.tex"))
-        self.beamer_template_tail_tex = read_list(os.path.join(self.path_templates, "TEX/Beamer_Tail.tex"))
-        self.math_commands_tex = read_list(os.path.join(self.path_templates, "TEX/math_commands.tex"))
-        self.usepackages_tex = read_list(os.path.join(self.path_templates, "TEX/Style.tex"))
+        self.article_template_header_tex = read_list(os.path.join(self.path_templates, "TEX", "Article_Header.tex"))
+        self.article_template_tail_tex = read_list(os.path.join(self.path_templates, "TEX", "Article_Tail.tex"))
+        self.beamer_template_header_tex = read_list(os.path.join(self.path_templates, "TEX", "Beamer_Header.tex"))
+        self.beamer_template_tail_tex = read_list(os.path.join(self.path_templates, "TEX", "Beamer_Tail.tex"))
+        self.math_commands_tex = read_list(os.path.join(self.path_templates, "TEX", "math_commands.tex"))
+        self.usepackages_tex = read_list(os.path.join(self.path_templates, "TEX", "Style.tex"))
 
         # handly preamble
         self.handly_preamble = options.get("handly_preamble", False)

{pyeasyphd-0.0.2 → pyeasyphd-0.0.4}/pyeasyphd/main/pandoc_md_to.py

@@ -323,8 +323,8 @@ class PandocMdTo(BasicInput):
     def generate_tex_content(self, file_prefix: str, path_subsection: str, path_bib: str, path_combine: str) -> None:
         # for latex
         # add template for tex file
-        add_bib_name = "{}/{}-abbr.bib".format(os.path.basename(path_bib), file_prefix)
-        add_tex_name = "{}/{}.tex".format(os.path.basename(path_subsection), file_prefix)
+        add_bib_name = os.path.join(os.path.basename(path_bib), f"{file_prefix}-abbr.bib")
+        add_tex_name = os.path.join(os.path.basename(path_subsection), f"{file_prefix}.tex")
         insert_part_one, insert_part_two = self._generate_tex_content(file_prefix, add_tex_name, add_bib_name)
 
         # write tex
@@ -343,9 +343,9 @@ class PandocMdTo(BasicInput):
         part_one = [
             "\\date{" + "{}".format(time.strftime("%B %d, %Y")) + "}\n\n",
             "\\ifx \\fullpath \\undefined\n",
-            "    \\addbibresource{" + "../{}".format(add_bib_name) + "}\n",
+            "    \\addbibresource{" + os.path.join("..", add_bib_name) + "}\n",
             "\\else\n",
-            "    \\addbibresource{" + "\\fullpath/{}".format(add_bib_name) + "}\n",
+            "    \\addbibresource{" + os.path.join("\\fullpath", add_bib_name) + "}\n",
             "\\fi\n\n",
         ]
         part_two = [
@@ -353,9 +353,9 @@ class PandocMdTo(BasicInput):
             "% \\maketitle\n",
             "\\tableofcontents\n\n",
             "\\ifx \\fullpath \\undefined\n",
-            "    \\input{" + "../{}".format(add_tex_name) + "}\n",
+            "    \\input{" + os.path.join("..", add_tex_name) + "}\n",
             "\\else\n",
-            "    \\input{" + "\\fullpath/{}".format(add_tex_name) + "}\n",
+            "    \\input{" + os.path.join("\\fullpath", add_tex_name) + "}\n",
             "\\fi\n",
         ]
         return part_one, part_two

{pyeasyphd-0.0.2 → pyeasyphd-0.0.4}/pyeasyphd/main/python_run_tex.py

@@ -48,8 +48,8 @@ class PythonRunTex(BasicInput):
         # for figures
         for i in range(len(data_list_body)):
             if re.search(r"\\includegraphics", data_list_body[i]):
-                data_list_body[i] = data_list_body[i].replace("./Figures/", f"./{figure_folder_name}/")
-                data_list_body[i] = data_list_body[i].replace("Figures/", f"{figure_folder_name}/")
+                data_list_body[i] = data_list_body[i].replace(f".{os.sep}Figures{os.sep}", f".{os.sep}{figure_folder_name}{os.sep}")
+                data_list_body[i] = data_list_body[i].replace(f"Figures{os.sep}", f"{figure_folder_name}{os.sep}")
         write_list(data_list_body, output_tex_name, "w", os.path.join(path_output, tex_folder_name), False)
 
         self._special_operate_tex(
@@ -105,15 +105,15 @@ class PythonRunTex(BasicInput):
                 data_list = insert_list_in_list(data_list, ["\n\\def\\cn{}\n"], r"\\documentclass", "after")
 
             # for bib
-            regex = re.compile(r"\\addbibresource{\./References/References\.bib}")
+            regex = re.compile(r"\\addbibresource{" + os.path.join(".", "References", "References.bib") + "}")
             for i in range(len(data_list)):
                 mch = regex.search(data_list[i])
                 if not mch:
                     continue
                 if bib_folder_name:
-                    data_list[i] = "\\addbibresource{" + f"./{bib_folder_name}/{bib_name}" + "}\n"
+                    data_list[i] = "\\addbibresource{" + os.path.join(".", bib_folder_name, bib_name) + "}\n"
                 else:
-                    data_list[i] = "\\addbibresource{" + f"./{bib_name}" + "}\n"
+                    data_list[i] = "\\addbibresource{" + os.path.join(".", bib_name) + "}\n"
 
             # body
             if len(data_list_body) != 0:

{pyeasyphd-0.0.2 → pyeasyphd-0.0.4}/pyeasyphd/pyeasyphd.sublime-settings

@@ -1,6 +1,7 @@
 {
     // config
     // config path
+    // Must be configured by the user.
     "path_config": "",
 
     // figures, templates, bibs
@@ -8,27 +9,27 @@
     "path_figures": "",
     "path_templates": "",
 
-    // pypapers/bib/core/convert_str_to_str.py
+    // pyeasyphd/bib/core/convert_str_to_str.py
     "default_additional_field_list": [],
 
-    // pypapers/bib/bibtexparser/middlewares_str_to_str.py
+    // pyeasyphd/bib/bibtexparser/middlewares_str_to_str.py
     "substitute_in_bib": true,
     "substitute_old_list": [],
     "substitute_new_list": [],
 
 
-    // pypapers/bib/core/convert_str_to_library.py
+    // pyeasyphd/bib/core/convert_str_to_library.py
     "is_standardize_bib": true,
 
-    // pypapers/bib/bibtexparser/middlewares_str_to_library.py
+    // pyeasyphd/bib/bibtexparser/middlewares_str_to_library.py
     "is_display_implicit_comments": true,
 
 
-    // pypapers/bib/core/convert_library_to_library.py
+    // pyeasyphd/bib/core/convert_library_to_library.py
     // "abbr", "zotero", or "save"
     "choose_abbr_zotero_save": "save",
 
-    // pypapers/bib/bibtexparser/middlewares_library_to_library.py
+    // pyeasyphd/bib/bibtexparser/middlewares_library_to_library.py
     "function_common_again": true,
     "function_common_again_abbr": true,
     "function_common_again_zotero": true,
@@ -134,13 +135,13 @@
     "delete_fields_list_for_save": [],
 
 
-    // pypapers/bib/core/convert_library_to_str.py
+    // pyeasyphd/bib/core/convert_library_to_str.py
     "is_standardize_library": false,
     "empty_entry_cite_keys": false,
     "add_index_to_entries": false,
     "entries_necessary": true,
 
-    // pypapers/bib/bibtexparser/middlewares_library_to_str.py
+    // pyeasyphd/bib/bibtexparser/middlewares_library_to_str.py
     "is_sort_entry_fields": true,
     "is_sort_blocks": true,
     "sort_entries_by_cite_keys": [],
@@ -148,7 +149,7 @@
     "sort_entries_by_field_keys_reverse": true,
 
 
-    // pypapers/main/pandoc_md_to.py
+    // pyeasyphd/main/pandoc_md_to.py
     // for pandoc
     "csl_name": "apa-no-ampersand",
     // the number of columns in md files
@@ -160,7 +161,7 @@
     "cite_flag_in_tex": "cite",
 
     // for bib file
-    // pypapers/main/python_writers.py
+    // pyeasyphd/main/python_writers.py
     // "abbr.bib", "zotero.bib", "save.bib"
     "bib_for_abbr_name": "abbr.bib",
     "bib_for_zotero_name": "zotero.bib",
@@ -174,7 +175,7 @@
     "bibtex_format_block_separator": "",
 
     // for md file
-    // pypapers/main/python_run_md.py
+    // pyeasyphd/main/python_run_md.py
     // default is ""
     "final_output_main_md_name": "",
     // true, false
@@ -191,7 +192,7 @@
     "display_basic_beauty_complex_references_in_md": "beauty",
 
     // for tex file
-    // pypapers/main/python_run_tex.py
+    // pyeasyphd/main/python_run_tex.py
     // handly preamble
     "handly_preamble": false,
 
@@ -208,7 +209,7 @@
         ".nav", ".snm", ".toc", ".xdv"
     ],
 
-    // pypapers/tools/python_run_latex_md.py
+    // pyeasyphd/tools/python_run_latex_md.py
     // true, false
     "generate_html": false,
 
@@ -229,7 +230,7 @@
     "delete_original_tex_in_output_folder": false,
     "delete_original_bib_in_output_folder": false,
 
-    // pypapers/pypapers.py
+    // pyeasyphd/pyeasyphd.py
     // default is the same with the active file
     "path_output": "",
 }

{pyeasyphd-0.0.2 → pyeasyphd-0.0.4}/pyeasyphd/tools/format_save_bibs.py

@@ -172,7 +172,7 @@ def generate_statistic_information(path_output: str) -> None:
             informations.append(flag + "\n")
 
         # Write information to CSV file
-        csv_path = f.replace(".bib", ".csv").replace("/bib/", "/url/")
+        csv_path = f.replace(".bib", ".csv").replace(f"{os.sep}bib{os.sep}", f"{os.sep}url{os.sep}")
         write_list(informations, csv_path, "w", None, False)
 
     return None

{pyeasyphd-0.0.2 → pyeasyphd-0.0.4}/pyeasyphd/tools/search/search_keywords.py

@@ -1,6 +1,7 @@
 import copy
 import os
 import re
+from pathlib import Path
 from typing import Any, Dict, List
 
 from pyadvtools import (
@@ -214,11 +215,11 @@ class Searchkeywords(object):
             data_list.append(f"<td>{name}</td>\n")
 
             for f in data_dict[name]:
+                folders = Path(f).parts[1:]
                 if index == "combine":
-                    data_list.append(x.format(f, f.split("-")[0].split("/")[-1].title() + ":" + f.split(".")[-1]))
+                    data_list.append(x.format(f, folders[-1].split("-")[0].title() + ":" + f.split(".")[-1]))
                 elif index == "separate":
-                    data_list.append(x.format(f, f.split("/")[-2].split("-")[0].title() + ":" + f.split(".")[-1]))
-
+                    data_list.append(x.format(f, folders[-2].split("-")[0].title() + ":" + f.split(".")[-1]))
             data_list.append("</tr>\n")
         data_list.append("</tbody>\n")
 

{pyeasyphd-0.0.2 → pyeasyphd-0.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyeasyphd"
-version = "0.0.2"
+version = "0.0.4"
 description = "pyeasyphd"
 license = "GPL-3.0-or-later"
 authors = ["NextAI <nextartifintell@gmail.com>"]
@@ -14,7 +14,7 @@ classifiers = ["Topic :: Software Development :: Libraries :: Python Modules"]
 
 [tool.poetry.dependencies]
 python = ">=3.8.1"
-pyadvtools = "^0.0.3"
+pyadvtools = "^0.0.5"
 
 [tool.poetry.group.dev.dependencies]
 mypy = "^1.10.0"