@trebco/treb 32.3.3 → 32.4.1

package/treb-grid/src/types/grid_events.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/types/grid_options.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/types/scale-control.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/types/set_range_options.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/types/tab_bar.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/types/tile.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/types/update_flags.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/util/fontmetrics.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/util/ua.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-parser/src/csv-parser.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-parser/src/index.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-parser/src/md-parser.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-parser/src/parser-types.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */
@@ -393,6 +393,12 @@ export interface OptionalParserFlags {
    */
   r1c1: boolean,
 
+  /**
+   * handle r1c1 properly, which is to say use absolute addressing
+   * for absolute references and relative addressing otherwise. this should 
+   * be the default, but I don't want to break anything.
+   */
+  r1c1_proper_semantics: boolean;
 
   /* *
    * what if we do want =1/2 to be a fraction? more importantly, if we are
@@ -448,6 +454,14 @@ export interface RenderOptions {
   /** force addresses to be relative */
   r1c1_force_relative?: boolean;
 
+  /**
+   * handle r1c1 properly, which is to say use absolute addressing
+   * for absolute references and relative addressing otherwise (assuming
+   * there's a base set). this should be the default, but I don't want
+   * to break anything.
+   */
+  r1c1_proper_semantics?: boolean;
+
   /** if we're just translating, don't have to render addresses */
   pass_through_addresses?: boolean;
 

package/treb-parser/src/parser.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */
@@ -602,15 +602,15 @@ export class Parser {
         if (options.pass_through_addresses) { 
           return unit.label;
         }
-        return options.r1c1 ? this.R1C1Label(unit, options.r1c1_base, options.r1c1_force_relative) : this.AddressLabel(unit, offset);
+        return options.r1c1 ? this.R1C1Label(unit, options) : this.AddressLabel(unit, offset);
 
       case 'range':
         if (options.pass_through_addresses) { 
           return unit.label;
         }
         return options.r1c1 ? 
-          this.R1C1Label(unit.start, options.r1c1_base, options.r1c1_force_relative) + ':' + 
-            this.R1C1Label(unit.end, options.r1c1_base, options.r1c1_force_relative) : 
+          this.R1C1Label(unit.start, options) + ':' + 
+            this.R1C1Label(unit.end, options) : 
           this.AddressLabel(unit.start, offset) + ':' + this.AddressLabel(unit.end, offset);
 
       case 'missing':
@@ -962,10 +962,14 @@ export class Parser {
    */
   protected R1C1Label(
     address: UnitAddress,
-    base?: UnitAddress,
-    force_relative = false,
+    options: Partial<RenderOptions>,
+    // base?: UnitAddress,
+    // force_relative = false,
   ): string {
 
+    const force_relative = !!options.r1c1_force_relative;
+    const base = options.r1c1_base;
+
     let label = '';
 
     if (address.sheet) { // && (!base?.sheet || base?.sheet !== address.sheet)) {
@@ -976,7 +980,30 @@ export class Parser {
     let row = '';
     let column = '';
 
-    if (force_relative && base) { 
+    if (force_relative && options.r1c1_proper_semantics && base) {
+
+      if (address.absolute_row) {
+        row = (address.row + 1).toString();
+      }
+      else {
+        const delta_row = address.row - base.row;
+        if (delta_row) {
+          row = `[${delta_row}]`;
+        }
+      }
+
+      if (address.absolute_column) {
+        column = (address.column + 1).toString();
+      }
+      else {
+        const delta_column = address.column - base.column;
+        if (delta_column) {
+          column = `[${delta_column}]`;
+        }
+      }
+
+    }
+    else if (force_relative && base) { 
       const delta_row = address.row - base.row;
       const delta_column = address.column - base.column;
 
@@ -2527,6 +2554,9 @@ export class Parser {
         }
         else if (match[1]){ // absolute
           r1c1.row = Number(match[1]) - 1; // R1C1 is 1-based
+          if (this.flags.r1c1_proper_semantics) {
+            r1c1.absolute_row = true;
+          }
         }
         else {
           r1c1.offset_row = true;
@@ -2539,6 +2569,9 @@ export class Parser {
         }
         else if (match[2]) { // absolute
           r1c1.column = Number(match[2]) - 1; // R1C1 is 1-based
+          if (this.flags.r1c1_proper_semantics) {
+            r1c1.absolute_column = true;
+          }
         }
         else {
           r1c1.offset_column = true;

package/treb-utils/src/event_source.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-utils/src/ievent_source.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-utils/src/index.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-utils/src/measurement.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-utils/src/scale.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-utils/src/serialize_html.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-utils/src/validate_uri.ts

@@ -1,3 +1,24 @@
+/*
+ * This file is part of TREB.
+ *
+ * TREB is free software: you can redistribute it and/or modify it under the 
+ * terms of the GNU General Public License as published by the Free Software 
+ * Foundation, either version 3 of the License, or (at your option) any 
+ * later version.
+ *
+ * TREB is distributed in the hope that it will be useful, but WITHOUT ANY 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along 
+ * with TREB. If not, see <https://www.gnu.org/licenses/>. 
+ *
+ * Copyright 2022-2025 trebco, llc. 
+ * info@treb.app
+ * 
+ */
+
 
 /**
  * TODO: possibly add an allow-list for remotes