asciidoctor-dita-topic 1.3.1 → 1.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/dita-topic.rb +37 -45
  3. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 62fa0187c3b7c336aefe18fe37acf00f67c477ca621852712bffa72c4f376a5a
4
- data.tar.gz: 4f758d9811bfd1417499cc2f32bc66f5a6a46c48917156ed3807d7351968bc31
3
+ metadata.gz: cf26fdeafc9634faed7fdbfd75e19d8d249f2a80643a11985100debab1cf43de
4
+ data.tar.gz: e5ccc018b1894f7ea87bae9bd2839839c49f97b3c0c13c17e0ad51ba11e6dbd2
5
5
  SHA512:
6
- metadata.gz: 2aa4841c7b6302ce390c71c94de4e7f68ef8c69beca991f01a8d75c59e69b76026490f4892232dffeb6a630f88c99f151c453f954f68a8c22f7f7f75f024157b
7
- data.tar.gz: 4d1c4bb35c464b7c00dcb6dfb9a6977b1265a65e027a99319cc021ae7277d67f3281d0e7f6f1d0abe5005419ccba7efc97d8681bc4fb36dd28e9da17cb98f8d2
6
+ metadata.gz: 245f4881e471dbc9c48e7e6f57206f0289ace1785a320c4edcbbed7f217942eb9f2168f4a992aa909b5e91547ae3dffd409612a7b328b646c4609728c9f1d13c
7
+ data.tar.gz: df1afd0adc48153663f6f66186d2afdf4c290cedd2265be499d426b9a467c4e61e21557af0573c8b95ce1ee64b8da27a4dfc4193de3cd566a7dfafec745c011e
data/lib/dita-topic.rb CHANGED
@@ -130,7 +130,7 @@ class DitaTopic < Asciidoctor::Converter::Base
130
130
 
131
131
  # Return the XML output:
132
132
  <<~EOF.chomp
133
- <note type="#{node.attr 'name'}"#{compose_metadata node.role}>#{node.content}</note>
133
+ <note type="#{node.attr 'name'}"#{compose_id node.id}#{compose_metadata node.role}>#{node.content}</note>
134
134
  EOF
135
135
  end
136
136
 
@@ -138,12 +138,12 @@ class DitaTopic < Asciidoctor::Converter::Base
138
138
  # Check if the audio macro has a title specified:
139
139
  if node.title?
140
140
  <<~EOF.chomp
141
- <object data="#{node.media_uri(node.attr 'target')}"#{compose_metadata node.role}>
141
+ <object data="#{node.media_uri(node.attr 'target')}"#{compose_id node.id}#{compose_metadata node.role}>
142
142
  <desc>#{node.title}</desc>
143
143
  </object>
144
144
  EOF
145
145
  else
146
- %(<object data="#{node.media_uri(node.attr 'target')}"#{compose_metadata node.role} />)
146
+ %(<object data="#{node.media_uri(node.attr 'target')}"#{compose_id node.id}#{compose_metadata node.role} />)
147
147
  end
148
148
  end
149
149
 
@@ -158,7 +158,7 @@ class DitaTopic < Asciidoctor::Converter::Base
158
158
  number = 0
159
159
 
160
160
  # Open the definition list:
161
- result = [%(<dl outputclass="callout-list"#{compose_metadata node.role}>)]
161
+ result = [%(<dl outputclass="callout-list"#{compose_id node.id}#{compose_metadata node.role}>)]
162
162
 
163
163
  # Process individual list items:
164
164
  node.items.each do |item|
@@ -198,7 +198,7 @@ class DitaTopic < Asciidoctor::Converter::Base
198
198
  return compose_qanda_dlist node if node.style == 'qanda'
199
199
 
200
200
  # Open the definition list:
201
- result = [%(<dl#{compose_metadata node.role}>)]
201
+ result = [%(<dl#{compose_id node.id}#{compose_metadata node.role}>)]
202
202
 
203
203
  # Process individual list items:
204
204
  node.items.each do |terms, description|
@@ -260,7 +260,7 @@ class DitaTopic < Asciidoctor::Converter::Base
260
260
  end
261
261
 
262
262
  # Return the XML output:
263
- %(<p outputclass="title sect#{node.level}"#{compose_metadata node.role}><b>#{node.title}</b></p>)
263
+ %(<p outputclass="title sect#{node.level}"#{compose_id node.id}#{compose_metadata node.role}><b>#{node.title}</b></p>)
264
264
  end
265
265
 
266
266
  def convert_image node
@@ -276,7 +276,7 @@ class DitaTopic < Asciidoctor::Converter::Base
276
276
  # Check if the image has a title specified:
277
277
  if node.title?
278
278
  <<~EOF.chomp
279
- <fig#{compose_metadata node.role}>
279
+ <fig#{compose_id node.id}#{compose_metadata node.role}>
280
280
  <title>#{node.title}</title>
281
281
  <image href="#{node.image_uri(node.attr 'target')}"#{width}#{height}#{scale} placement="break">
282
282
  <alt>#{node.alt}</alt>
@@ -285,7 +285,7 @@ class DitaTopic < Asciidoctor::Converter::Base
285
285
  EOF
286
286
  else
287
287
  <<~EOF.chomp
288
- <image href="#{node.image_uri(node.attr 'target')}"#{width}#{height}#{scale} placement="break"#{compose_metadata node.role}>
288
+ <image href="#{node.image_uri(node.attr 'target')}"#{width}#{height}#{scale} placement="break"#{compose_id node.id}#{compose_metadata node.role}>
289
289
  <alt>#{node.alt}</alt>
290
290
  </image>
291
291
  EOF
@@ -297,7 +297,7 @@ class DitaTopic < Asciidoctor::Converter::Base
297
297
  case node.type
298
298
  when :link
299
299
  # Compose an external link:
300
- %(<xref href="#{node.target}" scope="external"#{compose_metadata node.role}>#{node.text}</xref>)
300
+ %(<xref href="#{node.target}" scope="external"#{compose_id node.id}#{compose_metadata node.role}>#{node.text}</xref>)
301
301
  when :xref
302
302
  # NOTE: While AsciiDoc is happy to reference an ID that is not
303
303
  # defined in the same AsciiDoc file, DITA requires the topic ID as
@@ -453,9 +453,9 @@ class DitaTopic < Asciidoctor::Converter::Base
453
453
  # Determine the inline markup type:
454
454
  case node.type
455
455
  when :emphasis
456
- %(<i#{compose_metadata node.role}>#{node.text}</i>)
456
+ %(<i#{compose_id node.id}#{compose_metadata node.role}>#{node.text}</i>)
457
457
  when :strong
458
- %(<b#{compose_metadata node.role}>#{node.text}</b>)
458
+ %(<b#{compose_id node.id}#{compose_metadata node.role}>#{node.text}</b>)
459
459
  when :monospaced
460
460
  # Set the default element value:
461
461
  element = 'codeph'
@@ -479,11 +479,11 @@ class DitaTopic < Asciidoctor::Converter::Base
479
479
  end
480
480
 
481
481
  # Return the result:
482
- %(<#{element}#{compose_metadata node.role}>#{node.text}</#{element}>)
482
+ %(<#{element}#{compose_id node.id}#{compose_metadata node.role}>#{node.text}</#{element}>)
483
483
  when :superscript
484
- %(<sup#{compose_metadata node.role}>#{node.text}</sup>)
484
+ %(<sup#{compose_id node.id}#{compose_metadata node.role}>#{node.text}</sup>)
485
485
  when :subscript
486
- %(<sub#{compose_metadata node.role}>#{node.text}</sub>)
486
+ %(<sub#{compose_id node.id}#{compose_metadata node.role}>#{node.text}</sub>)
487
487
  when :double
488
488
  %(&#8220;#{node.text}&#8221;)
489
489
  when :single
@@ -501,7 +501,7 @@ class DitaTopic < Asciidoctor::Converter::Base
501
501
  # Add comments around the STEM content:
502
502
  %(<!-- latexmath start -->#{node.text}<!-- latexmath end -->)
503
503
  else
504
- %(<ph#{compose_metadata node.role}>#{node.text}</ph>)
504
+ %(<ph#{compose_id node.id}#{compose_metadata node.role}>#{node.text}</ph>)
505
505
  end
506
506
  end
507
507
 
@@ -510,11 +510,7 @@ class DitaTopic < Asciidoctor::Converter::Base
510
510
  language = (node.attributes.key? 'language') ? %( outputclass="language-#{node.attributes['language']}") : ''
511
511
 
512
512
  # Compose the XML output:
513
- result = <<~EOF.chomp
514
- <codeblock#{language}#{compose_metadata node.role}>
515
- #{node.content}
516
- </codeblock>
517
- EOF
513
+ result = %(<codeblock#{language}#{compose_id node.id}#{compose_metadata node.role}>#{node.content}</codeblock>)
518
514
 
519
515
  # Return the XML output:
520
516
  add_block_title result, node
@@ -522,11 +518,7 @@ class DitaTopic < Asciidoctor::Converter::Base
522
518
 
523
519
  def convert_literal node
524
520
  # Compose the XML output:
525
- result = <<~EOF.chomp
526
- <pre#{compose_metadata node.role}>
527
- #{node.content}
528
- </pre>
529
- EOF
521
+ result = %(<pre#{compose_id node.id}#{compose_metadata node.role}>#{node.content}</pre>)
530
522
 
531
523
  # Return the XML output:
532
524
  add_block_title result, node
@@ -534,17 +526,17 @@ class DitaTopic < Asciidoctor::Converter::Base
534
526
 
535
527
  def convert_olist node
536
528
  # Open the ordered list:
537
- result = [%(<ol#{compose_metadata node.role}>)]
529
+ result = [%(<ol#{compose_id node.id}#{compose_metadata node.role}>)]
538
530
 
539
531
  # Process individual list items:
540
532
  node.items.each do |item|
541
533
  # Check if the list item contains multiple block elements:
542
534
  if item.blocks?
543
- result << %(<li#{compose_metadata item.role}>#{item.text})
535
+ result << %(<li#{compose_id item.id}#{compose_metadata item.role}>#{item.text})
544
536
  result << item.content
545
537
  result << %(</li>)
546
538
  else
547
- result << %(<li#{compose_metadata item.role}>#{item.text}</li>)
539
+ result << %(<li#{compose_id item.id}#{compose_metadata item.role}>#{item.text}</li>)
548
540
  end
549
541
  end
550
542
 
@@ -566,12 +558,12 @@ class DitaTopic < Asciidoctor::Converter::Base
566
558
  node.content
567
559
  elsif node.content_model == :compound
568
560
  <<~EOF.chomp
569
- <div#{(node.style == 'abstract') ? ' outputclass="abstract"' : ''}#{compose_metadata node.role}>
561
+ <div#{(node.style == 'abstract') ? ' outputclass="abstract"' : ''}#{compose_id node.id}#{compose_metadata node.role}>
570
562
  #{compose_floating_title node.title}#{node.content}
571
563
  </div>
572
564
  EOF
573
565
  else
574
- %(#{compose_floating_title node.title}<p#{(node.style == 'abstract') ? ' outputclass="abstract"' : ''}#{compose_metadata node.role}>#{node.content}</p>)
566
+ %(#{compose_floating_title node.title}<p#{(node.style == 'abstract') ? ' outputclass="abstract"' : ''}#{compose_id node.id}#{compose_metadata node.role}>#{node.content}</p>)
575
567
  end
576
568
  end
577
569
 
@@ -587,9 +579,9 @@ class DitaTopic < Asciidoctor::Converter::Base
587
579
 
588
580
  def convert_paragraph node
589
581
  if (node.attr 'role') and (node.attr 'role').split.include? '_abstract'
590
- add_block_title %(<p outputclass="abstract"#{compose_metadata node.role}>#{node.content}</p>), node
582
+ add_block_title %(<p outputclass="abstract"#{compose_id node.id}#{compose_metadata node.role}>#{node.content}</p>), node
591
583
  else
592
- add_block_title %(<p#{compose_metadata node.role}>#{node.content}</p>), node
584
+ add_block_title %(<p#{compose_id node.id}#{compose_metadata node.role}>#{node.content}</p>), node
593
585
  end
594
586
  end
595
587
 
@@ -607,13 +599,13 @@ class DitaTopic < Asciidoctor::Converter::Base
607
599
  # Check if the content contains multiple block elements:
608
600
  if node.content_model == :compound
609
601
  <<~EOF.chomp
610
- <lq#{compose_metadata node.role}>
602
+ <lq#{compose_id node.id}#{compose_metadata node.role}>
611
603
  #{compose_floating_title node.title}#{node.content}#{author}#{source}
612
604
  </lq>
613
605
  EOF
614
606
  else
615
607
  <<~EOF.chomp
616
- <lq#{compose_metadata node.role}>
608
+ <lq#{compose_id node.id}#{compose_metadata node.role}>
617
609
  #{compose_floating_title node.title}<p>#{node.content}</p>#{author}#{source}
618
610
  </lq>
619
611
  EOF
@@ -659,13 +651,13 @@ class DitaTopic < Asciidoctor::Converter::Base
659
651
  # Check if the content contains multiple block elements:
660
652
  if node.content_model == :compound
661
653
  <<~EOF.chomp
662
- <div outputclass="sidebar"#{compose_metadata node.role}>
654
+ <div outputclass="sidebar"#{compose_id node.id}#{compose_metadata node.role}>
663
655
  #{compose_floating_title node.title}#{node.content}
664
656
  </div>
665
657
  EOF
666
658
  else
667
659
  <<~EOF.chomp
668
- <div outputclass="sidebar"#{compose_metadata node.role}>
660
+ <div outputclass="sidebar"#{compose_id node.id}#{compose_metadata node.role}>
669
661
  #{compose_floating_title node.title}<p>#{node.content}</p>
670
662
  </div>
671
663
  EOF
@@ -680,7 +672,7 @@ class DitaTopic < Asciidoctor::Converter::Base
680
672
 
681
673
  def convert_table node
682
674
  # Open the table:
683
- result = [%(<table#{compose_metadata node.role}>)]
675
+ result = [%(<table#{compose_id node.id}#{compose_metadata node.role}>)]
684
676
 
685
677
  # Check if the title is specified:
686
678
  result << %(<title>#{node.title}</title>) if node.title?
@@ -770,7 +762,7 @@ class DitaTopic < Asciidoctor::Converter::Base
770
762
 
771
763
  def convert_ulist node
772
764
  # Open the unordered list:
773
- result = [%(<ul#{compose_metadata node.role}>)]
765
+ result = [%(<ul#{compose_id node.id}#{compose_metadata node.role}>)]
774
766
 
775
767
  # Process individual list items:
776
768
  node.items.each do |item|
@@ -783,11 +775,11 @@ class DitaTopic < Asciidoctor::Converter::Base
783
775
 
784
776
  # Check if the list item contains multiple block elements:
785
777
  if item.blocks?
786
- result << %(<li#{compose_metadata item.role}>#{check_box}#{item.text})
778
+ result << %(<li#{compose_id item.id}#{compose_metadata item.role}>#{check_box}#{item.text})
787
779
  result << item.content
788
780
  result << %(</li>)
789
781
  else
790
- result << %(<li#{compose_metadata item.role}>#{check_box}#{item.text}</li>)
782
+ result << %(<li#{compose_id item.id}#{compose_metadata item.role}>#{check_box}#{item.text}</li>)
791
783
  end
792
784
  end
793
785
 
@@ -807,7 +799,7 @@ class DitaTopic < Asciidoctor::Converter::Base
807
799
 
808
800
  # Return the XML output:
809
801
  <<~EOF.chomp
810
- <lines#{compose_metadata node.role}>
802
+ <lines#{compose_id node.id}#{compose_metadata node.role}>
811
803
  #{node.content}#{author}#{source}
812
804
  </lines>
813
805
  EOF
@@ -842,18 +834,18 @@ class DitaTopic < Asciidoctor::Converter::Base
842
834
  # Check if the audio macro has a title specified:
843
835
  if node.title?
844
836
  <<~EOF.chomp
845
- <object data="#{target_url}"#{width}#{height}#{compose_metadata node.role}>
837
+ <object data="#{target_url}"#{width}#{height}#{compose_id node.id}#{compose_metadata node.role}>
846
838
  <desc>#{node.title}</desc>
847
839
  </object>
848
840
  EOF
849
841
  else
850
- %(<object data="#{target_url}"#{width}#{height}#{compose_metadata node.role} />)
842
+ %(<object data="#{target_url}"#{width}#{height}#{compose_id node.id}#{compose_metadata node.role} />)
851
843
  end
852
844
  end
853
845
 
854
846
  def compose_qanda_dlist node
855
847
  # Open the ordered list:
856
- result = [%(<ol#{compose_metadata node.role}>)]
848
+ result = [%(<ol#{compose_id node.id}#{compose_metadata node.role}>)]
857
849
 
858
850
  # Process individual list items:
859
851
  node.items.each do |terms, description|
@@ -884,7 +876,7 @@ class DitaTopic < Asciidoctor::Converter::Base
884
876
 
885
877
  def compose_horizontal_dlist node
886
878
  # Open the table:
887
- result = [%(<table outputclass="horizontal-dlist"#{compose_metadata node.role}>)]
879
+ result = [%(<table outputclass="horizontal-dlist"#{compose_id node.id}#{compose_metadata node.role}>)]
888
880
 
889
881
  # Check if the title is specified:
890
882
  result << %(<title>#{node.title}</title>) if node.title?
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: asciidoctor-dita-topic
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.1
4
+ version: 1.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jaromir Hradilek