Merge branch 'hotfix/v2.02e'

.gitattributes

@@ -10,4 +10,5 @@
 *.sh           text eol=lf
 *.sty          text eol=lf
 *.tex          text eol=lf
+*.pdf_tex      text eol=lf
 *.zip          binary

.gitignore

@@ -5,6 +5,8 @@ temp/
 ## auxiliary files
 *.aux
 *.bak
+*.bbl
+*.blg
 *.cls
 *.dvi
 *.glg
@@ -19,6 +21,7 @@ temp/
 *.ps
 *.run.xml
 *.sty
+*.synctex(busy)
 *.synctex.gz*
 *.tdo
 *.toc

LICENSE.md

@@ -1,8 +1,8 @@
 
- svg and svg-extract -- Include and extract SVG pictures in LaTeX documents 
+ svg and svg-extract – Handling SVG pictures in LaTeX documents 
 ----------------------------------------------------------------------------
 
- Copyright (C) Philip Ilten <[email protected]>, 2012-2016  
+ Copyright (C) Philip Ilten <[email protected]>, 2012-2016<br>
  Copyright (C) Falk Hanisch <[email protected]>, 2017-
 
 ----------------------------------------------------------------------------

Makefile

@@ -3,13 +3,17 @@ PACKAGE = svg
 
 MAKESOURCE = $(MAKE) -C source
 
-.PHONY: all $(PACKAGE) pdf mostlyclean clean dist distclean release releaseclean install uninstall
+.PHONY: $(PACKAGE) pdf all doc mostlyclean clean dist distclean release releaseclean install uninstall
 
-all:
-	$(MAKESOURCE) all
+$(PACKAGE):
+	$(MAKESOURCE) $(PACKAGE)
 pdf: 
 	$(MAKESOURCE) pdf
-mostlyclean:	
+all:
+	$(MAKESOURCE) all
+doc:
+	$(MAKESOURCE) doc
+mostlyclean:
 	$(MAKESOURCE) mostlyclean
 clean:
 	$(MAKESOURCE) clean
@@ -25,4 +29,3 @@ install:
 	$(MAKESOURCE) install
 uninstall:
 	$(MAKESOURCE) uninstall
-

README.md

@@ -5,7 +5,7 @@
  Copyright (C) Philip Ilten <[email protected]>, 2012-2016<br>
  Copyright (C) Falk Hanisch <[email protected]>, 2017-
 
- svg 2019/10/22 v2.02d
+ **svg 2020/01/13 v2.02e**
 
 ----------------------------------------------------------------------------
 
@@ -39,6 +39,9 @@ can be invoked.
 Versions
 --------
 
+**v2.02e** (2020/01/13)
++ fixes for new version of package **scrbase**
+
 **v2.02d** (2019/10/22)
 + fix bugs with current kernel (2019/10/01) regarding file name parsing, see
   https://github.com/mrpiggi/svg/issues/16

source/Makefile

@@ -49,19 +49,24 @@ TMP_FILES := $(wildcard *.* $(TMP_FILES))
 TMP_FILES += $(foreach DIR,$(SRC_DIRS),$(wildcard $(DIR)*.*))
 TMP_FILES := $(filter-out $(SRC_FILES) $(EXM_FILES) $(AUX_FILES) $(OUT_FILES) $(DOC_FILES), $(TMP_FILES))
 
-.PHONY: all $(PACKAGE) pdf mostlyclean clean dist distclean release releaseclean install uninstall
+.PHONY: $(PACKAGE) pdf all doc mostlyclean clean dist distclean release releaseclean install uninstall
 
 # creates package files only
-all: $(PACKAGE)
-
 $(PACKAGE): $(OUT_FILES)
 
 %.sty: $(SRC__FILE)
 	$(TEX) $<
-
-# creates documentation only
-pdf: $(DOC__FILE)
 
+# run pdflatex once for updating documentation
+pdf: $(SRC__FILE) $(PACKAGE)
+	$(LATEX) --shell-escape "\input{$<}"
+
+# creating package files and update documentation
+all: $(PACKAGE) pdf
+
+# creates complete documentation
+doc: $(DOC__FILE)
+
 %.pdf: $(SRC__FILE) $(SRC_FILES)
 	$(MAKE) mostlyclean
 	$(LATEX) --shell-escape "\def\tudfinalflag{}\input{$<}"
@@ -72,28 +77,28 @@ pdf: $(DOC__FILE)
 	$(LATEX) --shell-escape "\def\tudfinalflag{}\input{$<}"
 
 # removes all temporary files created with all or doc
-mostlyclean:	
+mostlyclean:
 	$(call rm_dirs,$(TMP_DIRS))
 	$(call rm_files,$(TMP_FILES))
 
 # addtionally removes package files and documentation
 clean: mostlyclean
 	$(call rm_files,$(OUT_FILES))
 	$(call rm_files,$(DOC_FILES))
-	
+
 # creates TDS folder structure with generated files
-dist: $(PACKAGE) pdf
+dist: $(PACKAGE) doc
 	$(call rm_dirs,$(RLS_DIR))
 	$(call copy_tds,$(RLS_DIR))
-	
+
 # removes TDS folder structure
 distclean: 
 	$(call rm_tds,$(RLS_DIR))
 	$(call rm_tds,$(GIT_DIR))
 	$(call rm_dirs,$(CTAN_DIR)$(PACKAGE)/)
 
 # creates zip files for CTAN and GitHub from TDS folder structure
-release: $(PACKAGE) pdf
+release: $(PACKAGE) doc
 	$(call rm_dirs,$(GIT_DIR))
 	$(call copy_tds,$(GIT_DIR))
 	$(call rm_dirs,$(CTAN_DIR))
@@ -108,7 +113,7 @@ releaseclean:
 	$(call rm_dirs,$(RLS_DIR))
 
 # installs all files in TDS folder structur in TEXMF_HOME
-install: $(PACKAGE) pdf
+install: $(PACKAGE) doc
 	$(call copy_tds,$(TEXMF_HOME))
 	texhash
 

source/clearsource.bat

@@ -3,7 +3,10 @@ attrib +h "Makefile*" /s
 attrib +h "*.bat" /s
 attrib +h "*.dtx" /s
 attrib +h "*.mak" /s
-attrib +h "examples\*.*" /s
+attrib +h "examples\*.svg" /s
+attrib +h "examples\*.tex" /s
+attrib +h "examples\*.c" /s
+attrib +h "examples\*.S" /s
 del "*.*" /s /q> nul
 if exist svg-inkscape rmdir svg-inkscape /s /q > nul
 if exist svg-extract rmdir svg-extract /s /q > nul

source/examples/root.C

@@ -17,9 +17,9 @@ void root() {
   // Draw additional text.
   TText *t = new TText(); t->SetTextAlign(31);
   t->DrawText(0.7, 0.9, "\\larger[2]$z(x,y) =  \\frac{1}{\\sigma_x\\sigma_y"
-	      "\\sqrt{4\\pi^2}}\\exp\\left(- \\left(\\frac{(x-\\mu_x)^2}"
-	      "{2\\sigma_x^2} + \\frac{(y-\\mu_y)^2}{2\\sigma_y^2} \\right)"
-	      "\\right)$");
+		"\\sqrt{4\\pi^2}}\\exp\\left(- \\left(\\frac{(x-\\mu_x)^2}"
+		"{2\\sigma_x^2} + \\frac{(y-\\mu_y)^2}{2\\sigma_y^2} \\right)"
+		"\\right)$");
 
   // Print the plot.
   gPad->Print("root.svg");

source/osutils.mak

@@ -5,29 +5,29 @@ MD = mkdir
 CP = copy /Y
 #MV = move /Y
 define rm_dirs
-	$(foreach DIR,$(subst /,\,$(1)),
-		$(shell if exist $(DIR) $(RD) $(DIR))
-	)
+  $(foreach DIR,$(subst /,\,$(1)),
+    $(shell if exist $(DIR) $(RD) $(DIR))
+  )
 endef
 define mk_dirs
-	$(foreach DIR,$(subst /,\,$(1)),
-		$(shell if not exist $(DIR) $(MD) $(DIR))
-	)
+  $(foreach DIR,$(subst /,\,$(1)),
+    $(shell if not exist $(DIR) $(MD) $(DIR))
+  )
 endef
 define rm_files
-	$(foreach FILE,$(subst /,\,$(1)),
-		$(shell if exist $(FILE) $(RM) $(FILE))
-	)
+  $(foreach FILE,$(subst /,\,$(1)),
+    $(shell if exist $(FILE) $(RM) $(FILE))
+  )
 endef
 define cp_files
-	$(foreach FILE,$(subst /,\,$(1)),
-		$(shell echo $(CP) $(FILE) $(subst /,\,$(2)))
-	)
+  $(foreach FILE,$(subst /,\,$(1)),
+    $(shell echo $(CP) $(FILE) $(subst /,\,$(2)))
+  )
 endef
 #define mv_files
-#	$(foreach FILE,$(subst /,\,$(1)),
-#		$(shell echo $(MV) $(FILE) $(subst /,\,$(2)))
-#	)
+#  $(foreach FILE,$(subst /,\,$(1)),
+#    $(shell echo $(MV) $(FILE) $(subst /,\,$(2)))
+#  )
 #endef
 else
 RM = rm -f
@@ -36,19 +36,19 @@ MD = mkdir -p
 CP = cp
 #MV = mv
 define rm_dirs
-	$(RD) $(1)
+  $(RD) $(1)
 endef
 define mk_dirs
-	$(MD) $(1)
+  $(MD) $(1)
 endef
 define rm_files
-	$(RM) $(1)
+  $(RM) $(1)
 endef
 define cp_files
-	$(CP) $(1) $(2)
+  $(CP) $(1) $(2)
 endef
 #define mv_files
-#	$(MV) $(1) $(2)
+#  $(MV) $(1) $(2)
 #endef
 endif