byrne.mp and byrne.sty updated

jemmybutton · Sep 16, 2024 · ce04fe3 · ce04fe3
1 parent b6a2971
commit ce04fe3
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/byrne.mp b/byrne.mp
@@ -1,7 +1,7 @@
-%    byrne-euclid 0.2.4
+%    byrne-euclid 0.2.5
 %    MetaPost library that implements most of the graphical
 %    features present in Oliver Byrne's version of Euclid's "Elements"
-%    Copyright 2023 Sergey Slyusarev
+%    Copyright 2024 Sergey Slyusarev
 %
 %    This program is free software: you can redistribute it and/or modify
 %    it under the terms of the GNU General Public License as published by
@@ -1211,6 +1211,33 @@ vardef byNamedLineSeq (expr s)(text linesListRaw) =
     )
 enddef;
 
+vardef byNamedLineSeqByPoints(expr s, cyc)(text pointsList) =
+	save constLinesList, lastPoint, firstPoint, i;
+	string constLinesList, lastPoint, firstPoint;
+	numeric i;
+	constLinesList := "";
+	lastPoint := "";
+	i := 0;
+	forsuffixes pN=pointsList:
+		i := i + 1;
+		if (lastPoint <> ""):
+			if (str pN <> "noPoint"):
+				if (i > 2):
+					constLinesList := constLinesList &  ", ";
+				fi;
+				constLinesList := constLinesList & lastPoint & str pN;
+			fi;
+		else:
+			firstPoint := str pN;
+		fi;
+		lastPoint := str pN;
+	endfor;
+	if (cyc) and (i <> 2) and (lastPoint <> "noPoint"):
+		constLinesList := constLinesList &  ", " & lastPoint & firstPoint;
+	fi;
+	byNamedLineSeq(s)(scantokens(constLinesList))
+enddef;
+
 vardef byMarkLine(expr pos, col)(suffix lineName) =
     setAttribute("mark", "Position", str lineName, pos);
     setAttribute("mark", "Color", str lineName, col);

diff --git a/byrne.sty b/byrne.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{byrne}[2023/04/22 Byrne]
+\ProvidesPackage{byrne}[2024/09/16 Byrne]
 
 \RequirePackage{xparse}
 \RequirePackage{ifmtarg}
@@ -272,6 +272,16 @@ end
 		{\drawFromCurrentPicture[\plal][line#3]{startAutoLabeling;draw byNamedLineSeq(0)(#3);stopAutoLabeling;}}%
 		{\drawFromCurrentPicture[\plal][#2]{startAutoLabeling;draw byNamedLineSeq(0)(#3);stopAutoLabeling;}}%
 }
+
+\DeclareDocumentCommand{\drawLineByPoints}{o o m}{%
+	\IfNoValueTF{#1}%
+		{\global\def\plal{middle}}%
+		{\global\def\plal{#1}}%
+	\IfNoValueTF{#2}%
+		{\drawFromCurrentPicture[\plal][line#3]{startAutoLabeling;draw byNamedLineSeqByPoints(0,true)(#3);stopAutoLabeling;}}%
+		{\drawFromCurrentPicture[\plal][#2]{startAutoLabeling;draw byNamedLineSeqByPoints(0,true)(#3);stopAutoLabeling;}}%
+}
+
 
 \def\drawPointM#1{\drawFromCurrentPicture[middle][pointm#1]{startAutoLabeling; draw byNamedPointMark(#1); stopAutoLabeling;}}