akkartik/wardley.love - Change NDHQN23GI2IFUYGNYSO4BC467L37CQDDYL4C7NYCLD47QHOG6WFQC

done passing left/right margins everywhere

The final step is to add them to:

Text.compute_fragments

Doing it carefully caught 5 call-sites that my tests didn't catch.

Created by Kartik K. Agaram on July 8, 2022

NDHQN23GI2IFUYGNYSO4BC467L37CQDDYL4C7NYCLD47QHOG6WFQC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 23 [5.1]

B:BD[3.1850] → [4.743:776]

    Text.compute_fragments(line)

[3.1850]

[6.103]

    Text.compute_fragments(line, left, right)

Replacement in text.lua at line 96 [5.1]

B:BD[7.42] → [4.1120:1158]

B:BD[4.1158] → [2.3739:3803]

function Text.compute_fragments(line)
--?   print('compute_fragments', App.screen.width-Margin_right)

[7.42]

[8.51]

function Text.compute_fragments(line, left, right)
--?   print('compute_fragments', right)

Replacement in text.lua at line 99 [5.1]
B:BD[8.73] → [9.2279:2303]
```
  local x = Margin_left
```
[8.73]
[8.88]
```
  local x = left
```

Replacement in text.lua at line 104 [5.1]

B:BD[10.2940] → [2.3804:3899]

--?     print('x: '..tostring(x)..'; '..tostring(App.screen.width-Margin_right-x)..'px to go')

[10.2940]

[8.380]

--?     print('x: '..tostring(x)..'; '..tostring(right-x)..'px to go')

Replacement in text.lua at line 106 [5.1]

B:BD[8.453] → [2.3900:4219]

    if x + frag_width > App.screen.width-Margin_right then
      while x + frag_width > App.screen.width-Margin_right do
--?         print(x, frag, frag_width, App.screen.width-Margin_right)
        if x < 0.8*(App.screen.width-Margin_right) then
--?           print(frag, x, frag_width, App.screen.width-Margin_right)

[8.453]

[8.571]

    if x + frag_width > right then
      while x + frag_width > right do
--?         print(x, frag, frag_width, right)
        if x < 0.8*right then
--?           print(frag, x, frag_width, right)

Replacement in text.lua at line 113 [5.1]

B:BD[8.672] → [2.4220:4311]

          local bpos = Text.nearest_pos_less_than(frag, App.screen.width-Margin_right - x)

[8.672]

[11.833]

          local bpos = Text.nearest_pos_less_than(frag, right - x)

Replacement in text.lua at line 120 [5.1]

B:BD[10.2993] → [2.4312:4452]

--?           print(frag, x, frag1_width, App.screen.width-Margin_right)
          assert(x + frag1_width <= App.screen.width-Margin_right)

[10.2993]

[8.998]

--?           print(frag, x, frag1_width, right)
          assert(x + frag1_width <= right)

Replacement in text.lua at line 128 [5.1]
B:BD[8.1339] → [9.2304:2341]
```
        x = Margin_left  -- new line
```
[8.1339]
[8.1367]
```
        x = left  -- new line
```

Replacement in text.lua at line 677 [5.1]

B:BD[12.35] → [4.1811:1844]

    Text.compute_fragments(line)

[12.35]

[12.80]

    Text.compute_fragments(line, left, right)

Replacement in text.lua at line 902 [5.1]
B:BD[13.2315] → [4.1845:1878]
```
    Text.compute_fragments(line)
```
[13.2315]
[13.2360]
```
    Text.compute_fragments(line, left, right)
```