From 5939fd0b80d765a6572d9560b36c8223da53ce6b Mon Sep 17 00:00:00 2001

From: myfreeer <myfreeer@users.noreply.github.com>

Date: Sun, 14 Oct 2018 16:43:53 +0800

Subject: [PATCH] source: use zh localized version

Makefile | 54 ++++++++++++------------

commands/preprocess.py | 23 ++++++----

commands/preprocess_cssless.py | 5 ++-

gadgets/standard_revisions-tests/base.py | 2 +-

gadgets/sync_tests_mwiki.py | 2 +-

index2ddg.py | 4 +-

index_transform/browser.py | 2 +-

preprocess.py | 8 ++--

tests/test_preprocess.py | 19 ++++++---

tests/test_preprocess_cssless.py | 2 +-

10 files changed, 67 insertions(+), 54 deletions(-)

index 2366fbc..423be32 100644

@@ -100,18 +100,18 @@ install: all

popd > /dev/null

# install the devhelp documentation

install -DT -m 644 "output/cppreference-doxygen-local.tag.xml" \

"$(DESTDIR)$(bookdir)/cppreference-doxygen-local.tag.xml"

install -DT -m 644 "output/cppreference-doxygen-web.tag.xml" \

"$(DESTDIR)$(bookdir)/cppreference-doxygen-web.tag.xml"

# install the .qch (Qt Help) documentation

uninstall:

rm -rf "$(DESTDIR)$(docdir)"

@@ -138,16 +138,16 @@ release: all

# zip qch

pushd "output"; \

popd

#WORKER RULES

doc_html: output/reference

doc_doxygen: output/cppreference-doxygen-web.tag.xml output/cppreference-doxygen-local.tag.xml

@@ -156,32 +156,32 @@ output/link-map.xml: output/reference

./build_link_map.py

#build the .devhelp2 index

./index2devhelp.py $(docdir)/html index-chapters-c.xml \

index-functions-c.xml "output/devhelp-index-c.xml"

./fix_devhelp-links.py "output/devhelp-index-c.xml" \

./index2devhelp.py $(docdir)/html index-chapters-cpp.xml \

index-functions-cpp.xml "output/devhelp-index-cpp.xml"

./fix_devhelp-links.py "output/devhelp-index-cpp.xml" \

#build the .qch (QT help) file

#qhelpgenerator only works if the project file is in the same directory as the documentation

cp "output/qch-help-project-cpp.xml" "output/reference_cssless/qch.xml"

pushd "output/reference_cssless" > /dev/null; \

popd > /dev/null

rm -f "output/reference_cssless/qch.xml"

#build the file list

echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><files>" > "output/qch-files.xml"

@@ -193,7 +193,7 @@ output/qch-help-project-cpp.xml: output/cppreference-doc-en-cpp.devhelp2 output/

echo "</files>" >> "output/qch-files.xml"

#create the project (copies the file list)

--dst=output/qch-help-project-cpp.xml \

--virtual_folder=cpp --file_list=output/qch-files.xml

@@ -229,7 +229,7 @@ indexes:

./index2autolinker.py index-functions-c.xml output/indexes/autolink-c

./index2autolinker.py index-functions-cpp.xml output/indexes/autolink-cpp

source:

rm -rf "reference"

mkdir "reference"

@@ -238,15 +238,15 @@ source:

regex=".*index\\.php.*|.*/Special:.*|.*/Talk:.*" \

regex+="|.*/Help:.*|.*/File:.*|.*/Cppreference:.*" \

regex+="|.*/WhatLinksHere:.*|.*/Template:.*|.*/Category:.*" \

echo $$regex ; \

wget --adjust-extension --page-requisites --convert-links \

--reject-regex $$regex \

--retry-connrefused --waitretry=10 --read-timeout=20 \

popd > /dev/null

index 12cb4e3..9e394d9 100644

@@ -41,15 +41,15 @@ def rearrange_archive(root):

# rearrange the archive. {root} here is output/reference

# before

# ... (other languages)

# {root}/upload.cppreference.com/mwiki/ : data

# after

# {root}/common/ : all common data

# ... (other languages)

data_path = os.path.join(root, 'common')

@@ -57,7 +57,7 @@ def rearrange_archive(root):

shutil.move(os.path.join(root, 'upload.cppreference.com/mwiki'), data_path)

shutil.rmtree(os.path.join(root, 'upload.cppreference.com'))

path = os.path.join(root, lang + ".cppreference.com/")

src_html_path = path + "w/"

src_data_path = path + "mwiki/"

@@ -78,7 +78,7 @@ def rearrange_archive(root):

shutil.copy(os.path.join(path, 'favicon.ico'), data_path)

# remove what's left

# remove the XML source file

for fn in fnmatch.filter(os.listdir(root), 'cppreference-export*.xml'):

@@ -295,7 +295,9 @@ def remove_google_analytics(html):

for el in html.xpath('/html/body/script'):

if el.get('src') is not None and 'google-analytics.com/ga.js' in el.get('src'):

el.getparent().remove(el)

el.getparent().remove(el)

# remove Carbon ads

@@ -316,7 +318,10 @@ def remove_fileinfo(html):

# make custom footer

def add_footer(html, root, fn):

for child in footer.getchildren():

id = child.get('id')

if id == 'cpp-navigation':

@@ -338,7 +343,7 @@ def add_footer(html, root, fn):

footer.remove(child)

def preprocess_html_file(root, fn, rename_map):

html = etree.parse(fn, parser)

output = io.StringIO()

index 2f75d5a..64742c6 100644

@@ -27,11 +27,12 @@ import io

import logging

import os

import warnings

def preprocess_html_merge_cssless(src_path, dst_path):

content = a_file.read()

stripped = content.strip()

root = etree.fromstring(stripped, parser)

index 848d431..91a0a99 100644

@@ -27,7 +27,7 @@ import unittest, time, re

class Driver:

def __init__(self):

driver = webdriver.Firefox()

driver.implicitly_wait(30)

try:

index 9aa3fc7..13294ec 100755

@@ -114,7 +114,7 @@ def perform_sync(url, direction, dest_root, title_filter, user, password,

# Supply information to config that would otherwise be defined in

# user-config.py

pywikibot.config2.family = 'cppreference'

pywikibot.config2.family_files['cppreference'] = url

pywikibot.config2.step = 100

pywikibot.config2.put_throttle = 0

index 9789e56..32a8707 100755

@@ -447,7 +447,7 @@ def process_identifier(out, redirects, root, link, item_ident, item_type,

abstract = abstract.replace('\n','\\n')

line += abstract + '\t'

# source url

out.write(line)

build_redirects(redirects, item_ident, item_type)

@@ -540,7 +540,7 @@ def main():

#print(str(i) + '/' + str(len(proc_ins)) + ': ' + link)

#i+=1

for ident in idents:

index d2e625c..11375f2 100644

@@ -42,7 +42,7 @@ class Index2Browser(IndexTransform):

res = u''

res += '<tt><b>' + xml_escape(full_name) + '</b></tt> [<span class="link">'

res += full_link + '</a></span>] <span class="mark">' + mark + '</span>\n'

return res

index ba5d37b..f852885 100755

@@ -29,12 +29,12 @@ def main():

parser.add_argument('--dst', type=str, help='Destination folder to put preprocessed archive to')

args = parser.parse_args()

# copy the source tree

preprocess.rearrange_archive(root)

index 0c6568c..247d062 100644

@@ -26,19 +26,26 @@ from lxml import etree

class TestConvertLoaderName(unittest.TestCase):

def test_convert_loader_name(self):

self.assertEqual('site_scripts.js', convert_loader_name(url))

self.assertEqual('site_modules.css', convert_loader_name(url))

self.assertEqual('skin_scripts.js', convert_loader_name(url))

self.assertEqual('startup_scripts.js', convert_loader_name(url))

self.assertEqual('ext.css', convert_loader_name(url))

with self.assertRaises(Exception):

@@ -196,7 +203,7 @@ class TestPreprocessHtml(unittest.TestCase):

def setUp(self):

self.testdata = os.path.join(os.path.dirname(__file__), 'preprocess_data')

infile = os.path.join(self.testdata, "fabs.html")

self.html = etree.parse(infile, self.parser)

# Check whether the HTML matches the contents of the specified test data file

index fc93019..ffad345 100644

@@ -63,7 +63,7 @@ class HTMLTestBase(unittest.TestCase):

input = '<html><body>{0}</body></html>'.format(input)

expected_output = '<html><body>{0}</body></html>'.format(expected_output)

root = etree.fromstring(input, parser)

root = function(root)

2.19.0