@@ -2468,12 +2468,9 @@ void MemberDefImpl::writeDeclaration(OutputList &ol,
2468
2468
ol.endAnonTypeScope (--s_indentLevel);
2469
2469
}
2470
2470
2471
- // write brief description all but HTML
2472
- ol.pushGeneratorState ();
2473
- ol.disable (OutputGenerator::Html);
2471
+ // write brief description
2474
2472
if (!briefDescription ().isEmpty () &&
2475
2473
Config_getBool (BRIEF_MEMBER_DESC)
2476
- /* && !annMemb */
2477
2474
)
2478
2475
{
2479
2476
std::unique_ptr<IDocParser> parser { createDocParser () };
@@ -2487,6 +2484,16 @@ void MemberDefImpl::writeDeclaration(OutputList &ol,
2487
2484
{
2488
2485
ol.startMemberDescription (anchor (),inheritId);
2489
2486
ol.writeDoc (rootNode.get (),getOuterScope ()?getOuterScope ():d,this );
2487
+ if (detailsVisible) // add More.. link only when both brief and details are visible
2488
+ {
2489
+ ol.pushGeneratorState ();
2490
+ ol.disableAllBut (OutputGenerator::Html);
2491
+ ol.docify (" " );
2492
+ ol.startTextLink (getOutputFileBase (),anchor ());
2493
+ ol.parseText (theTranslator->trMore ());
2494
+ ol.endTextLink ();
2495
+ ol.popGeneratorState ();
2496
+ }
2490
2497
// for RTF we need to add an extra empty paragraph
2491
2498
ol.pushGeneratorState ();
2492
2499
ol.disableAllBut (OutputGenerator::RTF);
@@ -2496,44 +2503,6 @@ void MemberDefImpl::writeDeclaration(OutputList &ol,
2496
2503
ol.endMemberDescription ();
2497
2504
}
2498
2505
}
2499
- ol.popGeneratorState ();
2500
-
2501
- // write brief description HTML
2502
- ol.pushGeneratorState ();
2503
- ol.disableAllBut (OutputGenerator::Html);
2504
- if ( Config_getBool (BRIEF_MEMBER_DESC)
2505
- )
2506
- {
2507
- std::unique_ptr<IDocParser> parser { createDocParser () };
2508
- std::unique_ptr<DocRoot> rootNode { validatingParseDoc (*parser.get (),
2509
- briefFile (),briefLine (),
2510
- getOuterScope ()?getOuterScope ():d,
2511
- this ,briefDescription (),TRUE ,FALSE ,
2512
- QCString (),TRUE ,FALSE ,Config_getBool (MARKDOWN_SUPPORT)) };
2513
-
2514
- if (rootNode)
2515
- {
2516
- if (!rootNode->isEmpty () || detailsVisible)
2517
- { // to prevent empty line i n case both are empty
2518
- ol.startMemberDescription (anchor (),inheritId);
2519
- ol.writeDoc (rootNode.get (),getOuterScope ()?getOuterScope ():d,this );
2520
- }
2521
- if (detailsVisible)
2522
- {
2523
- // ol.endEmphasis();
2524
- ol.docify (" " );
2525
- ol.startTextLink (getOutputFileBase (),anchor ());
2526
- ol.parseText (theTranslator->trMore ());
2527
- ol.endTextLink ();
2528
- // ol.startEmphasis();
2529
- }
2530
- if (!rootNode->isEmpty () || detailsVisible)
2531
- {
2532
- ol.endMemberDescription ();
2533
- }
2534
- }
2535
- }
2536
- ol.popGeneratorState ();
2537
2506
2538
2507
ol.endMemberDeclaration (anchor (),inheritId);
2539
2508
0 commit comments