" + @converter.convert(s[1]) + "" - slugsInBlock = block.scan(/.*?(%7[Bb]%slug%20([\w-]+)%{2}7[Dd])/) - if slugsInBlock.count > 0 - slugsInBlock.each do |slug| - targetPage = @site.pages.find {|p| p.data['slug'] == slug[1]} - if targetPage - link = @site.baseurl + targetPage.url.sub('.html', '') - block.sub!(slug[0], link) - end - end - end - content.sub!(s[0]+s[1], block) - end - end - end - end + def createAlert(alertType, content) + sub_string = content.scan(/(>#{alertType})((.|\n[\w\*\[!^<>|#])*)/) + if sub_string.count == 0 + ##puts "no " + alertType + "s" + else + sub_string.each do |s| + block ="
" + @converter.convert(s[1].gsub(/(^>)/x, "")) + "" + slugsInBlock = block.scan(/.*?(%7[Bb]%slug%20([\w-]+)%{2}7[Dd])/) + if slugsInBlock.count > 0 + slugsInBlock.each do |slug| + targetPage = @site.pages.find {|p| p.data['slug'] == slug[1]} + if targetPage + link = @site.baseurl + targetPage.url.sub('.html', '') + block.sub!(slug[0], link) + end + end + end + content.sub!(s[0]+s[1], block) + end + end + end + end end diff --git a/_plugins/caption_generator.rb b/_plugins/caption_generator.rb new file mode 100644 index 0000000..3eb6377 --- /dev/null +++ b/_plugins/caption_generator.rb @@ -0,0 +1,20 @@ +module Reading + class CaptionGenerator < Jekyll::Generator + def generate(site) + @site = site + @converter = site.find_converter_instance(Jekyll::Converters::Markdown) + site.pages.each do |p| + createCaption(p.content) + end + end + + def createCaption(content) + sub_string = content.scan(/(>caption)(.*)/) + + sub_string.each do |s| + block ="
" + @converter.convert(s[1]) + "
"
+ content.sub!(s[0]+s[1], block)
+ end
+ end
+ end
+end
diff --git a/_plugins/code_tabstrip_generator.rb b/_plugins/code_tabstrip_generator.rb
index 0bf5c2c..4ad3132 100644
--- a/_plugins/code_tabstrip_generator.rb
+++ b/_plugins/code_tabstrip_generator.rb
@@ -1,5 +1,5 @@
module Reading
- class TabbedCodeGenerator < Jekyll::Generator
+ class RegionCodeTabStripGenerator < Jekyll::Generator
def generate(site)
@headerSearchPattern = /####\s{1,}(__|\*\*)?\[?(VB|VB.NET|C#|XAML|SQL|XML)\]?\s*.*/
@snippetSearchPattern = /####\s{1,}(__|\*\*)?\[?(VB|VB.NET|C#|XAML|SQL|XML)\]?\s*.*\s*(>\n*)*{{region\s.*}}\n*\r*((?!{{endregion}}).*\n*\r*\s*)+?(>?{{endregion}})/ # gets the whole snippet portion - header + region tags + code snippet
@@ -95,7 +95,7 @@ module Reading
languageString = languageString.gsub("__", "")
languageString = languageString.gsub("**", "")
languageString = languageString.gsub("[", "")
- languageString = languageString.gsub("]", "")
+ languageString = languageString.gsub("]", "")
return languageString
end
return ""
diff --git a/_plugins/markdown_processor.rb b/_plugins/markdown_processor.rb
index 3701afc..9f5322e 100644
--- a/_plugins/markdown_processor.rb
+++ b/_plugins/markdown_processor.rb
@@ -8,7 +8,7 @@ module Jekyll
def call()
- doc.css('h1, h2').each do |heading|
+ doc.css('h1, h2, h3').each do |heading|
desc_node = heading.children.first()
if desc_node
diff --git a/_plugins/remove_inheritance_generator.rb b/_plugins/remove_inheritance_generator.rb
new file mode 100644
index 0000000..92628bb
--- /dev/null
+++ b/_plugins/remove_inheritance_generator.rb
@@ -0,0 +1,13 @@
+module Reading
+ class RemoveInheritanceGenerator < Jekyll::Generator
+ def generate(site)
+ if site.config['platform'] == "aspnet-ajax"
+ site.pages.each do |p|
+ if p.data["description"] == "Client-side API Reference"
+ p.content.sub!(/(^#[^:]*).*/, '\1')
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/_plugins/tabbedCode_generator.rb b/_plugins/tabbedCode_generator.rb
new file mode 100644
index 0000000..735aabe
--- /dev/null
+++ b/_plugins/tabbedCode_generator.rb
@@ -0,0 +1,38 @@
+module Reading
+ class TabbedCodeGenerator < Jekyll::Generator
+ def generate(site)
+ @site = site
+ @converter = site.find_converter_instance(Jekyll::Converters::Markdown)
+ site.pages.each do |p|
+ createTabbedCode(p, p.content)
+ end
+ end
+
+ def createTabbedCode(page, content)
+ tab_start = /````\w/
+ tab_end = /````\s{2,}/
+
+ first_index = content.index(tab_start)
+ last_index = first_index && content.index(tab_end, first_index)
+ indexes = []
+
+ while first_index && !indexes.include?(first_index)
+ if last_index.nil?
+ Jekyll.logger.warn "Tabbed Code Error:", "Failed to generate tabbed code in #{page.path}"
+ end
+
+ indexes.push(first_index)
+ block = encode_liquid(content[first_index..last_index + 4])
+ block = @converter.convert(block)
+ content[first_index..last_index + 4] = "" + block + "
"
+
+ first_index = content.index(tab_start, last_index)
+ last_index = first_index && content.index(tab_end, last_index + 4)
+ end
+ end
+
+ def encode_liquid(content)
+ content = content.gsub("{{", "{{ '{{' }}")
+ end
+ end
+end
diff --git a/_plugins/template_generator.rb b/_plugins/template_generator.rb
new file mode 100644
index 0000000..6a54124
--- /dev/null
+++ b/_plugins/template_generator.rb
@@ -0,0 +1,97 @@
+module Reading
+ class TemplateGenerator < Jekyll::Generator
+ priority :highest
+
+ def generate(site)
+ @site = site
+ @converter = site.find_converter_instance(Jekyll::Converters::Markdown)
+ site.pages.each do |p|
+ process_content(p, p.content)
+ end
+ end
+
+ def process_content(page, content)
+ template_regexp = /@\[template[^\]]*\]\(\/([^#]*)#([^\s]*)(\s+"([^"]*)")?\)/
+ template_match = content.match template_regexp
+
+ while template_match
+ begin
+ result = process_template(template_match)
+ content.gsub!(template_match.to_s, result)
+ template_match = content.match template_regexp
+ rescue => error
+ Jekyll.logger.warn "Error:", "Templates processing failed in #{page.path}"
+ raise error
+ end
+ end
+ end
+
+ def process_template(match)
+ file_name = match[1]
+ section_id = match[2].downcase
+ has_arguments = match[3]
+ arguments = match[4]
+
+ unless $template_hash
+ $template_hash = Hash.new
+ end
+
+ unless $template_hash[file_name]
+ read_template_file(file_name)
+ end
+
+ result = $template_hash[file_name][section_id].to_s
+
+ if(has_arguments)
+ arg_plc_start = "@{"
+ arg_plc_end = "}"
+ placeholder_regex = /#{arg_plc_start}([^#{arg_plc_end}]*)#{arg_plc_end}/
+ arguments_hash = generate_arguments_hash(arguments, arg_plc_start, arg_plc_end)
+ return result.gsub(placeholder_regex, arguments_hash).rstrip
+ end
+
+ return result.rstrip
+ end
+
+ def read_template_file(file_name)
+ $template_hash[file_name] = Hash.new
+ start_regex = /#+([^#]*)/
+ end_regex = /#+end/i
+
+ lines = File.readlines(file_name, :encoding => 'UTF-8')
+ start_recording = false
+ id = ""
+
+ lines.each do |line|
+ start_match = start_regex.match(line)
+ end_match = end_regex.match(line)
+
+ if(end_match and start_recording)
+ start_recording = false
+ id = ""
+ end
+
+ if(start_recording)
+ $template_hash[file_name][id] = $template_hash[file_name][id].to_s << line
+ end
+
+ if(start_match and !start_recording and !end_match)
+ start_recording = true
+ id = start_match[1].strip.downcase
+ $template_hash[file_name][id] = ""
+ end
+ end
+ end
+
+ def generate_arguments_hash(arguments, plc_start, plc_end)
+ args_array = arguments.split(",").collect{|x| x.strip.split(":").collect{|value| value.strip}}
+ hash_args = Hash.new
+ Hash[args_array].each {|key, value|
+ hash_key = "#{plc_start}#{key}#{plc_end}"
+ hash_args[hash_key] = value
+ }
+
+ return hash_args
+ end
+ end
+end
diff --git a/build-docs.sh b/build-docs.sh
index c4c50b9..c0af503 100644
--- a/build-docs.sh
+++ b/build-docs.sh
@@ -16,6 +16,6 @@ if [ ! -z "$2" ]
fi
rm -rf _site/ .sass-cache .jekyll-cache .asset-cache
-docker pull tmitev/docs-seed:site
-docker build -t tmitev/docs-seed:site .
-docker run --rm --env CONFIG_FILE=$config_file --env JEKYLL_COMMAND=build --env JEKYLL_EXTRA=$debug_params -t -v "/$(pwd):/app_root" -t tmitev/docs-seed:site
+docker pull progressdocs/docs-seed:site
+docker build -t progressdocs/docs-seed:site .
+docker run --rm --env CONFIG_FILE=$config_file --env JEKYLL_COMMAND=build --env JEKYLL_EXTRA=$debug_params -t -v "/$(pwd):/app_root" -t progressdocs/docs-seed:site
diff --git a/start-docs.sh b/start-docs.sh
index 59e6235..25b7198 100644
--- a/start-docs.sh
+++ b/start-docs.sh
@@ -9,6 +9,6 @@ fi
echo "Using configuration from: $config_file"
rm -rf _site/ .sass-cache .jekyll-cache .asset-cache
-docker pull tmitev/docs-seed:site
-docker build -t tmitev/docs-seed:site .
-docker run --rm -it --env CONFIG_FILE=$config_file --env JEKYLL_COMMAND="serve" --env JEKYLL_EXTRA="--watch --incremental --host 0.0.0.0" --name docs_site -t -i -v /$(pwd):/app_root -p 4000:4000 -t tmitev/docs-seed:site
+docker pull progressdocs/docs-seed:site
+docker build -t progressdocs/docs-seed:site .
+docker run --rm -it --env CONFIG_FILE=$config_file --env JEKYLL_COMMAND="serve" --env JEKYLL_EXTRA="--watch --incremental --host 0.0.0.0" --name docs_site -t -i -v /$(pwd):/app_root -p 4000:4000 -t progressdocs/docs-seed:site