@@ -31,13 +31,13 @@ module JekyllPluginPreName
3131class PreTagBlock < Liquid ::Block
3232 @@prefix = "<button class='copyBtn' data-clipboard-target="
3333 @@suffix = " title='Copy to clipboard'><img src='/assets/images/clippy.svg' " \
34- "alt='Copy to clipboard' style='width: 13px'></button>"
34+ "alt='Copy to clipboard' style='width: 13px'></button>"
3535
3636 def self . make_copy_button ( pre_id )
3737 "#{ @@prefix } #{ pre_id } #{ @@suffix }
3838 end
3939
40- def self . make_pre ( make_copy_button , label , content )
40+ def self . make_pre ( make_copy_button , number_lines , label , content )
4141 label = if label . to_s . empty?
4242 ""
4343 elsif label . to_s . downcase . strip == "shell"
@@ -47,47 +47,73 @@ def self.make_pre(make_copy_button, label, content)
4747 end
4848 pre_id = "id#{ SecureRandom . hex ( 6 ) }
4949 copy_button = make_copy_button ? PreTagBlock . make_copy_button ( pre_id ) : ""
50+ content = PreTagBlock . number_content ( content ) if number_lines
5051 "#{ label } #{ pre_id } #{ copy_button } #{ content . strip }
5152 end
5253
53- # @param tag_name [String] is the name of the tag, which we already know.
54- # @param text [Hash, String, Liquid::Tag::Parser] the arguments from the web page.
55- # @param tokens [Liquid::ParseContext] tokenized command line
54+ def self . number_content ( content )
55+ lines = content . split ( "\n " )
56+ digits = lines . length . to_s . length
57+ i = 0
58+ numbered_content = lines . map do |line |
59+ i += 1
60+ number = i . to_s . rjust ( digits , " " )
61+ "<span class='unselectable'> #{ number } #{ line }
62+ end
63+ result = numbered_content . join ( "\n " )
64+ result += "\n " unless result . end_with? ( "\n " )
65+ result
66+ end
67+
68+ # @param _tag_name [String] is the name of the tag, which we already know.
69+ # @param argument_string [String] the arguments from the web page.
70+ # @param _tokens [Liquid::ParseContext] tokenized command line
5671 # @return [void]
57- def initialize ( tag_name , text , tokens )
58- super ( tag_name , text , tokens )
59- text = "" if text . nil?
60- text . strip!
61- @make_copy_button = text . include? "copyButton"
62- remaining_text = text . sub ( "copyButton" , "" ) . strip
72+ def initialize ( _tag_name , argument_string , _tokens )
73+ super
74+ argument_string = "" if argument_string . nil?
75+ argument_string . strip!
76+
6377 @logger = PluginMetaLogger . instance . new_logger ( self )
64- @logger . debug { "@make_copy_button = '#{ @make_copy_button } #{ text } #{ remaining_text } }
78+
79+ @make_copy_button = argument_string . include? "copyButton"
80+ remaining_text = argument_string . sub ( "copyButton" , "" ) . strip
81+
82+ @number_lines = remaining_text . include? "number"
83+ remaining_text = remaining_text . sub ( "number" , "" ) . strip
84+
6585 @label = remaining_text
86+
87+ @logger . debug { "@make_copy_button = '#{ @make_copy_button } #{ argument_string } #{ remaining_text } }
6688 end
6789
6890 # Method prescribed by the Jekyll plugin lifecycle.
6991 # @return [String]
7092 def render ( context )
7193 content = super
7294 @logger . debug { "@make_copy_button = '#{ @make_copy_button } #{ @label } }
73- PreTagBlock . make_pre ( @make_copy_button , @label , content )
95+ PreTagBlock . make_pre ( @make_copy_button , @number_lines , @ label, content )
7496 end
7597end
7698
7799# """\\{% noselect %} or \\{% noselect this all gets copied.
78100# Also, space before the closing percent is signficant %}"""
79101class UnselectableTag < Liquid ::Tag
80- def initialize ( tag_name , text , tokens )
81- super ( tag_name , text , tokens )
82- @content = text
102+ # @param _tag_name [String] is the name of the tag, which we already know.
103+ # @param argument_string [String] the arguments from the web page.
104+ # @param _tokens [Liquid::ParseContext] tokenized command line
105+ # @return [void]
106+ def initialize ( _tag_name , argument_string , _tokens )
107+ super
83108 @logger = PluginMetaLogger . instance . new_logger ( self )
84- @logger . debug { "UnselectableTag: content1= '#{ @content } }
85- @content = "$ " if @content . nil? || @content . empty?
86- @logger . debug { "UnselectableTag: content2= '#{ @content } }
109+
110+ @argument_string = argument_string
111+ @argument_string = "$ " if @argument_string . nil? || @argument_string . empty?
112+ @logger . debug { "UnselectableTag: argument_string= '#{ @argument_string } }
87113 end
88114
89115 def render ( _ )
90- "<span class='unselectable'>#{ @content }
116+ "<span class='unselectable'>#{ @argument_string }
91117 end
92118end
93119
0 commit comments