Check-in by ben on 2022-11-22 18:19:07
Trim leading and trailing space before joining ingredient line
continuations.
INSERTED DELETED
1 1 mmhtml.awk
1 1 mmrtf.awk
2 2 TOTAL over 2 changed files
Index: mmhtml.awk
==================================================================
--- mmhtml.awk
+++ mmhtml.awk
@@ -144,11 +144,11 @@
function ingredient_parse(line) {
new_amount = substr(line, 1, 7)
new_unit = substr(line, 9, 2)
new_ingredient = substr(line, 12)
if (new_amount == " " && new_unit == " " && new_ingredient ~ /^-/) {
- ingredient = ingredient " " substr(new_ingredient, 2)
+ ingredient = ingredient " " trim(substr(new_ingredient, 2))
is_continuation = 1
} else {
amount = new_amount
unit = new_unit
ingredient = new_ingredient
Index: mmrtf.awk
==================================================================
--- mmrtf.awk
+++ mmrtf.awk
@@ -48,11 +48,11 @@
function ingredient_parse(line) {
new_amount = substr(line, 1, 7)
new_unit = substr(line, 9, 2)
new_ingredient = substr(line, 12)
if (new_amount == " " && new_unit == " " && new_ingredient ~ /^-/) {
- ingredient = ingredient " " substr(new_ingredient, 2)
+ ingredient = ingredient " " trim(substr(new_ingredient, 2))
is_continuation = 1
} else {
amount = new_amount
unit = new_unit
ingredient = new_ingredient