From 711b9eac4e12fcc2936d5fe5df66b3addbcaccc7 Mon Sep 17 00:00:00 2001
From: Bozo The Builder <bozo@mcneel.com>
Date: Wed, 26 Apr 2023 06:44:54 -0700
Subject: [PATCH] Sync changes from upstream repository

Co-authored-by: Dale Fugier <dale@mcneel.com>
Co-authored-by: Steve Baer <steve@mcneel.com>
---
 CMakeLists.txt             |  2 +-
 opennurbs_dimension.cpp    |  6 +++---
 opennurbs_leader.cpp       |  2 +-
 opennurbs_public_version.h | 14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b8e8fb1..86d7c462 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 3.16)
-set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD)")
+#set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD)")
 project(opennurbs CXX)
 
 # specify the C++ standard
diff --git a/opennurbs_dimension.cpp b/opennurbs_dimension.cpp
index 64b030ab..c0f0cc0d 100644
--- a/opennurbs_dimension.cpp
+++ b/opennurbs_dimension.cpp
@@ -774,7 +774,7 @@ bool ON_DimLinear::GetTextXform(
 
   text_gap = dimstyle->TextGap();
   if (dimstyle->MaskFrameType() != ON_TextMask::MaskFrame::NoFrame)
-    text_gap = dimstyle->TextMask().MaskBorder();
+    text_gap += dimstyle->TextMask().MaskBorder(); // RH-71452
   text_gap *= dimscale;
 
 
@@ -2941,7 +2941,7 @@ bool ON_DimAngular::GetTextXform(
 
   text_gap = dimstyle->TextGap();
   if (dimstyle->MaskFrameType() != ON_TextMask::MaskFrame::NoFrame)
-    text_gap = dimstyle->TextMask().MaskBorder();
+    text_gap += dimstyle->TextMask().MaskBorder(); // RH-71452
   text_gap *= dimscale;
 
   bool draw_forward = dimstyle->DrawForward();
@@ -4134,7 +4134,7 @@ bool ON_DimRadial::GetTextXform(
   line_height = dimstyle->TextHeight() * dimscale;
   text_gap = dimstyle->TextGap();
   if (dimstyle->MaskFrameType() != ON_TextMask::MaskFrame::NoFrame)
-    text_gap = dimstyle->TextMask().MaskBorder();
+    text_gap += dimstyle->TextMask().MaskBorder(); // RH-71452
   text_gap *= dimscale;
 
   landing_length = dimstyle->LeaderLandingLength() * dimscale;
diff --git a/opennurbs_leader.cpp b/opennurbs_leader.cpp
index 1ad36709..3d41317b 100644
--- a/opennurbs_leader.cpp
+++ b/opennurbs_leader.cpp
@@ -283,7 +283,7 @@ bool ON_Leader::GetTextXform(
 
     if (maskframe != ON_TextMask::MaskFrame::NoFrame)
     {
-      text_gap = dimstyle->TextMask().MaskBorder();
+      text_gap += dimstyle->TextMask().MaskBorder(); // RH-71452
     }
 
     if (maskframe == ON_TextMask::MaskFrame::CapsuleFrame)
diff --git a/opennurbs_public_version.h b/opennurbs_public_version.h
index dead4409..09fa718f 100644
--- a/opennurbs_public_version.h
+++ b/opennurbs_public_version.h
@@ -15,9 +15,9 @@
 //
 #define RMA_VERSION_YEAR   2023
 #define RMA_VERSION_MONTH  4
-#define RMA_VERSION_DATE   23
-#define RMA_VERSION_HOUR   3
-#define RMA_VERSION_MINUTE 55
+#define RMA_VERSION_DATE   26
+#define RMA_VERSION_HOUR   6
+#define RMA_VERSION_MINUTE 32
 
 ////////////////////////////////////////////////////////////////
 //
@@ -35,8 +35,8 @@
 //     3 = build system release build
 #define RMA_VERSION_BRANCH 0
 
-#define VERSION_WITH_COMMAS  8,0,23113,3550
-#define VERSION_WITH_PERIODS 8.0.23113.03550
+#define VERSION_WITH_COMMAS  8,0,23116,6320
+#define VERSION_WITH_PERIODS 8.0.23116.06320
 #define COPYRIGHT "Copyright (C) 1993-2023, Robert McNeel & Associates. All Rights Reserved."
 #define SPECIAL_BUILD_DESCRIPTION "Public OpenNURBS C++ 3dm file IO library."
 
@@ -47,8 +47,8 @@
 #define RMA_VERSION_NUMBER_SR_STRING   "SR0"
 #define RMA_VERSION_NUMBER_SR_WSTRING L"SR0"
 
-#define RMA_VERSION_WITH_PERIODS_STRING   "8.0.23113.03550"
-#define RMA_VERSION_WITH_PERIODS_WSTRING L"8.0.23113.03550"
+#define RMA_VERSION_WITH_PERIODS_STRING   "8.0.23116.06320"
+#define RMA_VERSION_WITH_PERIODS_WSTRING L"8.0.23116.06320"