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