Support rich line output in both speech and braille

third_party/liblouis/nacl_wrapper/liblouis_wrapper.cc

 // Copyright 2013 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"); you may not
 // use this file except in compliance with the License. You may obtain a copy of
 // the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
@@ skipping 122 matching lines @@
   int out_cursor_position;
   int* out_cursor_position_ptr;
   if (params.cursor_position < 0) {
     out_cursor_position = -1;
     out_cursor_position_ptr = NULL;
   } else {
     out_cursor_position = params.cursor_position;
     out_cursor_position_ptr = &out_cursor_position;
   }
 
+  std::vector<unsigned char> form_type_map(params.form_type_map);
+
   // Invoke liblouis.  Do this in a loop since we can't precalculate the
   // translated size.  We add an extra slot in the output buffer so that
   // common cases like single digits or capital letters won't always trigger
   // retranslations (see the comments above the second exit condition inside
   // the loop).  We also set an arbitrary upper bound for the allocation
   // to make sure the loop exits without running out of memory.
   for (int outalloc = (inbufsize + 1) * 2, maxoutalloc = (inbufsize + 1) * 8;
        outalloc <= maxoutalloc; outalloc *= 2) {
     int inlen = inbufsize;
     outlen = outalloc;
     outbuf.resize(outalloc);
     braille_to_text.resize(outalloc);
-    int result = lou_translate(params.table_names.c_str(),
-                               &inbuf[0], &inlen, &outbuf[0], &outlen,
-                               NULL /* typeform */, NULL /* spacing */,
-                               &text_to_braille[0], &braille_to_text[0],
-                               out_cursor_position_ptr, dotsIO /* mode */);
+    form_type_map.resize(outalloc);
+    int result = lou_translate(
+        params.table_names.c_str(), &inbuf[0], &inlen, &outbuf[0], &outlen,
+        &form_type_map[0], NULL /* spacing */, &text_to_braille[0],
+        &braille_to_text[0], out_cursor_position_ptr, dotsIO /* mode */);
     if (result == 0) {
       // TODO(jbroman): log this
       return false;
     }
     // If all of inbuf was not consumed, the output buffer must be too small
     // and we have to retry with a larger buffer.
     // In addition, if all of outbuf was exhausted, there's no way to know if
     // more space was needed, so we'll have to retry the translation in that
     // corner case as well.
     if (inlen == inbufsize && outlen < outalloc)
@@ skipping 69 matching lines @@
     // TODO(jbroman): log this
     return false;
   }
 
   // Return the back translation result.
   out->swap(text);
   return true;
 }
 
 }  // namespace liblouis_nacl