src/output_xhtml.cpp

   1 /**
   2  * \file output_xhtml.cpp
   3  * This file is part of LyX, the document processor.
   4  * Licence details can be found in the file COPYING.
   5  *
   6  * \author Richard Heck
   7  *
   8  * This code is based upon output_docbook.cpp
   9  *
  10  * Full author contact details are available in file CREDITS.
  11  */
  12
  13 #include <config.h>
  14
  15 #include "output_xhtml.h"
  16
  17 #include "Buffer.h"
  18 #include "buffer_funcs.h"
  19 #include "BufferParams.h"
  20 #include "Counters.h"
  21 #include "Layout.h"
  22 #include "OutputParams.h"
  23 #include "Paragraph.h"
  24 #include "ParagraphList.h"
  25 #include "ParagraphParameters.h"
  26 #include "sgml.h"
  27 #include "Text.h"
  28 #include "TextClass.h"
  29
  30 #include "support/lassert.h"
  31 #include "support/debug.h"
  32 #include "support/lstrings.h"
  33
  34 #include <vector>
  35
  36 using namespace std;
  37 using namespace lyx::support;
  38
  39 namespace lyx {
  40
  41 namespace html {
  42
  43 docstring escapeChar(char_type c)
  44 {
  45         docstring str;
  46         switch (c) {
  47         case ' ':
  48                 str += " ";
  49                 break;
  50         case '&':
  51                 str += "&amp;";
  52                 break;
  53         case '<':
  54                 str += "&lt;";
  55                 break;
  56         case '>':
  57                 str += "&gt;";
  58                 break;
  59         default:
  60                 str += c;
  61                 break;
  62         }
  63         return str;
  64 }
  65
  66
  67 // escape what needs escaping
  68 docstring htmlize(docstring const & str) {
  69         odocstringstream d;
  70         docstring::const_iterator it = str.begin();
  71         docstring::const_iterator en = str.end();
  72         for (; it != en; ++it)
  73                 d << escapeChar(*it);
  74         return d.str();
  75 }
  76
  77
  78 bool isFontTag(string const & s)
  79 {
  80         return s == "em" || s == "strong"; // others?
  81 }
  82 } // namespace html
  83
  84
  85 docstring StartTag::asTag() const
  86 {
  87         string output = "<" + tag_;
  88         if (!attr_.empty())
  89                 output += " " + attr_;
  90         output += ">";
  91         return from_utf8(output);
  92 }
  93
  94
  95 docstring StartTag::asEndTag() const
  96 {
  97         string output = "</" + tag_ + ">";
  98         return from_utf8(output);
  99 }
 100
 101
 102 docstring EndTag::asEndTag() const
 103 {
 104         string output = "</" + tag_ + ">";
 105         return from_utf8(output);
 106 }
 107
 108
 109 docstring CompTag::asTag() const
 110 {
 111         string output = "<" + tag_;
 112         if (!attr_.empty())
 113                 output += " " + attr_;
 114         output += " />";
 115         return from_utf8(output);
 116 }
 117
 118
 119 ////////////////////////////////////////////////////////////////
 120 ///
 121 /// XHTMLStream
 122 ///
 123 ////////////////////////////////////////////////////////////////
 124
 125 XHTMLStream::XHTMLStream(odocstream & os)
 126                 :os_(os)
 127 {}
 128
 129
 130 void XHTMLStream::cr()
 131 {
 132         // tabs?
 133         os_ << from_ascii("\n");
 134 }
 135
 136
 137 bool XHTMLStream::closeFontTags()
 138 {
 139         // first, we close any open font tags we can close
 140         StartTag curtag = tag_stack_.back();
 141         while (html::isFontTag(curtag.tag_)) {
 142                 os_ << curtag.asEndTag();
 143                 tag_stack_.pop_back();
 144                 if (tag_stack_.empty())
 145                         // this probably shouldn't happen, since then the
 146                         // font tags weren't in any other tag. but that
 147                         // problem will likely be caught elsewhere.
 148                         return true;
 149                 curtag = tag_stack_.back();
 150         }
 151         // so we've hit a non-font tag. let's see if any of the
 152         // remaining tags are font tags.
 153         TagStack::const_iterator it = tag_stack_.begin();
 154         TagStack::const_iterator en = tag_stack_.end();
 155         bool noFontTags = true;
 156         for (; it != en; ++it) {
 157                 if (html::isFontTag(it->tag_)) {
 158                         LYXERR0("Font tag `" << it->tag_ << "' still open in closeFontTags().");
 159                         noFontTags = false;
 160                 }
 161         }
 162         return noFontTags;
 163 }
 164
 165
 166 void XHTMLStream::clearTagDeque()
 167 {
 168         while (!pending_tags_.empty()) {
 169                 StartTag const & tag = pending_tags_.front();
 170                 // tabs?
 171                 os_ << tag.asTag();
 172                 tag_stack_.push_back(tag);
 173                 pending_tags_.pop_front();
 174         }
 175 }
 176
 177
 178 XHTMLStream & XHTMLStream::operator<<(docstring const & d)
 179 {
 180         clearTagDeque();
 181         os_ << html::htmlize(d);
 182         return *this;
 183 }
 184
 185
 186 XHTMLStream & XHTMLStream::operator<<(const char * s)
 187 {
 188         clearTagDeque();
 189         os_ << html::htmlize(from_ascii(s));
 190         return *this;
 191 }
 192
 193
 194 XHTMLStream & XHTMLStream::operator<<(char_type c)
 195 {
 196         clearTagDeque();
 197         os_ << html::escapeChar(c);
 198         return *this;
 199 }
 200
 201
 202 XHTMLStream & XHTMLStream::operator<<(StartTag const & tag)
 203 {
 204         if (tag.tag_.empty())
 205                 return *this;
 206         pending_tags_.push_back(tag);
 207         if (tag.keepempty_)
 208                 clearTagDeque();
 209         return *this;
 210 }
 211
 212
 213 XHTMLStream & XHTMLStream::operator<<(CompTag const & tag)
 214 {
 215         if (tag.tag_.empty())
 216                 return *this;
 217         clearTagDeque();
 218         // tabs?
 219         os_ << tag.asTag();
 220         return *this;
 221 }
 222
 223
 224 bool    XHTMLStream::isTagOpen(string const & stag)
 225 {
 226         TagStack::const_iterator sit = tag_stack_.begin();
 227         TagStack::const_iterator const sen = tag_stack_.end();
 228         for (; sit != sen; ++sit)
 229                 // we could check for the
 230                 if (sit->tag_ == stag)
 231                         return true;
 232         return false;
 233 }
 234
 235
 236 // this is complicated, because we want to make sure that
 237 // everything is properly nested. the code ought to make
 238 // sure of that, but we won't assert (yet) if we run into
 239 // a problem. we'll just output error messages and try our
 240 // best to make things work.
 241 XHTMLStream & XHTMLStream::operator<<(EndTag const & etag)
 242 {
 243         if (etag.tag_.empty())
 244                 return *this;
 245         // first make sure we're not closing an empty tag
 246         if (!pending_tags_.empty()) {
 247                 StartTag const & stag = pending_tags_.back();
 248                 if (etag.tag_ == stag.tag_)  {
 249                         // we have <tag></tag>, so we discard it and remove it
 250                         // from the pending_tags_.
 251                         pending_tags_.pop_back();
 252                         return *this;
 253                 }
 254                 // there is a pending tag that isn't the one we are trying
 255                 // to close.
 256                 // is this tag itself pending?
 257                 // non-const iterators because we may call erase().
 258                 TagDeque::iterator dit = pending_tags_.begin();
 259                 TagDeque::iterator const den = pending_tags_.end();
 260                 for (; dit != den; ++dit) {
 261                         if (dit->tag_ == etag.tag_) {
 262                                 // it was pending, so we just erase it
 263                                 LYXERR0("Tried to close pending tag `" << etag.tag_
 264                                         << "' when other tags were pending. Tag discarded.");
 265                                 pending_tags_.erase(dit);
 266                                 return *this;
 267                         }
 268                 }
 269                 // so etag isn't itself pending. is it even open?
 270                 if (!isTagOpen(etag.tag_)) {
 271                         LYXERR0("Tried to close `" << etag.tag_
 272                                  << "' when tag was not open. Tag discarded.");
 273                         return *this;
 274                 }
 275                 // ok, so etag is open.
 276                 // our strategy will be as below: we will do what we need to
 277                 // do to close this tag.
 278                 LYXERR0("Closing tag `" << etag.tag_
 279                         << "' when other tags are pending. Discarded pending tags:");
 280                 for (dit = pending_tags_.begin(); dit != den; ++dit)
 281                         LYXERR0(dit->tag_);
 282                 // clear the pending tags...
 283                 pending_tags_.clear();
 284                 // ...and then just fall through.
 285         }
 286
 287         // is the tag we are closing the last one we opened?
 288         if (etag.tag_ == tag_stack_.back().tag_) {
 289                 // output it...
 290                 os_ << etag.asEndTag();
 291                 // ...and forget about it
 292                 tag_stack_.pop_back();
 293                 return *this;
 294         }
 295
 296         // we are trying to close a tag other than the one last opened.
 297         // let's first see if this particular tag is still open somehow.
 298         if (!isTagOpen(etag.tag_)) {
 299                 LYXERR0("Tried to close `" << etag.tag_
 300                         << "' when tag was not open. Tag discarded.");
 301                 return *this;
 302         }
 303
 304         // so the tag was opened, but other tags have been opened since
 305         // and not yet closed.
 306         // if it's a font tag, though...
 307         if (html::isFontTag(etag.tag_)) {
 308                 // it won't be a problem if the other tags open since this one
 309                 // are also font tags.
 310                 TagStack::const_reverse_iterator rit = tag_stack_.rbegin();
 311                 TagStack::const_reverse_iterator ren = tag_stack_.rend();
 312                 for (; rit != ren; ++rit) {
 313                         if (rit->tag_ == etag.tag_)
 314                                 break;
 315                         if (!html::isFontTag(rit->tag_)) {
 316                                 // we'll just leave it and, presumably, have to close it later.
 317                                 LYXERR0("Unable to close font tag `" << etag.tag_
 318                                         << "' due to open non-font tag `" << rit->tag_ << "'.");
 319                                 return *this;
 320                         }
 321                 }
 322
 323                 // so we have e.g.:
 324                 //    <em>this is <strong>bold
 325                 // and are being asked to closed em. we want:
 326                 //    <em>this is <strong>bold</strong></em><strong>
 327                 // first, we close the intervening tags...
 328                 StartTag curtag = tag_stack_.back();
 329                 // ...remembering them in a stack.
 330                 TagStack fontstack;
 331                 while (curtag.tag_ != etag.tag_) {
 332                         os_ << curtag.asEndTag();
 333                         fontstack.push_back(curtag);
 334                         tag_stack_.pop_back();
 335                         curtag = tag_stack_.back();
 336                 }
 337                 // now close our tag...
 338                 os_ << etag.asEndTag();
 339                 // ...and restore the other tags.
 340                 rit = fontstack.rbegin();
 341                 ren = fontstack.rend();
 342                 for (; rit != ren; ++rit)
 343                         pending_tags_.push_back(*rit);
 344                 return *this;
 345         }
 346
 347         // it wasn't a font tag.
 348         // so other tags were opened before this one and not properly closed.
 349         // so we'll close them, too. that may cause other issues later, but it
 350         // at least guarantees proper nesting.
 351         LYXERR0("Closing tag `" << etag.tag_
 352                 << "' when other tags are open, namely:");
 353         StartTag curtag = tag_stack_.back();
 354         while (curtag.tag_ != etag.tag_) {
 355                 LYXERR0(curtag.tag_);
 356                 os_ << curtag.asEndTag();
 357                 tag_stack_.pop_back();
 358                 curtag = tag_stack_.back();
 359         }
 360         // curtag is now the one we actually want.
 361         os_ << curtag.asEndTag();
 362         tag_stack_.pop_back();
 363
 364         return *this;
 365 }
 366
 367 // End code for XHTMLStream
 368
 369 namespace {
 370
 371 // convenience functions
 372
 373 inline void openTag(XHTMLStream & xs, Layout const & lay)
 374 {
 375         xs << StartTag(lay.htmltag(), lay.htmlattr());
 376 }
 377
 378
 379 inline void closeTag(XHTMLStream & xs, Layout const & lay)
 380 {
 381         xs << EndTag(lay.htmltag());
 382 }
 383
 384
 385 inline void openLabelTag(XHTMLStream & xs, Layout const & lay)
 386 {
 387         xs << StartTag(lay.htmllabeltag(), lay.htmllabelattr());
 388 }
 389
 390
 391 inline void closeLabelTag(XHTMLStream & xs, Layout const & lay)
 392 {
 393         xs << EndTag(lay.htmllabeltag());
 394 }
 395
 396
 397 inline void openItemTag(XHTMLStream & xs, Layout const & lay)
 398 {
 399         xs << StartTag(lay.htmlitemtag(), lay.htmlitemattr(), true);
 400 }
 401
 402
 403 inline void closeItemTag(XHTMLStream & xs, Layout const & lay)
 404 {
 405         xs << EndTag(lay.htmlitemtag());
 406 }
 407
 408 // end of convenience functions
 409
 410 ParagraphList::const_iterator searchParagraphHtml(
 411         ParagraphList::const_iterator p,
 412         ParagraphList::const_iterator const & pend)
 413 {
 414         for (++p; p != pend && p->layout().latextype == LATEX_PARAGRAPH; ++p)
 415                 ;
 416
 417         return p;
 418 }
 419
 420
 421 ParagraphList::const_iterator searchEnvironmentHtml(
 422                 ParagraphList::const_iterator const pstart,
 423                 ParagraphList::const_iterator const & pend)
 424 {
 425         ParagraphList::const_iterator p = pstart;
 426         Layout const & bstyle = p->layout();
 427         size_t const depth = p->params().depth();
 428         for (++p; p != pend; ++p) {
 429                 Layout const & style = p->layout();
 430                 // It shouldn't happen that e.g. a section command occurs inside
 431                 // a quotation environment, at a higher depth, but as of 6/2009,
 432                 // it can happen. We pretend that it's just at lowest depth.
 433                 if (style.latextype == LATEX_COMMAND)
 434                         return p;
 435                 // If depth is down, we're done
 436                 if (p->params().depth() < depth)
 437                         return p;
 438                 // If depth is up, we're not done
 439                 if (p->params().depth() > depth)
 440                         continue;
 441                 // Now we know we are at the same depth
 442                 if (style.latextype == LATEX_PARAGRAPH
 443                     || style.latexname() != bstyle.latexname())
 444                         return p;
 445         }
 446         return pend;
 447 }
 448
 449
 450 ParagraphList::const_iterator makeParagraphs(Buffer const & buf,
 451                                             XHTMLStream & xs,
 452                                             OutputParams const & runparams,
 453                                             Text const & text,
 454                                             ParagraphList::const_iterator const & pbegin,
 455                                             ParagraphList::const_iterator const & pend)
 456 {
 457         ParagraphList::const_iterator const begin = text.paragraphs().begin();
 458         ParagraphList::const_iterator par = pbegin;
 459         for (; par != pend; ++par) {
 460                 Layout const & lay = par->layout();
 461                 if (!lay.counter.empty())
 462                         buf.params().documentClass().counters().step(lay.counter);
 463                 // FIXME We should see if there's a label to be output and
 464                 // do something with it.
 465                 if (par != pbegin)
 466                         xs.cr();
 467
 468                 // FIXME Should we really allow anything other than 'p' here?
 469
 470                 // If we are already in a paragraph, and this is the first one, then we
 471                 // do not want to open the paragraph tag.
 472                 bool const opened =
 473                         (par == pbegin && runparams.html_in_par) ? false : true;
 474                 if (opened)
 475                         openTag(xs, lay);
 476                 docstring const deferred =
 477                         par->simpleLyXHTMLOnePar(buf, xs, runparams, text.outerFont(distance(begin, par)));
 478
 479                 // We want to issue the closing tag if either:
 480                 //   (i)  We opened it, and either html_in_par is false,
 481                 //        or we're not in the last paragraph, anyway.
 482                 //   (ii) We didn't open it and html_in_par is true,
 483                 //        but we are in the first par, and there is a next par.
 484                 ParagraphList::const_iterator nextpar = par;
 485                 nextpar++;
 486                 bool const needclose =
 487                         (opened && (!runparams.html_in_par || nextpar != pend))
 488                         || (!opened && runparams.html_in_par && par == pbegin && nextpar != pend);
 489                 if (needclose) {
 490                         closeTag(xs, lay);
 491                         xs.cr();
 492                 }
 493                 if (!deferred.empty()) {
 494                         xs << deferred;
 495                         xs.cr();
 496                 }
 497         }
 498         return pend;
 499 }
 500
 501
 502 ParagraphList::const_iterator makeBibliography(Buffer const & buf,
 503                                 XHTMLStream & xs,
 504                                 OutputParams const & runparams,
 505                                 Text const & text,
 506                                 ParagraphList::const_iterator const & pbegin,
 507                                 ParagraphList::const_iterator const & pend)
 508 {
 509         xs << StartTag("h2", "class='bibliography'");
 510         xs << pbegin->layout().labelstring(false);
 511         xs << EndTag("h2");
 512         xs.cr();
 513         xs << StartTag("div", "class='bibliography'");
 514         xs.cr();
 515         makeParagraphs(buf, xs, runparams, text, pbegin, pend);
 516         xs << EndTag("div");
 517         return pend;
 518 }
 519
 520
 521 bool isNormalEnv(Layout const & lay)
 522 {
 523         return lay.latextype == LATEX_ENVIRONMENT;
 524 }
 525
 526
 527 ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
 528                                               XHTMLStream & xs,
 529                                               OutputParams const & runparams,
 530                                               Text const & text,
 531                                               ParagraphList::const_iterator const & pbegin,
 532                                               ParagraphList::const_iterator const & pend)
 533 {
 534         ParagraphList::const_iterator const begin = text.paragraphs().begin();
 535         ParagraphList::const_iterator par = pbegin;
 536         Layout const & bstyle = par->layout();
 537         depth_type const origdepth = pbegin->params().depth();
 538
 539         // open tag for this environment
 540         openTag(xs, bstyle);
 541         xs.cr();
 542
 543         // we will on occasion need to remember a layout from before.
 544         Layout const * lastlay = 0;
 545
 546         while (par != pend) {
 547                 Layout const & style = par->layout();
 548                 // the counter only gets stepped if we're in some kind of list,
 549                 // or if it's the first time through.
 550                 if (!style.counter.empty() && (par == pbegin || !isNormalEnv(style)))
 551                         buf.params().documentClass().counters().step(style.counter);
 552                 ParagraphList::const_iterator send;
 553                 // this will be positive, if we want to skip the initial word
 554                 // (if it's been taken for the label).
 555                 pos_type sep = 0;
 556
 557                 switch (style.latextype) {
 558                 case LATEX_ENVIRONMENT:
 559                 case LATEX_LIST_ENVIRONMENT:
 560                 case LATEX_ITEM_ENVIRONMENT: {
 561                         // There are two possiblities in this case.
 562                         // One is that we are still in the environment in which we
 563                         // started---which we will be if the depth is the same.
 564                         if (par->params().depth() == origdepth) {
 565                                 LASSERT(bstyle == style, /* */);
 566                                 if (lastlay != 0) {
 567                                         closeItemTag(xs, *lastlay);
 568                                         lastlay = 0;
 569                                 }
 570                                 bool const labelfirst = style.htmllabelfirst();
 571                                 if (isNormalEnv(style)) {
 572                                         // in this case, we print the label only for the first
 573                                         // paragraph (as in a theorem).
 574                                         openItemTag(xs, style);
 575                                         if (par == pbegin && style.htmllabeltag() != "NONE") {
 576                                                 docstring const lbl =
 577                                                                 pbegin->expandLabel(style, buf.params(), false);
 578                                                 if (!lbl.empty()) {
 579                                                         openLabelTag(xs, style);
 580                                                         xs << lbl;
 581                                                         closeLabelTag(xs, style);
 582                                                 }
 583                                                 xs.cr();
 584                                         }
 585                                 }       else { // some kind of list
 586                                         if (!labelfirst)
 587                                                 openItemTag(xs, style);
 588                                         if (style.labeltype == LABEL_MANUAL
 589                                             && style.htmllabeltag() != "NONE") {
 590                                                 openLabelTag(xs, style);
 591 //                                              sep = par->firstWordLyXHTML(xs, runparams);
 592                                                 closeLabelTag(xs, style);
 593                                                 xs.cr();
 594                                         }
 595                                         else if (style.labeltype != LABEL_NO_LABEL
 596                                                  && style.htmllabeltag() != "NONE") {
 597                                                 openLabelTag(xs, style);
 598                                                 xs << par->expandLabel(style, buf.params(), false);
 599                                                 closeLabelTag(xs, style);
 600                                                 xs.cr();
 601                                         }
 602                                         if (labelfirst)
 603                                                 openItemTag(xs, style);
 604                                         else
 605                                                 xs << StartTag("span", "class='" + to_utf8(style.name()) + " inneritem'");
 606                                 }
 607                                 par->simpleLyXHTMLOnePar(buf, xs, runparams,
 608                                         text.outerFont(distance(begin, par)), sep);
 609                                 if (!isNormalEnv(style) && !labelfirst)
 610                                         xs << EndTag("span");
 611                                 ++par;
 612                                 // We may not want to close the tag yet, in particular,
 613                                 // if we're not at the end...
 614                                 if (par != pend
 615                                         //  and are doing items...
 616                                          && style.latextype == LATEX_ITEM_ENVIRONMENT
 617                                          // and if the depth has changed...
 618                                          && par->params().depth() != origdepth) {
 619                                          // then we'll save this layout for later, and close it when
 620                                          // we get another item.
 621                                         lastlay = &style;
 622                                 } else
 623                                         closeItemTag(xs, style);
 624                                 xs.cr();
 625                         }
 626                         // The other possibility is that the depth has increased, in which
 627                         // case we need to recurse.
 628                         else {
 629                                 send = searchEnvironmentHtml(par, pend);
 630                                 par = makeEnvironmentHtml(buf, xs, runparams, text, par, send);
 631                         }
 632                         break;
 633                 }
 634                 case LATEX_PARAGRAPH:
 635                         send = searchParagraphHtml(par, pend);
 636                         par = makeParagraphs(buf, xs, runparams, text, par, send);
 637                         break;
 638                 // Shouldn't happen
 639                 case LATEX_BIB_ENVIRONMENT:
 640                         send = par;
 641                         ++send;
 642                         par = makeParagraphs(buf, xs, runparams, text, par, send);
 643                         break;
 644                 // Shouldn't happen
 645                 case LATEX_COMMAND:
 646                         ++par;
 647                         break;
 648                 }
 649         }
 650
 651         if (lastlay != 0)
 652                 closeItemTag(xs, *lastlay);
 653         closeTag(xs, bstyle);
 654         xs.cr();
 655         return pend;
 656 }
 657
 658
 659 void makeCommand(Buffer const & buf,
 660                                           XHTMLStream & xs,
 661                                           OutputParams const & runparams,
 662                                           Text const & text,
 663                                           ParagraphList::const_iterator const & pbegin)
 664 {
 665         Layout const & style = pbegin->layout();
 666         if (!style.counter.empty())
 667                 buf.params().documentClass().counters().step(style.counter);
 668
 669         openTag(xs, style);
 670
 671         // Label around sectioning number:
 672         // FIXME Probably need to account for LABEL_MANUAL
 673         if (style.labeltype != LABEL_NO_LABEL) {
 674                 openLabelTag(xs, style);
 675                 xs << pbegin->expandLabel(style, buf.params(), false);
 676                 closeLabelTag(xs, style);
 677                 // Otherwise the label might run together with the text
 678                 xs << from_ascii(" ");
 679         }
 680
 681         ParagraphList::const_iterator const begin = text.paragraphs().begin();
 682         pbegin->simpleLyXHTMLOnePar(buf, xs, runparams,
 683                         text.outerFont(distance(begin, pbegin)));
 684         closeTag(xs, style);
 685         xs.cr();
 686 }
 687
 688 } // end anonymous namespace
 689
 690
 691 void xhtmlParagraphs(Text const & text,
 692                        Buffer const & buf,
 693                        XHTMLStream & xs,
 694                        OutputParams const & runparams)
 695 {
 696         ParagraphList const & paragraphs = text.paragraphs();
 697         ParagraphList::const_iterator par = paragraphs.begin();
 698         ParagraphList::const_iterator pend = paragraphs.end();
 699
 700         OutputParams ourparams = runparams;
 701         while (par != pend) {
 702                 Layout const & style = par->layout();
 703                 ParagraphList::const_iterator lastpar = par;
 704                 ParagraphList::const_iterator send;
 705
 706                 switch (style.latextype) {
 707                 case LATEX_COMMAND: {
 708                         // The files with which we are working never have more than
 709                         // one paragraph in a command structure.
 710                         // FIXME
 711                         // if (ourparams.html_in_par)
 712                         //   fix it so we don't get sections inside standard, e.g.
 713                         // note that we may then need to make runparams not const, so we
 714                         // can communicate that back.
 715                         // FIXME Maybe this fix should be in the routines themselves, in case
 716                         // they are called from elsewhere.
 717                         makeCommand(buf, xs, ourparams, text, par);
 718                         ++par;
 719                         break;
 720                 }
 721                 case LATEX_ENVIRONMENT:
 722                 case LATEX_LIST_ENVIRONMENT:
 723                 case LATEX_ITEM_ENVIRONMENT: {
 724                         // FIXME Same fix here.
 725                         send = searchEnvironmentHtml(par, pend);
 726                         par = makeEnvironmentHtml(buf, xs, ourparams, text, par, send);
 727                         break;
 728                 }
 729                 case LATEX_BIB_ENVIRONMENT: {
 730                         // FIXME Same fix here.
 731                         send = searchEnvironmentHtml(par, pend);
 732                         par = makeBibliography(buf, xs, ourparams, text, par, send);
 733                         break;
 734                 }
 735                 case LATEX_PARAGRAPH:
 736                         send = searchParagraphHtml(par, pend);
 737                         par = makeParagraphs(buf, xs, ourparams, text, par, send);
 738                         break;
 739                 }
 740                 // FIXME??
 741                 // makeEnvironment may process more than one paragraphs and bypass pend
 742                 if (distance(lastpar, par) >= distance(lastpar, pend))
 743                         break;
 744         }
 745 }
 746
 747
 748 } // namespace lyx